commit ee6a12d0d4d85f3833d177cd382cd417f0ef011b
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Thu Oct 5 21:42:47 2023 -0400
+
+ ext4: add missing initialization of call_notify_error in update_super_work()
+
+ Fixes: ff0722de896e ("ext4: add periodic superblock update check")
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index dbebd8b3127e..6f48dec19f4a 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -768,7 +768,8 @@ static void update_super_work(struct work_struct *work)
+ */
+ if (!sb_rdonly(sbi->s_sb) && journal) {
+ struct buffer_head *sbh = sbi->s_sbh;
+- bool call_notify_err;
++ bool call_notify_err = false;
++
+ handle = jbd2_journal_start(journal, 1);
+ if (IS_ERR(handle))
+ goto write_directly;commit bb15cea20f211e110150e528fca806f38d5789e0
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Tue Aug 22 23:43:38 2023 -0400
+
+ ext4: rename s_error_work to s_sb_upd_work
+
+ The most common use that s_error_work will get scheduled is now the
+ periodic update of the superblock. So rename it to s_sb_upd_work.
+
+ Also rename the function flush_stashed_error_work() to
+ update_super_work().
+
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
+index 2c2c3191bf41..84618c46f239 100644
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -1698,10 +1698,13 @@ struct ext4_sb_info {
+ const char *s_last_error_func;
+ time64_t s_last_error_time;
+ /*
+- * If we are in a context where we cannot update error information in
+- * the on-disk superblock, we queue this work to do it.
++ * If we are in a context where we cannot update the on-disk
++ * superblock, we queue the work here. This is used to update
++ * the error information in the superblock, and for periodic
++ * updates of the superblock called from the commit callback
++ * function.
+ */
+- struct work_struct s_error_work;
++ struct work_struct s_sb_upd_work;
+
+ /* Ext4 fast commit sub transaction ID */
+ atomic_t s_fc_subtid;
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index bf0cfdffa9d0..91f20afa1d71 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -481,7 +481,7 @@ static void ext4_maybe_update_superblock(struct super_block *sb)
+ diff_size = lifetime_write_kbytes - le64_to_cpu(es->s_kbytes_written);
+
+ if (diff_size > EXT4_SB_REFRESH_INTERVAL_KB)
+- schedule_work(&EXT4_SB(sb)->s_error_work);
++ schedule_work(&EXT4_SB(sb)->s_sb_upd_work);
+ }
+
+ /*
+@@ -723,7 +723,7 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
+ * defer superblock flushing to a workqueue.
+ */
+ if (continue_fs && journal)
+- schedule_work(&EXT4_SB(sb)->s_error_work);
++ schedule_work(&EXT4_SB(sb)->s_sb_upd_work);
+ else
+ ext4_commit_super(sb);
+ }
+@@ -750,10 +750,10 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
+ sb->s_flags |= SB_RDONLY;
+ }
+
+-static void flush_stashed_error_work(struct work_struct *work)
++static void update_super_work(struct work_struct *work)
+ {
+ struct ext4_sb_info *sbi = container_of(work, struct ext4_sb_info,
+- s_error_work);
++ s_sb_upd_work);
+ journal_t *journal = sbi->s_journal;
+ handle_t *handle;
+
+@@ -1078,7 +1078,7 @@ __acquires(bitlock)
+ if (!bdev_read_only(sb->s_bdev)) {
+ save_error_info(sb, EFSCORRUPTED, ino, block, function,
+ line);
+- schedule_work(&EXT4_SB(sb)->s_error_work);
++ schedule_work(&EXT4_SB(sb)->s_sb_upd_work);
+ }
+ return;
+ }
+@@ -1318,10 +1318,10 @@ static void ext4_put_super(struct super_block *sb)
+ * Unregister sysfs before destroying jbd2 journal.
+ * Since we could still access attr_journal_task attribute via sysfs
+ * path which could have sbi->s_journal->j_task as NULL
+- * Unregister sysfs before flush sbi->s_error_work.
++ * Unregister sysfs before flush sbi->s_sb_upd_work.
+ * Since user may read /proc/fs/ext4/xx/mb_groups during umount, If
+ * read metadata verify failed then will queue error work.
+- * flush_stashed_error_work will call start_this_handle may trigger
++ * update_super_work will call start_this_handle may trigger
+ * BUG_ON.
+ */
+ ext4_unregister_sysfs(sb);
+@@ -1333,7 +1333,7 @@ static void ext4_put_super(struct super_block *sb)
+ ext4_unregister_li_request(sb);
+ ext4_quotas_off(sb, EXT4_MAXQUOTAS);
+
+- flush_work(&sbi->s_error_work);
++ flush_work(&sbi->s_sb_upd_work);
+ destroy_workqueue(sbi->rsv_conversion_wq);
+ ext4_release_orphan_info(sb);
+
+@@ -4998,8 +4998,8 @@ static int ext4_load_and_init_journal(struct super_block *sb,
+ return 0;
+
+ out:
+- /* flush s_error_work before journal destroy. */
+- flush_work(&sbi->s_error_work);
++ /* flush s_sb_upd_work before destroying the journal. */
++ flush_work(&sbi->s_sb_upd_work);
+ jbd2_journal_destroy(sbi->s_journal);
+ sbi->s_journal = NULL;
+ return -EINVAL;
+@@ -5322,7 +5322,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
+
+ timer_setup(&sbi->s_err_report, print_daily_error_info, 0);
+ spin_lock_init(&sbi->s_error_lock);
+- INIT_WORK(&sbi->s_error_work, flush_stashed_error_work);
++ INIT_WORK(&sbi->s_sb_upd_work, update_super_work);
+
+ err = ext4_group_desc_init(sb, es, logical_sb_block, &first_not_zeroed);
+ if (err)
+@@ -5666,16 +5666,16 @@ failed_mount9: __maybe_unused
+ sbi->s_ea_block_cache = NULL;
+
+ if (sbi->s_journal) {
+- /* flush s_error_work before journal destroy. */
+- flush_work(&sbi->s_error_work);
++ /* flush s_sb_upd_work before journal destroy. */
++ flush_work(&sbi->s_sb_upd_work);
+ jbd2_journal_destroy(sbi->s_journal);
+ sbi->s_journal = NULL;
+ }
+ failed_mount3a:
+ ext4_es_unregister_shrinker(sbi);
+ failed_mount3:
+- /* flush s_error_work before sbi destroy */
+- flush_work(&sbi->s_error_work);
++ /* flush s_sb_upd_work before sbi destroy */
++ flush_work(&sbi->s_sb_upd_work);
+ del_timer_sync(&sbi->s_err_report);
+ ext4_stop_mmpd(sbi);
+ ext4_group_desc_free(sbi);
+@@ -6551,7 +6551,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ }
+
+ /* Flush outstanding errors before changing fs state */
+- flush_work(&sbi->s_error_work);
++ flush_work(&sbi->s_sb_upd_work);
+
+ if ((bool)(fc->sb_flags & SB_RDONLY) != sb_rdonly(sb)) {
+ if (ext4_forced_shutdown(sb)) {commit 2ef6c32a914b85217b44a0a2418e830e520b085e
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Fri Jun 23 10:18:51 2023 -0400
+
+ ext4: avoid updating the superblock on a r/o mount if not needed
+
+ This was noticed by a user who noticied that the mtime of a file
+ backing a loopback device was getting bumped when the loopback device
+ is mounted read/only. Note: This doesn't show up when doing a
+ loopback mount of a file directly, via "mount -o ro /tmp/foo.img
+ /mnt", since the loop device is set read-only when mount automatically
+ creates loop device. However, this is noticeable for a LUKS loop
+ device like this:
+
+ % cryptsetup luksOpen /tmp/foo.img test
+ % mount -o ro /dev/loop0 /mnt ; umount /mnt
+
+ or, if LUKS is not in use, if the user manually creates the loop
+ device like this:
+
+ % losetup /dev/loop0 /tmp/foo.img
+ % mount -o ro /dev/loop0 /mnt ; umount /mnt
+
+ The modified mtime causes rsync to do a rolling checksum scan of the
+ file on the local and remote side, incrementally increasing the time
+ to rsync the not-modified-but-touched image file.
+
+ Fixes: eee00237fa5e ("ext4: commit super block if fs record error when journal record without error")
+ Cc: stable@kernel.org
+ Link: https://lore.kernel.org/r/ZIauBR7YiV3rVAHL@glitch
+ Reported-by: Sean Greenslade <sean@seangreenslade.com>
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index b3819e70093e..c638b0db3b2b 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -5997,19 +5997,27 @@ static int ext4_load_journal(struct super_block *sb,
+ err = jbd2_journal_wipe(journal, !really_read_only);
+ if (!err) {
+ char *save = kmalloc(EXT4_S_ERR_LEN, GFP_KERNEL);
++ __le16 orig_state;
++ bool changed = false;
+
+ if (save)
+ memcpy(save, ((char *) es) +
+ EXT4_S_ERR_START, EXT4_S_ERR_LEN);
+ err = jbd2_journal_load(journal);
+- if (save)
++ if (save && memcmp(((char *) es) + EXT4_S_ERR_START,
++ save, EXT4_S_ERR_LEN)) {
+ memcpy(((char *) es) + EXT4_S_ERR_START,
+ save, EXT4_S_ERR_LEN);
++ changed = true;
++ }
+ kfree(save);
++ orig_state = es->s_state;
+ es->s_state |= cpu_to_le16(EXT4_SB(sb)->s_mount_state &
+ EXT4_ERROR_FS);
++ if (orig_state != es->s_state)
++ changed = true;
+ /* Write out restored error information to the superblock */
+- if (!bdev_read_only(sb->s_bdev)) {
++ if (changed && !really_read_only) {
+ int err2;
+ err2 = ext4_commit_super(sb);
+ err = err ? : err2;commit 4c0cfebdf3c34c9cd2c55844f549fa46b1da3164
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Thu Jun 8 10:39:35 2023 -0400
+
+ ext4: clean up mballoc criteria comments
+
+ Line wrap and slightly clarify the comments describing mballoc's
+ cirtiera.
+
+ Define EXT4_MB_NUM_CRS as part of the enum, so that it will
+ automatically get updated when criteria is added or removed.
+
+ Also fix a potential unitialized use of 'cr' variable if
+ CONFIG_EXT4_DEBUG is enabled.
+
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
+index 6a1f013d23f7..45a531446ea2 100644
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -128,47 +128,52 @@ enum SHIFT_DIRECTION {
+ };
+
+ /*
+- * Number of criterias defined. For each criteria, mballoc has slightly
+- * different way of finding the required blocks nad usually, higher the
+- * criteria the slower the allocation. We start at lower criterias and keep
+- * falling back to higher ones if we are not able to find any blocks.
+- */
+-#define EXT4_MB_NUM_CRS 5
+-/*
+- * All possible allocation criterias for mballoc. Lower are faster.
++ * For each criteria, mballoc has slightly different way of finding
++ * the required blocks nad usually, higher the criteria the slower the
++ * allocation. We start at lower criterias and keep falling back to
++ * higher ones if we are not able to find any blocks. Lower (earlier)
++ * criteria are faster.
+ */
+ enum criteria {
+ /*
+- * Used when number of blocks needed is a power of 2. This doesn't
+- * trigger any disk IO except prefetch and is the fastest criteria.
++ * Used when number of blocks needed is a power of 2. This
++ * doesn't trigger any disk IO except prefetch and is the
++ * fastest criteria.
+ */
+ CR_POWER2_ALIGNED,
+
+ /*
+- * Tries to lookup in-memory data structures to find the most suitable
+- * group that satisfies goal request. No disk IO except block prefetch.
++ * Tries to lookup in-memory data structures to find the most
++ * suitable group that satisfies goal request. No disk IO
++ * except block prefetch.
+ */
+ CR_GOAL_LEN_FAST,
+
+ /*
+- * Same as CR_GOAL_LEN_FAST but is allowed to reduce the goal length to
+- * the best available length for faster allocation.
++ * Same as CR_GOAL_LEN_FAST but is allowed to reduce the goal
++ * length to the best available length for faster allocation.
+ */
+ CR_BEST_AVAIL_LEN,
+
+ /*
+- * Reads each block group sequentially, performing disk IO if necessary, to
+- * find find_suitable block group. Tries to allocate goal length but might trim
+- * the request if nothing is found after enough tries.
++ * Reads each block group sequentially, performing disk IO if
++ * necessary, to find find_suitable block group. Tries to
++ * allocate goal length but might trim the request if nothing
++ * is found after enough tries.
+ */
+ CR_GOAL_LEN_SLOW,
+
+ /*
+- * Finds the first free set of blocks and allocates those. This is only
+- * used in rare cases when CR_GOAL_LEN_SLOW also fails to allocate
+- * anything.
++ * Finds the first free set of blocks and allocates
++ * those. This is only used in rare cases when
++ * CR_GOAL_LEN_SLOW also fails to allocate anything.
+ */
+ CR_ANY_FREE,
++
++ /*
++ * Number of criterias defined.
++ */
++ EXT4_MB_NUM_CRS
+ };
+
+ /* criteria below which we use fast block scanning and avoid unnecessary IO */
+diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
+index 74ebe31f8d0f..a2475b8c9fb5 100644
+--- a/fs/ext4/mballoc.c
++++ b/fs/ext4/mballoc.c
+@@ -1035,11 +1035,9 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context
+
+ if (num_stripe_clusters > 0) {
+ /*
+- * Try to round up the adjusted goal to stripe size
+- * (in cluster units) multiple for efficiency.
+- *
+- * XXX: Is s->stripe always a power of 2? In that case
+- * we can use the faster round_up() variant.
++ * Try to round up the adjusted goal length to
++ * stripe size (in cluster units) multiple for
++ * efficiency.
+ */
+ ac->ac_g_ex.fe_len = roundup(ac->ac_g_ex.fe_len,
+ num_stripe_clusters);
+@@ -2758,7 +2756,7 @@ static noinline_for_stack int
+ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
+ {
+ ext4_group_t prefetch_grp = 0, ngroups, group, i;
+- enum criteria cr, new_cr;
++ enum criteria new_cr, cr = CR_GOAL_LEN_FAST;
+ int err = 0, first_err = 0;
+ unsigned int nr = 0, prefetch_ios = 0;
+ struct ext4_sb_info *sbi;
+@@ -2815,12 +2813,13 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac)
+ spin_unlock(&sbi->s_md_lock);
+ }
+
+- /* Let's just scan groups to find more-less suitable blocks */
+- cr = ac->ac_2order ? CR_POWER2_ALIGNED : CR_GOAL_LEN_FAST;
+ /*
+- * cr == CR_POWER2_ALIGNED try to get exact allocation,
+- * cr == CR_ANY_FREE try to get anything
++ * Let's just scan groups to find more-less suitable blocks We
++ * start with CR_GOAL_LEN_FAST, unless it is power of 2
++ * aligned, in which case let's do that faster approach first.
+ */
++ if (ac->ac_2order)
++ cr = CR_POWER2_ALIGNED;
+ repeat:
+ for (; cr < EXT4_MB_NUM_CRS && ac->ac_status == AC_STATUS_CONTINUE; cr++) {
+ ac->ac_criteria = cr;commit dea9d8f7643fab07bf89a1155f1f94f37d096a5e
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Thu Jun 8 10:06:40 2023 -0400
+
+ ext4: only check dquot_initialize_needed() when debugging
+
+ ext4_xattr_block_set() relies on its caller to call dquot_initialize()
+ on the inode. To assure that this has happened there are WARN_ON
+ checks. Unfortunately, this is subject to false positives if there is
+ an antagonist thread which is flipping the file system at high rates
+ between r/o and rw. So only do the check if EXT4_XATTR_DEBUG is
+ enabled.
+
+ Link: https://lore.kernel.org/r/20230608044056.GA1418535@mit.edu
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index 13d7f17a9c8c..321e3a888c20 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -2056,8 +2056,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
+ else {
+ u32 ref;
+
++#ifdef EXT4_XATTR_DEBUG
+ WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+ /* The old block is released after updating
+ the inode. */
+ error = dquot_alloc_block(inode,
+@@ -2120,8 +2121,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
+ /* We need to allocate a new block */
+ ext4_fsblk_t goal, block;
+
++#ifdef EXT4_XATTR_DEBUG
+ WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+ goal = ext4_group_first_block_no(sb,
+ EXT4_I(inode)->i_block_group);
+ block = ext4_new_meta_blocks(handle, inode, goal, 0,commit 1b29243933098cdbc31b579b5616e183b4275e2f
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Thu Jun 8 09:57:04 2023 -0400
+
+ Revert "ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled"
+
+ This reverts commit a44be64bbecb15a452496f60db6eacfee2b59c79.
+
+ Link: https://lore.kernel.org/r/653b3359-2005-21b1-039d-c55ca4cffdcc@gmail.com
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 56a5d1c469fc..05fcecc36244 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -6388,7 +6388,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ struct ext4_mount_options old_opts;
+ ext4_group_t g;
+ int err = 0;
+- int enable_rw = 0;
+ #ifdef CONFIG_QUOTA
+ int enable_quota = 0;
+ int i, j;
+@@ -6575,7 +6574,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ if (err)
+ goto restore_opts;
+
+- enable_rw = 1;
++ sb->s_flags &= ~SB_RDONLY;
+ if (ext4_has_feature_mmp(sb)) {
+ err = ext4_multi_mount_protect(sb,
+ le64_to_cpu(es->s_mmp_block));
+@@ -6622,9 +6621,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)
+ ext4_release_system_zone(sb);
+
+- if (enable_rw)
+- sb->s_flags &= ~SB_RDONLY;
+-
+ /*
+ * Reinitialize lazy itable initialization thread based on
+ * current settingscommit eb1f822c76beeaa76ab8b6737ab9dc9f9798408c
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Fri May 26 23:57:29 2023 -0400
+
+ ext4: enable the lazy init thread when remounting read/write
+
+ In commit a44be64bbecb ("ext4: don't clear SB_RDONLY when remounting
+ r/w until quota is re-enabled") we defer clearing tyhe SB_RDONLY flag
+ in struct super. However, we didn't defer when we checked sb_rdonly()
+ to determine the lazy itable init thread should be enabled, with the
+ next result that the lazy inode table initialization would not be
+ properly started. This can cause generic/231 to fail in ext4's
+ nojournal mode.
+
+ Fix this by moving when we decide to start or stop the lazy itable
+ init thread to after we clear the SB_RDONLY flag when we are
+ remounting the file system read/write.
+
+ Fixes a44be64bbecb ("ext4: don't clear SB_RDONLY when remounting r/w until...")
+
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+ Link: https://lore.kernel.org/r/20230527035729.1001605-1-tytso@mit.edu
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 9680fe753e59..56a5d1c469fc 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -6588,18 +6588,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ }
+ }
+
+- /*
+- * Reinitialize lazy itable initialization thread based on
+- * current settings
+- */
+- if (sb_rdonly(sb) || !test_opt(sb, INIT_INODE_TABLE))
+- ext4_unregister_li_request(sb);
+- else {
+- ext4_group_t first_not_zeroed;
+- first_not_zeroed = ext4_has_uninit_itable(sb);
+- ext4_register_li_request(sb, first_not_zeroed);
+- }
+-
+ /*
+ * Handle creation of system zone data early because it can fail.
+ * Releasing of existing data is done when we are sure remount will
+@@ -6637,6 +6625,18 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
+ if (enable_rw)
+ sb->s_flags &= ~SB_RDONLY;
+
++ /*
++ * Reinitialize lazy itable initialization thread based on
++ * current settings
++ */
++ if (sb_rdonly(sb) || !test_opt(sb, INIT_INODE_TABLE))
++ ext4_unregister_li_request(sb);
++ else {
++ ext4_group_t first_not_zeroed;
++ first_not_zeroed = ext4_has_uninit_itable(sb);
++ ext4_register_li_request(sb, first_not_zeroed);
++ }
++
+ if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))
+ ext4_stop_mmpd(sbi);
+ commit aff3bea95388299eec63440389b4545c8041b357
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Tue May 23 23:49:51 2023 -0400
+
+ ext4: add lockdep annotations for i_data_sem for ea_inode's
+
+ Treat i_data_sem for ea_inodes as being in their own lockdep class to
+ avoid lockdep complaints about ext4_setattr's use of inode_lock() on
+ normal inodes potentially causing lock ordering with i_data_sem on
+ ea_inodes in ext4_xattr_inode_write(). However, ea_inodes will be
+ operated on by ext4_setattr(), so this isn't a problem.
+
+ Cc: stable@kernel.org
+ Link: https://syzkaller.appspot.com/bug?extid=298c5d8fb4a128bc27b0
+ Reported-by: syzbot+298c5d8fb4a128bc27b0@syzkaller.appspotmail.com
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+ Link: https://lore.kernel.org/r/20230524034951.779531-5-tytso@mit.edu
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
+index 9525c52b78dc..8104a21b001a 100644
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -918,11 +918,13 @@ do { \
+ * where the second inode has larger inode number
+ * than the first
+ * I_DATA_SEM_QUOTA - Used for quota inodes only
++ * I_DATA_SEM_EA - Used for ea_inodes only
+ */
+ enum {
+ I_DATA_SEM_NORMAL = 0,
+ I_DATA_SEM_OTHER,
+ I_DATA_SEM_QUOTA,
++ I_DATA_SEM_EA
+ };
+
+
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index ff7ab63c5b4f..13d7f17a9c8c 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -121,7 +121,11 @@ ext4_expand_inode_array(struct ext4_xattr_inode_array **ea_inode_array,
+ #ifdef CONFIG_LOCKDEP
+ void ext4_xattr_inode_set_class(struct inode *ea_inode)
+ {
++ struct ext4_inode_info *ei = EXT4_I(ea_inode);
++
+ lockdep_set_subclass(&ea_inode->i_rwsem, 1);
++ (void) ei; /* shut up clang warning if !CONFIG_LOCKDEP */
++ lockdep_set_subclass(&ei->i_data_sem, I_DATA_SEM_EA);
+ }
+ #endif
+ commit 2bc7e7c1a3bc9bd0cbf0f71006f6fe7ef24a00c2
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Tue May 23 23:49:50 2023 -0400
+
+ ext4: disallow ea_inodes with extended attributes
+
+ An ea_inode stores the value of an extended attribute; it can not have
+ extended attributes itself, or this will cause recursive nightmares.
+ Add a check in ext4_iget() to make sure this is the case.
+
+ Cc: stable@kernel.org
+ Reported-by: syzbot+e44749b6ba4d0434cd47@syzkaller.appspotmail.com
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+ Link: https://lore.kernel.org/r/20230524034951.779531-4-tytso@mit.edu
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index 258f3cbed347..02de439bf1f0 100644
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -4647,6 +4647,9 @@ static const char *check_igot_inode(struct inode *inode, ext4_iget_flags flags)
+ if (flags & EXT4_IGET_EA_INODE) {
+ if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL))
+ return "missing EA_INODE flag";
++ if (ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||
++ EXT4_I(inode)->i_file_acl)
++ return "ea_inode with extended attributes";
+ } else {
+ if ((EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL))
+ return "unexpected EA_INODE flag";commit b928dfdcb27d8fa59917b794cfba53052a2f050f
+Author: Theodore Ts'o <tytso@mit.edu>
+Date: Tue May 23 23:49:49 2023 -0400
+
+ ext4: set lockdep subclass for the ea_inode in ext4_xattr_inode_cache_find()
+
+ If the ea_inode has been pushed out of the inode cache while there is
+ still a reference in the mb_cache, the lockdep subclass will not be
+ set on the inode, which can lead to some lockdep false positives.
+
+ Fixes: 33d201e0277b ("ext4: fix lockdep warning about recursive inode locking")
+ Cc: stable@kernel.org
+ Reported-by: syzbot+d4b971e744b1f5439336@syzkaller.appspotmail.com
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+ Link: https://lore.kernel.org/r/20230524034951.779531-3-tytso@mit.edu
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index a27208129a80..ff7ab63c5b4f 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -1539,6 +1539,7 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value,
+ EXT4_IGET_EA_INODE);
+ if (IS_ERR(ea_inode))
+ goto next_entry;
++ ext4_xattr_inode_set_class(ea_inode);
+ if (i_size_read(ea_inode) == value_len &&
+ !ext4_xattr_inode_read(ea_inode, ea_data, value_len) &&
+ !ext4_xattr_inode_verify_hashes(ea_inode, NULL, ea_data,
+ commit 69163dd9eaebef22975ecf20852d4aab875eb20d +Author: Carlos Bilbao <bilbao@vt.edu> +Date: Sat Dec 3 18:01:10 2022 -0600 + + docs/sp_SP: Add process code-of-conduct.rst translation + + Translate the following document into Spanish: + + - process/code-of-conduct.rst + + Signed-off-by: Carlos Bilbao <carlos.bilbao@amd.com> + Link: https://lore.kernel.org/r/20221204000109.17224-1-bilbao@vt.edu + Signed-off-by: Jonathan Corbet <corbet@lwn.net> + +diff --git a/Documentation/translations/sp_SP/process/code-of-conduct.rst b/Documentation/translations/sp_SP/process/code-of-conduct.rst +new file mode 100644 +index 000000000000..adc6c770cc37 +--- /dev/null ++++ b/Documentation/translations/sp_SP/process/code-of-conduct.rst +@@ -0,0 +1,97 @@ ++.. include:: ../disclaimer-sp.rst ++ ++:Original: :ref:`Documentation/process/code-of-conduct.rst <code_of_conduct>` ++:Translator: Contributor Covenant and Carlos Bilbao <carlos.bilbao@amd.com> ++ ++.. _sp_code_of_conduct: ++ ++Código de Conducta para Contribuyentes +++++++++++++++++++++++++++++++++++++++++ ++ ++Nuestro Compromiso ++================== ++ ++Nosotros, como miembros, contribuyentes y administradores nos comprometemos ++a hacer de la participación en nuestra comunidad una experiencia libre de ++acoso para todo el mundo, independientemente de la edad, dimensión corporal, ++minusvalía visible o invisible, etnicidad, características sexuales, ++identidad y expresión de género, nivel de experiencia, educación, nivel ++socio-económico, nacionalidad, apariencia personal, raza, religión, o ++identidad u orientación sexual. Nos comprometemos a actuar e interactuar de ++maneras que contribuyan a una comunidad abierta, acogedora, diversa, ++inclusiva y sana. ++ ++Nuestros Estándares ++=================== ++ ++Ejemplos de comportamiento que contribuyen a crear un ambiente positivo ++para nuestra comunidad: ++ ++* Demostrar empatía y amabilidad ante otras personas ++* Respeto a diferentes opiniones, puntos de vista y experiencias ++* Dar y aceptar adecuadamente retroalimentación constructiva ++* Aceptar la responsabilidad y disculparse ante quienes se vean afectados ++ por nuestros errores, aprendiendo de la experiencia ++* Centrarse en lo que sea mejor no sólo para nosotros como individuos, sino ++ para la comunidad en general ++ ++ ++Ejemplos de comportamiento inaceptable: ++ ++* El uso de lenguaje o imágenes sexualizadas, y aproximaciones o ++ atenciones sexuales de cualquier tipo ++* Comentarios despectivos (trolling), insultantes o derogatorios, y ataques ++ personales o políticos ++* El acoso en público o privado ++* Publicar información privada de otras personas, tales como direcciones ++ físicas o de correo ++ electrónico, sin su permiso explícito ++* Otras conductas que puedan ser razonablemente consideradas como ++ inapropiadas en un entorno profesional ++ ++ ++Aplicación de las responsabilidades ++=================================== ++ ++Los administradores de la comunidad son responsables de aclarar y hacer ++cumplir nuestros estándares de comportamiento aceptable y tomarán acciones ++apropiadas y correctivas de forma justa en respuesta a cualquier ++comportamiento que consideren inapropiado, amenazante, ofensivo o dañino. ++ ++Los administradores de la comunidad tendrán el derecho y la responsabilidad ++de eliminar, editar o rechazar comentarios, commits, código, ediciones de ++páginas de wiki, issues y otras contribuciones que no se alineen con este ++Código de Conducta, y comunicarán las razones para sus decisiones de ++moderación cuando sea apropiado. ++ ++Alcance ++======= ++ ++Este código de conducta aplica tanto a espacios del proyecto como a ++espacios públicos donde un individuo esté en representación del proyecto o ++comunidad. Ejemplos de esto incluyen el uso de la cuenta oficial de correo ++electrónico, publicaciones a través de las redes sociales oficiales, o ++presentaciones con personas designadas en eventos en línea o no. ++ ++Aplicación ++========== ++ ++Instancias de comportamiento abusivo, acosador o inaceptable de otro modo ++podrán ser reportadas contactando el Code of Conduct Commitee a través de ++<conduct@kernel.org>. Todas las quejas serán evaluadas e investigadas de ++una manera puntual y justa. El Code of Condut Commitee está obligados a ++respetar la privacidad y la seguridad de quienes reporten incidentes. ++Detalles de políticas y aplicación en particular, serán incluidos por ++separado. ++ ++Atribución ++========== ++ ++Este Código de Conducta es una adaptación del Contributor Covenant, versión ++1.4, disponible en https://www.contributor-covenant.org/version/1/4/code-of-conduct.html ++ ++Interpretación ++============== ++ ++Consulte el documento :ref:`code_of_conduct_interpretation` para ver cómo ++interpretará la comunidad del kernel Linux este documento. +diff --git a/Documentation/translations/sp_SP/process/index.rst b/Documentation/translations/sp_SP/process/index.rst +index 49a05f6a5544..0998cc15d274 100644 +--- a/Documentation/translations/sp_SP/process/index.rst ++++ b/Documentation/translations/sp_SP/process/index.rst +@@ -13,3 +13,4 @@ + submitting-patches + kernel-docs + coding-style ++ code-of-conduct
commit e62e074814862cffd8e60a1bdf52d6b592a03675
+Author: Carlos Bilbao <bilbao@vt.edu>
+Date: Thu Jul 8 07:15:42 2021 -0400
+
+ arm64: Add missing header <asm/smp.h> in two files
+
+ Add missing header <asm/smp.h> on include/asm/smp_plat.h, as it calls function
+ cpu_logical_map(). Also include it on kernel/cpufeature.c since it has calls to
+ functions cpu_panic_kernel() and cpu_die_early().
+
+ Both files call functions defined on this header, make the header dependencies
+ less fragile.
+
+ Signed-off-by: Carlos Bilbao <bilbao@vt.edu>
+ Acked-by: Mark Rutland <mark.rutland@arm.com>
+ Link: https://lore.kernel.org/r/4325940.LvFx2qVVIh@iron-maiden
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/arch/arm64/include/asm/smp_plat.h b/arch/arm64/include/asm/smp_plat.h
+index 99ad77df8f52..97ddc6c203b7 100644
+--- a/arch/arm64/include/asm/smp_plat.h
++++ b/arch/arm64/include/asm/smp_plat.h
+@@ -10,6 +10,7 @@
+
+ #include <linux/cpumask.h>
+
++#include <asm/smp.h>
+ #include <asm/types.h>
+
+ struct mpidr_hash {
+diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
+index 125d5c9471ac..0ead8bfedf20 100644
+--- a/arch/arm64/kernel/cpufeature.c
++++ b/arch/arm64/kernel/cpufeature.c
+@@ -81,6 +81,7 @@
+ #include <asm/mmu_context.h>
+ #include <asm/mte.h>
+ #include <asm/processor.h>
++#include <asm/smp.h>
+ #include <asm/sysreg.h>
+ #include <asm/traps.h>
+ #include <asm/virt.h>commit 3e42d1de020805ff3f7d854e1cff742d14e158f5 +Author: Carlos Bilbao <bilbao@vt.edu> +Date: Thu May 13 09:31:10 2021 -0400 + + docs: typo fixes in Documentation/ABI/ + + Fix the following typos in the Documentation/ABI/ directory: + + - In file obsolete/sysfs-cpuidle, change "obselete" for "obsolete". + + - In file removed/sysfs-kernel-uids, change "propotional" for "proportional". + + - In directory stable/, fix the following words: "associtated" for "associated", + "hexidecimal" for "hexadecimal", "vlue" for "value", "csed" for "caused" and + "wrtie" for "write". This updates a total of five files. + + - In directory testing/, fix the following words: "subystem" for "subsystem", + "isochrnous" for "isochronous", "Desctiptors" for "Descriptors", "picutre" for + "picture", "capture" for "capture", "occured" for "ocurred", "connnected" for + "connected","agressively" for "aggressively","manufacturee" for "manufacturer" + and "transaction" for "transaction", "malformatted" for "incorrectly formated" + ,"internel" for "internal", "writtento" for "written to", "specificed" for + "specified", "beyound" for "beyond", "Symetric" for "Symmetric". This updates + a total of eleven files. + + Signed-off-by: Carlos Bilbao <bilbao@vt.edu> + Reviewed-by: Randy Dunlap <rdunlap@infradead.org> + Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> + Link: https://lore.kernel.org/r/5710038.lOV4Wx5bFT@iron-maiden + Signed-off-by: Jonathan Corbet <corbet@lwn.net> + +diff --git a/Documentation/ABI/obsolete/sysfs-cpuidle b/Documentation/ABI/obsolete/sysfs-cpuidle +index e398fb5e542f..972cc11d3434 100644 +--- a/Documentation/ABI/obsolete/sysfs-cpuidle ++++ b/Documentation/ABI/obsolete/sysfs-cpuidle +@@ -6,4 +6,4 @@ Description: + with the update that cpuidle governor can be changed at runtime in default, + both current_governor and current_governor_ro co-exist under + /sys/devices/system/cpu/cpuidle/ file, it's duplicate so make +- current_governor_ro obselete. ++ current_governor_ro obsolete. +diff --git a/Documentation/ABI/removed/sysfs-kernel-uids b/Documentation/ABI/removed/sysfs-kernel-uids +index dc4463f190a7..85a90b86ce1e 100644 +--- a/Documentation/ABI/removed/sysfs-kernel-uids ++++ b/Documentation/ABI/removed/sysfs-kernel-uids +@@ -5,7 +5,7 @@ Contact: Dhaval Giani <dhaval@linux.vnet.ibm.com> + Description: + The /sys/kernel/uids/<uid>/cpu_shares tunable is used + to set the cpu bandwidth a user is allowed. This is a +- propotional value. What that means is that if there ++ proportional value. What that means is that if there + are two users logged in, each with an equal number of + shares, then they will get equal CPU bandwidth. Another + example would be, if User A has shares = 1024 and user +diff --git a/Documentation/ABI/stable/sysfs-bus-vmbus b/Documentation/ABI/stable/sysfs-bus-vmbus +index 42599d9fa161..3066feae1d8d 100644 +--- a/Documentation/ABI/stable/sysfs-bus-vmbus ++++ b/Documentation/ABI/stable/sysfs-bus-vmbus +@@ -61,7 +61,7 @@ Date: September. 2017 + KernelVersion: 4.14 + Contact: Stephen Hemminger <sthemmin@microsoft.com> + Description: Directory for per-channel information +- NN is the VMBUS relid associtated with the channel. ++ NN is the VMBUS relid associated with the channel. + + What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu + Date: September. 2017 +diff --git a/Documentation/ABI/stable/sysfs-bus-xen-backend b/Documentation/ABI/stable/sysfs-bus-xen-backend +index e8b60bd766f7..480a89edfa05 100644 +--- a/Documentation/ABI/stable/sysfs-bus-xen-backend ++++ b/Documentation/ABI/stable/sysfs-bus-xen-backend +@@ -19,7 +19,7 @@ Date: April 2011 + KernelVersion: 3.0 + Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> + Description: +- The major:minor number (in hexidecimal) of the ++ The major:minor number (in hexadecimal) of the + physical device providing the storage for this backend + block device. + +diff --git a/Documentation/ABI/stable/sysfs-driver-dma-idxd b/Documentation/ABI/stable/sysfs-driver-dma-idxd +index 55285c136cf0..d431e2d00472 100644 +--- a/Documentation/ABI/stable/sysfs-driver-dma-idxd ++++ b/Documentation/ABI/stable/sysfs-driver-dma-idxd +@@ -173,7 +173,7 @@ What: /sys/bus/dsa/devices/wq<m>.<n>/priority + Date: Oct 25, 2019 + KernelVersion: 5.6.0 + Contact: dmaengine@vger.kernel.org +-Description: The priority value of this work queue, it is a vlue relative to ++Description: The priority value of this work queue, it is a value relative to + other work queue in the same group to control quality of service + for dispatching work from multiple workqueues in the same group. + +diff --git a/Documentation/ABI/stable/sysfs-driver-mlxreg-io b/Documentation/ABI/stable/sysfs-driver-mlxreg-io +index fd9a8045bb0c..b2553df2e786 100644 +--- a/Documentation/ABI/stable/sysfs-driver-mlxreg-io ++++ b/Documentation/ABI/stable/sysfs-driver-mlxreg-io +@@ -137,7 +137,7 @@ Contact: Vadim Pasternak <vadimpmellanox.com> + Description: These files show the system reset cause, as following: + COMEX thermal shutdown; wathchdog power off or reset was derived + by one of the next components: COMEX, switch board or by Small Form +- Factor mezzanine, reset requested from ASIC, reset cuased by BIOS ++ Factor mezzanine, reset requested from ASIC, reset caused by BIOS + reload. Value 1 in file means this is reset cause, 0 - otherwise. + Only one of the above causes could be 1 at the same time, representing + only last reset cause. +@@ -183,7 +183,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/vpd_wp + Date: January 2020 + KernelVersion: 5.6 + Contact: Vadim Pasternak <vadimpmellanox.com> +-Description: This file allows to overwrite system VPD hardware wrtie ++Description: This file allows to overwrite system VPD hardware write + protection when attribute is set 1. + + The file is read/write. +diff --git a/Documentation/ABI/testing/configfs-iio b/Documentation/ABI/testing/configfs-iio +index aebda53ec0f7..1637fcb50f56 100644 +--- a/Documentation/ABI/testing/configfs-iio ++++ b/Documentation/ABI/testing/configfs-iio +@@ -31,4 +31,4 @@ Date: April 2016 + KernelVersion: 4.7 + Description: + Dummy IIO devices directory. Creating a directory here will result +- in creating a dummy IIO device in the IIO subystem. ++ in creating a dummy IIO device in the IIO subsystem. +diff --git a/Documentation/ABI/testing/configfs-most b/Documentation/ABI/testing/configfs-most +index bc6b8bd18da4..0a4b8649aa5a 100644 +--- a/Documentation/ABI/testing/configfs-most ++++ b/Documentation/ABI/testing/configfs-most +@@ -20,7 +20,7 @@ Description: + + subbuffer_size + configure the sub-buffer size for this channel +- (needed for synchronous and isochrnous data) ++ (needed for synchronous and isochronous data) + + + num_buffers +@@ -75,7 +75,7 @@ Description: + + subbuffer_size + configure the sub-buffer size for this channel +- (needed for synchronous and isochrnous data) ++ (needed for synchronous and isochronous data) + + + num_buffers +@@ -130,7 +130,7 @@ Description: + + subbuffer_size + configure the sub-buffer size for this channel +- (needed for synchronous and isochrnous data) ++ (needed for synchronous and isochronous data) + + + num_buffers +@@ -196,7 +196,7 @@ Description: + + subbuffer_size + configure the sub-buffer size for this channel +- (needed for synchronous and isochrnous data) ++ (needed for synchronous and isochronous data) + + + num_buffers +diff --git a/Documentation/ABI/testing/configfs-usb-gadget b/Documentation/ABI/testing/configfs-usb-gadget +index dc351e9af80a..b7943aa7e997 100644 +--- a/Documentation/ABI/testing/configfs-usb-gadget ++++ b/Documentation/ABI/testing/configfs-usb-gadget +@@ -137,7 +137,7 @@ Description: + This group contains "OS String" extension handling attributes. + + ============= =============================================== +- use flag turning "OS Desctiptors" support on/off ++ use flag turning "OS Descriptors" support on/off + b_vendor_code one-byte value used for custom per-device and + per-interface requests + qw_sign an identifier to be reported as "OS String" +diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc +index ac5e11af79a8..889ed45be4ca 100644 +--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc ++++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc +@@ -170,7 +170,7 @@ Description: Default color matching descriptors + bMatrixCoefficients matrix used to compute luma and + chroma values from the color primaries + bTransferCharacteristics optoelectronic transfer +- characteristic of the source picutre, ++ characteristic of the source picture, + also called the gamma function + bColorPrimaries color primaries and the reference + white +@@ -311,7 +311,7 @@ Description: Specific streaming header descriptors + a hardware trigger interrupt event + bTriggerSupport flag specifying if hardware + triggering is supported +- bStillCaptureMethod method of still image caputre ++ bStillCaptureMethod method of still image capture + supported + bTerminalLink id of the output terminal to which + the video endpoint of this interface +diff --git a/Documentation/ABI/testing/debugfs-driver-genwqe b/Documentation/ABI/testing/debugfs-driver-genwqe +index 1c2f25674e8c..b45b016545d8 100644 +--- a/Documentation/ABI/testing/debugfs-driver-genwqe ++++ b/Documentation/ABI/testing/debugfs-driver-genwqe +@@ -31,7 +31,7 @@ What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_regs + Date: Oct 2013 + Contact: haver@linux.vnet.ibm.com + Description: Dump of the error registers before the last reset of +- the card occured. ++ the card occurred. + Only available for PF. + + What: /sys/kernel/debug/genwqe/genwqe<n>_card/prev_dbg_uid0 +diff --git a/Documentation/ABI/testing/debugfs-driver-habanalabs b/Documentation/ABI/testing/debugfs-driver-habanalabs +index c78fc9282876..e89c6351503c 100644 +--- a/Documentation/ABI/testing/debugfs-driver-habanalabs ++++ b/Documentation/ABI/testing/debugfs-driver-habanalabs +@@ -153,7 +153,7 @@ KernelVersion: 5.1 + Contact: ogabbay@kernel.org + Description: Triggers an I2C transaction that is generated by the device's + CPU. Writing to this file generates a write transaction while +- reading from the file generates a read transcation ++ reading from the file generates a read transaction + + What: /sys/kernel/debug/habanalabs/hl<n>/i2c_reg + Date: Jan 2019 +diff --git a/Documentation/ABI/testing/sysfs-bus-fsi b/Documentation/ABI/testing/sysfs-bus-fsi +index d148214181a1..76e0caa0c2b3 100644 +--- a/Documentation/ABI/testing/sysfs-bus-fsi ++++ b/Documentation/ABI/testing/sysfs-bus-fsi +@@ -12,7 +12,7 @@ KernelVersion: 4.12 + Contact: linux-fsi@lists.ozlabs.org + Description: + Sends an FSI BREAK command on a master's communication +- link to any connnected slaves. A BREAK resets connected ++ link to any connected slaves. A BREAK resets connected + device's logic and preps it to receive further commands + from the master. + +diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci +index ef00fada2efb..793cbb76cd25 100644 +--- a/Documentation/ABI/testing/sysfs-bus-pci ++++ b/Documentation/ABI/testing/sysfs-bus-pci +@@ -139,8 +139,8 @@ Description: + binary file containing the Vital Product Data for the + device. It should follow the VPD format defined in + PCI Specification 2.1 or 2.2, but users should consider +- that some devices may have malformatted data. If the +- underlying VPD has a writable section then the ++ that some devices may have incorrectly formatted data. ++ If the underlying VPD has a writable section then the + corresponding section of this file will be writable. + + What: /sys/bus/pci/devices/.../virtfnN +diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu +index fe13baa53c59..160b10c029c0 100644 +--- a/Documentation/ABI/testing/sysfs-devices-system-cpu ++++ b/Documentation/ABI/testing/sysfs-devices-system-cpu +@@ -50,7 +50,7 @@ Description: Dynamic addition and removal of CPU's. This is not hotplug + architecture specific. + + release: writes to this file dynamically remove a CPU from +- the system. Information writtento the file to remove CPU's ++ the system. Information written to the file to remove CPU's + is architecture specific. + + What: /sys/devices/system/cpu/cpu#/node +@@ -97,7 +97,7 @@ Description: CPU topology files that describe a logical CPU's relationship + corresponds to a physical socket number, but the actual value + is architecture and platform dependent. + +- thread_siblings: internel kernel map of cpu#'s hardware ++ thread_siblings: internal kernel map of cpu#'s hardware + threads within the same core as cpu# + + thread_siblings_list: human-readable list of cpu#'s hardware +@@ -280,7 +280,7 @@ Description: Disable L3 cache indices + on a processor with this functionality will return the currently + disabled index for that node. There is one L3 structure per + node, or per internal node on MCM machines. Writing a valid +- index to one of these files will cause the specificed cache ++ index to one of these files will cause the specified cache + index to be disabled. + + All AMD processors with L3 caches provide this functionality. +@@ -295,7 +295,7 @@ Description: Processor frequency boosting control + + This switch controls the boost setting for the whole system. + Boosting allows the CPU and the firmware to run at a frequency +- beyound it's nominal limit. ++ beyond it's nominal limit. + + More details can be found in + Documentation/admin-guide/pm/cpufreq.rst +@@ -532,7 +532,7 @@ What: /sys/devices/system/cpu/smt + /sys/devices/system/cpu/smt/control + Date: June 2018 + Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org> +-Description: Control Symetric Multi Threading (SMT) ++Description: Control Symmetric Multi Threading (SMT) + + active: Tells whether SMT is active (enabled and siblings online) + +diff --git a/Documentation/ABI/testing/sysfs-driver-ufs b/Documentation/ABI/testing/sysfs-driver-ufs +index d1bc23cb6a9d..eaac6898f0c0 100644 +--- a/Documentation/ABI/testing/sysfs-driver-ufs ++++ b/Documentation/ABI/testing/sysfs-driver-ufs +@@ -168,7 +168,7 @@ Description: This file shows the manufacturing date in BCD format. + What: /sys/bus/platform/drivers/ufshcd/*/device_descriptor/manufacturer_id + Date: February 2018 + Contact: Stanislav Nijnikov <stanislav.nijnikov@wdc.com> +-Description: This file shows the manufacturee ID. This is one of the ++Description: This file shows the manufacturer ID. This is one of the + UFS device descriptor parameters. The full information about + the descriptor could be found at UFS specifications 2.1. + +@@ -521,7 +521,7 @@ Description: This file shows maximum VCC, VCCQ and VCCQ2 value for + What: /sys/bus/platform/drivers/ufshcd/*/string_descriptors/manufacturer_name + Date: February 2018 + Contact: Stanislav Nijnikov <stanislav.nijnikov@wdc.com> +-Description: This file contains a device manufactureer name string. ++Description: This file contains a device manufacturer name string. + The full information about the descriptor could be found at + UFS specifications 2.1. + +diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs +index 4849b8e84e42..5d9ae27bd462 100644 +--- a/Documentation/ABI/testing/sysfs-fs-f2fs ++++ b/Documentation/ABI/testing/sysfs-fs-f2fs +@@ -238,7 +238,7 @@ Description: Shows current reserved blocks in system, it may be temporarily + What: /sys/fs/f2fs/<disk>/gc_urgent + Date: August 2017 + Contact: "Jaegeuk Kim" <jaegeuk@kernel.org> +-Description: Do background GC agressively when set. When gc_urgent = 1, ++Description: Do background GC aggressively when set. When gc_urgent = 1, + background thread starts to do GC by given gc_urgent_sleep_time + interval. When gc_urgent = 2, F2FS will lower the bar of + checking idle in order to process outstanding discard commands
commit 6a79162fe5d5e0eb55bc48e99450982b0daf0a0f +Author: bilbao@vt.edu <bilbao@vt.edu> +Date: Tue Apr 27 13:28:29 2021 -0400 + + docs: Fix typo in Documentation/x86/x86_64/5level-paging.rst + + fix two typos in the documentation + (Documentation/x86/x86_64/5level-paging.rst), changing 'paing' for 'paging' + and using the right verbal form for plural on 'some vendors offer'. + + Signed-off-by: Carlos Bilbao <bilbao@vt.edu> + Link: https://lore.kernel.org/r/2599991.mvXUDI8C0e@iron-maiden + Signed-off-by: Jonathan Corbet <corbet@lwn.net> + +diff --git a/Documentation/x86/x86_64/5level-paging.rst b/Documentation/x86/x86_64/5level-paging.rst +index 44856417e6a5..b792bbdc0b01 100644 +--- a/Documentation/x86/x86_64/5level-paging.rst ++++ b/Documentation/x86/x86_64/5level-paging.rst +@@ -6,9 +6,9 @@ + + Overview + ======== +-Original x86-64 was limited by 4-level paing to 256 TiB of virtual address ++Original x86-64 was limited by 4-level paging to 256 TiB of virtual address + space and 64 TiB of physical address space. We are already bumping into +-this limit: some vendors offers servers with 64 TiB of memory today. ++this limit: some vendors offer servers with 64 TiB of memory today. + + To overcome the limitation upcoming hardware will introduce support for + 5-level paging. It is a straight-forward extension of the current page
commit 389102a3515b53a38858554a915006be7f0b6a06 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Fri Jan 15 02:07:03 2021 -0500 + + scsi: target: iscsi: Fix typo in comment + + Correct the spelling of Nagle's name in a comment. + + Link: https://lore.kernel.org/r/2921.1610694423@turing-police + Reviewed-by: Chaitanya Kulkarni <chiatanya.kulkarni@wdc.com> + Signed-off-by: Valdis Klētnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> + +diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c +index 893d1b406c29..1a9c50401bdb 100644 +--- a/drivers/target/iscsi/iscsi_target_login.c ++++ b/drivers/target/iscsi/iscsi_target_login.c +@@ -896,7 +896,7 @@ int iscsit_setup_np( + else + len = sizeof(struct sockaddr_in); + /* +- * Set SO_REUSEADDR, and disable Nagel Algorithm with TCP_NODELAY. ++ * Set SO_REUSEADDR, and disable Nagle Algorithm with TCP_NODELAY. + */ + if (np->np_network_transport == ISCSI_TCP) + tcp_sock_set_nodelay(sock->sk);
commit 67a5a68013056cbcf0a647e36cb6f4622fb6a470 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Sat Dec 26 13:21:58 2020 -0500 + + gcc-plugins: fix gcc 11 indigestion with plugins... + + Fedora Rawhide has started including gcc 11,and the g++ compiler + throws a wobbly when it hits scripts/gcc-plugins: + + HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so + In file included from /usr/include/c++/11/type_traits:35, + from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244, + from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28, + from scripts/gcc-plugins/gcc-common.h:7, + from scripts/gcc-plugins/latent_entropy_plugin.c:78: + /usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO + C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options. + 32 | #error This file requires compiler and library support \ + + In fact, it works just fine with c++11, which has been in gcc since 4.8, + and we now require 4.9 as a minimum. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> + Signed-off-by: Kees Cook <keescook@chromium.org> + Link: https://lore.kernel.org/r/82487.1609006918@turing-police + +diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile +index d66949bfeba4..b5487cce69e8 100644 +--- a/scripts/gcc-plugins/Makefile ++++ b/scripts/gcc-plugins/Makefile +@@ -22,9 +22,9 @@ always-y += $(GCC_PLUGIN) + GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) + + plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \ +- -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \ ++ -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \ + -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ +- -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ ++ -ggdb -Wno-narrowing -Wno-unused-variable \ + -Wno-format-diag + + plugin_ldflags = -shared
commit 036491542aa47633a7c9a1b01a0c19f2c5e67f04 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Sat Jun 20 13:03:22 2020 -0400 + + opp: core: Add missing export for dev_pm_opp_adjust_voltage + + Export dev_pm_opp_adjust_voltage() as it may be used by modules later + on. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + [ Viresh: Rewrote commit log ] + Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> + +diff --git a/drivers/opp/core.c b/drivers/opp/core.c +index dfbd3d10410c..864cf4c65fff 100644 +--- a/drivers/opp/core.c ++++ b/drivers/opp/core.c +@@ -2271,6 +2271,7 @@ int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq, + dev_pm_opp_put_opp_table(opp_table); + return r; + } ++EXPORT_SYMBOL_GPL(dev_pm_opp_adjust_voltage); + + /** + * dev_pm_opp_enable() - Enable a specific OPP
commit 9f64fbdb774838db1445268fa8c46041fb1c28ab +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Sat May 9 00:47:19 2020 -0400 + + bpfilter: document build requirements for bpfilter_umh + + It's not intuitively obvious that bpfilter_umh is a statically linked binary. + Mention the toolchain requirement in the Kconfig help, so people + have an easier time figuring out what's needed. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> + +diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig +index 045144d4a42c..84015ef3ee27 100644 +--- a/net/bpfilter/Kconfig ++++ b/net/bpfilter/Kconfig +@@ -13,4 +13,8 @@ config BPFILTER_UMH + default m + help + This builds bpfilter kernel module with embedded user mode helper ++ ++ Note: your toolchain must support building static binaries, since ++ rootfs isn't mounted at the time when __init functions are called ++ and do_execv won't be able to find the elf interpreter. + endif
commit 9acd0d53800c55c6e2186e29b6433daf24617451
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Mar 2 15:21:45 2020 +0900
+
+ exfat: update file system parameter handling
+
+ Al Viro recently reworked the way file system parameters are handled
+ Update super.c to work with it in linux-next 20200203.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Reviewed-by: Christoph Hellwig <hch@lst.de>
+ Acked-by: Namjae Jeon <namjae.jeon@samsung.com>
+ Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+
+diff --git a/fs/exfat/super.c b/fs/exfat/super.c
+index f06e0b53e393..16ed202ef527 100644
+--- a/fs/exfat/super.c
++++ b/fs/exfat/super.c
+@@ -214,7 +214,14 @@ enum {
+ Opt_time_offset,
+ };
+
+-static const struct fs_parameter_spec exfat_param_specs[] = {
++static const struct constant_table exfat_param_enums[] = {
++ { "continue", EXFAT_ERRORS_CONT },
++ { "panic", EXFAT_ERRORS_PANIC },
++ { "remount-ro", EXFAT_ERRORS_RO },
++ {}
++};
++
++static const struct fs_parameter_spec exfat_parameters[] = {
+ fsparam_u32("uid", Opt_uid),
+ fsparam_u32("gid", Opt_gid),
+ fsparam_u32oct("umask", Opt_umask),
+@@ -222,25 +229,12 @@ static const struct fs_parameter_spec exfat_param_specs[] = {
+ fsparam_u32oct("fmask", Opt_fmask),
+ fsparam_u32oct("allow_utime", Opt_allow_utime),
+ fsparam_string("iocharset", Opt_charset),
+- fsparam_enum("errors", Opt_errors),
++ fsparam_enum("errors", Opt_errors, exfat_param_enums),
+ fsparam_flag("discard", Opt_discard),
+ fsparam_s32("time_offset", Opt_time_offset),
+ {}
+ };
+
+-static const struct fs_parameter_enum exfat_param_enums[] = {
+- { Opt_errors, "continue", EXFAT_ERRORS_CONT },
+- { Opt_errors, "panic", EXFAT_ERRORS_PANIC },
+- { Opt_errors, "remount-ro", EXFAT_ERRORS_RO },
+- {}
+-};
+-
+-static const struct fs_parameter_description exfat_parameters = {
+- .name = "exfat",
+- .specs = exfat_param_specs,
+- .enums = exfat_param_enums,
+-};
+-
+ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)
+ {
+ struct exfat_sb_info *sbi = fc->s_fs_info;
+@@ -248,7 +242,7 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param)
+ struct fs_parse_result result;
+ int opt;
+
+- opt = fs_parse(fc, &exfat_parameters, param, &result);
++ opt = fs_parse(fc, exfat_parameters, param, &result);
+ if (opt < 0)
+ return opt;
+
+@@ -665,7 +659,7 @@ static struct file_system_type exfat_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "exfat",
+ .init_fs_context = exfat_init_fs_context,
+- .parameters = &exfat_parameters,
++ .parameters = exfat_parameters,
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+ };commit 575b255c1663c8fccc41fe965dcac281e3113c65
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Feb 27 21:49:52 2020 -0500
+
+ KVM: x86: allow compiling as non-module with W=1
+
+ Compile error with CONFIG_KVM_INTEL=y and W=1:
+
+ CC arch/x86/kvm/vmx/vmx.o
+ arch/x86/kvm/vmx/vmx.c:68:32: error: 'vmx_cpu_id' defined but not used [-Werror=unused-const-variable=]
+ 68 | static const struct x86_cpu_id vmx_cpu_id[] = {
+ | ^~~~~~~~~~
+ cc1: all warnings being treated as errors
+
+ When building with =y, the MODULE_DEVICE_TABLE macro doesn't generate a
+ reference to the structure (or any code at all). This makes W=1 compiles
+ unhappy.
+
+ Wrap both in a #ifdef to avoid the issue.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ [Do the same for CONFIG_KVM_AMD. - Paolo]
+ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
+index bd02526300ab..24c0b2ba8fb9 100644
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -57,11 +57,13 @@
+ MODULE_AUTHOR("Qumranet");
+ MODULE_LICENSE("GPL");
+
++#ifdef MODULE
+ static const struct x86_cpu_id svm_cpu_id[] = {
+ X86_FEATURE_MATCH(X86_FEATURE_SVM),
+ {}
+ };
+ MODULE_DEVICE_TABLE(x86cpu, svm_cpu_id);
++#endif
+
+ #define IOPM_ALLOC_ORDER 2
+ #define MSRPM_ALLOC_ORDER 1
+diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
+index 63aaf44edd1f..ce70a71037ed 100644
+--- a/arch/x86/kvm/vmx/vmx.c
++++ b/arch/x86/kvm/vmx/vmx.c
+@@ -64,11 +64,13 @@
+ MODULE_AUTHOR("Qumranet");
+ MODULE_LICENSE("GPL");
+
++#ifdef MODULE
+ static const struct x86_cpu_id vmx_cpu_id[] = {
+ X86_FEATURE_MATCH(X86_FEATURE_VMX),
+ {}
+ };
+ MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);
++#endif
+
+ bool __read_mostly enable_vpid = 1;
+ module_param_named(vpid, enable_vpid, bool, 0444);
+ commit c4062dfc425e94290ac427a98d6b4721dd2bc91f
+Author: Erich E. Hoover <ehoover@mines.edu>
+Date: Wed Feb 8 09:11:08 2012 +0000
+
+ ipv6: Implement IPV6_UNICAST_IF socket option.
+
+ The IPV6_UNICAST_IF feature is the IPv6 compliment to IP_UNICAST_IF.
+
+ Signed-off-by: Erich E. Hoover <ehoover@mines.edu>
+ Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/include/linux/in6.h b/include/linux/in6.h
+index 097a34b55560..5c83d9e3eb8f 100644
+--- a/include/linux/in6.h
++++ b/include/linux/in6.h
+@@ -271,6 +271,7 @@ struct in6_flowlabel_req {
+ #define IPV6_ORIGDSTADDR 74
+ #define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR
+ #define IPV6_TRANSPARENT 75
++#define IPV6_UNICAST_IF 76
+
+ /*
+ * Multicast Routing:
+diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
+index 6318268dcaf5..743a16a41040 100644
+--- a/include/linux/ipv6.h
++++ b/include/linux/ipv6.h
+@@ -324,6 +324,7 @@ struct ipv6_pinfo {
+ __unused_2:6;
+ __s16 mcast_hops:9;
+ #endif
++ int ucast_oif;
+ int mcast_oif;
+
+ /* pktoption flags */
+diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
+index 01d46bff63c3..af88934e4d79 100644
+--- a/net/ipv6/icmp.c
++++ b/net/ipv6/icmp.c
+@@ -468,6 +468,8 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
+
+ if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
+ fl6.flowi6_oif = np->mcast_oif;
++ else if (!fl6.flowi6_oif)
++ fl6.flowi6_oif = np->ucast_oif;
+
+ dst = icmpv6_route_lookup(net, skb, sk, &fl6);
+ if (IS_ERR(dst))
+@@ -553,6 +555,8 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
+
+ if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
+ fl6.flowi6_oif = np->mcast_oif;
++ else if (!fl6.flowi6_oif)
++ fl6.flowi6_oif = np->ucast_oif;
+
+ err = ip6_dst_lookup(sk, &dst, &fl6);
+ if (err)
+diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
+index 18a2719003c3..6d6b65fdaa1a 100644
+--- a/net/ipv6/ipv6_sockglue.c
++++ b/net/ipv6/ipv6_sockglue.c
+@@ -516,6 +516,36 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
+ retv = 0;
+ break;
+
++ case IPV6_UNICAST_IF:
++ {
++ struct net_device *dev = NULL;
++ int ifindex;
++
++ if (optlen != sizeof(int))
++ goto e_inval;
++
++ ifindex = (__force int)ntohl((__force __be32)val);
++ if (ifindex == 0) {
++ np->ucast_oif = 0;
++ retv = 0;
++ break;
++ }
++
++ dev = dev_get_by_index(net, ifindex);
++ retv = -EADDRNOTAVAIL;
++ if (!dev)
++ break;
++ dev_put(dev);
++
++ retv = -EINVAL;
++ if (sk->sk_bound_dev_if)
++ break;
++
++ np->ucast_oif = ifindex;
++ retv = 0;
++ break;
++ }
++
+ case IPV6_MULTICAST_IF:
+ if (sk->sk_type == SOCK_STREAM)
+ break;
+@@ -1160,6 +1190,10 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
+ val = np->mcast_oif;
+ break;
+
++ case IPV6_UNICAST_IF:
++ val = (__force int)htonl((__u32) np->ucast_oif);
++ break;
++
+ case IPV6_MTU_DISCOVER:
+ val = np->pmtudisc;
+ break;
+diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
+index d02f7e4dd611..5bddea778840 100644
+--- a/net/ipv6/raw.c
++++ b/net/ipv6/raw.c
+@@ -856,6 +856,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
+
+ if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
+ fl6.flowi6_oif = np->mcast_oif;
++ else if (!fl6.flowi6_oif)
++ fl6.flowi6_oif = np->ucast_oif;
+ security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
+
+ dst = ip6_dst_lookup_flow(sk, &fl6, final_p, true);
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
+index 4f96b5c63685..8aebf8f90436 100644
+--- a/net/ipv6/udp.c
++++ b/net/ipv6/udp.c
+@@ -1130,7 +1130,8 @@ int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
+ if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr)) {
+ fl6.flowi6_oif = np->mcast_oif;
+ connected = 0;
+- }
++ } else if (!fl6.flowi6_oif)
++ fl6.flowi6_oif = np->ucast_oif;
+
+ security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
+ commit 76e21053b5bf33a07c76f99d27a74238310e3c71
+Author: Erich E. Hoover <ehoover@mines.edu>
+Date: Wed Feb 8 09:11:07 2012 +0000
+
+ ipv4: Implement IP_UNICAST_IF socket option.
+
+ The IP_UNICAST_IF feature is needed by the Wine project. This patch
+ implements the feature by setting the outgoing interface in a similar
+ fashion to that of IP_MULTICAST_IF. A separate option is needed to
+ handle this feature since the existing options do not provide all of
+ the characteristics required by IP_UNICAST_IF, a summary is provided
+ below.
+
+ SO_BINDTODEVICE:
+ * SO_BINDTODEVICE requires administrative privileges, IP_UNICAST_IF
+ does not. From reading some old mailing list articles my
+ understanding is that SO_BINDTODEVICE requires administrative
+ privileges because it can override the administrator's routing
+ settings.
+ * The SO_BINDTODEVICE option restricts both outbound and inbound
+ traffic, IP_UNICAST_IF only impacts outbound traffic.
+
+ IP_PKTINFO:
+ * Since IP_PKTINFO and IP_UNICAST_IF are independent options,
+ implementing IP_UNICAST_IF with IP_PKTINFO will likely break some
+ applications.
+ * Implementing IP_UNICAST_IF on top of IP_PKTINFO significantly
+ complicates the Wine codebase and reduces the socket performance
+ (doing this requires a lot of extra communication between the
+ "server" and "user" layers).
+
+ bind():
+ * bind() does not work on broadcast packets, IP_UNICAST_IF is
+ specifically intended to work with broadcast packets.
+ * Like SO_BINDTODEVICE, bind() restricts both outbound and inbound
+ traffic.
+
+ Signed-off-by: Erich E. Hoover <ehoover@mines.edu>
+ Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/include/linux/in.h b/include/linux/in.h
+index 01129c0ea87c..e0337f11d92e 100644
+--- a/include/linux/in.h
++++ b/include/linux/in.h
+@@ -111,6 +111,7 @@ struct in_addr {
+ #define MCAST_LEAVE_SOURCE_GROUP 47
+ #define MCAST_MSFILTER 48
+ #define IP_MULTICAST_ALL 49
++#define IP_UNICAST_IF 50
+
+ #define MCAST_EXCLUDE 0
+ #define MCAST_INCLUDE 1
+diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
+index e3e405106afe..022f772c0ebe 100644
+--- a/include/net/inet_sock.h
++++ b/include/net/inet_sock.h
+@@ -132,6 +132,7 @@ struct rtable;
+ * @tos - TOS
+ * @mc_ttl - Multicasting TTL
+ * @is_icsk - is this an inet_connection_sock?
++ * @uc_index - Unicast outgoing device index
+ * @mc_index - Multicast device index
+ * @mc_list - Group array
+ * @cork - info to build ip hdr on each ip frag while socket is corked
+@@ -167,6 +168,7 @@ struct inet_sock {
+ transparent:1,
+ mc_all:1,
+ nodefrag:1;
++ int uc_index;
+ int mc_index;
+ __be32 mc_addr;
+ struct ip_mc_socklist __rcu *mc_list;
+diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
+index 8aa87c19fa00..9125529dab95 100644
+--- a/net/ipv4/ip_sockglue.c
++++ b/net/ipv4/ip_sockglue.c
+@@ -469,6 +469,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
+ (1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) |
+ (1<<IP_PASSSEC) | (1<<IP_TRANSPARENT) |
+ (1<<IP_MINTTL) | (1<<IP_NODEFRAG))) ||
++ optname == IP_UNICAST_IF ||
+ optname == IP_MULTICAST_TTL ||
+ optname == IP_MULTICAST_ALL ||
+ optname == IP_MULTICAST_LOOP ||
+@@ -628,6 +629,35 @@ static int do_ip_setsockopt(struct sock *sk, int level,
+ goto e_inval;
+ inet->mc_loop = !!val;
+ break;
++ case IP_UNICAST_IF:
++ {
++ struct net_device *dev = NULL;
++ int ifindex;
++
++ if (optlen != sizeof(int))
++ goto e_inval;
++
++ ifindex = (__force int)ntohl((__force __be32)val);
++ if (ifindex == 0) {
++ inet->uc_index = 0;
++ err = 0;
++ break;
++ }
++
++ dev = dev_get_by_index(sock_net(sk), ifindex);
++ err = -EADDRNOTAVAIL;
++ if (!dev)
++ break;
++ dev_put(dev);
++
++ err = -EINVAL;
++ if (sk->sk_bound_dev_if)
++ break;
++
++ inet->uc_index = ifindex;
++ err = 0;
++ break;
++ }
+ case IP_MULTICAST_IF:
+ {
+ struct ip_mreqn mreq;
+@@ -1178,6 +1208,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+ case IP_MULTICAST_LOOP:
+ val = inet->mc_loop;
+ break;
++ case IP_UNICAST_IF:
++ val = (__force int)htonl((__u32) inet->uc_index);
++ break;
+ case IP_MULTICAST_IF:
+ {
+ struct in_addr addr;
+diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
+index aea5a199c37a..cfc82cf339f6 100644
+--- a/net/ipv4/ping.c
++++ b/net/ipv4/ping.c
+@@ -556,7 +556,8 @@ static int ping_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ ipc.oif = inet->mc_index;
+ if (!saddr)
+ saddr = inet->mc_addr;
+- }
++ } else if (!ipc.oif)
++ ipc.oif = inet->uc_index;
+
+ flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
+ RT_SCOPE_UNIVERSE, sk->sk_protocol,
+diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
+index 3ccda5ae8a27..ab466305b629 100644
+--- a/net/ipv4/raw.c
++++ b/net/ipv4/raw.c
+@@ -563,7 +563,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ ipc.oif = inet->mc_index;
+ if (!saddr)
+ saddr = inet->mc_addr;
+- }
++ } else if (!ipc.oif)
++ ipc.oif = inet->uc_index;
+
+ flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
+ RT_SCOPE_UNIVERSE,
+diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
+index 5d075b5f70fc..cd99f1a0f59f 100644
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
+@@ -917,7 +917,8 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ if (!saddr)
+ saddr = inet->mc_addr;
+ connected = 0;
+- }
++ } else if (!ipc.oif)
++ ipc.oif = inet->uc_index;
+
+ if (connected)
+ rt = (struct rtable *)sk_dst_check(sk, 0);
+ commit 1589cb1a94c381579a0235ca708d9e2dca6d3a39
+Author: Li Wang <liwang@nudt.edu.cn>
+Date: Wed Jan 25 15:40:31 2012 +0800
+
+ eCryptfs: move misleading function comments
+
+ The data encryption was moved from ecryptfs_write_end into
+ ecryptfs_writepage, this patch moves the corresponding function
+ comments to be consistent with the modification.
+
+ Signed-off-by: Li Wang <liwang@nudt.edu.cn>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
+index 6a44148c5fb9..10ec695ccd68 100644
+--- a/fs/ecryptfs/mmap.c
++++ b/fs/ecryptfs/mmap.c
+@@ -57,6 +57,10 @@ struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index)
+ * @page: Page that is locked before this call is made
+ *
+ * Returns zero on success; non-zero otherwise
++ *
++ * This is where we encrypt the data and pass the encrypted data to
++ * the lower filesystem. In OpenPGP-compatible mode, we operate on
++ * entire underlying packets.
+ */
+ static int ecryptfs_writepage(struct page *page, struct writeback_control *wbc)
+ {
+@@ -481,10 +485,6 @@ int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode)
+ * @copied: The amount of data copied
+ * @page: The eCryptfs page
+ * @fsdata: The fsdata (unused)
+- *
+- * This is where we encrypt the data and pass the encrypted data to
+- * the lower filesystem. In OpenPGP-compatible mode, we operate on
+- * entire underlying packets.
+ */
+ static int ecryptfs_write_end(struct file *file,
+ struct address_space *mapping,commit 684a3ff7e69acc7c678d1a1394fe9e757993fd34
+Author: Li Wang <liwang@nudt.edu.cn>
+Date: Thu Jan 19 09:44:36 2012 +0800
+
+ eCryptfs: Infinite loop due to overflow in ecryptfs_write()
+
+ ecryptfs_write() can enter an infinite loop when truncating a file to a
+ size larger than 4G. This only happens on architectures where size_t is
+ represented by 32 bits.
+
+ This was caused by a size_t overflow due to it incorrectly being used to
+ store the result of a calculation which uses potentially large values of
+ type loff_t.
+
+ [tyhicks@canonical.com: rewrite subject and commit message]
+ Signed-off-by: Li Wang <liwang@nudt.edu.cn>
+ Signed-off-by: Yunchuan Wen <wenyunchuan@kylinos.com.cn>
+ Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
+ Cc: <stable@vger.kernel.org>
+ Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
+
+diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
+index 3745f7c2b9c2..ec3d9368dc5b 100644
+--- a/fs/ecryptfs/read_write.c
++++ b/fs/ecryptfs/read_write.c
+@@ -130,13 +130,13 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
+ pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);
+ size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);
+ size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
+- size_t total_remaining_bytes = ((offset + size) - pos);
++ loff_t total_remaining_bytes = ((offset + size) - pos);
+
+ if (num_bytes > total_remaining_bytes)
+ num_bytes = total_remaining_bytes;
+ if (pos < offset) {
+ /* remaining zeros to write, up to destination offset */
+- size_t total_remaining_zeros = (offset - pos);
++ loff_t total_remaining_zeros = (offset - pos);
+
+ if (num_bytes > total_remaining_zeros)
+ num_bytes = total_remaining_zeros;
+ commit 4352b47ab7918108b389a48d2163c9a4c2aaf139 +Author: Marek Marczykowski <marmarek@mimuw.edu.pl> +Date: Tue May 3 12:04:52 2011 -0400 + + xen-blkfront: fix data size for xenbus_gather in blkfront_connect + + barrier variable is int, not long. This overflow caused another variable + override: "err" (in PV code) and "binfo" (in xenlinux code - + drivers/xen/blkfront/blkfront.c). The later caused incorrect device + flags (RO/removable etc). + + Signed-off-by: Marek Marczykowski <marmarek@mimuw.edu.pl> + Acked-by: Ian Campbell <Ian.Campbell@citrix.com> + [v1: Changed title] + Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> + +diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c +index 9cb8668ff5f4..20759817ad57 100644 +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -1141,7 +1141,7 @@ static void blkfront_connect(struct blkfront_info *info) + } + + err = xenbus_gather(XBT_NIL, info->xbdev->otherend, +- "feature-barrier", "%lu", &barrier, ++ "feature-barrier", "%d", &barrier, + NULL); + + /*
commit 8ec6dba2581754e375be66f7bedd708d856d8b30
+Author: Jan Rekorajski <baggins@sith.mimuw.edu.pl>
+Date: Mon Nov 16 11:57:02 2009 +0000
+
+ XFS bug in log recover with quota (bugzilla id 855)
+
+ Hi,
+ I was hit by a bug in linux 2.6.31 when XFS is not able to recover the
+ log after a crash if fs was mounted with quotas. Gory details in XFS
+ bugzilla: http://oss.sgi.com/bugzilla/show_bug.cgi?id=855.
+
+ It looks like wrong struct is used in buffer length check, and the following
+ patch should fix the problem.
+
+ xfs_dqblk_t has a size of 104+32 bytes, while xfs_disk_dquot_t is 104 bytes
+ long, and this is exactly what I see in system logs - "XFS: dquot too small
+ (104) in xlog_recover_do_dquot_trans."
+
+ Signed-off-by: Jan Rekorajski <baggins@sith.mimuw.edu.pl>
+ Reviewed-by: Christoph Hellwig <hch@lst.de>
+ Signed-off-by: Alex Elder <aelder@sgi.com>
+
+diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
+index 1099395d7d6c..fb17f8226b09 100644
+--- a/fs/xfs/xfs_log_recover.c
++++ b/fs/xfs/xfs_log_recover.c
+@@ -1980,7 +1980,7 @@ xlog_recover_do_reg_buffer(
+ "XFS: NULL dquot in %s.", __func__);
+ goto next;
+ }
+- if (item->ri_buf[i].i_len < sizeof(xfs_dqblk_t)) {
++ if (item->ri_buf[i].i_len < sizeof(xfs_disk_dquot_t)) {
+ cmn_err(CE_ALERT,
+ "XFS: dquot too small (%d) in %s.",
+ item->ri_buf[i].i_len, __func__);
+@@ -2635,7 +2635,7 @@ xlog_recover_do_dquot_trans(
+ "XFS: NULL dquot in %s.", __func__);
+ return XFS_ERROR(EIO);
+ }
+- if (item->ri_buf[1].i_len < sizeof(xfs_dqblk_t)) {
++ if (item->ri_buf[1].i_len < sizeof(xfs_disk_dquot_t)) {
+ cmn_err(CE_ALERT,
+ "XFS: dquot too small (%d) in %s.",
+ item->ri_buf[1].i_len, __func__);
+ commit 58dd7c0a2a6e76aab156aef625c7b53a6eaaace3
+Author: J.P. Mellor <jpmellor@rose-hulman.edu>
+Date: Thu Feb 19 09:42:53 2009 -0800
+
+ Staging: comedi: add ni_660x driver
+
+ Driver for National Instruments 660x counter/timer boards (PCI-6601,
+ PCI-6602, PXI-6602, and PXI-6608)
+
+ From: J.P. Mellor <jpmellor@rose-hulman.edu>
+ Cc: Herman Bruyninckx <Herman.Bruyninckx@mech.kuleuven.ac.be>
+ Cc: Wim Meeussen <Wim.Meeussen@mech.kuleuven.ac.be>
+ Cc: Klass Gadeyne <Klaas.Gadeyne@mech.kuleuven.ac.be>
+ Cc: David Schleef <ds@schleef.org>
+ Cc: Ian Abbott <abbotti@mev.co.uk>
+ Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
+new file mode 100644
+index 000000000000..e646e98f3082
+--- /dev/null
++++ b/drivers/staging/comedi/drivers/ni_660x.c
+@@ -0,0 +1,1322 @@
++/*
++ comedi/drivers/ni_660x.c
++ Hardware driver for NI 660x devices
++
++ 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.
++*/
++
++/*
++Driver: ni_660x
++Description: National Instruments 660x counter/timer boards
++Devices:
++[National Instruments] PCI-6601 (ni_660x), PCI-6602, PXI-6602,
++ PXI-6608
++Author: J.P. Mellor <jpmellor@rose-hulman.edu>,
++ Herman.Bruyninckx@mech.kuleuven.ac.be,
++ Wim.Meeussen@mech.kuleuven.ac.be,
++ Klaas.Gadeyne@mech.kuleuven.ac.be,
++ Frank Mori Hess <fmhess@users.sourceforge.net>
++Updated: Thu Oct 18 12:56:06 EDT 2007
++Status: experimental
++
++Encoders work. PulseGeneration (both single pulse and pulse train)
++works. Buffered commands work for input but not output.
++
++References:
++DAQ 660x Register-Level Programmer Manual (NI 370505A-01)
++DAQ 6601/6602 User Manual (NI 322137B-01)
++
++*/
++
++#include "../comedidev.h"
++#include "mite.h"
++#include "ni_tio.h"
++
++enum ni_660x_constants {
++ min_counter_pfi_chan = 8,
++ max_dio_pfi_chan = 31,
++ counters_per_chip = 4
++};
++
++#define NUM_PFI_CHANNELS 40
++// really there are only up to 3 dma channels, but the register layout allows for 4
++#define MAX_DMA_CHANNEL 4
++
++/* See Register-Level Programmer Manual page 3.1 */
++typedef enum {
++ G0InterruptAcknowledge,
++ G0StatusRegister,
++ G1InterruptAcknowledge,
++ G1StatusRegister,
++ G01StatusRegister,
++ G0CommandRegister,
++ STCDIOParallelInput,
++ G1CommandRegister,
++ G0HWSaveRegister,
++ G1HWSaveRegister,
++ STCDIOOutput,
++ STCDIOControl,
++ G0SWSaveRegister,
++ G1SWSaveRegister,
++ G0ModeRegister,
++ G01JointStatus1Register,
++ G1ModeRegister,
++ STCDIOSerialInput,
++ G0LoadARegister,
++ G01JointStatus2Register,
++ G0LoadBRegister,
++ G1LoadARegister,
++ G1LoadBRegister,
++ G0InputSelectRegister,
++ G1InputSelectRegister,
++ G0AutoincrementRegister,
++ G1AutoincrementRegister,
++ G01JointResetRegister,
++ G0InterruptEnable,
++ G1InterruptEnable,
++ G0CountingModeRegister,
++ G1CountingModeRegister,
++ G0SecondGateRegister,
++ G1SecondGateRegister,
++ G0DMAConfigRegister,
++ G0DMAStatusRegister,
++ G1DMAConfigRegister,
++ G1DMAStatusRegister,
++ G2InterruptAcknowledge,
++ G2StatusRegister,
++ G3InterruptAcknowledge,
++ G3StatusRegister,
++ G23StatusRegister,
++ G2CommandRegister,
++ G3CommandRegister,
++ G2HWSaveRegister,
++ G3HWSaveRegister,
++ G2SWSaveRegister,
++ G3SWSaveRegister,
++ G2ModeRegister,
++ G23JointStatus1Register,
++ G3ModeRegister,
++ G2LoadARegister,
++ G23JointStatus2Register,
++ G2LoadBRegister,
++ G3LoadARegister,
++ G3LoadBRegister,
++ G2InputSelectRegister,
++ G3InputSelectRegister,
++ G2AutoincrementRegister,
++ G3AutoincrementRegister,
++ G23JointResetRegister,
++ G2InterruptEnable,
++ G3InterruptEnable,
++ G2CountingModeRegister,
++ G3CountingModeRegister,
++ G3SecondGateRegister,
++ G2SecondGateRegister,
++ G2DMAConfigRegister,
++ G2DMAStatusRegister,
++ G3DMAConfigRegister,
++ G3DMAStatusRegister,
++ DIO32Input,
++ DIO32Output,
++ ClockConfigRegister,
++ GlobalInterruptStatusRegister,
++ DMAConfigRegister,
++ GlobalInterruptConfigRegister,
++ IOConfigReg0_1,
++ IOConfigReg2_3,
++ IOConfigReg4_5,
++ IOConfigReg6_7,
++ IOConfigReg8_9,
++ IOConfigReg10_11,
++ IOConfigReg12_13,
++ IOConfigReg14_15,
++ IOConfigReg16_17,
++ IOConfigReg18_19,
++ IOConfigReg20_21,
++ IOConfigReg22_23,
++ IOConfigReg24_25,
++ IOConfigReg26_27,
++ IOConfigReg28_29,
++ IOConfigReg30_31,
++ IOConfigReg32_33,
++ IOConfigReg34_35,
++ IOConfigReg36_37,
++ IOConfigReg38_39,
++ NumRegisters,
++} NI_660x_Register;
++
++static inline unsigned IOConfigReg(unsigned pfi_channel)
++{
++ unsigned reg = IOConfigReg0_1 + pfi_channel / 2;
++ BUG_ON(reg > IOConfigReg38_39);
++ return reg;
++}
++
++enum ni_660x_register_width {
++ DATA_1B,
++ DATA_2B,
++ DATA_4B
++};
++
++enum ni_660x_register_direction {
++ NI_660x_READ,
++ NI_660x_WRITE,
++ NI_660x_READ_WRITE
++};
++
++enum ni_660x_pfi_output_select {
++ pfi_output_select_high_Z = 0,
++ pfi_output_select_counter = 1,
++ pfi_output_select_do = 2,
++ num_pfi_output_selects
++};
++
++enum ni_660x_subdevices {
++ NI_660X_DIO_SUBDEV = 1,
++ NI_660X_GPCT_SUBDEV_0 = 2
++};
++static inline unsigned NI_660X_GPCT_SUBDEV(unsigned index)
++{
++ return NI_660X_GPCT_SUBDEV_0 + index;
++}
++
++typedef struct {
++ const char *name; // Register Name
++ int offset; // Offset from base address from GPCT chip
++ enum ni_660x_register_direction direction;
++ enum ni_660x_register_width size; // 1 byte, 2 bytes, or 4 bytes
++} NI_660xRegisterData;
++
++static const NI_660xRegisterData registerData[NumRegisters] = {
++ {"G0 Interrupt Acknowledge", 0x004, NI_660x_WRITE, DATA_2B},
++ {"G0 Status Register", 0x004, NI_660x_READ, DATA_2B},
++ {"G1 Interrupt Acknowledge", 0x006, NI_660x_WRITE, DATA_2B},
++ {"G1 Status Register", 0x006, NI_660x_READ, DATA_2B},
++ {"G01 Status Register ", 0x008, NI_660x_READ, DATA_2B},
++ {"G0 Command Register", 0x00C, NI_660x_WRITE, DATA_2B},
++ {"STC DIO Parallel Input", 0x00E, NI_660x_READ, DATA_2B},
++ {"G1 Command Register", 0x00E, NI_660x_WRITE, DATA_2B},
++ {"G0 HW Save Register", 0x010, NI_660x_READ, DATA_4B},
++ {"G1 HW Save Register", 0x014, NI_660x_READ, DATA_4B},
++ {"STC DIO Output", 0x014, NI_660x_WRITE, DATA_2B},
++ {"STC DIO Control", 0x016, NI_660x_WRITE, DATA_2B},
++ {"G0 SW Save Register", 0x018, NI_660x_READ, DATA_4B},
++ {"G1 SW Save Register", 0x01C, NI_660x_READ, DATA_4B},
++ {"G0 Mode Register", 0x034, NI_660x_WRITE, DATA_2B},
++ {"G01 Joint Status 1 Register", 0x036, NI_660x_READ, DATA_2B},
++ {"G1 Mode Register", 0x036, NI_660x_WRITE, DATA_2B},
++ {"STC DIO Serial Input", 0x038, NI_660x_READ, DATA_2B},
++ {"G0 Load A Register", 0x038, NI_660x_WRITE, DATA_4B},
++ {"G01 Joint Status 2 Register", 0x03A, NI_660x_READ, DATA_2B},
++ {"G0 Load B Register", 0x03C, NI_660x_WRITE, DATA_4B},
++ {"G1 Load A Register", 0x040, NI_660x_WRITE, DATA_4B},
++ {"G1 Load B Register", 0x044, NI_660x_WRITE, DATA_4B},
++ {"G0 Input Select Register", 0x048, NI_660x_WRITE, DATA_2B},
++ {"G1 Input Select Register", 0x04A, NI_660x_WRITE, DATA_2B},
++ {"G0 Autoincrement Register", 0x088, NI_660x_WRITE, DATA_2B},
++ {"G1 Autoincrement Register", 0x08A, NI_660x_WRITE, DATA_2B},
++ {"G01 Joint Reset Register", 0x090, NI_660x_WRITE, DATA_2B},
++ {"G0 Interrupt Enable", 0x092, NI_660x_WRITE, DATA_2B},
++ {"G1 Interrupt Enable", 0x096, NI_660x_WRITE, DATA_2B},
++ {"G0 Counting Mode Register", 0x0B0, NI_660x_WRITE, DATA_2B},
++ {"G1 Counting Mode Register", 0x0B2, NI_660x_WRITE, DATA_2B},
++ {"G0 Second Gate Register", 0x0B4, NI_660x_WRITE, DATA_2B},
++ {"G1 Second Gate Register", 0x0B6, NI_660x_WRITE, DATA_2B},
++ {"G0 DMA Config Register", 0x0B8, NI_660x_WRITE, DATA_2B},
++ {"G0 DMA Status Register", 0x0B8, NI_660x_READ, DATA_2B},
++ {"G1 DMA Config Register", 0x0BA, NI_660x_WRITE, DATA_2B},
++ {"G1 DMA Status Register", 0x0BA, NI_660x_READ, DATA_2B},
++ {"G2 Interrupt Acknowledge", 0x104, NI_660x_WRITE, DATA_2B},
++ {"G2 Status Register", 0x104, NI_660x_READ, DATA_2B},
++ {"G3 Interrupt Acknowledge", 0x106, NI_660x_WRITE, DATA_2B},
++ {"G3 Status Register", 0x106, NI_660x_READ, DATA_2B},
++ {"G23 Status Register", 0x108, NI_660x_READ, DATA_2B},
++ {"G2 Command Register", 0x10C, NI_660x_WRITE, DATA_2B},
++ {"G3 Command Register", 0x10E, NI_660x_WRITE, DATA_2B},
++ {"G2 HW Save Register", 0x110, NI_660x_READ, DATA_4B},
++ {"G3 HW Save Register", 0x114, NI_660x_READ, DATA_4B},
++ {"G2 SW Save Register", 0x118, NI_660x_READ, DATA_4B},
++ {"G3 SW Save Register", 0x11C, NI_660x_READ, DATA_4B},
++ {"G2 Mode Register", 0x134, NI_660x_WRITE, DATA_2B},
++ {"G23 Joint Status 1 Register", 0x136, NI_660x_READ, DATA_2B},
++ {"G3 Mode Register", 0x136, NI_660x_WRITE, DATA_2B},
++ {"G2 Load A Register", 0x138, NI_660x_WRITE, DATA_4B},
++ {"G23 Joint Status 2 Register", 0x13A, NI_660x_READ, DATA_2B},
++ {"G2 Load B Register", 0x13C, NI_660x_WRITE, DATA_4B},
++ {"G3 Load A Register", 0x140, NI_660x_WRITE, DATA_4B},
++ {"G3 Load B Register", 0x144, NI_660x_WRITE, DATA_4B},
++ {"G2 Input Select Register", 0x148, NI_660x_WRITE, DATA_2B},
++ {"G3 Input Select Register", 0x14A, NI_660x_WRITE, DATA_2B},
++ {"G2 Autoincrement Register", 0x188, NI_660x_WRITE, DATA_2B},
++ {"G3 Autoincrement Register", 0x18A, NI_660x_WRITE, DATA_2B},
++ {"G23 Joint Reset Register", 0x190, NI_660x_WRITE, DATA_2B},
++ {"G2 Interrupt Enable", 0x192, NI_660x_WRITE, DATA_2B},
++ {"G3 Interrupt Enable", 0x196, NI_660x_WRITE, DATA_2B},
++ {"G2 Counting Mode Register", 0x1B0, NI_660x_WRITE, DATA_2B},
++ {"G3 Counting Mode Register", 0x1B2, NI_660x_WRITE, DATA_2B},
++ {"G3 Second Gate Register", 0x1B6, NI_660x_WRITE, DATA_2B},
++ {"G2 Second Gate Register", 0x1B4, NI_660x_WRITE, DATA_2B},
++ {"G2 DMA Config Register", 0x1B8, NI_660x_WRITE, DATA_2B},
++ {"G2 DMA Status Register", 0x1B8, NI_660x_READ, DATA_2B},
++ {"G3 DMA Config Register", 0x1BA, NI_660x_WRITE, DATA_2B},
++ {"G3 DMA Status Register", 0x1BA, NI_660x_READ, DATA_2B},
++ {"32 bit Digital Input", 0x414, NI_660x_READ, DATA_4B},
++ {"32 bit Digital Output", 0x510, NI_660x_WRITE, DATA_4B},
++ {"Clock Config Register", 0x73C, NI_660x_WRITE, DATA_4B},
++ {"Global Interrupt Status Register", 0x754, NI_660x_READ, DATA_4B},
++ {"DMA Configuration Register", 0x76C, NI_660x_WRITE, DATA_4B},
++ {"Global Interrupt Config Register", 0x770, NI_660x_WRITE, DATA_4B},
++ {"IO Config Register 0-1", 0x77C, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 2-3", 0x77E, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 4-5", 0x780, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 6-7", 0x782, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 8-9", 0x784, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 10-11", 0x786, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 12-13", 0x788, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 14-15", 0x78A, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 16-17", 0x78C, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 18-19", 0x78E, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 20-21", 0x790, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 22-23", 0x792, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 24-25", 0x794, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 26-27", 0x796, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 28-29", 0x798, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 30-31", 0x79A, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 32-33", 0x79C, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 34-35", 0x79E, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 36-37", 0x7A0, NI_660x_READ_WRITE, DATA_2B},
++ {"IO Config Register 38-39", 0x7A2, NI_660x_READ_WRITE, DATA_2B}
++};
++
++// kind of ENABLE for the second counter
++enum clock_config_register_bits {
++ CounterSwap = 0x1 << 21
++};
++
++// ioconfigreg
++static inline unsigned ioconfig_bitshift(unsigned pfi_channel)
++{
++ if (pfi_channel % 2)
++ return 0;
++ else
++ return 8;
++}
++static inline unsigned pfi_output_select_mask(unsigned pfi_channel)
++{
++ return 0x3 << ioconfig_bitshift(pfi_channel);
++}
++static inline unsigned pfi_output_select_bits(unsigned pfi_channel,
++ unsigned output_select)
++{
++ return (output_select & 0x3) << ioconfig_bitshift(pfi_channel);
++}
++static inline unsigned pfi_input_select_mask(unsigned pfi_channel)
++{
++ return 0x7 << (4 + ioconfig_bitshift(pfi_channel));
++}
++static inline unsigned pfi_input_select_bits(unsigned pfi_channel,
++ unsigned input_select)
++{
++ return (input_select & 0x7) << (4 + ioconfig_bitshift(pfi_channel));
++}
++
++// dma configuration register bits
++static inline unsigned dma_select_mask(unsigned dma_channel)
++{
++ BUG_ON(dma_channel >= MAX_DMA_CHANNEL);
++ return 0x1f << (8 * dma_channel);
++}
++enum dma_selection {
++ dma_selection_none = 0x1f,
++};
++static inline unsigned dma_selection_counter(unsigned counter_index)
++{
++ BUG_ON(counter_index >= counters_per_chip);
++ return counter_index;
++}
++static inline unsigned dma_select_bits(unsigned dma_channel, unsigned selection)
++{
++ BUG_ON(dma_channel >= MAX_DMA_CHANNEL);
++ return (selection << (8 * dma_channel)) & dma_select_mask(dma_channel);
++}
++static inline unsigned dma_reset_bit(unsigned dma_channel)
++{
++ BUG_ON(dma_channel >= MAX_DMA_CHANNEL);
++ return 0x80 << (8 * dma_channel);
++}
++
++enum global_interrupt_status_register_bits {
++ Counter_0_Int_Bit = 0x100,
++ Counter_1_Int_Bit = 0x200,
++ Counter_2_Int_Bit = 0x400,
++ Counter_3_Int_Bit = 0x800,
++ Cascade_Int_Bit = 0x20000000,
++ Global_Int_Bit = 0x80000000
++};
++
++enum global_interrupt_config_register_bits {
++ Cascade_Int_Enable_Bit = 0x20000000,
++ Global_Int_Polarity_Bit = 0x40000000,
++ Global_Int_Enable_Bit = 0x80000000
++};
++
++// Offset of the GPCT chips from the base-adress of the card
++static const unsigned GPCT_OFFSET[2] = { 0x0, 0x800 }; /* First chip is at base-address +
++ 0x00, etc. */
++
++/* Board description*/
++typedef struct {
++ unsigned short dev_id; /* `lspci` will show you this */
++ const char *name;
++ unsigned n_chips; /* total number of TIO chips */
++} ni_660x_board;
++
++static const ni_660x_board ni_660x_boards[] = {
++ {
++ dev_id: 0x2c60,
++ name: "PCI-6601",
++ n_chips: 1,
++ },
++ {
++ dev_id: 0x1310,
++ name: "PCI-6602",
++ n_chips: 2,
++ },
++ {
++ dev_id: 0x1360,
++ name: "PXI-6602",
++ n_chips: 2,
++ },
++ {
++ dev_id: 0x2cc0,
++ name: "PXI-6608",
++ n_chips: 2,
++ },
++};
++
++#define NI_660X_MAX_NUM_CHIPS 2
++#define NI_660X_MAX_NUM_COUNTERS (NI_660X_MAX_NUM_CHIPS * counters_per_chip)
++
++static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
++ {PCI_VENDOR_ID_NATINST, 0x2c60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ {PCI_VENDOR_ID_NATINST, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ {PCI_VENDOR_ID_NATINST, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ {PCI_VENDOR_ID_NATINST, 0x2cc0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ {0}
++};
++
++MODULE_DEVICE_TABLE(pci, ni_660x_pci_table);
++
++typedef struct {
++ struct mite_struct *mite;
++ struct ni_gpct_device *counter_dev;
++ uint64_t pfi_direction_bits;
++ struct mite_dma_descriptor_ring
++ *mite_rings[NI_660X_MAX_NUM_CHIPS][counters_per_chip];
++ spinlock_t mite_channel_lock;
++ unsigned dma_configuration_soft_copies[NI_660X_MAX_NUM_CHIPS];
++ spinlock_t soft_reg_copy_lock;
++ unsigned short pfi_output_selects[NUM_PFI_CHANNELS];
++} ni_660x_private;
++
++static inline ni_660x_private *private(comedi_device * dev)
++{
++ return dev->private;
++}
++
++/* initialized in ni_660x_find_device() */
++static inline const ni_660x_board *board(comedi_device * dev)
++{
++ return dev->board_ptr;
++}
++
++#define n_ni_660x_boards (sizeof(ni_660x_boards)/sizeof(ni_660x_boards[0]))
++
++static int ni_660x_attach(comedi_device * dev, comedi_devconfig * it);
++static int ni_660x_detach(comedi_device * dev);
++static void init_tio_chip(comedi_device * dev, int chipset);
++static void ni_660x_select_pfi_output(comedi_device * dev, unsigned pfi_channel,
++ unsigned output_select);
++
++static comedi_driver driver_ni_660x = {
++ driver_name:"ni_660x",
++ module:THIS_MODULE,
++ attach:ni_660x_attach,
++ detach:ni_660x_detach,
++};
++
++COMEDI_PCI_INITCLEANUP(driver_ni_660x, ni_660x_pci_table);
++
++static int ni_660x_find_device(comedi_device * dev, int bus, int slot);
++static int ni_660x_set_pfi_routing(comedi_device * dev, unsigned chan,
++ unsigned source);
++
++/* Possible instructions for a GPCT */
++static int ni_660x_GPCT_rinsn(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
++static int ni_660x_GPCT_insn_config(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
++static int ni_660x_GPCT_winsn(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
++
++/* Possible instructions for Digital IO */
++static int ni_660x_dio_insn_config(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
++static int ni_660x_dio_insn_bits(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
++
++static inline unsigned ni_660x_num_counters(comedi_device * dev)
++{
++ return board(dev)->n_chips * counters_per_chip;
++}
++
++static NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg)
++{
++ NI_660x_Register ni_660x_register;
++ switch (reg) {
++ case NITIO_G0_Autoincrement_Reg:
++ ni_660x_register = G0AutoincrementRegister;
++ break;
++ case NITIO_G1_Autoincrement_Reg:
++ ni_660x_register = G1AutoincrementRegister;
++ break;
++ case NITIO_G2_Autoincrement_Reg:
++ ni_660x_register = G2AutoincrementRegister;
++ break;
++ case NITIO_G3_Autoincrement_Reg:
++ ni_660x_register = G3AutoincrementRegister;
++ break;
++ case NITIO_G0_Command_Reg:
++ ni_660x_register = G0CommandRegister;
++ break;
++ case NITIO_G1_Command_Reg:
++ ni_660x_register = G1CommandRegister;
++ break;
++ case NITIO_G2_Command_Reg:
++ ni_660x_register = G2CommandRegister;
++ break;
++ case NITIO_G3_Command_Reg:
++ ni_660x_register = G3CommandRegister;
++ break;
++ case NITIO_G0_HW_Save_Reg:
++ ni_660x_register = G0HWSaveRegister;
++ break;
++ case NITIO_G1_HW_Save_Reg:
++ ni_660x_register = G1HWSaveRegister;
++ break;
++ case NITIO_G2_HW_Save_Reg:
++ ni_660x_register = G2HWSaveRegister;
++ break;
++ case NITIO_G3_HW_Save_Reg:
++ ni_660x_register = G3HWSaveRegister;
++ break;
++ case NITIO_G0_SW_Save_Reg:
++ ni_660x_register = G0SWSaveRegister;
++ break;
++ case NITIO_G1_SW_Save_Reg:
++ ni_660x_register = G1SWSaveRegister;
++ break;
++ case NITIO_G2_SW_Save_Reg:
++ ni_660x_register = G2SWSaveRegister;
++ break;
++ case NITIO_G3_SW_Save_Reg:
++ ni_660x_register = G3SWSaveRegister;
++ break;
++ case NITIO_G0_Mode_Reg:
++ ni_660x_register = G0ModeRegister;
++ break;
++ case NITIO_G1_Mode_Reg:
++ ni_660x_register = G1ModeRegister;
++ break;
++ case NITIO_G2_Mode_Reg:
++ ni_660x_register = G2ModeRegister;
++ break;
++ case NITIO_G3_Mode_Reg:
++ ni_660x_register = G3ModeRegister;
++ break;
++ case NITIO_G0_LoadA_Reg:
++ ni_660x_register = G0LoadARegister;
++ break;
++ case NITIO_G1_LoadA_Reg:
++ ni_660x_register = G1LoadARegister;
++ break;
++ case NITIO_G2_LoadA_Reg:
++ ni_660x_register = G2LoadARegister;
++ break;
++ case NITIO_G3_LoadA_Reg:
++ ni_660x_register = G3LoadARegister;
++ break;
++ case NITIO_G0_LoadB_Reg:
++ ni_660x_register = G0LoadBRegister;
++ break;
++ case NITIO_G1_LoadB_Reg:
++ ni_660x_register = G1LoadBRegister;
++ break;
++ case NITIO_G2_LoadB_Reg:
++ ni_660x_register = G2LoadBRegister;
++ break;
++ case NITIO_G3_LoadB_Reg:
++ ni_660x_register = G3LoadBRegister;
++ break;
++ case NITIO_G0_Input_Select_Reg:
++ ni_660x_register = G0InputSelectRegister;
++ break;
++ case NITIO_G1_Input_Select_Reg:
++ ni_660x_register = G1InputSelectRegister;
++ break;
++ case NITIO_G2_Input_Select_Reg:
++ ni_660x_register = G2InputSelectRegister;
++ break;
++ case NITIO_G3_Input_Select_Reg:
++ ni_660x_register = G3InputSelectRegister;
++ break;
++ case NITIO_G01_Status_Reg:
++ ni_660x_register = G01StatusRegister;
++ break;
++ case NITIO_G23_Status_Reg:
++ ni_660x_register = G23StatusRegister;
++ break;
++ case NITIO_G01_Joint_Reset_Reg:
++ ni_660x_register = G01JointResetRegister;
++ break;
++ case NITIO_G23_Joint_Reset_Reg:
++ ni_660x_register = G23JointResetRegister;
++ break;
++ case NITIO_G01_Joint_Status1_Reg:
++ ni_660x_register = G01JointStatus1Register;
++ break;
++ case NITIO_G23_Joint_Status1_Reg:
++ ni_660x_register = G23JointStatus1Register;
++ break;
++ case NITIO_G01_Joint_Status2_Reg:
++ ni_660x_register = G01JointStatus2Register;
++ break;
++ case NITIO_G23_Joint_Status2_Reg:
++ ni_660x_register = G23JointStatus2Register;
++ break;
++ case NITIO_G0_Counting_Mode_Reg:
++ ni_660x_register = G0CountingModeRegister;
++ break;
++ case NITIO_G1_Counting_Mode_Reg:
++ ni_660x_register = G1CountingModeRegister;
++ break;
++ case NITIO_G2_Counting_Mode_Reg:
++ ni_660x_register = G2CountingModeRegister;
++ break;
++ case NITIO_G3_Counting_Mode_Reg:
++ ni_660x_register = G3CountingModeRegister;
++ break;
++ case NITIO_G0_Second_Gate_Reg:
++ ni_660x_register = G0SecondGateRegister;
++ break;
++ case NITIO_G1_Second_Gate_Reg:
++ ni_660x_register = G1SecondGateRegister;
++ break;
++ case NITIO_G2_Second_Gate_Reg:
++ ni_660x_register = G2SecondGateRegister;
++ break;
++ case NITIO_G3_Second_Gate_Reg:
++ ni_660x_register = G3SecondGateRegister;
++ break;
++ case NITIO_G0_DMA_Config_Reg:
++ ni_660x_register = G0DMAConfigRegister;
++ break;
++ case NITIO_G0_DMA_Status_Reg:
++ ni_660x_register = G0DMAStatusRegister;
++ break;
++ case NITIO_G1_DMA_Config_Reg:
++ ni_660x_register = G1DMAConfigRegister;
++ break;
++ case NITIO_G1_DMA_Status_Reg:
++ ni_660x_register = G1DMAStatusRegister;
++ break;
++ case NITIO_G2_DMA_Config_Reg:
++ ni_660x_register = G2DMAConfigRegister;
++ break;
++ case NITIO_G2_DMA_Status_Reg:
++ ni_660x_register = G2DMAStatusRegister;
++ break;
++ case NITIO_G3_DMA_Config_Reg:
++ ni_660x_register = G3DMAConfigRegister;
++ break;
++ case NITIO_G3_DMA_Status_Reg:
++ ni_660x_register = G3DMAStatusRegister;
++ break;
++ case NITIO_G0_Interrupt_Acknowledge_Reg:
++ ni_660x_register = G0InterruptAcknowledge;
++ break;
++ case NITIO_G1_Interrupt_Acknowledge_Reg:
++ ni_660x_register = G1InterruptAcknowledge;
++ break;
++ case NITIO_G2_Interrupt_Acknowledge_Reg:
++ ni_660x_register = G2InterruptAcknowledge;
++ break;
++ case NITIO_G3_Interrupt_Acknowledge_Reg:
++ ni_660x_register = G3InterruptAcknowledge;
++ break;
++ case NITIO_G0_Status_Reg:
++ ni_660x_register = G0StatusRegister;
++ break;
++ case NITIO_G1_Status_Reg:
++ ni_660x_register = G0StatusRegister;
++ break;
++ case NITIO_G2_Status_Reg:
++ ni_660x_register = G0StatusRegister;
++ break;
++ case NITIO_G3_Status_Reg:
++ ni_660x_register = G0StatusRegister;
++ break;
++ case NITIO_G0_Interrupt_Enable_Reg:
++ ni_660x_register = G0InterruptEnable;
++ break;
++ case NITIO_G1_Interrupt_Enable_Reg:
++ ni_660x_register = G1InterruptEnable;
++ break;
++ case NITIO_G2_Interrupt_Enable_Reg:
++ ni_660x_register = G2InterruptEnable;
++ break;
++ case NITIO_G3_Interrupt_Enable_Reg:
++ ni_660x_register = G3InterruptEnable;
++ break;
++ default:
++ rt_printk("%s: unhandled register 0x%x in switch.\n",
++ __FUNCTION__, reg);
++ BUG();
++ return 0;
++ break;
++ }
++ return ni_660x_register;
++}
++
++static inline void ni_660x_write_register(comedi_device * dev,
++ unsigned chip_index, unsigned bits, NI_660x_Register reg)
++{
++ void *const write_address =
++ private(dev)->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
++ registerData[reg].offset;
++
++ switch (registerData[reg].size) {
++ case DATA_2B:
++ writew(bits, write_address);
++ break;
++ case DATA_4B:
++ writel(bits, write_address);
++ break;
++ default:
++ rt_printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
++ __FILE__, __FUNCTION__, reg);
++ BUG();
++ break;
++ }
++}
++
++static inline unsigned ni_660x_read_register(comedi_device * dev,
++ unsigned chip_index, NI_660x_Register reg)
++{
++ void *const read_address =
++ private(dev)->mite->daq_io_addr + GPCT_OFFSET[chip_index] +
++ registerData[reg].offset;
++
++ switch (registerData[reg].size) {
++ case DATA_2B:
++ return readw(read_address);
++ break;
++ case DATA_4B:
++ return readl(read_address);
++ break;
++ default:
++ rt_printk("%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
++ __FILE__, __FUNCTION__, reg);
++ BUG();
++ break;
++ }
++ return 0;
++}
++
++static void ni_gpct_write_register(struct ni_gpct *counter, unsigned bits,
++ enum ni_gpct_register reg)
++{
++ comedi_device *dev = counter->counter_dev->dev;
++ NI_660x_Register ni_660x_register = ni_gpct_to_660x_register(reg);
++ ni_660x_write_register(dev, counter->chip_index, bits,
++ ni_660x_register);
++}
++
++static unsigned ni_gpct_read_register(struct ni_gpct *counter,
++ enum ni_gpct_register reg)
++{
++ comedi_device *dev = counter->counter_dev->dev;
++ NI_660x_Register ni_660x_register = ni_gpct_to_660x_register(reg);
++ return ni_660x_read_register(dev, counter->chip_index,
++ ni_660x_register);
++}
++
++static inline struct mite_dma_descriptor_ring *mite_ring(ni_660x_private * priv,
++ struct ni_gpct *counter)
++{
++ return priv->mite_rings[counter->chip_index][counter->counter_index];
++}
++
++static inline void ni_660x_set_dma_channel(comedi_device * dev,
++ unsigned mite_channel, struct ni_gpct *counter)
++{
++ unsigned long flags;
++ comedi_spin_lock_irqsave(&private(dev)->soft_reg_copy_lock, flags);
++ private(dev)->dma_configuration_soft_copies[counter->chip_index] &=
++ ~dma_select_mask(mite_channel);
++ private(dev)->dma_configuration_soft_copies[counter->chip_index] |=
++ dma_select_bits(mite_channel,
++ dma_selection_counter(counter->counter_index));
++ ni_660x_write_register(dev, counter->chip_index,
++ private(dev)->dma_configuration_soft_copies[counter->
++ chip_index] | dma_reset_bit(mite_channel),
++ DMAConfigRegister);
++ mmiowb();
++ comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags);
++}
++
++static inline void ni_660x_unset_dma_channel(comedi_device * dev,
++ unsigned mite_channel, struct ni_gpct *counter)
++{
++ unsigned long flags;
++ comedi_spin_lock_irqsave(&private(dev)->soft_reg_copy_lock, flags);
++ private(dev)->dma_configuration_soft_copies[counter->chip_index] &=
++ ~dma_select_mask(mite_channel);
++ private(dev)->dma_configuration_soft_copies[counter->chip_index] |=
++ dma_select_bits(mite_channel, dma_selection_none);
++ ni_660x_write_register(dev, counter->chip_index,
++ private(dev)->dma_configuration_soft_copies[counter->
++ chip_index], DMAConfigRegister);
++ mmiowb();
++ comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags);
++}
++
++static int ni_660x_request_mite_channel(comedi_device * dev,
++ struct ni_gpct *counter, enum comedi_io_direction direction)
++{
++ unsigned long flags;
++ struct mite_channel *mite_chan;
++
++ comedi_spin_lock_irqsave(&private(dev)->mite_channel_lock, flags);
++ BUG_ON(counter->mite_chan);
++ mite_chan =
++ mite_request_channel(private(dev)->mite, mite_ring(private(dev),
++ counter));
++ if (mite_chan == NULL) {
++ comedi_spin_unlock_irqrestore(&private(dev)->mite_channel_lock,
++ flags);
++ comedi_error(dev,
++ "failed to reserve mite dma channel for counter.");
++ return -EBUSY;
++ }
++ mite_chan->dir = direction;
++ ni_tio_set_mite_channel(counter, mite_chan);
++ ni_660x_set_dma_channel(dev, mite_chan->channel, counter);
++ comedi_spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags);
++ return 0;
++}
++
++void ni_660x_release_mite_channel(comedi_device * dev, struct ni_gpct *counter)
++{
++ unsigned long flags;
++
++ comedi_spin_lock_irqsave(&private(dev)->mite_channel_lock, flags);
++ if (counter->mite_chan) {
++ struct mite_channel *mite_chan = counter->mite_chan;
++
++ ni_660x_unset_dma_channel(dev, mite_chan->channel, counter);
++ ni_tio_set_mite_channel(counter, NULL);
++ mite_release_channel(mite_chan);
++ }
++ comedi_spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags);
++}
++
++static int ni_660x_cmd(comedi_device * dev, comedi_subdevice * s)
++{
++ int retval;
++
++ struct ni_gpct *counter = subdev_to_counter(s);
++// const comedi_cmd *cmd = &s->async->cmd;
++
++ retval = ni_660x_request_mite_channel(dev, counter, COMEDI_INPUT);
++ if (retval) {
++ comedi_error(dev,
++ "no dma channel available for use by counter");
++ return retval;
++ }
++ ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);
++ retval = ni_tio_cmd(counter, s->async);
++
++ return retval;
++}
++
++static int ni_660x_cmdtest(comedi_device * dev, comedi_subdevice * s,
++ comedi_cmd * cmd)
++{
++ struct ni_gpct *counter = subdev_to_counter(s);
++
++ return ni_tio_cmdtest(counter, cmd);
++}
++
++static int ni_660x_cancel(comedi_device * dev, comedi_subdevice * s)
++{
++ struct ni_gpct *counter = subdev_to_counter(s);
++ int retval;
++
++ retval = ni_tio_cancel(counter);
++ ni_660x_release_mite_channel(dev, counter);
++ return retval;
++}
++
++static void set_tio_counterswap(comedi_device * dev, int chipset)
++{
++ /* See P. 3.5 of the Register-Level Programming manual. The
++ CounterSwap bit has to be set on the second chip, otherwise
++ it will try to use the same pins as the first chip.
++ */
++ if (chipset)
++ ni_660x_write_register(dev, chipset, CounterSwap,
++ ClockConfigRegister);
++ else
++ ni_660x_write_register(dev, chipset, 0, ClockConfigRegister);
++}
++
++static void ni_660x_handle_gpct_interrupt(comedi_device * dev,
++ comedi_subdevice * s)
++{
++ ni_tio_handle_interrupt(subdev_to_counter(s), s);
++ if (s->async->events) {
++ if (s->async->
++ events & (COMEDI_CB_EOA | COMEDI_CB_ERROR |
++ COMEDI_CB_OVERFLOW)) {
++ ni_660x_cancel(dev, s);
++ }
++ comedi_event(dev, s);
++ }
++}
++
++static irqreturn_t ni_660x_interrupt(int irq, void *d PT_REGS_ARG)
++{
++ comedi_device *dev = d;
++ comedi_subdevice *s;
++ unsigned i;
++
++ if (dev->attached == 0)
++ return IRQ_NONE;
++ smp_mb();
++ for (i = 0; i < ni_660x_num_counters(dev); ++i) {
++ s = dev->subdevices + NI_660X_GPCT_SUBDEV(i);
++ ni_660x_handle_gpct_interrupt(dev, s);
++ }
++ return IRQ_HANDLED;
++}
++
++static int ni_660x_buf_change(comedi_device * dev, comedi_subdevice * s,
++ unsigned long new_size)
++{
++ int ret;
++
++ ret = mite_buf_change(mite_ring(private(dev), subdev_to_counter(s)),
++ s->async);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static int ni_660x_allocate_private(comedi_device * dev)
++{
++ int retval;
++ unsigned i;
++
++ if ((retval = alloc_private(dev, sizeof(ni_660x_private))) < 0)
++ return retval;
++ spin_lock_init(&private(dev)->mite_channel_lock);
++ spin_lock_init(&private(dev)->soft_reg_copy_lock);
++ for (i = 0; i < NUM_PFI_CHANNELS; ++i) {
++ private(dev)->pfi_output_selects[i] = pfi_output_select_counter;
++ }
++ return 0;
++}
++
++static int ni_660x_alloc_mite_rings(comedi_device * dev)
++{
++ unsigned i;
++ unsigned j;
++
++ for (i = 0; i < board(dev)->n_chips; ++i) {
++ for (j = 0; j < counters_per_chip; ++j) {
++ private(dev)->mite_rings[i][j] =
++ mite_alloc_ring(private(dev)->mite);
++ if (private(dev)->mite_rings[i][j] == NULL) {
++ return -ENOMEM;
++ }
++ }
++ }
++ return 0;
++}
++
++static void ni_660x_free_mite_rings(comedi_device * dev)
++{
++ unsigned i;
++ unsigned j;
++
++ for (i = 0; i < board(dev)->n_chips; ++i) {
++ for (j = 0; j < counters_per_chip; ++j) {
++ mite_free_ring(private(dev)->mite_rings[i][j]);
++ }
++ }
++}
++
++static int ni_660x_attach(comedi_device * dev, comedi_devconfig * it)
++{
++ comedi_subdevice *s;
++ int ret;
++ unsigned i;
++ unsigned global_interrupt_config_bits;
++
++ printk("comedi%d: ni_660x: ", dev->minor);
++
++ ret = ni_660x_allocate_private(dev);
++ if (ret < 0)
++ return ret;
++ ret = ni_660x_find_device(dev, it->options[0], it->options[1]);
++ if (ret < 0)
++ return ret;
++
++ dev->board_name = board(dev)->name;
++
++ ret = mite_setup2(private(dev)->mite, 1);
++ if (ret < 0) {
++ printk("error setting up mite\n");
++ return ret;
++ }
++ comedi_set_hw_dev(dev, &private(dev)->mite->pcidev->dev);
++ ret = ni_660x_alloc_mite_rings(dev);
++ if (ret < 0)
++ return ret;
++
++ printk(" %s ", dev->board_name);
++
++ dev->n_subdevices = 2 + NI_660X_MAX_NUM_COUNTERS;
++
++ if (alloc_subdevices(dev, dev->n_subdevices) < 0)
++ return -ENOMEM;
++
++ s = dev->subdevices + 0;
++ /* Old GENERAL-PURPOSE COUNTER/TIME (GPCT) subdevice, no longer used */
++ s->type = COMEDI_SUBD_UNUSED;
++
++ s = dev->subdevices + NI_660X_DIO_SUBDEV;
++ /* DIGITAL I/O SUBDEVICE */
++ s->type = COMEDI_SUBD_DIO;
++ s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
++ s->n_chan = NUM_PFI_CHANNELS;
++ s->maxdata = 1;
++ s->range_table = &range_digital;
++ s->insn_bits = ni_660x_dio_insn_bits;
++ s->insn_config = ni_660x_dio_insn_config;
++ s->io_bits = 0; /* all bits default to input */
++ // we use the ioconfig registers to control dio direction, so zero output enables in stc dio control reg
++ ni_660x_write_register(dev, 0, 0, STCDIOControl);
++
++ private(dev)->counter_dev = ni_gpct_device_construct(dev,
++ &ni_gpct_write_register, &ni_gpct_read_register,
++ ni_gpct_variant_660x, ni_660x_num_counters(dev));
++ if (private(dev)->counter_dev == NULL)
++ return -ENOMEM;
++ for (i = 0; i < NI_660X_MAX_NUM_COUNTERS; ++i) {
++ s = dev->subdevices + NI_660X_GPCT_SUBDEV(i);
++ if (i < ni_660x_num_counters(dev)) {
++ s->type = COMEDI_SUBD_COUNTER;
++ s->subdev_flags =
++ SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL |
++ SDF_CMD_READ /* | SDF_CMD_WRITE */ ;
++ s->n_chan = 3;
++ s->maxdata = 0xffffffff;
++ s->insn_read = ni_660x_GPCT_rinsn;
++ s->insn_write = ni_660x_GPCT_winsn;
++ s->insn_config = ni_660x_GPCT_insn_config;
++ s->do_cmd = &ni_660x_cmd;
++ s->len_chanlist = 1;
++ s->do_cmdtest = &ni_660x_cmdtest;
++ s->cancel = &ni_660x_cancel;
++ s->async_dma_dir = DMA_BIDIRECTIONAL;
++ s->buf_change = &ni_660x_buf_change;
++ s->private = &private(dev)->counter_dev->counters[i];
++
++ private(dev)->counter_dev->counters[i].chip_index =
++ i / counters_per_chip;
++ private(dev)->counter_dev->counters[i].counter_index =
++ i % counters_per_chip;
++ } else {
++ s->type = COMEDI_SUBD_UNUSED;
++ }
++ }
++ for (i = 0; i < board(dev)->n_chips; ++i) {
++ init_tio_chip(dev, i);
++ }
++ for (i = 0; i < ni_660x_num_counters(dev); ++i) {
++ ni_tio_init_counter(&private(dev)->counter_dev->counters[i]);
++ }
++ for (i = 0; i < NUM_PFI_CHANNELS; ++i) {
++ if (i < min_counter_pfi_chan)
++ ni_660x_set_pfi_routing(dev, i, pfi_output_select_do);
++ else
++ ni_660x_set_pfi_routing(dev, i,
++ pfi_output_select_counter);
++ ni_660x_select_pfi_output(dev, i, pfi_output_select_high_Z);
++ }
++ /* to be safe, set counterswap bits on tio chips after all the counter
++ outputs have been set to high impedance mode */
++ for (i = 0; i < board(dev)->n_chips; ++i) {
++ set_tio_counterswap(dev, i);
++ }
++ if ((ret = comedi_request_irq(mite_irq(private(dev)->mite),
++ &ni_660x_interrupt, IRQF_SHARED, "ni_660x",
++ dev)) < 0) {
++ printk(" irq not available\n");
++ return ret;
++ }
++ dev->irq = mite_irq(private(dev)->mite);
++ global_interrupt_config_bits = Global_Int_Enable_Bit;
++ if (board(dev)->n_chips > 1)
++ global_interrupt_config_bits |= Cascade_Int_Enable_Bit;
++ ni_660x_write_register(dev, 0, global_interrupt_config_bits,
++ GlobalInterruptConfigRegister);
++ printk("attached\n");
++ return 0;
++}
++
++static int ni_660x_detach(comedi_device * dev)
++{
++ printk("comedi%d: ni_660x: remove\n", dev->minor);
++
++ /* Free irq */
++ if (dev->irq)
++ comedi_free_irq(dev->irq, dev);
++
++ if (dev->private) {
++ if (private(dev)->counter_dev)
++ ni_gpct_device_destroy(private(dev)->counter_dev);
++ if (private(dev)->mite) {
++ ni_660x_free_mite_rings(dev);
++ mite_unsetup(private(dev)->mite);
++ }
++ }
++ return 0;
++}
++
++static int
++ni_660x_GPCT_rinsn(comedi_device * dev, comedi_subdevice * s,
++ comedi_insn * insn, lsampl_t * data)
++{
++ return ni_tio_rinsn(subdev_to_counter(s), insn, data);
++}
++
++static void init_tio_chip(comedi_device * dev, int chipset)
++{
++ unsigned i;
++
++ // init dma configuration register
++ private(dev)->dma_configuration_soft_copies[chipset] = 0;
++ for (i = 0; i < MAX_DMA_CHANNEL; ++i) {
++ private(dev)->dma_configuration_soft_copies[chipset] |=
++ dma_select_bits(i,
++ dma_selection_none) & dma_select_mask(i);
++ }
++ ni_660x_write_register(dev, chipset,
++ private(dev)->dma_configuration_soft_copies[chipset],
++ DMAConfigRegister);
++ for(i = 0; i < NUM_PFI_CHANNELS; ++i)
++ {
++ ni_660x_write_register(dev, chipset, 0, IOConfigReg(i));
++ }
++}
++
++static int
++ni_660x_GPCT_insn_config(comedi_device * dev, comedi_subdevice * s,
++ comedi_insn * insn, lsampl_t * data)
++{
++ return ni_tio_insn_config(subdev_to_counter(s), insn, data);
++}
++
++static int ni_660x_GPCT_winsn(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
++{
++ return ni_tio_winsn(subdev_to_counter(s), insn, data);
++}
++
++static int ni_660x_find_device(comedi_device * dev, int bus, int slot)
++{
++ struct mite_struct *mite;
++ int i;
++
++ for (mite = mite_devices; mite; mite = mite->next) {
++ if (mite->used)
++ continue;
++ if (bus || slot) {
++ if (bus != mite->pcidev->bus->number ||
++ slot != PCI_SLOT(mite->pcidev->devfn))
++ continue;
++ }
++
++ for (i = 0; i < n_ni_660x_boards; i++) {
++ if (mite_device_id(mite) == ni_660x_boards[i].dev_id) {
++ dev->board_ptr = ni_660x_boards + i;
++ private(dev)->mite = mite;
++ return 0;
++ }
++ }
++ }
++ printk("no device found\n");
++ mite_list_devices();
++ return -EIO;
++}
++
++static int ni_660x_dio_insn_bits(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
++{
++ unsigned base_bitfield_channel = CR_CHAN(insn->chanspec);
++
++ // Check if we have to write some bits
++ if (data[0]) {
++ s->state &= ~(data[0] << base_bitfield_channel);
++ s->state |= (data[0] & data[1]) << base_bitfield_channel;
++ /* Write out the new digital output lines */
++ ni_660x_write_register(dev, 0, s->state, DIO32Output);
++ }
++ /* on return, data[1] contains the value of the digital
++ * input and output lines. */
++ data[1] =
++ (ni_660x_read_register(dev, 0,
++ DIO32Input) >> base_bitfield_channel);
++ return 2;
++}
++
++static void ni_660x_select_pfi_output(comedi_device * dev, unsigned pfi_channel,
++ unsigned output_select)
++{
++ static const unsigned counter_4_7_first_pfi = 8;
++ static const unsigned counter_4_7_last_pfi = 23;
++ unsigned active_chipset = 0;
++ unsigned idle_chipset = 0;
++ unsigned active_bits;
++ unsigned idle_bits;
++
++ if(board(dev)->n_chips > 1) {
++ if(output_select == pfi_output_select_counter &&
++ pfi_channel >= counter_4_7_first_pfi &&
++ pfi_channel <= counter_4_7_last_pfi) {
++ active_chipset = 1;
++ idle_chipset = 0;
++ }else {
++ active_chipset = 0;
++ idle_chipset = 1;
++ }
++ }
++
++ if(idle_chipset != active_chipset) {
++ idle_bits = ni_660x_read_register(dev, idle_chipset, IOConfigReg(pfi_channel));
++ idle_bits &= ~pfi_output_select_mask(pfi_channel);
++ idle_bits |= pfi_output_select_bits(pfi_channel, pfi_output_select_high_Z);
++ ni_660x_write_register(dev, idle_chipset, idle_bits, IOConfigReg(pfi_channel));
++ }
++
++ active_bits = ni_660x_read_register(dev, active_chipset, IOConfigReg(pfi_channel));
++ active_bits &= ~pfi_output_select_mask(pfi_channel);
++ active_bits |= pfi_output_select_bits(pfi_channel, output_select);
++ ni_660x_write_register(dev, active_chipset, active_bits, IOConfigReg(pfi_channel));
++}
++
++static int ni_660x_set_pfi_routing(comedi_device * dev, unsigned chan,
++ unsigned source)
++{
++ if (source > num_pfi_output_selects)
++ return -EINVAL;
++ if (source == pfi_output_select_high_Z)
++ return -EINVAL;
++ if (chan < min_counter_pfi_chan) {
++ if (source == pfi_output_select_counter)
++ return -EINVAL;
++ } else if (chan > max_dio_pfi_chan) {
++ if (source == pfi_output_select_do)
++ return -EINVAL;
++ }
++ BUG_ON(chan >= NUM_PFI_CHANNELS);
++
++ private(dev)->pfi_output_selects[chan] = source;
++ if (private(dev)->pfi_direction_bits & (((uint64_t) 1) << chan))
++ ni_660x_select_pfi_output(dev, chan,
++ private(dev)->pfi_output_selects[chan]);
++ return 0;
++}
++
++static unsigned ni_660x_get_pfi_routing(comedi_device * dev, unsigned chan)
++{
++ BUG_ON(chan >= NUM_PFI_CHANNELS);
++ return private(dev)->pfi_output_selects[chan];
++}
++
++static void ni660x_config_filter(comedi_device * dev, unsigned pfi_channel,
++ enum ni_gpct_filter_select filter)
++{
++ unsigned bits = ni_660x_read_register(dev, 0, IOConfigReg(pfi_channel));
++ bits &= ~pfi_input_select_mask(pfi_channel);
++ bits |= pfi_input_select_bits(pfi_channel, filter);
++ ni_660x_write_register(dev, 0, bits, IOConfigReg(pfi_channel));
++}
++
++static int ni_660x_dio_insn_config(comedi_device * dev,
++ comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
++{
++ int chan = CR_CHAN(insn->chanspec);
++
++ /* The input or output configuration of each digital line is
++ * configured by a special insn_config instruction. chanspec
++ * contains the channel to be changed, and data[0] contains the
++ * value COMEDI_INPUT or COMEDI_OUTPUT. */
++
++ switch (data[0]) {
++ case INSN_CONFIG_DIO_OUTPUT:
++ private(dev)->pfi_direction_bits |= ((uint64_t) 1) << chan;
++ ni_660x_select_pfi_output(dev, chan,
++ private(dev)->pfi_output_selects[chan]);
++ break;
++ case INSN_CONFIG_DIO_INPUT:
++ private(dev)->pfi_direction_bits &= ~(((uint64_t) 1) << chan);
++ ni_660x_select_pfi_output(dev, chan, pfi_output_select_high_Z);
++ break;
++ case INSN_CONFIG_DIO_QUERY:
++ data[1] =
++ (private(dev)->
++ pfi_direction_bits & (((uint64_t) 1) << chan)) ?
++ COMEDI_OUTPUT : COMEDI_INPUT;
++ return 0;
++ case INSN_CONFIG_SET_ROUTING:
++ return ni_660x_set_pfi_routing(dev, chan, data[1]);
++ break;
++ case INSN_CONFIG_GET_ROUTING:
++ data[1] = ni_660x_get_pfi_routing(dev, chan);
++ break;
++ case INSN_CONFIG_FILTER:
++ ni660x_config_filter(dev, chan, data[1]);
++ break;
++ default:
++ return -EINVAL;
++ break;
++ };
++ return 0;
++}commit 7ab21a8692094872298df172f54d55cba72fd308
+Author: Andy Spencer <spenceal@rose-hulman.edu>
+Date: Fri Jan 2 16:19:13 2009 +0000
+
+ i8k: Enable i8k on Dell Precision Systems
+
+ Patch to enable i8k on Dell Precisions.
+
+ Signed-off-by: Andy Spencer <spenceal@rose-hulman.edu>
+ Signed-off-by: Alan Cox <alan@redhat.com>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
+index b60d425ce8d1..099fc89a5bdd 100644
+--- a/drivers/char/i8k.c
++++ b/drivers/char/i8k.c
+@@ -485,6 +485,13 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "MP061"),
+ },
+ },
++ {
++ .ident = "Dell Precision",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "Precision"),
++ },
++ },
+ { }
+ };
+
+ commit 7b6c32daec3bff380ced6822002bc352bdf2c982
+Author: Xiaochuan-Xu <xiaochuan-xu@cqu.edu.cn>
+Date: Mon Dec 15 21:07:41 2008 +0800
+
+ UBI: simplify PEB protection code
+
+ UBI has 2 RB-trees to implement PEB protection, which is too
+ much for simply prevent PEB from being moved for some time.
+ This patch implements this using lists. The benefits:
+
+ 1. No need to allocate protection entry on each PEB get.
+ 2. No need to maintain balanced trees and walk them.
+
+ Signed-off-by: Xiaochuan-Xu <xiaochuan-xu@cqu.edu.cn>
+ Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
+
+diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
+index 46a4763f8e7c..4a8ec485c91d 100644
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -73,6 +73,13 @@
+ */
+ #define UBI_IO_RETRIES 3
+
++/*
++ * Length of the protection queue. The length is effectively equivalent to the
++ * number of (global) erase cycles PEBs are protected from the wear-leveling
++ * worker.
++ */
++#define UBI_PROT_QUEUE_LEN 10
++
+ /*
+ * Error codes returned by the I/O sub-system.
+ *
+@@ -96,6 +103,7 @@ enum {
+ /**
+ * struct ubi_wl_entry - wear-leveling entry.
+ * @u.rb: link in the corresponding (free/used) RB-tree
++ * @u.list: link in the protection queue
+ * @ec: erase counter
+ * @pnum: physical eraseblock number
+ *
+@@ -106,6 +114,7 @@ enum {
+ struct ubi_wl_entry {
+ union {
+ struct rb_node rb;
++ struct list_head list;
+ } u;
+ int ec;
+ int pnum;
+@@ -290,7 +299,7 @@ struct ubi_wl_entry;
+ * @beb_rsvd_level: normal level of PEBs reserved for bad PEB handling
+ *
+ * @autoresize_vol_id: ID of the volume which has to be auto-resized at the end
+- * of UBI ititializetion
++ * of UBI initialization
+ * @vtbl_slots: how many slots are available in the volume table
+ * @vtbl_size: size of the volume table in bytes
+ * @vtbl: in-RAM volume table copy
+@@ -308,18 +317,17 @@ struct ubi_wl_entry;
+ * @used: RB-tree of used physical eraseblocks
+ * @free: RB-tree of free physical eraseblocks
+ * @scrub: RB-tree of physical eraseblocks which need scrubbing
+- * @prot: protection trees
+- * @prot.pnum: protection tree indexed by physical eraseblock numbers
+- * @prot.aec: protection tree indexed by absolute erase counter value
+- * @wl_lock: protects the @used, @free, @prot, @lookuptbl, @abs_ec, @move_from,
+- * @move_to, @move_to_put @erase_pending, @wl_scheduled, and @works
+- * fields
++ * @pq: protection queue (contain physical eraseblocks which are temporarily
++ * protected from the wear-leveling worker)
++ * @pq_head: protection queue head
++ * @wl_lock: protects the @used, @free, @pq, @pq_head, @lookuptbl, @move_from,
++ * @move_to, @move_to_put @erase_pending, @wl_scheduled and @works
++ * fields
+ * @move_mutex: serializes eraseblock moves
+- * @work_sem: sycnhronizes the WL worker with use tasks
++ * @work_sem: synchronizes the WL worker with use tasks
+ * @wl_scheduled: non-zero if the wear-leveling was scheduled
+ * @lookuptbl: a table to quickly find a &struct ubi_wl_entry object for any
+ * physical eraseblock
+- * @abs_ec: absolute erase counter
+ * @move_from: physical eraseblock from where the data is being moved
+ * @move_to: physical eraseblock where the data is being moved to
+ * @move_to_put: if the "to" PEB was put
+@@ -353,11 +361,11 @@ struct ubi_wl_entry;
+ *
+ * @peb_buf1: a buffer of PEB size used for different purposes
+ * @peb_buf2: another buffer of PEB size used for different purposes
+- * @buf_mutex: proptects @peb_buf1 and @peb_buf2
++ * @buf_mutex: protects @peb_buf1 and @peb_buf2
+ * @ckvol_mutex: serializes static volume checking when opening
+- * @mult_mutex: serializes operations on multiple volumes, like re-nameing
++ * @mult_mutex: serializes operations on multiple volumes, like re-naming
+ * @dbg_peb_buf: buffer of PEB size used for debugging
+- * @dbg_buf_mutex: proptects @dbg_peb_buf
++ * @dbg_buf_mutex: protects @dbg_peb_buf
+ */
+ struct ubi_device {
+ struct cdev cdev;
+@@ -394,16 +402,13 @@ struct ubi_device {
+ struct rb_root used;
+ struct rb_root free;
+ struct rb_root scrub;
+- struct {
+- struct rb_root pnum;
+- struct rb_root aec;
+- } prot;
++ struct list_head pq[UBI_PROT_QUEUE_LEN];
++ int pq_head;
+ spinlock_t wl_lock;
+ struct mutex move_mutex;
+ struct rw_semaphore work_sem;
+ int wl_scheduled;
+ struct ubi_wl_entry **lookuptbl;
+- unsigned long long abs_ec;
+ struct ubi_wl_entry *move_from;
+ struct ubi_wl_entry *move_to;
+ int move_to_put;
+diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
+index 0279bf9dc722..14901cb82c18 100644
+--- a/drivers/mtd/ubi/wl.c
++++ b/drivers/mtd/ubi/wl.c
+@@ -22,7 +22,7 @@
+ * UBI wear-leveling sub-system.
+ *
+ * This sub-system is responsible for wear-leveling. It works in terms of
+- * physical* eraseblocks and erase counters and knows nothing about logical
++ * physical eraseblocks and erase counters and knows nothing about logical
+ * eraseblocks, volumes, etc. From this sub-system's perspective all physical
+ * eraseblocks are of two types - used and free. Used physical eraseblocks are
+ * those that were "get" by the 'ubi_wl_get_peb()' function, and free physical
+@@ -55,8 +55,39 @@
+ *
+ * As it was said, for the UBI sub-system all physical eraseblocks are either
+ * "free" or "used". Free eraseblock are kept in the @wl->free RB-tree, while
+- * used eraseblocks are kept in a set of different RB-trees: @wl->used,
+- * @wl->prot.pnum, @wl->prot.aec, and @wl->scrub.
++ * used eraseblocks are kept in @wl->used or @wl->scrub RB-trees, or
++ * (temporarily) in the @wl->pq queue.
++ *
++ * When the WL sub-system returns a physical eraseblock, the physical
++ * eraseblock is protected from being moved for some "time". For this reason,
++ * the physical eraseblock is not directly moved from the @wl->free tree to the
++ * @wl->used tree. There is a protection queue in between where this
++ * physical eraseblock is temporarily stored (@wl->pq).
++ *
++ * All this protection stuff is needed because:
++ * o we don't want to move physical eraseblocks just after we have given them
++ * to the user; instead, we first want to let users fill them up with data;
++ *
++ * o there is a chance that the user will put the physical eraseblock very
++ * soon, so it makes sense not to move it for some time, but wait; this is
++ * especially important in case of "short term" physical eraseblocks.
++ *
++ * Physical eraseblocks stay protected only for limited time. But the "time" is
++ * measured in erase cycles in this case. This is implemented with help of the
++ * protection queue. Eraseblocks are put to the tail of this queue when they
++ * are returned by the 'ubi_wl_get_peb()', and eraseblocks are removed from the
++ * head of the queue on each erase operation (for any eraseblock). So the
++ * length of the queue defines how may (global) erase cycles PEBs are protected.
++ *
++ * To put it differently, each physical eraseblock has 2 main states: free and
++ * used. The former state corresponds to the @wl->free tree. The latter state
++ * is split up on several sub-states:
++ * o the WL movement is allowed (@wl->used tree);
++ * o the WL movement is temporarily prohibited (@wl->pq queue);
++ * o scrubbing is needed (@wl->scrub tree).
++ *
++ * Depending on the sub-state, wear-leveling entries of the used physical
++ * eraseblocks may be kept in one of those structures.
+ *
+ * Note, in this implementation, we keep a small in-RAM object for each physical
+ * eraseblock. This is surely not a scalable solution. But it appears to be good
+@@ -70,9 +101,6 @@
+ * target PEB, we pick a PEB with the highest EC if our PEB is "old" and we
+ * pick target PEB with an average EC if our PEB is not very "old". This is a
+ * room for future re-works of the WL sub-system.
+- *
+- * Note: the stuff with protection trees looks too complex and is difficult to
+- * understand. Should be fixed.
+ */
+
+ #include <linux/slab.h>
+@@ -84,14 +112,6 @@
+ /* Number of physical eraseblocks reserved for wear-leveling purposes */
+ #define WL_RESERVED_PEBS 1
+
+-/*
+- * How many erase cycles are short term, unknown, and long term physical
+- * eraseblocks protected.
+- */
+-#define ST_PROTECTION 16
+-#define U_PROTECTION 10
+-#define LT_PROTECTION 4
+-
+ /*
+ * Maximum difference between two erase counters. If this threshold is
+ * exceeded, the WL sub-system starts moving data from used physical
+@@ -119,65 +139,10 @@
+ */
+ #define WL_MAX_FAILURES 32
+
+-/**
+- * struct ubi_wl_prot_entry - PEB protection entry.
+- * @rb_pnum: link in the @wl->prot.pnum RB-tree
+- * @rb_aec: link in the @wl->prot.aec RB-tree
+- * @abs_ec: the absolute erase counter value when the protection ends
+- * @e: the wear-leveling entry of the physical eraseblock under protection
+- *
+- * When the WL sub-system returns a physical eraseblock, the physical
+- * eraseblock is protected from being moved for some "time". For this reason,
+- * the physical eraseblock is not directly moved from the @wl->free tree to the
+- * @wl->used tree. There is one more tree in between where this physical
+- * eraseblock is temporarily stored (@wl->prot).
+- *
+- * All this protection stuff is needed because:
+- * o we don't want to move physical eraseblocks just after we have given them
+- * to the user; instead, we first want to let users fill them up with data;
+- *
+- * o there is a chance that the user will put the physical eraseblock very
+- * soon, so it makes sense not to move it for some time, but wait; this is
+- * especially important in case of "short term" physical eraseblocks.
+- *
+- * Physical eraseblocks stay protected only for limited time. But the "time" is
+- * measured in erase cycles in this case. This is implemented with help of the
+- * absolute erase counter (@wl->abs_ec). When it reaches certain value, the
+- * physical eraseblocks are moved from the protection trees (@wl->prot.*) to
+- * the @wl->used tree.
+- *
+- * Protected physical eraseblocks are searched by physical eraseblock number
+- * (when they are put) and by the absolute erase counter (to check if it is
+- * time to move them to the @wl->used tree). So there are actually 2 RB-trees
+- * storing the protected physical eraseblocks: @wl->prot.pnum and
+- * @wl->prot.aec. They are referred to as the "protection" trees. The
+- * first one is indexed by the physical eraseblock number. The second one is
+- * indexed by the absolute erase counter. Both trees store
+- * &struct ubi_wl_prot_entry objects.
+- *
+- * Each physical eraseblock has 2 main states: free and used. The former state
+- * corresponds to the @wl->free tree. The latter state is split up on several
+- * sub-states:
+- * o the WL movement is allowed (@wl->used tree);
+- * o the WL movement is temporarily prohibited (@wl->prot.pnum and
+- * @wl->prot.aec trees);
+- * o scrubbing is needed (@wl->scrub tree).
+- *
+- * Depending on the sub-state, wear-leveling entries of the used physical
+- * eraseblocks may be kept in one of those trees.
+- */
+-struct ubi_wl_prot_entry {
+- struct rb_node rb_pnum;
+- struct rb_node rb_aec;
+- unsigned long long abs_ec;
+- struct ubi_wl_entry *e;
+-};
+-
+ /**
+ * struct ubi_work - UBI work description data structure.
+ * @list: a link in the list of pending works
+ * @func: worker function
+- * @priv: private data of the worker function
+ * @e: physical eraseblock to erase
+ * @torture: if the physical eraseblock has to be tortured
+ *
+@@ -198,9 +163,11 @@ struct ubi_work {
+ static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec);
+ static int paranoid_check_in_wl_tree(struct ubi_wl_entry *e,
+ struct rb_root *root);
++static int paranoid_check_in_pq(struct ubi_device *ubi, struct ubi_wl_entry *e);
+ #else
+ #define paranoid_check_ec(ubi, pnum, ec) 0
+ #define paranoid_check_in_wl_tree(e, root)
++#define paranoid_check_in_pq(ubi, e) 0
+ #endif
+
+ /**
+@@ -355,49 +322,24 @@ static int in_wl_tree(struct ubi_wl_entry *e, struct rb_root *root)
+ }
+
+ /**
+- * prot_tree_add - add physical eraseblock to protection trees.
++ * prot_queue_add - add physical eraseblock to the protection queue.
+ * @ubi: UBI device description object
+ * @e: the physical eraseblock to add
+- * @pe: protection entry object to use
+- * @ec: for how many erase operations this PEB should be protected
+ *
+- * @wl->lock has to be locked.
++ * This function adds @e to the tail of the protection queue @ubi->pq, where
++ * @e will stay for %UBI_PROT_QUEUE_LEN erase operations and will be
++ * temporarily protected from the wear-leveling worker. Note, @wl->lock has to
++ * be locked.
+ */
+-static void prot_tree_add(struct ubi_device *ubi, struct ubi_wl_entry *e,
+- struct ubi_wl_prot_entry *pe, int ec)
++static void prot_queue_add(struct ubi_device *ubi, struct ubi_wl_entry *e)
+ {
+- struct rb_node **p, *parent = NULL;
+- struct ubi_wl_prot_entry *pe1;
++ int pq_tail = ubi->pq_head - 1;
+
+- pe->e = e;
+- pe->abs_ec = ubi->abs_ec + ec;
+-
+- p = &ubi->prot.pnum.rb_node;
+- while (*p) {
+- parent = *p;
+- pe1 = rb_entry(parent, struct ubi_wl_prot_entry, rb_pnum);
+-
+- if (e->pnum < pe1->e->pnum)
+- p = &(*p)->rb_left;
+- else
+- p = &(*p)->rb_right;
+- }
+- rb_link_node(&pe->rb_pnum, parent, p);
+- rb_insert_color(&pe->rb_pnum, &ubi->prot.pnum);
+-
+- p = &ubi->prot.aec.rb_node;
+- parent = NULL;
+- while (*p) {
+- parent = *p;
+- pe1 = rb_entry(parent, struct ubi_wl_prot_entry, rb_aec);
+-
+- if (pe->abs_ec < pe1->abs_ec)
+- p = &(*p)->rb_left;
+- else
+- p = &(*p)->rb_right;
+- }
+- rb_link_node(&pe->rb_aec, parent, p);
+- rb_insert_color(&pe->rb_aec, &ubi->prot.aec);
++ if (pq_tail < 0)
++ pq_tail = UBI_PROT_QUEUE_LEN - 1;
++ ubi_assert(pq_tail >= 0 && pq_tail < UBI_PROT_QUEUE_LEN);
++ list_add_tail(&e->u.list, &ubi->pq[pq_tail]);
++ dbg_wl("added PEB %d EC %d to the protection queue", e->pnum, e->ec);
+ }
+
+ /**
+@@ -442,17 +384,12 @@ static struct ubi_wl_entry *find_wl_entry(struct rb_root *root, int max)
+ */
+ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ {
+- int err, protect, medium_ec;
++ int err, medium_ec;
+ struct ubi_wl_entry *e, *first, *last;
+- struct ubi_wl_prot_entry *pe;
+
+ ubi_assert(dtype == UBI_LONGTERM || dtype == UBI_SHORTTERM ||
+ dtype == UBI_UNKNOWN);
+
+- pe = kmalloc(sizeof(struct ubi_wl_prot_entry), GFP_NOFS);
+- if (!pe)
+- return -ENOMEM;
+-
+ retry:
+ spin_lock(&ubi->wl_lock);
+ if (!ubi->free.rb_node) {
+@@ -460,16 +397,13 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ ubi_assert(list_empty(&ubi->works));
+ ubi_err("no free eraseblocks");
+ spin_unlock(&ubi->wl_lock);
+- kfree(pe);
+ return -ENOSPC;
+ }
+ spin_unlock(&ubi->wl_lock);
+
+ err = produce_free_peb(ubi);
+- if (err < 0) {
+- kfree(pe);
++ if (err < 0)
+ return err;
+- }
+ goto retry;
+ }
+
+@@ -482,7 +416,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ * %WL_FREE_MAX_DIFF.
+ */
+ e = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF);
+- protect = LT_PROTECTION;
+ break;
+ case UBI_UNKNOWN:
+ /*
+@@ -502,7 +435,6 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ medium_ec = (first->ec + WL_FREE_MAX_DIFF)/2;
+ e = find_wl_entry(&ubi->free, medium_ec);
+ }
+- protect = U_PROTECTION;
+ break;
+ case UBI_SHORTTERM:
+ /*
+@@ -510,63 +442,45 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ * lowest erase counter as we expect it will be erased soon.
+ */
+ e = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry, u.rb);
+- protect = ST_PROTECTION;
+ break;
+ default:
+- protect = 0;
+- e = NULL;
+ BUG();
+ }
+
++ paranoid_check_in_wl_tree(e, &ubi->free);
++
+ /*
+- * Move the physical eraseblock to the protection trees where it will
++ * Move the physical eraseblock to the protection queue where it will
+ * be protected from being moved for some time.
+ */
+- paranoid_check_in_wl_tree(e, &ubi->free);
+ rb_erase(&e->u.rb, &ubi->free);
+- prot_tree_add(ubi, e, pe, protect);
+-
+- dbg_wl("PEB %d EC %d, protection %d", e->pnum, e->ec, protect);
++ dbg_wl("PEB %d EC %d", e->pnum, e->ec);
++ prot_queue_add(ubi, e);
+ spin_unlock(&ubi->wl_lock);
+-
+ return e->pnum;
+ }
+
+ /**
+- * prot_tree_del - remove a physical eraseblock from the protection trees
++ * prot_queue_del - remove a physical eraseblock from the protection queue.
+ * @ubi: UBI device description object
+ * @pnum: the physical eraseblock to remove
+ *
+- * This function returns PEB @pnum from the protection trees and returns zero
+- * in case of success and %-ENODEV if the PEB was not found in the protection
+- * trees.
++ * This function deletes PEB @pnum from the protection queue and returns zero
++ * in case of success and %-ENODEV if the PEB was not found.
+ */
+-static int prot_tree_del(struct ubi_device *ubi, int pnum)
++static int prot_queue_del(struct ubi_device *ubi, int pnum)
+ {
+- struct rb_node *p;
+- struct ubi_wl_prot_entry *pe = NULL;
+-
+- p = ubi->prot.pnum.rb_node;
+- while (p) {
+-
+- pe = rb_entry(p, struct ubi_wl_prot_entry, rb_pnum);
+-
+- if (pnum == pe->e->pnum)
+- goto found;
++ struct ubi_wl_entry *e;
+
+- if (pnum < pe->e->pnum)
+- p = p->rb_left;
+- else
+- p = p->rb_right;
+- }
++ e = ubi->lookuptbl[pnum];
++ if (!e)
++ return -ENODEV;
+
+- return -ENODEV;
++ if (paranoid_check_in_pq(ubi, e))
++ return -ENODEV;
+
+-found:
+- ubi_assert(pe->e->pnum == pnum);
+- rb_erase(&pe->rb_aec, &ubi->prot.aec);
+- rb_erase(&pe->rb_pnum, &ubi->prot.pnum);
+- kfree(pe);
++ list_del(&e->u.list);
++ dbg_wl("deleted PEB %d from the protection queue", e->pnum);
+ return 0;
+ }
+
+@@ -632,47 +546,47 @@ static int sync_erase(struct ubi_device *ubi, struct ubi_wl_entry *e,
+ }
+
+ /**
+- * check_protection_over - check if it is time to stop protecting some PEBs.
++ * serve_prot_queue - check if it is time to stop protecting PEBs.
+ * @ubi: UBI device description object
+ *
+- * This function is called after each erase operation, when the absolute erase
+- * counter is incremented, to check if some physical eraseblock have not to be
+- * protected any longer. These physical eraseblocks are moved from the
+- * protection trees to the used tree.
++ * This function is called after each erase operation and removes PEBs from the
++ * tail of the protection queue. These PEBs have been protected for long enough
++ * and should be moved to the used tree.
+ */
+-static void check_protection_over(struct ubi_device *ubi)
++static void serve_prot_queue(struct ubi_device *ubi)
+ {
+- struct ubi_wl_prot_entry *pe;
++ struct ubi_wl_entry *e, *tmp;
++ int count;
+
+ /*
+ * There may be several protected physical eraseblock to remove,
+ * process them all.
+ */
+- while (1) {
+- spin_lock(&ubi->wl_lock);
+- if (!ubi->prot.aec.rb_node) {
+- spin_unlock(&ubi->wl_lock);
+- break;
+- }
+-
+- pe = rb_entry(rb_first(&ubi->prot.aec),
+- struct ubi_wl_prot_entry, rb_aec);
++repeat:
++ count = 0;
++ spin_lock(&ubi->wl_lock);
++ list_for_each_entry_safe(e, tmp, &ubi->pq[ubi->pq_head], u.list) {
++ dbg_wl("PEB %d EC %d protection over, move to used tree",
++ e->pnum, e->ec);
+
+- if (pe->abs_ec > ubi->abs_ec) {
++ list_del(&e->u.list);
++ wl_tree_add(e, &ubi->used);
++ if (count++ > 32) {
++ /*
++ * Let's be nice and avoid holding the spinlock for
++ * too long.
++ */
+ spin_unlock(&ubi->wl_lock);
+- break;
++ cond_resched();
++ goto repeat;
+ }
+-
+- dbg_wl("PEB %d protection over, abs_ec %llu, PEB abs_ec %llu",
+- pe->e->pnum, ubi->abs_ec, pe->abs_ec);
+- rb_erase(&pe->rb_aec, &ubi->prot.aec);
+- rb_erase(&pe->rb_pnum, &ubi->prot.pnum);
+- wl_tree_add(pe->e, &ubi->used);
+- spin_unlock(&ubi->wl_lock);
+-
+- kfree(pe);
+- cond_resched();
+ }
++
++ ubi->pq_head += 1;
++ if (ubi->pq_head == UBI_PROT_QUEUE_LEN)
++ ubi->pq_head = 0;
++ ubi_assert(ubi->pq_head >= 0 && ubi->pq_head < UBI_PROT_QUEUE_LEN);
++ spin_unlock(&ubi->wl_lock);
+ }
+
+ /**
+@@ -680,8 +594,8 @@ static void check_protection_over(struct ubi_device *ubi)
+ * @ubi: UBI device description object
+ * @wrk: the work to schedule
+ *
+- * This function enqueues a work defined by @wrk to the tail of the pending
+- * works list.
++ * This function adds a work defined by @wrk to the tail of the pending works
++ * list.
+ */
+ static void schedule_ubi_work(struct ubi_device *ubi, struct ubi_work *wrk)
+ {
+@@ -740,7 +654,6 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
+ int cancel)
+ {
+ int err, scrubbing = 0, torture = 0;
+- struct ubi_wl_prot_entry *uninitialized_var(pe);
+ struct ubi_wl_entry *e1, *e2;
+ struct ubi_vid_hdr *vid_hdr;
+
+@@ -857,23 +770,17 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
+ * The LEB has not been moved because the volume is being
+ * deleted or the PEB has been put meanwhile. We should prevent
+ * this PEB from being selected for wear-leveling movement
+- * again, so put it to the protection tree.
++ * again, so put it to the protection queue.
+ */
+
+ dbg_wl("canceled moving PEB %d", e1->pnum);
+ ubi_assert(err == 1);
+
+- pe = kmalloc(sizeof(struct ubi_wl_prot_entry), GFP_NOFS);
+- if (!pe) {
+- err = -ENOMEM;
+- goto out_error;
+- }
+-
+ ubi_free_vid_hdr(ubi, vid_hdr);
+ vid_hdr = NULL;
+
+ spin_lock(&ubi->wl_lock);
+- prot_tree_add(ubi, e1, pe, U_PROTECTION);
++ prot_queue_add(ubi, e1);
+ ubi_assert(!ubi->move_to_put);
+ ubi->move_from = ubi->move_to = NULL;
+ ubi->wl_scheduled = 0;
+@@ -1075,7 +982,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
+ kfree(wl_wrk);
+
+ spin_lock(&ubi->wl_lock);
+- ubi->abs_ec += 1;
+ wl_tree_add(e, &ubi->free);
+ spin_unlock(&ubi->wl_lock);
+
+@@ -1083,7 +989,7 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
+ * One more erase operation has happened, take care about
+ * protected physical eraseblocks.
+ */
+- check_protection_over(ubi);
++ serve_prot_queue(ubi);
+
+ /* And take care about wear-leveling */
+ err = ensure_wear_leveling(ubi);
+@@ -1220,7 +1126,7 @@ int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture)
+ paranoid_check_in_wl_tree(e, &ubi->scrub);
+ rb_erase(&e->u.rb, &ubi->scrub);
+ } else {
+- err = prot_tree_del(ubi, e->pnum);
++ err = prot_queue_del(ubi, e->pnum);
+ if (err) {
+ ubi_err("PEB %d not found", pnum);
+ ubi_ro_mode(ubi);
+@@ -1284,7 +1190,7 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum)
+ } else {
+ int err;
+
+- err = prot_tree_del(ubi, e->pnum);
++ err = prot_queue_del(ubi, e->pnum);
+ if (err) {
+ ubi_err("PEB %d not found", pnum);
+ ubi_ro_mode(ubi);
+@@ -1315,7 +1221,7 @@ int ubi_wl_flush(struct ubi_device *ubi)
+ int err;
+
+ /*
+- * Erase while the pending works queue is not empty, but not more then
++ * Erase while the pending works queue is not empty, but not more than
+ * the number of currently pending works.
+ */
+ dbg_wl("flush (%d pending works)", ubi->works_count);
+@@ -1461,15 +1367,13 @@ static void cancel_pending(struct ubi_device *ubi)
+ */
+ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
+ {
+- int err;
++ int err, i;
+ struct rb_node *rb1, *rb2;
+ struct ubi_scan_volume *sv;
+ struct ubi_scan_leb *seb, *tmp;
+ struct ubi_wl_entry *e;
+
+-
+ ubi->used = ubi->free = ubi->scrub = RB_ROOT;
+- ubi->prot.pnum = ubi->prot.aec = RB_ROOT;
+ spin_lock_init(&ubi->wl_lock);
+ mutex_init(&ubi->move_mutex);
+ init_rwsem(&ubi->work_sem);
+@@ -1483,6 +1387,10 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
+ if (!ubi->lookuptbl)
+ return err;
+
++ for (i = 0; i < UBI_PROT_QUEUE_LEN; i++)
++ INIT_LIST_HEAD(&ubi->pq[i]);
++ ubi->pq_head = 0;
++
+ list_for_each_entry_safe(seb, tmp, &si->erase, u.list) {
+ cond_resched();
+
+@@ -1577,33 +1485,18 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
+ }
+
+ /**
+- * protection_trees_destroy - destroy the protection RB-trees.
++ * protection_queue_destroy - destroy the protection queue.
+ * @ubi: UBI device description object
+ */
+-static void protection_trees_destroy(struct ubi_device *ubi)
++static void protection_queue_destroy(struct ubi_device *ubi)
+ {
+- struct rb_node *rb;
+- struct ubi_wl_prot_entry *pe;
++ int i;
++ struct ubi_wl_entry *e, *tmp;
+
+- rb = ubi->prot.aec.rb_node;
+- while (rb) {
+- if (rb->rb_left)
+- rb = rb->rb_left;
+- else if (rb->rb_right)
+- rb = rb->rb_right;
+- else {
+- pe = rb_entry(rb, struct ubi_wl_prot_entry, rb_aec);
+-
+- rb = rb_parent(rb);
+- if (rb) {
+- if (rb->rb_left == &pe->rb_aec)
+- rb->rb_left = NULL;
+- else
+- rb->rb_right = NULL;
+- }
+-
+- kmem_cache_free(ubi_wl_entry_slab, pe->e);
+- kfree(pe);
++ for (i = 0; i < UBI_PROT_QUEUE_LEN; ++i) {
++ list_for_each_entry_safe(e, tmp, &ubi->pq[i], u.list) {
++ list_del(&e->u.list);
++ kmem_cache_free(ubi_wl_entry_slab, e);
+ }
+ }
+ }
+@@ -1616,7 +1509,7 @@ void ubi_wl_close(struct ubi_device *ubi)
+ {
+ dbg_wl("close the WL sub-system");
+ cancel_pending(ubi);
+- protection_trees_destroy(ubi);
++ protection_queue_destroy(ubi);
+ tree_destroy(&ubi->used);
+ tree_destroy(&ubi->free);
+ tree_destroy(&ubi->scrub);
+@@ -1686,4 +1579,27 @@ static int paranoid_check_in_wl_tree(struct ubi_wl_entry *e,
+ return 1;
+ }
+
++/**
++ * paranoid_check_in_pq - check if wear-leveling entry is in the protection
++ * queue.
++ * @ubi: UBI device description object
++ * @e: the wear-leveling entry to check
++ *
++ * This function returns zero if @e is in @ubi->pq and %1 if it is not.
++ */
++static int paranoid_check_in_pq(struct ubi_device *ubi, struct ubi_wl_entry *e)
++{
++ struct ubi_wl_entry *p;
++ int i;
++
++ for (i = 0; i < UBI_PROT_QUEUE_LEN; ++i)
++ list_for_each_entry(p, &ubi->pq[i], u.list)
++ if (p == e)
++ return 0;
++
++ ubi_err("paranoid check failed for PEB %d, EC %d, Protect queue",
++ e->pnum, e->ec);
++ ubi_dbg_dump_stack();
++ return 1;
++}
+ #endif /* CONFIG_MTD_UBI_DEBUG_PARANOID */commit 23553b2c08c9b6e96be98c44feb9c5e640d3e789
+Author: Xiaochuan-Xu <xiaochuan-xu@cqu.edu.cn>
+Date: Tue Dec 9 19:44:12 2008 +0800
+
+ UBI: prepare for protection tree improvements
+
+ This patch modifies @struct ubi_wl_entry and adds union which
+ contains only one element so far. This is just a preparation
+ for further changes which will kill the protection tree and
+ make UBI use a list instead.
+
+ Signed-off-by: Xiaochuan-Xu <xiaochuan-xu@cqu.edu.cn>
+ Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
+
+diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
+index 1c3fa18c26a7..46a4763f8e7c 100644
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -95,7 +95,7 @@ enum {
+
+ /**
+ * struct ubi_wl_entry - wear-leveling entry.
+- * @rb: link in the corresponding RB-tree
++ * @u.rb: link in the corresponding (free/used) RB-tree
+ * @ec: erase counter
+ * @pnum: physical eraseblock number
+ *
+@@ -104,7 +104,9 @@ enum {
+ * RB-trees. See WL sub-system for details.
+ */
+ struct ubi_wl_entry {
+- struct rb_node rb;
++ union {
++ struct rb_node rb;
++ } u;
+ int ec;
+ int pnum;
+ };
+diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
+index abf65ea414e7..0279bf9dc722 100644
+--- a/drivers/mtd/ubi/wl.c
++++ b/drivers/mtd/ubi/wl.c
+@@ -220,7 +220,7 @@ static void wl_tree_add(struct ubi_wl_entry *e, struct rb_root *root)
+ struct ubi_wl_entry *e1;
+
+ parent = *p;
+- e1 = rb_entry(parent, struct ubi_wl_entry, rb);
++ e1 = rb_entry(parent, struct ubi_wl_entry, u.rb);
+
+ if (e->ec < e1->ec)
+ p = &(*p)->rb_left;
+@@ -235,8 +235,8 @@ static void wl_tree_add(struct ubi_wl_entry *e, struct rb_root *root)
+ }
+ }
+
+- rb_link_node(&e->rb, parent, p);
+- rb_insert_color(&e->rb, root);
++ rb_link_node(&e->u.rb, parent, p);
++ rb_insert_color(&e->u.rb, root);
+ }
+
+ /**
+@@ -331,7 +331,7 @@ static int in_wl_tree(struct ubi_wl_entry *e, struct rb_root *root)
+ while (p) {
+ struct ubi_wl_entry *e1;
+
+- e1 = rb_entry(p, struct ubi_wl_entry, rb);
++ e1 = rb_entry(p, struct ubi_wl_entry, u.rb);
+
+ if (e->pnum == e1->pnum) {
+ ubi_assert(e == e1);
+@@ -413,14 +413,14 @@ static struct ubi_wl_entry *find_wl_entry(struct rb_root *root, int max)
+ struct rb_node *p;
+ struct ubi_wl_entry *e;
+
+- e = rb_entry(rb_first(root), struct ubi_wl_entry, rb);
++ e = rb_entry(rb_first(root), struct ubi_wl_entry, u.rb);
+ max += e->ec;
+
+ p = root->rb_node;
+ while (p) {
+ struct ubi_wl_entry *e1;
+
+- e1 = rb_entry(p, struct ubi_wl_entry, rb);
++ e1 = rb_entry(p, struct ubi_wl_entry, u.rb);
+ if (e1->ec >= max)
+ p = p->rb_left;
+ else {
+@@ -491,12 +491,13 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ * eraseblock with erase counter greater or equivalent than the
+ * lowest erase counter plus %WL_FREE_MAX_DIFF.
+ */
+- first = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry, rb);
+- last = rb_entry(rb_last(&ubi->free), struct ubi_wl_entry, rb);
++ first = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry,
++ u.rb);
++ last = rb_entry(rb_last(&ubi->free), struct ubi_wl_entry, u.rb);
+
+ if (last->ec - first->ec < WL_FREE_MAX_DIFF)
+ e = rb_entry(ubi->free.rb_node,
+- struct ubi_wl_entry, rb);
++ struct ubi_wl_entry, u.rb);
+ else {
+ medium_ec = (first->ec + WL_FREE_MAX_DIFF)/2;
+ e = find_wl_entry(&ubi->free, medium_ec);
+@@ -508,7 +509,7 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ * For short term data we pick a physical eraseblock with the
+ * lowest erase counter as we expect it will be erased soon.
+ */
+- e = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry, rb);
++ e = rb_entry(rb_first(&ubi->free), struct ubi_wl_entry, u.rb);
+ protect = ST_PROTECTION;
+ break;
+ default:
+@@ -522,7 +523,7 @@ int ubi_wl_get_peb(struct ubi_device *ubi, int dtype)
+ * be protected from being moved for some time.
+ */
+ paranoid_check_in_wl_tree(e, &ubi->free);
+- rb_erase(&e->rb, &ubi->free);
++ rb_erase(&e->u.rb, &ubi->free);
+ prot_tree_add(ubi, e, pe, protect);
+
+ dbg_wl("PEB %d EC %d, protection %d", e->pnum, e->ec, protect);
+@@ -779,7 +780,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
+ * highly worn-out free physical eraseblock. If the erase
+ * counters differ much enough, start wear-leveling.
+ */
+- e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, rb);
++ e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb);
+ e2 = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF);
+
+ if (!(e2->ec - e1->ec >= UBI_WL_THRESHOLD)) {
+@@ -788,21 +789,21 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
+ goto out_cancel;
+ }
+ paranoid_check_in_wl_tree(e1, &ubi->used);
+- rb_erase(&e1->rb, &ubi->used);
++ rb_erase(&e1->u.rb, &ubi->used);
+ dbg_wl("move PEB %d EC %d to PEB %d EC %d",
+ e1->pnum, e1->ec, e2->pnum, e2->ec);
+ } else {
+ /* Perform scrubbing */
+ scrubbing = 1;
+- e1 = rb_entry(rb_first(&ubi->scrub), struct ubi_wl_entry, rb);
++ e1 = rb_entry(rb_first(&ubi->scrub), struct ubi_wl_entry, u.rb);
+ e2 = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF);
+ paranoid_check_in_wl_tree(e1, &ubi->scrub);
+- rb_erase(&e1->rb, &ubi->scrub);
++ rb_erase(&e1->u.rb, &ubi->scrub);
+ dbg_wl("scrub PEB %d to PEB %d", e1->pnum, e2->pnum);
+ }
+
+ paranoid_check_in_wl_tree(e2, &ubi->free);
+- rb_erase(&e2->rb, &ubi->free);
++ rb_erase(&e2->u.rb, &ubi->free);
+ ubi->move_from = e1;
+ ubi->move_to = e2;
+ spin_unlock(&ubi->wl_lock);
+@@ -1012,7 +1013,7 @@ static int ensure_wear_leveling(struct ubi_device *ubi)
+ * erase counter of free physical eraseblocks is greater then
+ * %UBI_WL_THRESHOLD.
+ */
+- e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, rb);
++ e1 = rb_entry(rb_first(&ubi->used), struct ubi_wl_entry, u.rb);
+ e2 = find_wl_entry(&ubi->free, WL_FREE_MAX_DIFF);
+
+ if (!(e2->ec - e1->ec >= UBI_WL_THRESHOLD))
+@@ -1214,10 +1215,10 @@ int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture)
+ } else {
+ if (in_wl_tree(e, &ubi->used)) {
+ paranoid_check_in_wl_tree(e, &ubi->used);
+- rb_erase(&e->rb, &ubi->used);
++ rb_erase(&e->u.rb, &ubi->used);
+ } else if (in_wl_tree(e, &ubi->scrub)) {
+ paranoid_check_in_wl_tree(e, &ubi->scrub);
+- rb_erase(&e->rb, &ubi->scrub);
++ rb_erase(&e->u.rb, &ubi->scrub);
+ } else {
+ err = prot_tree_del(ubi, e->pnum);
+ if (err) {
+@@ -1279,7 +1280,7 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum)
+
+ if (in_wl_tree(e, &ubi->used)) {
+ paranoid_check_in_wl_tree(e, &ubi->used);
+- rb_erase(&e->rb, &ubi->used);
++ rb_erase(&e->u.rb, &ubi->used);
+ } else {
+ int err;
+
+@@ -1361,11 +1362,11 @@ static void tree_destroy(struct rb_root *root)
+ else if (rb->rb_right)
+ rb = rb->rb_right;
+ else {
+- e = rb_entry(rb, struct ubi_wl_entry, rb);
++ e = rb_entry(rb, struct ubi_wl_entry, u.rb);
+
+ rb = rb_parent(rb);
+ if (rb) {
+- if (rb->rb_left == &e->rb)
++ if (rb->rb_left == &e->u.rb)
+ rb->rb_left = NULL;
+ else
+ rb->rb_right = NULL;
+ commit 49afc59ca6aa41e55cffdef39f94c774bce55bd8 +Author: Valerie Henson <val@nmt.edu> +Date: Mon Jul 30 13:10:52 2007 -0600 + + tulip: Remove tulip maintainer + + Remove Val Henson as tulip maintainer and let her roam free, FREE! + + Signed-off-by: Val Henson <val@nmt.edu> + Signed-off-by: Jeff Garzik <jeff@garzik.org> + +diff --git a/MAINTAINERS b/MAINTAINERS +index babd00b0c65c..5c784be00b54 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -3674,11 +3674,9 @@ W: http://www.auk.cx/tms380tr/ + S: Maintained + + TULIP NETWORK DRIVER +-P: Valerie Henson +-M: val@nmt.edu + L: tulip-users@lists.sourceforge.net + W: http://sourceforge.net/projects/tulip/ +-S: Maintained ++S: Orphan + + TUN/TAP driver + P: Maxim Krasnyansky
commit df31233ab95980d037d0304aaf44f9939fbaede5 +Author: Valerie Henson <val@nmt.edu> +Date: Wed May 30 06:08:54 2007 -0600 + + Update tulip maintainer email address + + I've quit Intel and gone into business as a Linux consultant. Update + my email address in MAINTAINERS. + + Signed-off-by: Valerie Henson <val@nmt.edu> + Signed-off-by: Jeff Garzik <jeff@garzik.org> + +diff --git a/MAINTAINERS b/MAINTAINERS +index 124b9508ae2e..6d6a61ce12b4 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -3545,7 +3545,7 @@ S: Maintained + + TULIP NETWORK DRIVER + P: Valerie Henson +-M: val_henson@linux.intel.com ++M: val@nmt.edu + L: tulip-users@lists.sourceforge.net + W: http://sourceforge.net/projects/tulip/ + S: Maintained+
commit d6450e19329c85ac4888c185429094236a650928
+Author: Nick Sillik <n.sillik@temple.edu>
+Date: Wed Aug 17 13:37:34 2005 -0400
+
+ [PATCH] USB Storage: code cleanups for onetouch.c
+
+ As sugested by Alan Stern here are a few code cleanups for onetouch.c:
+
+ -Check number of endpoints before directly referencing intf->endpoint[2]
+ -Use defined constants instead of magic numbers
+ -Revmove the non-ascii characters from copyright notice
+ -Make registration and deregistration messages more similar
+
+ Signed-off-by: Nick Sillik <n.sillik@temple.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
+index 07fd29ceb347..2c9402dc702b 100644
+--- a/drivers/usb/storage/onetouch.c
++++ b/drivers/usb/storage/onetouch.c
+@@ -5,7 +5,7 @@
+ * Copyright (c) 2005 Nick Sillik <n.sillik@temple.edu>
+ *
+ * Initial work by:
+- * Copyright (c) 2003 Erik Thyrén <erth7411@student.uu.se>
++ * Copyright (c) 2003 Erik Thyren <erth7411@student.uu.se>
+ *
+ * Based on usbmouse.c (Vojtech Pavlik) and xpad.c (Marko Friedemann)
+ *
+@@ -35,6 +35,8 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
++#include <linux/usb_ch9.h>
++#include <linux/usb_input.h>
+ #include "usb.h"
+ #include "onetouch.h"
+ #include "debug.h"
+@@ -116,10 +118,14 @@ int onetouch_connect_input(struct us_data *ss)
+
+ interface = ss->pusb_intf->cur_altsetting;
+
++ if (interface->desc.bNumEndpoints != 3)
++ return -ENODEV;
++
+ endpoint = &interface->endpoint[2].desc;
+- if(!(endpoint->bEndpointAddress & 0x80))
++ if(!(endpoint->bEndpointAddress & USB_DIR_IN))
+ return -ENODEV;
+- if((endpoint->bmAttributes & 3) != 3)
++ if((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
++ != USB_ENDPOINT_XFER_INT)
+ return -ENODEV;
+
+ pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
+@@ -128,7 +134,8 @@ int onetouch_connect_input(struct us_data *ss)
+ if (!(onetouch = kcalloc(1, sizeof(struct usb_onetouch), GFP_KERNEL)))
+ return -ENOMEM;
+
+- onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN, SLAB_ATOMIC, &onetouch->data_dma);
++ onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN,
++ SLAB_ATOMIC, &onetouch->data_dma);
+ if (!onetouch->data){
+ kfree(onetouch);
+ return -ENOMEM;
+@@ -137,7 +144,8 @@ int onetouch_connect_input(struct us_data *ss)
+ onetouch->irq = usb_alloc_urb(0, GFP_KERNEL);
+ if (!onetouch->irq){
+ kfree(onetouch);
+- usb_buffer_free(udev, ONETOUCH_PKT_LEN, onetouch->data, onetouch->data_dma);
++ usb_buffer_free(udev, ONETOUCH_PKT_LEN,
++ onetouch->data, onetouch->data_dma);
+ return -ENODEV;
+ }
+
+@@ -152,16 +160,13 @@ int onetouch_connect_input(struct us_data *ss)
+ onetouch->dev.open = usb_onetouch_open;
+ onetouch->dev.close = usb_onetouch_close;
+
+- usb_make_path(udev, path, 64);
++ usb_make_path(udev, path, sizeof(path));
+ sprintf(onetouch->phys, "%s/input0", path);
+
+ onetouch->dev.name = onetouch->name;
+ onetouch->dev.phys = onetouch->phys;
+
+- onetouch->dev.id.bustype = BUS_USB;
+- onetouch->dev.id.vendor = le16_to_cpu(udev->descriptor.idVendor);
+- onetouch->dev.id.product = le16_to_cpu(udev->descriptor.idProduct);
+- onetouch->dev.id.version = le16_to_cpu(udev->descriptor.bcdDevice);
++ usb_to_input_id(udev, &onetouch->dev.id);
+
+ onetouch->dev.dev = &udev->dev;
+
+@@ -199,7 +204,7 @@ void onetouch_release_input(void *onetouch_)
+ usb_free_urb(onetouch->irq);
+ usb_buffer_free(onetouch->udev, ONETOUCH_PKT_LEN,
+ onetouch->data, onetouch->data_dma);
+- printk(KERN_INFO "Maxtor Onetouch %04x:%04x Deregistered\n",
+- onetouch->dev.id.vendor, onetouch->dev.id.product);
++ printk(KERN_INFO "usb-input: deregistering %s\n",
++ onetouch->dev.name);
+ }
+ }commit 7cee432a22bb328ea7a4012dacc5a3471fabeb07 +Author: Nick Sillik <n.sillik@temple.edu> +Date: Wed Jul 27 14:46:03 2005 -0700 + + [NETFILTER]: Fix -Wunder error in ip_conntrack_core.c + + Signed-off-by: Nick Sillik <n.sillik@temple.edu> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c +index 63bf88264980..86f04e41dd8e 100644 +--- a/net/ipv4/netfilter/ip_conntrack_core.c ++++ b/net/ipv4/netfilter/ip_conntrack_core.c +@@ -510,7 +510,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple, + /* Welcome, Mr. Bond. We've been expecting you... */ + __set_bit(IPS_EXPECTED_BIT, &conntrack->status); + conntrack->master = exp->master; +-#if CONFIG_IP_NF_CONNTRACK_MARK ++#ifdef CONFIG_IP_NF_CONNTRACK_MARK + conntrack->mark = exp->master->mark; + #endif + nf_conntrack_get(&conntrack->master->ct_general);+
commit 46bdac99382dd36e2d8c36cfb35d879b5c136965
+Author: Tom Duffy <thomas.duffy.99@alumni.brown.edu>
+Date: Sun Aug 7 09:42:23 2005 -0700
+
+ [PATCH] visws: linkage fix
+
+ This patch add stubs to allow the visws subarch to link again.
+
+ Signed-off-by: Tom Duffy <thomas.duffy.99@alumni.brown.edu>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/arch/i386/mach-visws/setup.c b/arch/i386/mach-visws/setup.c
+index 9f6d2d9b1be7..26ada6fc0d77 100644
+--- a/arch/i386/mach-visws/setup.c
++++ b/arch/i386/mach-visws/setup.c
+@@ -14,6 +14,8 @@
+ #include "cobalt.h"
+ #include "piix4.h"
+
++int no_broadcast;
++
+ char visws_board_type = -1;
+ char visws_board_rev = -1;
+
+diff --git a/arch/i386/pci/visws.c b/arch/i386/pci/visws.c
+index 314c933b6b8e..6c17433fdf7d 100644
+--- a/arch/i386/pci/visws.c
++++ b/arch/i386/pci/visws.c
+@@ -18,8 +18,10 @@
+ extern struct pci_raw_ops pci_direct_conf1;
+
+ static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; }
++static void pci_visws_disable_irq(struct pci_dev *dev) { }
+
+ int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq;
++void (*pcibios_disable_irq)(struct pci_dev *dev) = &pci_visws_disable_irq;
+
+ void __init pcibios_penalize_isa_irq(int irq, int active) {}
+ commit 6c79d7260a8522a54374fa10dd2838eaef492cf2 +Author: Tom Duffy <thomas.duffy.99@alumni.brown.edu> +Date: Sun Aug 7 09:42:16 2005 -0700 + + [PATCH] Make visws compile again + + In file included from linux-2.6.13-rc5/arch/i386/kernel/timers/timer_pit.c:20: + linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h: In function `do_timer_overflow': + linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: `i8259A_lock' undeclared (first use in this function) + linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: (Each undeclared identifier is reported only once + linux-2.6.13-rc5/include/asm-i386/mach-visws/do_timer.h:32: error: for each function it appears in.) + make[3]: *** [arch/i386/kernel/timers/timer_pit.o] Error 1 + make[2]: *** [arch/i386/kernel/timers] Error 2 + make[1]: *** [arch/i386/kernel] Error 2 + make: *** [_all] Error 2 + + Signed-off-by: Tom Duffy <thomas.duffy.99@alumni.brown.edu> + Cc: Andrey Panin <pazke@orbita1.ru> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/include/asm-i386/mach-visws/do_timer.h b/include/asm-i386/mach-visws/do_timer.h +index 33acd50fd9a8..92d638fc8b11 100644 +--- a/include/asm-i386/mach-visws/do_timer.h ++++ b/include/asm-i386/mach-visws/do_timer.h +@@ -1,6 +1,7 @@ + /* defines for inline arch setup functions */ + + #include <asm/fixmap.h> ++#include <asm/i8259.h> + #include "cobalt.h" + + static inline void do_timer_interrupt_hook(struct pt_regs *regs)+
commit bc7863d18677df66b2c7a0e172c91296ff380f11
+Author: Çağhan Demir <caghandemir@marun.edu.tr>
+Date: Mon Jan 15 20:23:03 2024 +0300
+
+ ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq2xxx
+
+ This HP Laptop uses ALC236 codec with COEF 0x07 idx 1 controlling
+ the mute LED. This patch enables the already existing quirk for
+ this device.
+
+ Signed-off-by: Çağhan Demir <caghandemir@marun.edu.tr>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/20240115172303.4718-1-caghandemir@marun.edu.tr
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index b68c94757051..0f0a03e89015 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -9861,6 +9861,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),
+ SND_PCI_QUIRK(0x103c, 0x87f6, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
+ SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
++ SND_PCI_QUIRK(0x103c, 0x87fe, "HP Laptop 15s-fq2xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),
+ SND_PCI_QUIRK(0x103c, 0x8805, "HP ProBook 650 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
+ SND_PCI_QUIRK(0x103c, 0x880d, "HP EliteBook 830 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
+ SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
+ commit bb619539629cee523df886705d6ef866e099640a +Author: Hunter Chasens <hunter.chasens18@ncf.edu> +Date: Tue Nov 7 11:28:30 2023 -0500 + + drm: amd: Resolve Sphinx unexpected indentation warning + + Resolves Sphinx unexpected indentation warning when compiling + documentation (e.g. `make htmldocs`). Replaces tabs with spaces and adds + a literal block to keep vertical formatting of the + example power state list. + + Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> + Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com> (v2) + Acked-by: Randy Dunlap <rdunlap@infradead.org> (v2) + Signed-off-by: Hunter Chasens <hunter.chasens18@ncf.edu> + Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + +diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c +index 8257be1b9464..ca2ece24e1e0 100644 +--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c ++++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c +@@ -989,12 +989,13 @@ static ssize_t amdgpu_get_pp_features(struct device *dev, + * Reading back the files will show you the available power levels within + * the power state and the clock information for those levels. If deep sleep is + * applied to a clock, the level will be denoted by a special level 'S:' +- * E.g., +- * S: 19Mhz * +- * 0: 615Mhz +- * 1: 800Mhz +- * 2: 888Mhz +- * 3: 1000Mhz ++ * E.g., :: ++ * ++ * S: 19Mhz * ++ * 0: 615Mhz ++ * 1: 800Mhz ++ * 2: 888Mhz ++ * 3: 1000Mhz + * + * + * To manually adjust these states, first select manual using+
commit 7f6ab07293c8ee6a64783b01840189f894dc3f16
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Dec 22 19:36:51 2015 -0500
+
+ drivers/staging/lustre: Clean up another C warnining: set but not used
+
+ drivers/staging/lustre/lustre/fid/../include/lustre_cfg.h: In function 'lustre_cfg_free':
+ drivers/staging/lustre/lustre/fid/../include/lustre_cfg.h:253:6: warning: variable 'len' set but not used [-Wunused-but-set-variable]
+ int len;
+
+ Yep, we're just gonna call kfree, no need to calculate len. Bye-bye.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/include/lustre_cfg.h b/drivers/staging/lustre/lustre/include/lustre_cfg.h
+index eb6b292b7b25..d30d8b054c92 100644
+--- a/drivers/staging/lustre/lustre/include/lustre_cfg.h
++++ b/drivers/staging/lustre/lustre/include/lustre_cfg.h
+@@ -252,10 +252,6 @@ static inline struct lustre_cfg *lustre_cfg_new(int cmd,
+
+ static inline void lustre_cfg_free(struct lustre_cfg *lcfg)
+ {
+- int len;
+-
+- len = lustre_cfg_len(lcfg->lcfg_bufcount, lcfg->lcfg_buflens);
+-
+ kfree(lcfg);
+ return;
+ }commit f65a0922f024d44a73fa113a833e55f4a5033597 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Tue Dec 22 19:36:50 2015 -0500 + + drivers/staging/lustre: Fix set-but-unused whinge. + + drivers/staging/lustre/lustre/fid/lproc_fid.c: In function 'ldebugfs_fid_write_common': + drivers/staging/lustre/lustre/fid/lproc_fid.c:67:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable] + int rc; + + We fix it by *using* the return code to help bulletproof it. It says it's + test code - it should be *more* bulletproof than production, not less. + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c +index 39f2aa32e984..0320b6e83576 100644 +--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c ++++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c +@@ -85,6 +85,8 @@ ldebugfs_fid_write_common(const char __user *buffer, size_t count, + rc = sscanf(kernbuf, "[%llx - %llx]\n", + (unsigned long long *)&tmp.lsr_start, + (unsigned long long *)&tmp.lsr_end); ++ if (rc != 2) ++ return -EINVAL; + if (!range_is_sane(&tmp) || range_is_zero(&tmp) || + tmp.lsr_start < range->lsr_start || tmp.lsr_end > range->lsr_end) + return -EINVAL;
commit b8947b399dbbce510183521d80f361df462e4383
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Dec 22 19:36:49 2015 -0500
+
+ drivers/staging/lustre: Silence warning about 'inline'
+
+ Low-hanging fruit first:
+
+ CC [M] drivers/staging/lustre/lustre/fid/fid_request.o
+ In file included from drivers/staging/lustre/lustre/fid/../include/lustre_net.h:66:0,
+ from drivers/staging/lustre/lustre/fid/../include/lustre_lib.h:64,
+ from drivers/staging/lustre/lustre/fid/../include/obd.h:52,
+ from drivers/staging/lustre/lustre/fid/fid_request.c:48:
+ drivers/staging/lustre/lustre/fid/../include/lu_object.h:765:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
+ static const inline struct lu_device_operations *
+ ^
+
+ So we just swap inline and const. 272 warnings gone. :)
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
+index ee1dbb257d5d..0b22e5ee99ac 100644
+--- a/drivers/staging/lustre/lustre/include/lu_object.h
++++ b/drivers/staging/lustre/lustre/include/lu_object.h
+@@ -756,7 +756,7 @@ static inline const struct lu_fid *lu_object_fid(const struct lu_object *o)
+ /**
+ * return device operations vector for this object
+ */
+-static const inline struct lu_device_operations *
++static inline const struct lu_device_operations *
+ lu_object_ops(const struct lu_object *o)
+ {
+ return o->lo_dev->ld_ops;commit e8dd2d2d641cb2724ee10e76c0ad02e04289c017
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Sat Aug 29 17:49:16 2015 -0400
+
+ Silence compiler warning in arch/x86/kvm/emulate.c
+
+ Compiler warning:
+
+ CC [M] arch/x86/kvm/emulate.o
+ arch/x86/kvm/emulate.c: In function "__do_insn_fetch_bytes":
+ arch/x86/kvm/emulate.c:814:9: warning: "linear" may be used uninitialized in this function [-Wmaybe-uninitialized]
+
+ GCC is smart enough to realize that the inlined __linearize may return before
+ setting the value of linear, but not smart enough to realize the same
+ X86EMU_CONTINUE blocks actual use of the value. However, the value of
+ 'linear' can only be set to one value, so hoisting the one line of code
+ upwards makes GCC happy with the code.
+
+ Reported-by: Aruna Hewapathirane <aruna.hewapathirane@gmail.com>
+ Tested-by: Aruna Hewapathirane <aruna.hewapathirane@gmail.com>
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
+index e7a4fde5d631..b372a7557c16 100644
+--- a/arch/x86/kvm/emulate.c
++++ b/arch/x86/kvm/emulate.c
+@@ -650,6 +650,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
+ u16 sel;
+
+ la = seg_base(ctxt, addr.seg) + addr.ea;
++ *linear = la;
+ *max_size = 0;
+ switch (mode) {
+ case X86EMUL_MODE_PROT64:
+@@ -693,7 +694,6 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
+ }
+ if (insn_aligned(ctxt, size) && ((la & (size - 1)) != 0))
+ return emulate_gp(ctxt, 0);
+- *linear = la;
+ return X86EMUL_CONTINUE;
+ bad:
+ if (addr.seg == VCPU_SREG_SS)commit 9261dc1de11e158a5f6b4b92c8bf1ef4a02dbf0d +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Fri Jan 2 11:19:57 2015 -0500 + + x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y + + Some Gentoo users are encountering problems because + USB_EHCI_TT_NEWSCHED isn't set in the defconfig (and Gentoo + differs from other distros in not providing a distro .config). + Alan Stern has said there's no reason to not set it, and the + ability to turn it off at all should probably be yanked: + + http://article.gmane.org/gmane.linux.usb.general/119920 + + This addresses issue: + + https://bugs.gentoo.org/show_bug.cgi?id=533472 + + (The problem also theoretically affects the sh, arm, mips, + powerpc, and sparc archs, but those would be other patches if + this one that fixes 98% of the problem is accepted). + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Alan Stern <stern@rowland.harvard.edu> + Signed-off-by: Ingo Molnar <mingo@kernel.org> + +diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig +index 419819d6dab3..aaa1118bf01e 100644 +--- a/arch/x86/configs/i386_defconfig ++++ b/arch/x86/configs/i386_defconfig +@@ -248,7 +248,7 @@ CONFIG_USB=y + CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + CONFIG_USB_MON=y + CONFIG_USB_EHCI_HCD=y +-# CONFIG_USB_EHCI_TT_NEWSCHED is not set ++CONFIG_USB_EHCI_TT_NEWSCHED=y + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_UHCI_HCD=y + CONFIG_USB_PRINTER=y +diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig +index 4c311ddd973b..315b86106572 100644 +--- a/arch/x86/configs/x86_64_defconfig ++++ b/arch/x86/configs/x86_64_defconfig +@@ -243,7 +243,7 @@ CONFIG_USB=y + CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + CONFIG_USB_MON=y + CONFIG_USB_EHCI_HCD=y +-# CONFIG_USB_EHCI_TT_NEWSCHED is not set ++CONFIG_USB_EHCI_TT_NEWSCHED=y + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_UHCI_HCD=y + CONFIG_USB_PRINTER=y
commit 69204cf7eb9c5a72067ce6922d4699378251d053 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Tue Dec 9 16:15:50 2014 -0500 + + net: fix suspicious rcu_dereference_check in net/sched/sch_fq_codel.c + + commit 46e5da40ae (net: qdisc: use rcu prefix and silence + sparse warnings) triggers a spurious warning: + + net/sched/sch_fq_codel.c:97 suspicious rcu_dereference_check() usage! + + The code should be using the _bh variant of rcu_dereference. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Eric Dumazet <edumazet@google.com> + Acked-by: John Fastabend <john.r.fastabend@intel.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c +index b9ca32ebc1de..1e52decb7b59 100644 +--- a/net/sched/sch_fq_codel.c ++++ b/net/sched/sch_fq_codel.c +@@ -94,7 +94,7 @@ static unsigned int fq_codel_classify(struct sk_buff *skb, struct Qdisc *sch, + TC_H_MIN(skb->priority) <= q->flows_cnt) + return TC_H_MIN(skb->priority); + +- filter = rcu_dereference(q->filter_list); ++ filter = rcu_dereference_bh(q->filter_list); + if (!filter) + return fq_codel_hash(q, skb) + 1; +
commit d4bf205da618bbd0b038e404d646f14e76915718
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Sun Oct 12 23:09:08 2014 -0400
+
+ pstore: Fix duplicate {console,ftrace}-efi entries
+
+ The pstore filesystem still creates duplicate filename/inode pairs for
+ some pstore types. Add the id to the filename to prevent that.
+
+ Before patch:
+
+ [/sys/fs/pstore] ls -li
+ total 0
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+ 1250 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi
+
+ After:
+
+ [/sys/fs/pstore] ls -li
+ total 0
+ 1232 -r--r--r--. 1 root root 148 Sep 29 17:09 console-efi-141202499100000
+ 1231 -r--r--r--. 1 root root 67 Sep 29 17:09 console-efi-141202499200000
+ 1230 -r--r--r--. 1 root root 148 Sep 29 17:44 console-efi-141202705400000
+ 1229 -r--r--r--. 1 root root 67 Sep 29 17:44 console-efi-141202705500000
+ 1228 -r--r--r--. 1 root root 67 Sep 29 20:42 console-efi-141203772600000
+ 1227 -r--r--r--. 1 root root 148 Sep 29 23:42 console-efi-141204854900000
+ 1226 -r--r--r--. 1 root root 67 Sep 29 23:42 console-efi-141204855000000
+ 1225 -r--r--r--. 1 root root 148 Sep 29 23:59 console-efi-141204954200000
+ 1224 -r--r--r--. 1 root root 67 Sep 29 23:59 console-efi-141204954400000
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Acked-by: Kees Cook <keescook@chromium.org>
+ Cc: stable@vger.kernel.org # 3.6+
+ Signed-off-by: Tony Luck <tony.luck@intel.com>
+
+diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
+index 192297b0090d..fafb7a02a5d6 100644
+--- a/fs/pstore/inode.c
++++ b/fs/pstore/inode.c
+@@ -320,10 +320,10 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
+ compressed ? ".enc.z" : "");
+ break;
+ case PSTORE_TYPE_CONSOLE:
+- sprintf(name, "console-%s", psname);
++ sprintf(name, "console-%s-%lld", psname, id);
+ break;
+ case PSTORE_TYPE_FTRACE:
+- sprintf(name, "ftrace-%s", psname);
++ sprintf(name, "ftrace-%s-%lld", psname, id);
+ break;
+ case PSTORE_TYPE_MCE:
+ sprintf(name, "mce-%s-%lld", psname, id);commit 79d99c305fd4edb9ee11ff57f43dc961ad684ab6 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Mon Sep 8 18:09:48 2014 -0400 + + staging/rtl8192u - check for skb alloc failure + + It's possible for dev_alloc_skb() to fail. Propagate the error to the caller, + so it can clean up and drop the packet. The sender should end up retransmitting + the packet, hopefully at a time we're prepared to allocate skb's again. + + Reported-By: Nicholas Krause <xerofoify@gmail.com> + Signed-Off-By: Valdis Kletnieks <valdis.kletnieks@vt.edu> + + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +index 40da37fdbcdc..73de9e9669f6 100644 +--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c ++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +@@ -847,6 +847,8 @@ static u8 parse_subframe(struct sk_buff *skb, + #else + /* Allocate new skb for releasing to upper layer */ + sub_skb = dev_alloc_skb(nSubframe_Length + 12); ++ if (!sub_skb) ++ return 0; + skb_reserve(sub_skb, 12); + data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length); + memcpy(data_ptr, skb->data, nSubframe_Length);
commit 015af06e103fa47af29ada0f564301c81d4973b2
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue May 27 14:28:59 2014 -0400
+
+ kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
+
+ This commit did an incorrect printk->pr_info conversion. If we were
+ converting to pr_info() we should lose the log_level parameter. The problem is
+ that this is called (indirectly) by show_regs_print_info(), which is called
+ with various log_levels (from _INFO clear to _EMERG). So we leave it as
+ a printk() call so the desired log_level is applied.
+
+ Not a full revert, as the other half of the patch is correct.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Tejun Heo <tj@kernel.org>
+
+diff --git a/kernel/workqueue.c b/kernel/workqueue.c
+index bc3c18892b7d..90a0fa592b72 100644
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -4440,7 +4440,7 @@ void print_worker_info(const char *log_lvl, struct task_struct *task)
+ probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);
+
+ if (fn || name[0] || desc[0]) {
+- pr_info("%sWorkqueue: %s %pf", log_lvl, name, fn);
++ printk("%sWorkqueue: %s %pf", log_lvl, name, fn);
+ if (desc[0])
+ pr_cont(" (%s)", desc);
+ pr_cont("\n");commit 5d1fadc1472396d602f0eeb10d37519e2a14e8bc
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Wed Feb 27 17:03:13 2013 -0800
+
+ kernel/signal.c: fix suboptimal printk usage
+
+ Several printk's were missing KERN_INFO and KERN_CONT flags. In
+ addition, a printk that was outside a #if/#endif should have been
+ inside, which would result in stray blank line on non-x86 boxes.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/signal.c b/kernel/signal.c
+index c6209135cca4..2676aac4103d 100644
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1157,11 +1157,11 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
+ static void print_fatal_signal(int signr)
+ {
+ struct pt_regs *regs = signal_pt_regs();
+- printk("%s/%d: potentially unexpected fatal signal %d.\n",
++ printk(KERN_INFO "%s/%d: potentially unexpected fatal signal %d.\n",
+ current->comm, task_pid_nr(current), signr);
+
+ #if defined(__i386__) && !defined(__arch_um__)
+- printk("code at %08lx: ", regs->ip);
++ printk(KERN_INFO "code at %08lx: ", regs->ip);
+ {
+ int i;
+ for (i = 0; i < 16; i++) {
+@@ -1169,11 +1169,11 @@ static void print_fatal_signal(int signr)
+
+ if (get_user(insn, (unsigned char *)(regs->ip + i)))
+ break;
+- printk("%02x ", insn);
++ printk(KERN_CONT "%02x ", insn);
+ }
+ }
++ printk(KERN_CONT "\n");
+ #endif
+- printk("\n");
+ preempt_disable();
+ show_regs(regs);
+ preempt_enable();
+ commit 38124328fb3ea0b28451071bf3c7401e35c91020 +Author: Reese Moore <ram@vt.edu> +Date: Wed Nov 7 07:05:08 2012 +0000 + + netfilter: nf_ct_pptp: Fix comment referring to incorrect RFC + + The header of this file cites to "RFFC2673" which is "Binary Labels in the + Domain Name System". It should refer to "RFC 2637" which is "Point-to-Point + Tunneling Protocol (PPTP)". This patch also corrects the typo RFFC. + + Signed-off-by: Reese Moore <ram@vt.edu> + Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c +index cc7669ef0b95..e6678d2b624e 100644 +--- a/net/netfilter/nf_conntrack_pptp.c ++++ b/net/netfilter/nf_conntrack_pptp.c +@@ -14,7 +14,7 @@ + * Limitations: + * - We blindly assume that control connections are always + * established in PNS->PAC direction. This is a violation +- * of RFFC2673 ++ * of RFC 2637 + * - We can only support one single call within each session + * TODO: + * - testing of incoming PPTP calls
commit d19978f58745e586d9385d306d557e7c785abe23 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Wed Nov 9 01:29:20 2011 -0500 + + crypto: fix typo in crypto/Kconfig + + Fix a typo in the Kconfig file help text. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 527a857d10b6..733208fe0a2d 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -105,7 +105,7 @@ config CRYPTO_USER + depends on NET + select CRYPTO_MANAGER + help +- Userapace configuration for cryptographic instantiations such as ++ Userspace configuration for cryptographic instantiations such as + cbc(aes). + + config CRYPTO_MANAGER_DISABLE_TESTS
commit d2df40857fd57f02906e6ac1484d10cb7accbc86 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Fri Oct 29 17:03:46 2010 -0400 + + drivers/dma/Kconfig: add part number for Topcliff. + + Product codenames are OK, but once an actual product name is available, + it should be referenced as well. + + http://ark.intel.com/chipset.aspx?familyID=52499 + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig +index 79d1542f31c0..6ee23592700a 100644 +--- a/drivers/dma/Kconfig ++++ b/drivers/dma/Kconfig +@@ -200,11 +200,11 @@ config PL330_DMA + platform_data for a dma-pl330 device. + + config PCH_DMA +- tristate "Topcliff PCH DMA support" ++ tristate "Topcliff (Intel EG20T) PCH DMA support" + depends on PCI && X86 + select DMA_ENGINE + help +- Enable support for the Topcliff PCH DMA engine. ++ Enable support for the Topcliff (Intel EG20T) PCH DMA engine. + + config IMX_SDMA + tristate "i.MX SDMA support"
commit 4c6a3999651741419cd3cc4303cf0c2be07d89bc +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Thu Apr 22 14:29:10 2010 -0400 + + dri-devel mailing list moved - update MAINTAINERS + + I posted to dri-devel@lists.sourceforge.net, and got a bounce back: + + The dri-devel list has moved to freedesktop.org (see + http://lists.freedesktop.org/mailman/listinfo/dri-devel). If you were + subscribed to the list here, the subscription should have been + transferred to the new location. + + Please only post to the new list. + + Fix MAINTAINERS to correspond. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/MAINTAINERS b/MAINTAINERS +index a2d9254a2233..183887518fe3 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -1960,7 +1960,7 @@ F: lib/kobj* + + DRM DRIVERS + M: David Airlie <airlied@linux.ie> +-L: dri-devel@lists.sourceforge.net ++L: dri-devel@lists.freedesktop.org + T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git + S: Maintained + F: drivers/gpu/drm/
commit fb9f88e1dc76f9feb39d39c40a5d61aad6df4388
+Author: Bharath Ramesh <bramesh@vt.edu>
+Date: Thu Jan 29 14:25:24 2009 -0800
+
+ hwmon: applesmc: add support for MacPro 3 temperature sensors
+
+ MacPro 3 have more temperature sensors than the previous MacPro's also the
+ sensor THTG has been removed. This patch add supports for the newer
+ temperature sensors in the MacPro3.
+
+ Signed-off-by: Bharath Ramesh <bramesh@vt.edu>
+ Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
+index e30186236588..678e34b01e52 100644
+--- a/drivers/hwmon/applesmc.c
++++ b/drivers/hwmon/applesmc.c
+@@ -83,7 +83,7 @@
+ /*
+ * Temperature sensors keys (sp78 - 2 bytes).
+ */
+-static const char* temperature_sensors_sets[][36] = {
++static const char *temperature_sensors_sets[][41] = {
+ /* Set 0: Macbook Pro */
+ { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
+ "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
+@@ -135,6 +135,13 @@ static const char* temperature_sensors_sets[][36] = {
+ { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TN0D", "TTF0",
+ "TV0P", "TVFP", "TW0P", "Th0P", "Tp0P", "Tp1P", "TpFP", "Ts0P",
+ "Ts0S", NULL },
++/* Set 16: Mac Pro 3,1 (2 x Quad-Core) */
++ { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P",
++ "TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "TH0P", "TH1P",
++ "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S", "TM1P",
++ "TM1S", "TM2P", "TM2S", "TM3S", "TM8P", "TM8S", "TM9P", "TM9S",
++ "TN0C", "TN0D", "TN0H", "TS0C", "Tp0C", "Tp1C", "Tv0S", "Tv1S",
++ NULL },
+ };
+
+ /* List of keys used to read/write fan speeds */
+@@ -1153,6 +1160,16 @@ static SENSOR_DEVICE_ATTR(temp34_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 33);
+ static SENSOR_DEVICE_ATTR(temp35_input, S_IRUGO,
+ applesmc_show_temperature, NULL, 34);
++static SENSOR_DEVICE_ATTR(temp36_input, S_IRUGO,
++ applesmc_show_temperature, NULL, 35);
++static SENSOR_DEVICE_ATTR(temp37_input, S_IRUGO,
++ applesmc_show_temperature, NULL, 36);
++static SENSOR_DEVICE_ATTR(temp38_input, S_IRUGO,
++ applesmc_show_temperature, NULL, 37);
++static SENSOR_DEVICE_ATTR(temp39_input, S_IRUGO,
++ applesmc_show_temperature, NULL, 38);
++static SENSOR_DEVICE_ATTR(temp40_input, S_IRUGO,
++ applesmc_show_temperature, NULL, 39);
+
+ static struct attribute *temperature_attributes[] = {
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
+@@ -1190,6 +1207,11 @@ static struct attribute *temperature_attributes[] = {
+ &sensor_dev_attr_temp33_input.dev_attr.attr,
+ &sensor_dev_attr_temp34_input.dev_attr.attr,
+ &sensor_dev_attr_temp35_input.dev_attr.attr,
++ &sensor_dev_attr_temp36_input.dev_attr.attr,
++ &sensor_dev_attr_temp37_input.dev_attr.attr,
++ &sensor_dev_attr_temp38_input.dev_attr.attr,
++ &sensor_dev_attr_temp39_input.dev_attr.attr,
++ &sensor_dev_attr_temp40_input.dev_attr.attr,
+ NULL
+ };
+
+@@ -1312,6 +1334,8 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
+ { .accelerometer = 0, .light = 0, .temperature_set = 14 },
+ /* MacBook Air 2,1: accelerometer, backlight and temperature set 15 */
+ { .accelerometer = 1, .light = 1, .temperature_set = 15 },
++/* MacPro3,1: temperature set 16 */
++ { .accelerometer = 0, .light = 0, .temperature_set = 16 },
+ };
+
+ /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
+@@ -1369,6 +1393,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
+ DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
+ &applesmc_dmi_data[4]},
++ { applesmc_dmi_match, "Apple MacPro3", {
++ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "MacPro3") },
++ &applesmc_dmi_data[16]},
+ { applesmc_dmi_match, "Apple MacPro", {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacPro") },commit 292cf4a8a989cb564a6a5f0ba7a66e08a095afa1 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Oct 15 22:04:35 2008 -0700 + + tpm: work around bug in Broadcom BCM0102 chipset + + Patch tpm-correct-tpm-timeouts-to-jiffies-conversion reveals a bug in the + Broadcom BCM0102 TPM chipset used in the Dell Latitude D820 - although + most of the timeouts are returned in usecs as per the spec, one is + apparently returned in msecs, which results in a too-small value leading + to a timeout when the code treats it as usecs. To prevent a regression, + we check for the known too-short value and adjust it to a value that makes + things work. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Cc: Marcin Obara <marcin_obara@users.sourceforge.net> + Cc: Marcel Selhorst <tpm@selhorst.net> + Cc: Kylene Jo Hall <kjhall@us.ibm.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c +index 6b5a0e0127a7..aa899cec6b3f 100644 +--- a/drivers/char/tpm/tpm.c ++++ b/drivers/char/tpm/tpm.c +@@ -557,6 +557,13 @@ void tpm_get_timeouts(struct tpm_chip *chip) + usecs_to_jiffies(be32_to_cpu + (*((__be32 *) (data + + TPM_GET_CAP_RET_UINT32_1_IDX)))); ++ /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above ++ * value wrong and apparently reports msecs rather than usecs. So we ++ * fix up the resulting too-small TPM_SHORT value to make things work. ++ */ ++ if (chip->vendor.duration[TPM_SHORT] < (HZ/100)) ++ chip->vendor.duration[TPM_SHORT] = HZ; ++ + chip->vendor.duration[TPM_MEDIUM] = + usecs_to_jiffies(be32_to_cpu + (*((__be32 *) (data +
commit 243f40cecb292cbb2333749614cf54302fc9cdc0 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Fri Dec 28 21:22:48 2007 -0500 + + kbuild: document 'make prepare' in 'make help' + + The output of 'make help' covers a lot of options, but doesn't include + a listing for 'make prepare'. Here's a one-liner to fix that... + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Sam Ravnborg <sam@ravnborg.org> + +diff --git a/Makefile b/Makefile +index 698dfc6ba65c..6847464402aa 100644 +--- a/Makefile ++++ b/Makefile +@@ -1181,6 +1181,7 @@ help: + @echo ' dir/ - Build all files in dir and below' + @echo ' dir/file.[ois] - Build specified target only' + @echo ' dir/file.ko - Build module including final link' ++ @echo ' prepare - Set up for building external modules' + @echo ' tags/TAGS - Generate tags file for editors' + @echo ' cscope - Generate cscope index' + @echo ' kernelrelease - Output the release version string'
commit 319e799abb89d9215a203e32c2cad51115d302f4
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Dec 6 20:37:43 2006 -0800
+
+ [PATCH] ver_linux additions
+
+ scripts/ver_linux needed some minor clean-ups, as follows:
+ 1) Add reporting of actual oprofile release
+ 2) Add reporting of actual wireless-tools release
+ 3) Add reporting of actual pcmciautils release
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/scripts/ver_linux b/scripts/ver_linux
+index 84999f69773d..72876dfadc8a 100755
+--- a/scripts/ver_linux
++++ b/scripts/ver_linux
+@@ -48,6 +48,8 @@ fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
+ xfs_db -V 2>&1 | grep version | awk \
+ 'NR==1{print "xfsprogs ", $3}'
+
++pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils ", $2}'
++
+ cardmgr -V 2>&1| grep version | awk \
+ 'NR==1{print "pcmcia-cs ", $3}'
+
+@@ -87,10 +89,16 @@ loadkeys -h 2>&1 | awk \
+ loadkeys -V 2>&1 | awk \
+ '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}'
+
++oprofiled --version 2>&1 | awk \
++'(NR==1 && ($2 == "oprofile")) {print "oprofile ", $3}'
++
+ expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}'
+
+ udevinfo -V 2>&1 | grep version | awk '{print "udev ", $3}'
+
++iwconfig --version 2>&1 | awk \
++'(NR==1 && ($3 == "version")) {print "wireless-tools ",$4}'
++
+ if [ -e /proc/modules ]; then
+ X=`cat /proc/modules | sed -e "s/ .*$//"`
+ echo "Modules Loaded "$Xcommit 73af994c7d58dd513922dc9d5cd76b124ec02b1b +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Apr 19 09:23:09 2006 +0200 + + [PATCH] Document online io scheduler switching + + We added the ability to change a block device's IO elevator scheduler both + at kernel boot and on-the-fly, but we only documented the elevator= boot + parameter. Add a quick how-to on doing it on the fly. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Jens Axboe <axboe@suse.de> + +diff --git a/Documentation/block/switching-sched.txt b/Documentation/block/switching-sched.txt +new file mode 100644 +index 000000000000..5fa130a67531 +--- /dev/null ++++ b/Documentation/block/switching-sched.txt +@@ -0,0 +1,22 @@ ++As of the Linux 2.6.10 kernel, it is now possible to change the ++IO scheduler for a given block device on the fly (thus making it possible, ++for instance, to set the CFQ scheduler for the system default, but ++set a specific device to use the anticipatory or noop schedulers - which ++can improve that device's throughput). ++ ++To set a specific scheduler, simply do this: ++ ++echo SCHEDNAME > /sys/block/DEV/queue/scheduler ++ ++where SCHEDNAME is the name of a defined IO scheduler, and DEV is the ++device name (hda, hdb, sga, or whatever you happen to have). ++ ++The list of defined schedulers can be found by simply doing ++a "cat /sys/block/DEV/queue/scheduler" - the list of valid names ++will be displayed, with the currently selected scheduler in brackets: ++ ++# cat /sys/block/hda/queue/scheduler ++noop anticipatory deadline [cfq] ++# echo anticipatory > /sys/block/hda/queue/scheduler ++# cat /sys/block/hda/queue/scheduler ++noop [anticipatory] deadline cfq
commit 4f95af5bb546a9e7f46ed10f5e0dbe1e42a77884
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Thu Jan 19 02:07:47 2006 -0500
+
+ [PATCH] orinoco_cs: tweak Vcc debugging messages
+
+ The current orinoco_cs.c can issue the exact same error message for
+ 2 different tests that can fail. Alter them so we can tell which
+ one of the two failed.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
+index b664708481cc..3c128b692bce 100644
+--- a/drivers/net/wireless/orinoco_cs.c
++++ b/drivers/net/wireless/orinoco_cs.c
+@@ -261,13 +261,13 @@ orinoco_cs_config(dev_link_t *link)
+ /* Note that the CIS values need to be rescaled */
+ if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+ if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+- DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n", conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
++ DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n", conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+ if (!ignore_cis_vcc)
+ goto next_entry;
+ }
+ } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
+ if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
+- DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n", conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
++ DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n", conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
+ if(!ignore_cis_vcc)
+ goto next_entry;
+ }
+ commit 3135806358e8d3d8ac61a13f58f148d0a98a7b9b
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Sat Jan 14 13:21:10 2006 -0800
+
+ [PATCH] quota: make useless quota error message informative
+
+ fs/quota_v2.c can, under some conditions, issue a kernel message that says,
+ in totality, 'failed read'. This patch does the following:
+
+ 1) Gives a hint who issued the error message, so people reading the logs
+ don't have to go grepping the entire kernel tree (with 11 false
+ positives).
+
+ 2) Say what amount of data we expected, and actually got.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Cc: Jan Kara <jack@ucw.cz>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/fs/quota_v2.c b/fs/quota_v2.c
+index 7afcbb1b9376..a4ef91bb4f3b 100644
+--- a/fs/quota_v2.c
++++ b/fs/quota_v2.c
+@@ -35,7 +35,8 @@ static int v2_check_quota_file(struct super_block *sb, int type)
+
+ size = sb->s_op->quota_read(sb, type, (char *)&dqhead, sizeof(struct v2_disk_dqheader), 0);
+ if (size != sizeof(struct v2_disk_dqheader)) {
+- printk("failed read\n");
++ printk("quota_v2: failed read expected=%d got=%d\n",
++ sizeof(struct v2_disk_dqheader), size);
+ return 0;
+ }
+ if (le32_to_cpu(dqhead.dqh_magic) != quota_magics[type] ||commit fc9c9ab22d5650977c417ef2032d02f455011b23 +Author: Bharath Ramesh <bramesh@vt.edu> +Date: Sat Apr 16 15:25:41 2005 -0700 + + [PATCH] AYSNC IO using singals other than SIGIO + + A question on sigwaitinfo based IO mechanism in multithreaded applications. + + I am trying to use RT signals to notify me of IO events using RT signals + instead of SIGIO in a multithreaded applications. I noticed that there was + some discussion on lkml during november 1999 with the subject of the + discussion as "Signal driven IO". In the thread I noticed that RT signals + were being delivered to the worker thread. I am running 2.6.10 kernel and + I am trying to use the very same mechanism and I find that only SIGIO being + propogated to the worker threads and RT signals only being propogated to + the main thread and not the worker threads where I actually want them to be + propogated too. On further inspection I found that the following patch + which I have attached solves the problem. + + I am not sure if this is a bug or feature in the kernel. + + + Roland McGrath <roland@redhat.com> said: + + This relates only to fcntl F_SETSIG, which is a Linux extension. So there is + no POSIX issue. When changing various things like the normal SIGIO signalling + to do group signals, I was concerned strictly with the POSIX semantics and + generally avoided touching things in the domain of Linux inventions. That's + why I didn't change this when I changed the call right next to it. There is + no reason I can see that F_SETSIG-requested signals shouldn't use a group + signal like normal SIGIO does. I'm happy to ACK this patch, there is nothing + wrong with its change to the semantics in my book. But neither POSIX nor I + care a whit what F_SETSIG does. + + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/fs/fcntl.c b/fs/fcntl.c +index c1708066bf55..3e7ab16ed154 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -437,7 +437,7 @@ static void send_sigio_to_task(struct task_struct *p, + else + si.si_band = band_table[reason - POLL_IN]; + si.si_fd = fd; +- if (!send_sig_info(fown->signum, &si, p)) ++ if (!send_group_sig_info(fown->signum, &si, p)) + break; + /* fall-through: fall back on the old plain SIGIO signal */ + case 0:
commit c09b42404d29c8a9266f8186632330dc8474bf2e
+Author: Matt Tolentino <metolent@cs.vt.edu>
+Date: Tue Jan 17 07:03:44 2006 +0100
+
+ [PATCH] x86_64: add __meminit for memory hotplug
+
+ Add __meminit to the __init lineup to ensure functions default
+ to __init when memory hotplug is not enabled. Replace __devinit
+ with __meminit on functions that were changed when the memory
+ hotplug code was introduced.
+
+ Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
+index 7df494b51a5b..2700f01994ba 100644
+--- a/arch/i386/mm/init.c
++++ b/arch/i386/mm/init.c
+@@ -268,7 +268,7 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base)
+ pkmap_page_table = pte;
+ }
+
+-static void __devinit free_new_highpage(struct page *page)
++static void __meminit free_new_highpage(struct page *page)
+ {
+ set_page_count(page, 1);
+ __free_page(page);
+diff --git a/include/linux/init.h b/include/linux/init.h
+index 59008c3826cf..ff8d8b8632f4 100644
+--- a/include/linux/init.h
++++ b/include/linux/init.h
+@@ -241,6 +241,18 @@ void __init parse_early_param(void);
+ #define __cpuexitdata __exitdata
+ #endif
+
++#ifdef CONFIG_MEMORY_HOTPLUG
++#define __meminit
++#define __meminitdata
++#define __memexit
++#define __memexitdata
++#else
++#define __meminit __init
++#define __meminitdata __initdata
++#define __memexit __exit
++#define __memexitdata __exitdata
++#endif
++
+ /* Functions marked as __devexit may be discarded at kernel link time, depending
+ on config options. Newer versions of binutils detect references from
+ retained sections to discarded sections and flag an error. Pointers to
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 8c960b469593..c2e29743a8d1 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -1735,7 +1735,7 @@ static void __init calculate_zone_totalpages(struct pglist_data *pgdat,
+ * up by free_all_bootmem() once the early boot process is
+ * done. Non-atomic initialization, single-pass.
+ */
+-void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
++void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
+ unsigned long start_pfn)
+ {
+ struct page *page;
+@@ -1788,7 +1788,7 @@ void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn,
+ memmap_init_zone((size), (nid), (zone), (start_pfn))
+ #endif
+
+-static int __devinit zone_batchsize(struct zone *zone)
++static int __meminit zone_batchsize(struct zone *zone)
+ {
+ int batch;
+
+@@ -1882,7 +1882,7 @@ static struct per_cpu_pageset
+ * Dynamically allocate memory for the
+ * per cpu pageset array in struct zone.
+ */
+-static int __devinit process_zones(int cpu)
++static int __meminit process_zones(int cpu)
+ {
+ struct zone *zone, *dzone;
+
+@@ -1923,7 +1923,7 @@ static inline void free_zone_pagesets(int cpu)
+ }
+ }
+
+-static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,
++static int __meminit pageset_cpuup_callback(struct notifier_block *nfb,
+ unsigned long action,
+ void *hcpu)
+ {
+@@ -1963,7 +1963,7 @@ void __init setup_per_cpu_pageset(void)
+
+ #endif
+
+-static __devinit
++static __meminit
+ void zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
+ {
+ int i;
+@@ -1983,7 +1983,7 @@ void zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
+ init_waitqueue_head(zone->wait_table + i);
+ }
+
+-static __devinit void zone_pcp_init(struct zone *zone)
++static __meminit void zone_pcp_init(struct zone *zone)
+ {
+ int cpu;
+ unsigned long batch = zone_batchsize(zone);
+@@ -2001,7 +2001,7 @@ static __devinit void zone_pcp_init(struct zone *zone)
+ zone->name, zone->present_pages, batch);
+ }
+
+-static __devinit void init_currently_empty_zone(struct zone *zone,
++static __meminit void init_currently_empty_zone(struct zone *zone,
+ unsigned long zone_start_pfn, unsigned long size)
+ {
+ struct pglist_data *pgdat = zone->zone_pgdat;commit 44df75e629106efcada087cead6c3f33ed6bcc60
+Author: Matt Tolentino <metolent@cs.vt.edu>
+Date: Tue Jan 17 07:03:41 2006 +0100
+
+ [PATCH] x86_64: add x86-64 support for memory hot-add
+
+ Add x86-64 specific memory hot-add functions, Kconfig options,
+ and runtime kernel page table update functions to make
+ hot-add usable on x86-64 machines. Also, fixup the nefarious
+ conditional locking and exports pointed out by Andi.
+
+ Tested on Intel and IBM x86-64 memory hot-add capable systems.
+
+ Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
+index 787feff0e8a5..2f9deca31cc9 100644
+--- a/arch/x86_64/Kconfig
++++ b/arch/x86_64/Kconfig
+@@ -305,7 +305,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
+
+ config ARCH_SPARSEMEM_ENABLE
+ def_bool y
+- depends on NUMA
++ depends on (NUMA || EXPERIMENTAL)
++
++config ARCH_MEMORY_PROBE
++ def_bool y
++ depends on MEMORY_HOTPLUG
+
+ config ARCH_FLATMEM_ENABLE
+ def_bool y
+@@ -315,6 +319,7 @@ source "mm/Kconfig"
+
+ config HAVE_ARCH_EARLY_PFN_TO_NID
+ def_bool y
++ depends on NUMA
+
+ config NR_CPUS
+ int "Maximum number of CPUs (2-256)"
+diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
+index 307d1ac0ef33..7af1742aa958 100644
+--- a/arch/x86_64/mm/init.c
++++ b/arch/x86_64/mm/init.c
+@@ -24,6 +24,8 @@
+ #include <linux/proc_fs.h>
+ #include <linux/pci.h>
+ #include <linux/dma-mapping.h>
++#include <linux/module.h>
++#include <linux/memory_hotplug.h>
+
+ #include <asm/processor.h>
+ #include <asm/system.h>
+@@ -180,13 +182,19 @@ static struct temp_map {
+ {}
+ };
+
+-static __init void *alloc_low_page(int *index, unsigned long *phys)
++static __meminit void *alloc_low_page(int *index, unsigned long *phys)
+ {
+ struct temp_map *ti;
+ int i;
+ unsigned long pfn = table_end++, paddr;
+ void *adr;
+
++ if (after_bootmem) {
++ adr = (void *)get_zeroed_page(GFP_ATOMIC);
++ *phys = __pa(adr);
++ return adr;
++ }
++
+ if (pfn >= end_pfn)
+ panic("alloc_low_page: ran out of memory");
+ for (i = 0; temp_mappings[i].allocated; i++) {
+@@ -199,55 +207,86 @@ static __init void *alloc_low_page(int *index, unsigned long *phys)
+ ti->allocated = 1;
+ __flush_tlb();
+ adr = ti->address + ((pfn << PAGE_SHIFT) & ~PMD_MASK);
++ memset(adr, 0, PAGE_SIZE);
+ *index = i;
+ *phys = pfn * PAGE_SIZE;
+ return adr;
+ }
+
+-static __init void unmap_low_page(int i)
++static __meminit void unmap_low_page(int i)
+ {
+- struct temp_map *ti = &temp_mappings[i];
++ struct temp_map *ti;
++
++ if (after_bootmem)
++ return;
++
++ ti = &temp_mappings[i];
+ set_pmd(ti->pmd, __pmd(0));
+ ti->allocated = 0;
+ }
+
+-static void __init phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
++static void __meminit
++phys_pmd_init(pmd_t *pmd, unsigned long address, unsigned long end)
++{
++ int i;
++
++ for (i = 0; i < PTRS_PER_PMD; pmd++, i++, address += PMD_SIZE) {
++ unsigned long entry;
++
++ if (address > end) {
++ for (; i < PTRS_PER_PMD; i++, pmd++)
++ set_pmd(pmd, __pmd(0));
++ break;
++ }
++ entry = _PAGE_NX|_PAGE_PSE|_KERNPG_TABLE|_PAGE_GLOBAL|address;
++ entry &= __supported_pte_mask;
++ set_pmd(pmd, __pmd(entry));
++ }
++}
++
++static void __meminit
++phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end)
++{
++ pmd_t *pmd = pmd_offset(pud, (unsigned long)__va(address));
++
++ if (pmd_none(*pmd)) {
++ spin_lock(&init_mm.page_table_lock);
++ phys_pmd_init(pmd, address, end);
++ spin_unlock(&init_mm.page_table_lock);
++ __flush_tlb_all();
++ }
++}
++
++static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)
+ {
+- long i, j;
++ long i = pud_index(address);
+
+- i = pud_index(address);
+ pud = pud + i;
++
++ if (after_bootmem && pud_val(*pud)) {
++ phys_pmd_update(pud, address, end);
++ return;
++ }
++
+ for (; i < PTRS_PER_PUD; pud++, i++) {
+ int map;
+ unsigned long paddr, pmd_phys;
+ pmd_t *pmd;
+
+- paddr = address + i*PUD_SIZE;
+- if (paddr >= end) {
+- for (; i < PTRS_PER_PUD; i++, pud++)
+- set_pud(pud, __pud(0));
++ paddr = (address & PGDIR_MASK) + i*PUD_SIZE;
++ if (paddr >= end)
+ break;
+- }
+
+- if (!e820_mapped(paddr, paddr+PUD_SIZE, 0)) {
++ if (!after_bootmem && !e820_mapped(paddr, paddr+PUD_SIZE, 0)) {
+ set_pud(pud, __pud(0));
+ continue;
+ }
+
+ pmd = alloc_low_page(&map, &pmd_phys);
++ spin_lock(&init_mm.page_table_lock);
+ set_pud(pud, __pud(pmd_phys | _KERNPG_TABLE));
+- for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) {
+- unsigned long pe;
+-
+- if (paddr >= end) {
+- for (; j < PTRS_PER_PMD; j++, pmd++)
+- set_pmd(pmd, __pmd(0));
+- break;
+- }
+- pe = _PAGE_NX|_PAGE_PSE | _KERNPG_TABLE | _PAGE_GLOBAL | paddr;
+- pe &= __supported_pte_mask;
+- set_pmd(pmd, __pmd(pe));
+- }
++ phys_pmd_init(pmd, paddr, end);
++ spin_unlock(&init_mm.page_table_lock);
+ unmap_low_page(map);
+ }
+ __flush_tlb();
+@@ -272,12 +311,15 @@ static void __init find_early_table_space(unsigned long end)
+
+ table_start >>= PAGE_SHIFT;
+ table_end = table_start;
++
++ early_printk("kernel direct mapping tables up to %lx @ %lx-%lx\n",
++ end, table_start << PAGE_SHIFT, table_end << PAGE_SHIFT);
+ }
+
+ /* Setup the direct mapping of the physical memory at PAGE_OFFSET.
+ This runs before bootmem is initialized and gets pages directly from the
+ physical memory. To access them they are temporarily mapped. */
+-void __init init_memory_mapping(unsigned long start, unsigned long end)
++void __meminit init_memory_mapping(unsigned long start, unsigned long end)
+ {
+ unsigned long next;
+
+@@ -289,7 +331,8 @@ void __init init_memory_mapping(unsigned long start, unsigned long end)
+ * mapped. Unfortunately this is done currently before the nodes are
+ * discovered.
+ */
+- find_early_table_space(end);
++ if (!after_bootmem)
++ find_early_table_space(end);
+
+ start = (unsigned long)__va(start);
+ end = (unsigned long)__va(end);
+@@ -297,20 +340,26 @@ void __init init_memory_mapping(unsigned long start, unsigned long end)
+ for (; start < end; start = next) {
+ int map;
+ unsigned long pud_phys;
+- pud_t *pud = alloc_low_page(&map, &pud_phys);
++ pgd_t *pgd = pgd_offset_k(start);
++ pud_t *pud;
++
++ if (after_bootmem)
++ pud = pud_offset_k(pgd, __PAGE_OFFSET);
++ else
++ pud = alloc_low_page(&map, &pud_phys);
++
+ next = start + PGDIR_SIZE;
+ if (next > end)
+ next = end;
+ phys_pud_init(pud, __pa(start), __pa(next));
+- set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
++ if (!after_bootmem)
++ set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
+ unmap_low_page(map);
+ }
+
+- asm volatile("movq %%cr4,%0" : "=r" (mmu_cr4_features));
++ if (!after_bootmem)
++ asm volatile("movq %%cr4,%0" : "=r" (mmu_cr4_features));
+ __flush_tlb_all();
+- early_printk("kernel direct mapping tables upto %lx @ %lx-%lx\n", end,
+- table_start<<PAGE_SHIFT,
+- table_end<<PAGE_SHIFT);
+ }
+
+ void __cpuinit zap_low_mappings(int cpu)
+@@ -385,6 +434,9 @@ size_zones(unsigned long *z, unsigned long *h,
+ void __init paging_init(void)
+ {
+ unsigned long zones[MAX_NR_ZONES], holes[MAX_NR_ZONES];
++
++ memory_present(0, 0, end_pfn);
++ sparse_init();
+ size_zones(zones, holes, 0, end_pfn);
+ free_area_init_node(0, NODE_DATA(0), zones,
+ __pa(PAGE_OFFSET) >> PAGE_SHIFT, holes);
+@@ -425,6 +477,50 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
+ __flush_tlb_all();
+ }
+
++/*
++ * Memory hotplug specific functions
++ * These are only for non-NUMA machines right now.
++ */
++#ifdef CONFIG_MEMORY_HOTPLUG
++
++void online_page(struct page *page)
++{
++ ClearPageReserved(page);
++ set_page_count(page, 1);
++ __free_page(page);
++ totalram_pages++;
++ num_physpages++;
++}
++
++int add_memory(u64 start, u64 size)
++{
++ struct pglist_data *pgdat = NODE_DATA(0);
++ struct zone *zone = pgdat->node_zones + MAX_NR_ZONES-2;
++ unsigned long start_pfn = start >> PAGE_SHIFT;
++ unsigned long nr_pages = size >> PAGE_SHIFT;
++ int ret;
++
++ ret = __add_pages(zone, start_pfn, nr_pages);
++ if (ret)
++ goto error;
++
++ init_memory_mapping(start, (start + size -1));
++
++ return ret;
++error:
++ printk("%s: Problem encountered in __add_pages!\n", __func__);
++ return ret;
++}
++EXPORT_SYMBOL_GPL(add_memory);
++
++int remove_memory(u64 start, u64 size)
++{
++ return -EINVAL;
++}
++EXPORT_SYMBOL_GPL(remove_memory);
++
++#endif
++
+ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
+ kcore_vsyscall;
+
+ commit bff47c2302cc249bcd550b17067f8dddbd4b6f77 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Dec 5 21:36:07 2019 -0500 + + x86/vdso: Provide missing include file + + When building with C=1, sparse issues a warning: + + CHECK arch/x86/entry/vdso/vdso32-setup.c + arch/x86/entry/vdso/vdso32-setup.c:28:28: warning: symbol 'vdso32_enabled' was not declared. Should it be static? + + Provide the missing header file. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Borislav Petkov <bp@suse.de> + Cc: "H. Peter Anvin" <hpa@zytor.com> + Cc: Andy Lutomirski <luto@kernel.org> + Cc: Ingo Molnar <mingo@redhat.com> + Cc: Thomas Gleixner <tglx@linutronix.de> + Cc: x86-ml <x86@kernel.org> + Link: https://lkml.kernel.org/r/36224.1575599767@turing-police + +diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c +index 240626e7f55a..43842fade8fa 100644 +--- a/arch/x86/entry/vdso/vdso32-setup.c ++++ b/arch/x86/entry/vdso/vdso32-setup.c +@@ -11,6 +11,7 @@ + #include <linux/smp.h> + #include <linux/kernel.h> + #include <linux/mm_types.h> ++#include <linux/elf.h> + + #include <asm/processor.h> + #include <asm/vdso.h>
commit 82c881b28aa89215a760e39c5f6bcde2d6ce4918
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Dec 5 22:44:33 2019 -0500
+
+ x86/microcode/AMD: Make stub function static inline
+
+ When building with C=1 W=1 (and when CONFIG_MICROCODE_AMD=n, as Luc Van
+ Oostenryck correctly points out) both sparse and gcc complain:
+
+ CHECK arch/x86/kernel/cpu/microcode/core.c
+ ./arch/x86/include/asm/microcode_amd.h:56:6: warning: symbol \
+ 'reload_ucode_amd' was not declared. Should it be static?
+ CC arch/x86/kernel/cpu/microcode/core.o
+ In file included from arch/x86/kernel/cpu/microcode/core.c:36:
+ ./arch/x86/include/asm/microcode_amd.h:56:6: warning: no previous \
+ prototype for 'reload_ucode_amd' [-Wmissing-prototypes]
+ 56 | void reload_ucode_amd(void) {}
+ | ^~~~~~~~~~~~~~~~
+
+ And they're right - that function can be a static inline like its
+ brethren.
+
+ Signed-off-by: Valdis Klētnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Borislav Petkov <bp@suse.de>
+ Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
+ Cc: x86@kernel.org
+ Link: https://lkml.kernel.org/r/52170.1575603873@turing-police
+
+diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
+index 209492849566..6685e1218959 100644
+--- a/arch/x86/include/asm/microcode_amd.h
++++ b/arch/x86/include/asm/microcode_amd.h
+@@ -53,6 +53,6 @@ static inline void __init load_ucode_amd_bsp(unsigned int family) {}
+ static inline void load_ucode_amd_ap(unsigned int family) {}
+ static inline int __init
+ save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
+-void reload_ucode_amd(void) {}
++static inline void reload_ucode_amd(void) {}
+ #endif
+ #endif /* _ASM_X86_MICROCODE_AMD_H */commit 579d705cd64e44f3fcda1a6cfd5f37468a5ddf63
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Dec 5 20:58:36 2019 -0500
+
+ crypto: chacha - fix warning message in header file
+
+ Building with W=1 causes a warning:
+
+ CC [M] arch/x86/crypto/chacha_glue.o
+ In file included from arch/x86/crypto/chacha_glue.c:10:
+ ./include/crypto/internal/chacha.h:37:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
+ 37 | static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
+ | ^~~~~~
+
+ Straighten out the order to match the rest of the header file.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h
+index aa5d4a16aac5..b085dc1ac151 100644
+--- a/include/crypto/internal/chacha.h
++++ b/include/crypto/internal/chacha.h
+@@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
+ return chacha_setkey(tfm, key, keysize, 20);
+ }
+
+-static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
++static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
+ unsigned int keysize)
+ {
+ return chacha_setkey(tfm, key, keysize, 12);commit 6366e523eb56b4b7191fd4261941a2762b6957bd
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 17:36:08 2019 -0500
+
+ staging: exfat: Update the TODO file
+
+ Updating with the current laundry list of things that need attention.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112223609.163501-1-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/TODO b/drivers/staging/exfat/TODO
+index b60e50b9cf4e..a283ce534cf4 100644
+--- a/drivers/staging/exfat/TODO
++++ b/drivers/staging/exfat/TODO
+@@ -1,17 +1,22 @@
++A laundry list of things that need looking at, most of which will
++require more work than the average checkpatch cleanup...
++
++Note that some of these entries may not be bugs - they're things
++that need to be looked at, and *possibly* fixed.
++
++Clean up the ffsCamelCase function names.
++
++Fix (thing)->flags to not use magic numbers - multiple offenders
++
++Sort out all the s32/u32/u8 nonsense - most of these should be plain int.
++
+ exfat_core.c - ffsReadFile - the goto err_out seem to leak a brelse().
+ same for ffsWriteFile.
+
+-exfat_core.c - fs_sync(sb,0) all over the place looks fishy as hell.
+-There's only one place that calls it with a non-zero argument.
+-Randomly removing fs_sync() calls is *not* the right answer, especially
+-if the removal then leaves a call to fs_set_vol_flags(VOL_CLEAN), as that
+-says the file system is clean and synced when we *know* it isn't.
+-The proper fix here is to go through and actually analyze how DELAYED_SYNC
+-should work, and any time we're setting VOL_CLEAN, ensure the file system
+-has in fact been synced to disk. In other words, changing the 'false' to
+-'true' is probably more correct. Also, it's likely that the one current
+-place where it actually does an bdev_sync isn't sufficient in the DELAYED_SYNC
+-case.
++All the calls to fs_sync() need to be looked at, particularly in the
++context of EXFAT_DELAYED_SYNC. Currently, if that's defined, we only
++flush to disk when sync() gets called. We should be doing at least
++metadata flushes at appropriate times.
+
+ ffsTruncateFile - if (old_size <= new_size) {
+ That doesn't look right. How did it ever work? Are they relying on lazy
+@@ -19,3 +24,46 @@ block allocation when actual writes happen? If nothing else, it never
+ does the 'fid->size = new_size' and do the inode update....
+
+ ffsSetAttr() is just dangling in the breeze, not wired up at all...
++
++Convert global mutexes to a per-superblock mutex.
++
++Right now, we load exactly one UTF-8 table. Check to see
++if that plays nice with different codepage and iocharset values
++for simultanous mounts of different devices
++
++exfat_rmdir() checks for -EBUSY but ffsRemoveDir() doesn't return it.
++In fact, there's a complete lack of -EBUSY testing anywhere.
++
++There's probably a few missing checks for -EEXIST
++
++check return codes of sync_dirty_buffer()
++
++Why is remove_file doing a num_entries++??
++
++Double check a lot of can't-happen parameter checks (for null pointers for
++things that have only one call site and can't pass a null, etc).
++
++All the DEBUG stuff can probably be tossed, including the ioctl(). Either
++that, or convert to a proper fault-injection system.
++
++exfat_remount does exactly one thing. Fix to actually deal with remount
++options, particularly handling R/O correctly. For that matter, allow
++R/O mounts in the first place.
++
++Figure out why the VFAT code used multi_sector_(read|write) but the
++exfat code doesn't use it. The difference matters on SSDs with wear leveling.
++
++exfat_fat_sync(), exfat_buf_sync(), and sync_alloc_bitmap()
++aren't called anyplace....
++
++Create helper function for exfat_set_entry_time() and exfat_set_entry_type()
++because it's sort of ugly to be calling the same functionn directly and
++other code calling through the fs_func struc ponters...
++
++clean up the remaining vol_type checks, which are of two types:
++some are ?: operators with magic numbers, and the rest are places
++where we're doing stuff with '.' and '..'.
++
++Patches to:
++ Greg Kroah-Hartman <gregkh@linuxfoundation.org>
++ Valdis Kletnieks <valdis.kletnieks@vt.edu>commit 65b88d81f5c9603ddfc86fc86c28f282408ffe8e
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:38 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 8
+
+ Rename all the FAT_* functions to exfat_fat_*.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-13-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 6a9cb6c68d28..2aac1e000977 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -739,12 +739,12 @@ void nls_cstring_to_uniname(struct super_block *sb,
+ /* buffer cache management */
+ void exfat_buf_init(struct super_block *sb);
+ void exfat_buf_shutdown(struct super_block *sb);
+-int FAT_read(struct super_block *sb, u32 loc, u32 *content);
+-s32 FAT_write(struct super_block *sb, u32 loc, u32 content);
+-u8 *FAT_getblk(struct super_block *sb, sector_t sec);
+-void FAT_modify(struct super_block *sb, sector_t sec);
+-void FAT_release_all(struct super_block *sb);
+-void FAT_sync(struct super_block *sb);
++int exfat_fat_read(struct super_block *sb, u32 loc, u32 *content);
++s32 exfat_fat_write(struct super_block *sb, u32 loc, u32 content);
++u8 *exfat_fat_getblk(struct super_block *sb, sector_t sec);
++void exfat_fat_modify(struct super_block *sb, sector_t sec);
++void exfat_fat_release_all(struct super_block *sb);
++void exfat_fat_sync(struct super_block *sb);
+ u8 *exfat_buf_getblk(struct super_block *sb, sector_t sec);
+ void exfat_buf_modify(struct super_block *sb, sector_t sec);
+ void exfat_buf_lock(struct super_block *sb, sector_t sec);
+diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c
+index 835871b2a3d0..3fd5604058a9 100644
+--- a/drivers/staging/exfat/exfat_cache.c
++++ b/drivers/staging/exfat/exfat_cache.c
+@@ -193,7 +193,7 @@ void exfat_buf_shutdown(struct super_block *sb)
+ {
+ }
+
+-static int __FAT_read(struct super_block *sb, u32 loc, u32 *content)
++static int __exfat_fat_read(struct super_block *sb, u32 loc, u32 *content)
+ {
+ s32 off;
+ u32 _content;
+@@ -206,7 +206,7 @@ static int __FAT_read(struct super_block *sb, u32 loc, u32 *content)
+ (loc >> (p_bd->sector_size_bits - 2));
+ off = (loc << 2) & p_bd->sector_size_mask;
+
+- fat_sector = FAT_getblk(sb, sec);
++ fat_sector = exfat_fat_getblk(sb, sec);
+ if (!fat_sector)
+ return -1;
+
+@@ -226,18 +226,18 @@ static int __FAT_read(struct super_block *sb, u32 loc, u32 *content)
+ * returns 0 on success
+ * -1 on error
+ */
+-int FAT_read(struct super_block *sb, u32 loc, u32 *content)
++int exfat_fat_read(struct super_block *sb, u32 loc, u32 *content)
+ {
+ s32 ret;
+
+ mutex_lock(&f_mutex);
+- ret = __FAT_read(sb, loc, content);
++ ret = __exfat_fat_read(sb, loc, content);
+ mutex_unlock(&f_mutex);
+
+ return ret;
+ }
+
+-static s32 __FAT_write(struct super_block *sb, u32 loc, u32 content)
++static s32 __exfat_fat_write(struct super_block *sb, u32 loc, u32 content)
+ {
+ s32 off;
+ sector_t sec;
+@@ -249,7 +249,7 @@ static s32 __FAT_write(struct super_block *sb, u32 loc, u32 content)
+ (p_bd->sector_size_bits - 2));
+ off = (loc << 2) & p_bd->sector_size_mask;
+
+- fat_sector = FAT_getblk(sb, sec);
++ fat_sector = exfat_fat_getblk(sb, sec);
+ if (!fat_sector)
+ return -1;
+
+@@ -257,22 +257,22 @@ static s32 __FAT_write(struct super_block *sb, u32 loc, u32 content)
+
+ SET32_A(fat_entry, content);
+
+- FAT_modify(sb, sec);
++ exfat_fat_modify(sb, sec);
+ return 0;
+ }
+
+-int FAT_write(struct super_block *sb, u32 loc, u32 content)
++int exfat_fat_write(struct super_block *sb, u32 loc, u32 content)
+ {
+ s32 ret;
+
+ mutex_lock(&f_mutex);
+- ret = __FAT_write(sb, loc, content);
++ ret = __exfat_fat_write(sb, loc, content);
+ mutex_unlock(&f_mutex);
+
+ return ret;
+ }
+
+-u8 *FAT_getblk(struct super_block *sb, sector_t sec)
++u8 *exfat_fat_getblk(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -307,7 +307,7 @@ u8 *FAT_getblk(struct super_block *sb, sector_t sec)
+ return bp->buf_bh->b_data;
+ }
+
+-void FAT_modify(struct super_block *sb, sector_t sec)
++void exfat_fat_modify(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+
+@@ -316,7 +316,7 @@ void FAT_modify(struct super_block *sb, sector_t sec)
+ sector_write(sb, sec, bp->buf_bh, 0);
+ }
+
+-void FAT_release_all(struct super_block *sb)
++void exfat_fat_release_all(struct super_block *sb)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -341,7 +341,7 @@ void FAT_release_all(struct super_block *sb)
+ mutex_unlock(&f_mutex);
+ }
+
+-void FAT_sync(struct super_block *sb)
++void exfat_fat_sync(struct super_block *sb)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index f60fb691e165..1638ed266f68 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -283,7 +283,7 @@ static s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ num_clusters++;
+
+ if (p_chain->flags == 0x01) {
+- if (FAT_write(sb, new_clu, CLUSTER_32(~0)) < 0)
++ if (exfat_fat_write(sb, new_clu, CLUSTER_32(~0)) < 0)
+ return -EIO;
+ }
+
+@@ -291,7 +291,7 @@ static s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ p_chain->dir = new_clu;
+ } else {
+ if (p_chain->flags == 0x01) {
+- if (FAT_write(sb, last_clu, new_clu) < 0)
++ if (exfat_fat_write(sb, last_clu, new_clu) < 0)
+ return -EIO;
+ }
+ }
+@@ -375,7 +375,7 @@ static void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ if (clr_alloc_bitmap(sb, clu - 2) != 0)
+ break;
+
+- if (FAT_read(sb, clu, &clu) == -1)
++ if (exfat_fat_read(sb, clu, &clu) == -1)
+ break;
+ num_clusters++;
+ } while ((clu != CLUSTER_32(0)) && (clu != CLUSTER_32(~0)));
+@@ -395,7 +395,7 @@ static u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain)
+ if (p_chain->flags == 0x03) {
+ clu += p_chain->size - 1;
+ } else {
+- while ((FAT_read(sb, clu, &next) == 0) &&
++ while ((exfat_fat_read(sb, clu, &next) == 0) &&
+ (next != CLUSTER_32(~0))) {
+ if (p_fs->dev_ejected)
+ break;
+@@ -422,7 +422,7 @@ s32 count_num_clusters(struct super_block *sb, struct chain_t *p_chain)
+ } else {
+ for (i = 2; i < p_fs->num_clusters; i++) {
+ count++;
+- if (FAT_read(sb, clu, &clu) != 0)
++ if (exfat_fat_read(sb, clu, &clu) != 0)
+ return 0;
+ if (clu == CLUSTER_32(~0))
+ break;
+@@ -461,12 +461,12 @@ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len)
+ return;
+
+ while (len > 1) {
+- if (FAT_write(sb, chain, chain + 1) < 0)
++ if (exfat_fat_write(sb, chain, chain + 1) < 0)
+ break;
+ chain++;
+ len--;
+ }
+- FAT_write(sb, chain, CLUSTER_32(~0));
++ exfat_fat_write(sb, chain, CLUSTER_32(~0));
+ }
+
+ /*
+@@ -538,7 +538,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ }
+ }
+
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ return -EIO;
+ }
+
+@@ -760,7 +760,7 @@ s32 load_upcase_table(struct super_block *sb)
+ break;
+ return 0;
+ }
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ return -EIO;
+ }
+ /* load default upcase table */
+@@ -1180,7 +1180,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+ if (es->alloc_flag == 0x03) {
+ clu++;
+ } else {
+- if (FAT_read(sb, clu, &clu) == -1)
++ if (exfat_fat_read(sb, clu, &clu) == -1)
+ goto err_out;
+ }
+ sec = START_SECTOR(clu);
+@@ -1242,7 +1242,7 @@ static s32 _walk_fat_chain(struct super_block *sb, struct chain_t *p_dir,
+ cur_clu += clu_offset;
+ } else {
+ while (clu_offset > 0) {
+- if (FAT_read(sb, cur_clu, &cur_clu) == -1)
++ if (exfat_fat_read(sb, cur_clu, &cur_clu) == -1)
+ return -EIO;
+ clu_offset--;
+ }
+@@ -1450,7 +1450,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+ if (es->alloc_flag == 0x03) {
+ clu++;
+ } else {
+- if (FAT_read(sb, clu, &clu) == -1)
++ if (exfat_fat_read(sb, clu, &clu) == -1)
+ goto err_out;
+ }
+ sec = START_SECTOR(clu);
+@@ -1575,7 +1575,7 @@ static s32 search_deleted_or_unused_entry(struct super_block *sb,
+ else
+ clu.dir = CLUSTER_32(~0);
+ } else {
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ return -1;
+ }
+ }
+@@ -1625,7 +1625,7 @@ static s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_
+ p_fs->hint_uentry.clu.flags = 0x01;
+ }
+ if (clu.flags == 0x01)
+- if (FAT_write(sb, last_clu, clu.dir) < 0)
++ if (exfat_fat_write(sb, last_clu, clu.dir) < 0)
+ return -EIO;
+
+ if (p_fs->hint_uentry.entry == -1) {
+@@ -1822,7 +1822,7 @@ static s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ else
+ clu.dir = CLUSTER_32(~0);
+ } else {
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ return -2;
+ }
+ }
+@@ -1903,7 +1903,7 @@ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ else
+ clu.dir = CLUSTER_32(~0);
+ } else {
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ return -EIO;
+ }
+ }
+@@ -1963,7 +1963,7 @@ bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir)
+ else
+ clu.dir = CLUSTER_32(~0);
+ }
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) != 0)
+ break;
+ }
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 4b8915098d20..23002aefc964 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -457,7 +457,7 @@ static int ffsUmountVol(struct super_block *sb)
+ free_upcase_table(sb);
+ free_alloc_bitmap(sb);
+
+- FAT_release_all(sb);
++ exfat_fat_release_all(sb);
+ exfat_buf_release_all(sb);
+
+ /* close the block device */
+@@ -722,8 +722,8 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+ }
+
+ while (clu_offset > 0) {
+- /* clu = FAT_read(sb, clu); */
+- if (FAT_read(sb, clu, &clu) == -1) {
++ /* clu = exfat_fat_read(sb, clu); */
++ if (exfat_fat_read(sb, clu, &clu) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -868,8 +868,8 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+
+ while ((clu_offset > 0) && (clu != CLUSTER_32(~0))) {
+ last_clu = clu;
+- /* clu = FAT_read(sb, clu); */
+- if (FAT_read(sb, clu, &clu) == -1) {
++ /* clu = exfat_fat_read(sb, clu); */
++ if (exfat_fat_read(sb, clu, &clu) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -911,7 +911,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ modified = true;
+ }
+ if (new_clu.flags == 0x01)
+- FAT_write(sb, last_clu, new_clu.dir);
++ exfat_fat_write(sb, last_clu, new_clu.dir);
+ }
+
+ num_clusters += num_alloced;
+@@ -1081,7 +1081,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ } else {
+ while (num_clusters > 0) {
+ last_clu = clu.dir;
+- if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -1123,7 +1123,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ /* (2) cut off from the FAT chain */
+ if (last_clu != CLUSTER_32(0)) {
+ if (fid->flags == 0x01)
+- FAT_write(sb, last_clu, CLUSTER_32(~0));
++ exfat_fat_write(sb, last_clu, CLUSTER_32(~0));
+ }
+
+ /* (3) free the clusters */
+@@ -1687,7 +1687,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+
+ while ((clu_offset > 0) && (*clu != CLUSTER_32(~0))) {
+ last_clu = *clu;
+- if (FAT_read(sb, *clu, clu) == -1) {
++ if (exfat_fat_read(sb, *clu, clu) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -1727,7 +1727,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ modified = true;
+ }
+ if (new_clu.flags == 0x01)
+- FAT_write(sb, last_clu, new_clu.dir);
++ exfat_fat_write(sb, last_clu, new_clu.dir);
+ }
+
+ num_clusters += num_alloced;
+@@ -1888,8 +1888,8 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ }
+
+ while (clu_offset > 0) {
+- /* clu.dir = FAT_read(sb, clu.dir); */
+- if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
++ /* clu.dir = exfat_fat_read(sb, clu.dir); */
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -1983,8 +1983,8 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ else
+ clu.dir = CLUSTER_32(~0);
+ } else {
+- /* clu.dir = FAT_read(sb, clu.dir); */
+- if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
++ /* clu.dir = exfat_fat_read(sb, clu.dir); */
++ if (exfat_fat_read(sb, clu.dir, &clu.dir) == -1) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -3821,7 +3821,7 @@ static void exfat_debug_kill_sb(struct super_block *sb)
+ * dirty. We use this to simulate device removal.
+ */
+ mutex_lock(&p_fs->v_mutex);
+- FAT_release_all(sb);
++ exfat_fat_release_all(sb);
+ exfat_buf_release_all(sb);
+ mutex_unlock(&p_fs->v_mutex);
+ commit 99a4b135289ed3e633a2f6bba1750513d9e4f731
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:37 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 7
+
+ Global functions called 'buf*' are a linkage editor disaster waiting to
+ happen. Rename our buf_* functions to exfat_buf_*
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-12-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 188ea1bd7162..6a9cb6c68d28 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -737,21 +737,21 @@ void nls_cstring_to_uniname(struct super_block *sb,
+ bool *p_lossy);
+
+ /* buffer cache management */
+-void buf_init(struct super_block *sb);
+-void buf_shutdown(struct super_block *sb);
++void exfat_buf_init(struct super_block *sb);
++void exfat_buf_shutdown(struct super_block *sb);
+ int FAT_read(struct super_block *sb, u32 loc, u32 *content);
+ s32 FAT_write(struct super_block *sb, u32 loc, u32 content);
+ u8 *FAT_getblk(struct super_block *sb, sector_t sec);
+ void FAT_modify(struct super_block *sb, sector_t sec);
+ void FAT_release_all(struct super_block *sb);
+ void FAT_sync(struct super_block *sb);
+-u8 *buf_getblk(struct super_block *sb, sector_t sec);
+-void buf_modify(struct super_block *sb, sector_t sec);
+-void buf_lock(struct super_block *sb, sector_t sec);
+-void buf_unlock(struct super_block *sb, sector_t sec);
+-void buf_release(struct super_block *sb, sector_t sec);
+-void buf_release_all(struct super_block *sb);
+-void buf_sync(struct super_block *sb);
++u8 *exfat_buf_getblk(struct super_block *sb, sector_t sec);
++void exfat_buf_modify(struct super_block *sb, sector_t sec);
++void exfat_buf_lock(struct super_block *sb, sector_t sec);
++void exfat_buf_unlock(struct super_block *sb, sector_t sec);
++void exfat_buf_release(struct super_block *sb, sector_t sec);
++void exfat_buf_release_all(struct super_block *sb);
++void exfat_buf_sync(struct super_block *sb);
+
+ /* fs management functions */
+ void fs_set_vol_flags(struct super_block *sb, u32 new_flag);
+diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c
+index 1d344c5f3e15..835871b2a3d0 100644
+--- a/drivers/staging/exfat/exfat_cache.c
++++ b/drivers/staging/exfat/exfat_cache.c
+@@ -128,7 +128,7 @@ static void buf_cache_remove_hash(struct buf_cache_t *bp)
+ (bp->hash_next)->hash_prev = bp->hash_prev;
+ }
+
+-void buf_init(struct super_block *sb)
++void exfat_buf_init(struct super_block *sb)
+ {
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+@@ -189,7 +189,7 @@ void buf_init(struct super_block *sb)
+ buf_cache_insert_hash(sb, &p_fs->buf_cache_array[i]);
+ }
+
+-void buf_shutdown(struct super_block *sb)
++void exfat_buf_shutdown(struct super_block *sb)
+ {
+ }
+
+@@ -392,7 +392,7 @@ static struct buf_cache_t *buf_cache_get(struct super_block *sb, sector_t sec)
+ return bp;
+ }
+
+-static u8 *__buf_getblk(struct super_block *sb, sector_t sec)
++static u8 *__exfat_buf_getblk(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -427,18 +427,18 @@ static u8 *__buf_getblk(struct super_block *sb, sector_t sec)
+ return bp->buf_bh->b_data;
+ }
+
+-u8 *buf_getblk(struct super_block *sb, sector_t sec)
++u8 *exfat_buf_getblk(struct super_block *sb, sector_t sec)
+ {
+ u8 *buf;
+
+ mutex_lock(&b_mutex);
+- buf = __buf_getblk(sb, sec);
++ buf = __exfat_buf_getblk(sb, sec);
+ mutex_unlock(&b_mutex);
+
+ return buf;
+ }
+
+-void buf_modify(struct super_block *sb, sector_t sec)
++void exfat_buf_modify(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+
+@@ -454,7 +454,7 @@ void buf_modify(struct super_block *sb, sector_t sec)
+ mutex_unlock(&b_mutex);
+ }
+
+-void buf_lock(struct super_block *sb, sector_t sec)
++void exfat_buf_lock(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+
+@@ -470,7 +470,7 @@ void buf_lock(struct super_block *sb, sector_t sec)
+ mutex_unlock(&b_mutex);
+ }
+
+-void buf_unlock(struct super_block *sb, sector_t sec)
++void exfat_buf_unlock(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+
+@@ -486,7 +486,7 @@ void buf_unlock(struct super_block *sb, sector_t sec)
+ mutex_unlock(&b_mutex);
+ }
+
+-void buf_release(struct super_block *sb, sector_t sec)
++void exfat_buf_release(struct super_block *sb, sector_t sec)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -510,7 +510,7 @@ void buf_release(struct super_block *sb, sector_t sec)
+ mutex_unlock(&b_mutex);
+ }
+
+-void buf_release_all(struct super_block *sb)
++void exfat_buf_release_all(struct super_block *sb)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -535,7 +535,7 @@ void buf_release_all(struct super_block *sb)
+ mutex_unlock(&b_mutex);
+ }
+
+-void buf_sync(struct super_block *sb)
++void exfat_buf_sync(struct super_block *sb)
+ {
+ struct buf_cache_t *bp;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 3cc13aaaed24..f60fb691e165 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -352,7 +352,7 @@ static void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ if (do_relse) {
+ sector = START_SECTOR(clu);
+ for (i = 0; i < p_fs->sectors_per_clu; i++)
+- buf_release(sb, sector + i);
++ exfat_buf_release(sb, sector + i);
+ }
+
+ if (clr_alloc_bitmap(sb, clu - 2) != 0)
+@@ -369,7 +369,7 @@ static void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ if (do_relse) {
+ sector = START_SECTOR(clu);
+ for (i = 0; i < p_fs->sectors_per_clu; i++)
+- buf_release(sb, sector + i);
++ exfat_buf_release(sb, sector + i);
+ }
+
+ if (clr_alloc_bitmap(sb, clu - 2) != 0)
+@@ -1032,10 +1032,10 @@ static s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ return -ENOENT;
+
+ init_file_entry(file_ep, type);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+
+ init_strm_entry(strm_ep, flags, start_clu, size);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+
+ return 0;
+ }
+@@ -1058,7 +1058,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ return -ENOENT;
+
+ file_ep->num_ext = (u8)(num_entries - 1);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+
+ strm_ep = (struct strm_dentry_t *)get_entry_in_dir(sb, p_dir, entry + 1,
+ §or);
+@@ -1067,7 +1067,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+
+ strm_ep->name_len = p_uniname->name_len;
+ SET16_A(strm_ep->name_hash, p_uniname->name_hash);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+
+ for (i = 2; i < num_entries; i++) {
+ name_ep = (struct name_dentry_t *)get_entry_in_dir(sb, p_dir,
+@@ -1077,7 +1077,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ return -ENOENT;
+
+ init_name_entry(name_ep, uniname);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+ uniname += 15;
+ }
+
+@@ -1100,7 +1100,7 @@ static void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir
+ return;
+
+ p_fs->fs_func->set_entry_type(ep, TYPE_DELETED);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+ }
+ }
+
+@@ -1118,7 +1118,7 @@ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+ if (!file_ep)
+ return;
+
+- buf_lock(sb, sector);
++ exfat_buf_lock(sb, sector);
+
+ num_entries = (s32)file_ep->num_ext + 1;
+ chksum = calc_checksum_2byte((void *)file_ep, DENTRY_SIZE, 0,
+@@ -1127,7 +1127,7 @@ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+ for (i = 1; i < num_entries; i++) {
+ ep = get_entry_in_dir(sb, p_dir, entry + i, NULL);
+ if (!ep) {
+- buf_unlock(sb, sector);
++ exfat_buf_unlock(sb, sector);
+ return;
+ }
+
+@@ -1136,8 +1136,8 @@ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+ }
+
+ SET16_A(file_ep->checksum, chksum);
+- buf_modify(sb, sector);
+- buf_unlock(sb, sector);
++ exfat_buf_modify(sb, sector);
++ exfat_buf_unlock(sb, sector);
+ }
+
+ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+@@ -1161,7 +1161,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+ copy_entries = min_t(s32,
+ remaining_byte_in_sector >> DENTRY_SIZE_BITS,
+ num_entries);
+- buf = buf_getblk(sb, sec);
++ buf = exfat_buf_getblk(sb, sec);
+ if (!buf)
+ goto err_out;
+ pr_debug("es->buf %p buf_off %u\n", esbuf, buf_off);
+@@ -1170,7 +1170,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+ (unsigned long long)sec);
+ memcpy(buf + off, esbuf + buf_off,
+ copy_entries << DENTRY_SIZE_BITS);
+- buf_modify(sb, sec);
++ exfat_buf_modify(sb, sec);
+ num_entries -= copy_entries;
+
+ if (num_entries) {
+@@ -1295,7 +1295,7 @@ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ if (find_location(sb, p_dir, entry, &sec, &off) != 0)
+ return NULL;
+
+- buf = buf_getblk(sb, sec);
++ buf = exfat_buf_getblk(sb, sec);
+
+ if (!buf)
+ return NULL;
+@@ -1359,7 +1359,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+ sec = byte_offset >> p_bd->sector_size_bits;
+ sec += START_SECTOR(clu);
+
+- buf = buf_getblk(sb, sec);
++ buf = exfat_buf_getblk(sb, sec);
+ if (!buf)
+ goto err_out;
+
+@@ -1457,7 +1457,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+ } else {
+ sec++;
+ }
+- buf = buf_getblk(sb, sec);
++ buf = exfat_buf_getblk(sb, sec);
+ if (!buf)
+ goto err_out;
+ off = 0;
+@@ -1649,7 +1649,7 @@ static s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_
+ return -ENOENT;
+ p_fs->fs_func->set_entry_size(ep, size);
+ p_fs->fs_func->set_entry_flag(ep, p_dir->flags);
+- buf_modify(sb, sector);
++ exfat_buf_modify(sb, sector);
+
+ update_dir_checksum(sb, &fid->dir,
+ fid->entry);
+@@ -2341,17 +2341,17 @@ void remove_file(struct inode *inode, struct chain_t *p_dir, s32 entry)
+ if (!ep)
+ return;
+
+- buf_lock(sb, sector);
++ exfat_buf_lock(sb, sector);
+
+- /* buf_lock() before call count_ext_entries() */
++ /* exfat_buf_lock() before call count_ext_entries() */
+ num_entries = fs_func->count_ext_entries(sb, p_dir, entry, ep);
+ if (num_entries < 0) {
+- buf_unlock(sb, sector);
++ exfat_buf_unlock(sb, sector);
+ return;
+ }
+ num_entries++;
+
+- buf_unlock(sb, sector);
++ exfat_buf_unlock(sb, sector);
+
+ /* (1) update the directory entry */
+ fs_func->delete_dir_entry(sb, p_dir, entry, 0, num_entries);
+@@ -2372,13 +2372,13 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ if (!epold)
+ return -ENOENT;
+
+- buf_lock(sb, sector_old);
++ exfat_buf_lock(sb, sector_old);
+
+- /* buf_lock() before call count_ext_entries() */
++ /* exfat_buf_lock() before call count_ext_entries() */
+ num_old_entries = fs_func->count_ext_entries(sb, p_dir, oldentry,
+ epold);
+ if (num_old_entries < 0) {
+- buf_unlock(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+ return -ENOENT;
+ }
+ num_old_entries++;
+@@ -2386,20 +2386,20 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ ret = get_num_entries_and_dos_name(sb, p_dir, p_uniname,
+ &num_new_entries, &dos_name);
+ if (ret) {
+- buf_unlock(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+ return ret;
+ }
+
+ if (num_old_entries < num_new_entries) {
+ newentry = find_empty_entry(inode, p_dir, num_new_entries);
+ if (newentry < 0) {
+- buf_unlock(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+ return -ENOSPC;
+ }
+
+ epnew = get_entry_in_dir(sb, p_dir, newentry, §or_new);
+ if (!epnew) {
+- buf_unlock(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+ return -ENOENT;
+ }
+
+@@ -2410,23 +2410,23 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ ATTR_ARCHIVE);
+ fid->attr |= ATTR_ARCHIVE;
+ }
+- buf_modify(sb, sector_new);
+- buf_unlock(sb, sector_old);
++ exfat_buf_modify(sb, sector_new);
++ exfat_buf_unlock(sb, sector_old);
+
+ epold = get_entry_in_dir(sb, p_dir, oldentry + 1,
+ §or_old);
+- buf_lock(sb, sector_old);
++ exfat_buf_lock(sb, sector_old);
+ epnew = get_entry_in_dir(sb, p_dir, newentry + 1,
+ §or_new);
+
+ if (!epold || !epnew) {
+- buf_unlock(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
+- buf_modify(sb, sector_new);
+- buf_unlock(sb, sector_old);
++ exfat_buf_modify(sb, sector_new);
++ exfat_buf_unlock(sb, sector_old);
+
+ ret = fs_func->init_ext_entry(sb, p_dir, newentry,
+ num_new_entries, p_uniname,
+@@ -2444,8 +2444,8 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ ATTR_ARCHIVE);
+ fid->attr |= ATTR_ARCHIVE;
+ }
+- buf_modify(sb, sector_old);
+- buf_unlock(sb, sector_old);
++ exfat_buf_modify(sb, sector_old);
++ exfat_buf_unlock(sb, sector_old);
+
+ ret = fs_func->init_ext_entry(sb, p_dir, oldentry,
+ num_new_entries, p_uniname,
+@@ -2481,13 +2481,13 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ fs_func->get_entry_clu0(epmov) == p_newdir->dir)
+ return -EINVAL;
+
+- buf_lock(sb, sector_mov);
++ exfat_buf_lock(sb, sector_mov);
+
+- /* buf_lock() before call count_ext_entries() */
++ /* exfat_buf_lock() before call count_ext_entries() */
+ num_old_entries = fs_func->count_ext_entries(sb, p_olddir, oldentry,
+ epmov);
+ if (num_old_entries < 0) {
+- buf_unlock(sb, sector_mov);
++ exfat_buf_unlock(sb, sector_mov);
+ return -ENOENT;
+ }
+ num_old_entries++;
+@@ -2495,19 +2495,19 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ ret = get_num_entries_and_dos_name(sb, p_newdir, p_uniname,
+ &num_new_entries, &dos_name);
+ if (ret) {
+- buf_unlock(sb, sector_mov);
++ exfat_buf_unlock(sb, sector_mov);
+ return ret;
+ }
+
+ newentry = find_empty_entry(inode, p_newdir, num_new_entries);
+ if (newentry < 0) {
+- buf_unlock(sb, sector_mov);
++ exfat_buf_unlock(sb, sector_mov);
+ return -ENOSPC;
+ }
+
+ epnew = get_entry_in_dir(sb, p_newdir, newentry, §or_new);
+ if (!epnew) {
+- buf_unlock(sb, sector_mov);
++ exfat_buf_unlock(sb, sector_mov);
+ return -ENOENT;
+ }
+
+@@ -2517,22 +2517,22 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ ATTR_ARCHIVE);
+ fid->attr |= ATTR_ARCHIVE;
+ }
+- buf_modify(sb, sector_new);
+- buf_unlock(sb, sector_mov);
++ exfat_buf_modify(sb, sector_new);
++ exfat_buf_unlock(sb, sector_mov);
+
+ epmov = get_entry_in_dir(sb, p_olddir, oldentry + 1,
+ §or_mov);
+- buf_lock(sb, sector_mov);
++ exfat_buf_lock(sb, sector_mov);
+ epnew = get_entry_in_dir(sb, p_newdir, newentry + 1,
+ §or_new);
+ if (!epmov || !epnew) {
+- buf_unlock(sb, sector_mov);
++ exfat_buf_unlock(sb, sector_mov);
+ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
+- buf_modify(sb, sector_new);
+- buf_unlock(sb, sector_mov);
++ exfat_buf_modify(sb, sector_new);
++ exfat_buf_unlock(sb, sector_mov);
+
+ ret = fs_func->init_ext_entry(sb, p_newdir, newentry, num_new_entries,
+ p_uniname, &dos_name);
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 3828150bca3f..4b8915098d20 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -355,7 +355,7 @@ static int ffsMountVol(struct super_block *sb)
+
+ mutex_lock(&z_mutex);
+
+- buf_init(sb);
++ exfat_buf_init(sb);
+
+ mutex_init(&p_fs->v_mutex);
+ p_fs->dev_ejected = 0;
+@@ -458,7 +458,7 @@ static int ffsUmountVol(struct super_block *sb)
+ free_alloc_bitmap(sb);
+
+ FAT_release_all(sb);
+- buf_release_all(sb);
++ exfat_buf_release_all(sb);
+
+ /* close the block device */
+ exfat_bdev_close(sb);
+@@ -468,7 +468,7 @@ static int ffsUmountVol(struct super_block *sb)
+ err = -EIO;
+ }
+
+- buf_shutdown(sb);
++ exfat_buf_shutdown(sb);
+
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -1921,7 +1921,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ if ((type != TYPE_FILE) && (type != TYPE_DIR))
+ continue;
+
+- buf_lock(sb, sector);
++ exfat_buf_lock(sb, sector);
+ dir_entry->Attr = fs_func->get_entry_attr(ep);
+
+ fs_func->get_entry_time(ep, &tm, TM_CREATE);
+@@ -1949,7 +1949,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ fs_func->get_uni_name_from_ext_entry(sb, &dir, dentry,
+ uni_name.name);
+ nls_uniname_to_cstring(sb, dir_entry->Name, &uni_name);
+- buf_unlock(sb, sector);
++ exfat_buf_unlock(sb, sector);
+
+ ep = get_entry_in_dir(sb, &clu, i + 1, NULL);
+ if (!ep) {
+@@ -3822,7 +3822,7 @@ static void exfat_debug_kill_sb(struct super_block *sb)
+ */
+ mutex_lock(&p_fs->v_mutex);
+ FAT_release_all(sb);
+- buf_release_all(sb);
++ exfat_buf_release_all(sb);
+ mutex_unlock(&p_fs->v_mutex);
+
+ invalidate_bdev(bdev);commit e5a490e03756ab07adbb736c9ecd3c34b40e0da4
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:36 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 6
+
+ Move a few more things so we can make them static and clear exfat.h out.
+ At this point, pretty much everything that can be static is static.
+ (Note: FAT_sync(), buf_sync(), and sync_alloc_bitmap() aren't called
+ anyplace, but aren't static because (a) that will toss an error and
+ (b) they probably *should* be getting called someplace
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-11-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index c41fc3ec9f29..188ea1bd7162 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -780,12 +780,6 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+ u32 type,
+ struct dentry_t **file_ep);
+ void release_entry_set(struct entry_set_cache_t *es);
+-s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es);
+-s32 write_partial_entries_in_entry_set(struct super_block *sb,
+- struct entry_set_cache_t *es,
+- struct dentry_t *ep, u32 count);
+-s32 search_deleted_or_unused_entry(struct super_block *sb,
+- struct chain_t *p_dir, s32 num_entries);
+ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ u32 type);
+ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+@@ -798,8 +792,6 @@ bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir);
+ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 *entries,
+ struct dos_name_t *p_dosname);
+-s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep,
+- u16 *uniname, s32 order);
+ u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type);
+
+ /* name resolution functions */
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 8d38f70c9726..3cc13aaaed24 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -1140,6 +1140,73 @@ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+ buf_unlock(sb, sector);
+ }
+
++static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es,
++ sector_t sec, s32 off, u32 count)
++{
++ s32 num_entries, buf_off = (off - es->offset);
++ u32 remaining_byte_in_sector, copy_entries;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ u32 clu;
++ u8 *buf, *esbuf = (u8 *)&es->__buf;
++
++ pr_debug("%s entered es %p sec %llu off %d count %d\n",
++ __func__, es, (unsigned long long)sec, off, count);
++ num_entries = count;
++
++ while (num_entries) {
++ /* white per sector base */
++ remaining_byte_in_sector = (1 << p_bd->sector_size_bits) - off;
++ copy_entries = min_t(s32,
++ remaining_byte_in_sector >> DENTRY_SIZE_BITS,
++ num_entries);
++ buf = buf_getblk(sb, sec);
++ if (!buf)
++ goto err_out;
++ pr_debug("es->buf %p buf_off %u\n", esbuf, buf_off);
++ pr_debug("copying %d entries from %p to sector %llu\n",
++ copy_entries, (esbuf + buf_off),
++ (unsigned long long)sec);
++ memcpy(buf + off, esbuf + buf_off,
++ copy_entries << DENTRY_SIZE_BITS);
++ buf_modify(sb, sec);
++ num_entries -= copy_entries;
++
++ if (num_entries) {
++ /* get next sector */
++ if (IS_LAST_SECTOR_IN_CLUSTER(sec)) {
++ clu = GET_CLUSTER_FROM_SECTOR(sec);
++ if (es->alloc_flag == 0x03) {
++ clu++;
++ } else {
++ if (FAT_read(sb, clu, &clu) == -1)
++ goto err_out;
++ }
++ sec = START_SECTOR(clu);
++ } else {
++ sec++;
++ }
++ off = 0;
++ buf_off += copy_entries << DENTRY_SIZE_BITS;
++ }
++ }
++
++ pr_debug("%s exited successfully\n", __func__);
++ return 0;
++err_out:
++ pr_debug("%s failed\n", __func__);
++ return -EINVAL;
++}
++
++/* write back all entries in entry set */
++static s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es)
++{
++ return __write_partial_entries_in_entry_set(sb, es, es->sector,
++ es->offset,
++ es->num_entries);
++}
++
+ void update_dir_checksum_with_entry_set(struct super_block *sb,
+ struct entry_set_cache_t *es)
+ {
+@@ -1421,75 +1488,8 @@ void release_entry_set(struct entry_set_cache_t *es)
+ kfree(es);
+ }
+
+-static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+- struct entry_set_cache_t *es,
+- sector_t sec, s32 off, u32 count)
+-{
+- s32 num_entries, buf_off = (off - es->offset);
+- u32 remaining_byte_in_sector, copy_entries;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+- u32 clu;
+- u8 *buf, *esbuf = (u8 *)&es->__buf;
+-
+- pr_debug("%s entered es %p sec %llu off %d count %d\n",
+- __func__, es, (unsigned long long)sec, off, count);
+- num_entries = count;
+-
+- while (num_entries) {
+- /* white per sector base */
+- remaining_byte_in_sector = (1 << p_bd->sector_size_bits) - off;
+- copy_entries = min_t(s32,
+- remaining_byte_in_sector >> DENTRY_SIZE_BITS,
+- num_entries);
+- buf = buf_getblk(sb, sec);
+- if (!buf)
+- goto err_out;
+- pr_debug("es->buf %p buf_off %u\n", esbuf, buf_off);
+- pr_debug("copying %d entries from %p to sector %llu\n",
+- copy_entries, (esbuf + buf_off),
+- (unsigned long long)sec);
+- memcpy(buf + off, esbuf + buf_off,
+- copy_entries << DENTRY_SIZE_BITS);
+- buf_modify(sb, sec);
+- num_entries -= copy_entries;
+-
+- if (num_entries) {
+- /* get next sector */
+- if (IS_LAST_SECTOR_IN_CLUSTER(sec)) {
+- clu = GET_CLUSTER_FROM_SECTOR(sec);
+- if (es->alloc_flag == 0x03) {
+- clu++;
+- } else {
+- if (FAT_read(sb, clu, &clu) == -1)
+- goto err_out;
+- }
+- sec = START_SECTOR(clu);
+- } else {
+- sec++;
+- }
+- off = 0;
+- buf_off += copy_entries << DENTRY_SIZE_BITS;
+- }
+- }
+-
+- pr_debug("%s exited successfully\n", __func__);
+- return 0;
+-err_out:
+- pr_debug("%s failed\n", __func__);
+- return -EINVAL;
+-}
+-
+-/* write back all entries in entry set */
+-s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es)
+-{
+- return __write_partial_entries_in_entry_set(sb, es, es->sector,
+- es->offset,
+- es->num_entries);
+-}
+-
+ /* search EMPTY CONTINUOUS "num_entries" entries */
+-s32 search_deleted_or_unused_entry(struct super_block *sb,
++static s32 search_deleted_or_unused_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 num_entries)
+ {
+ int i, dentry, num_empty = 0;
+@@ -1665,6 +1665,23 @@ static s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_
+ return dentry;
+ }
+
++static s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
++ s32 order)
++{
++ int i, len = 0;
++
++ for (i = 0; i < 30; i += 2) {
++ *uniname = GET16_A(ep->unicode_0_14 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++
++ *uniname = 0x0;
++ return len;
++}
++
+ /* return values of exfat_find_dir_entry()
+ * >= 0 : return dir entiry position with the name in dir
+ * -1 : (root dir, ".") it is the root dir itself
+@@ -2013,23 +2030,6 @@ static void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ release_entry_set(es);
+ }
+
+-s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
+- s32 order)
+-{
+- int i, len = 0;
+-
+- for (i = 0; i < 30; i += 2) {
+- *uniname = GET16_A(ep->unicode_0_14 + i);
+- if (*uniname == 0x0)
+- return len;
+- uniname++;
+- len++;
+- }
+-
+- *uniname = 0x0;
+- return len;
+-}
+-
+ static s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
+ {
+ s32 len;commit a78b34b89bcbb919b912fc8c0e1e964189972d87
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:35 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 5
+
+ Some more functions that can be moved and made static
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-10-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 48267dd11e9d..c41fc3ec9f29 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -764,9 +764,6 @@ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len);
+ /* allocation bitmap management functions */
+ s32 load_alloc_bitmap(struct super_block *sb);
+ void free_alloc_bitmap(struct super_block *sb);
+-s32 set_alloc_bitmap(struct super_block *sb, u32 clu);
+-s32 clr_alloc_bitmap(struct super_block *sb, u32 clu);
+-u32 test_alloc_bitmap(struct super_block *sb, u32 clu);
+ void sync_alloc_bitmap(struct super_block *sb);
+
+ /* upcase table management functions */
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 24700b251acb..8d38f70c9726 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -156,6 +156,97 @@ static s32 clear_cluster(struct super_block *sb, u32 clu)
+ return ret;
+ }
+
++static s32 set_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, b;
++ sector_t sector;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ i = clu >> (p_bd->sector_size_bits + 3);
++ b = clu & ((p_bd->sector_size << 3) - 1);
++
++ sector = START_SECTOR(p_fs->map_clu) + i;
++
++ exfat_bitmap_set((u8 *)p_fs->vol_amap[i]->b_data, b);
++
++ return sector_write(sb, sector, p_fs->vol_amap[i], 0);
++}
++
++static s32 clr_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, b;
++ sector_t sector;
++#ifdef CONFIG_EXFAT_DISCARD
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct exfat_mount_options *opts = &sbi->options;
++ int ret;
++#endif /* CONFIG_EXFAT_DISCARD */
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ i = clu >> (p_bd->sector_size_bits + 3);
++ b = clu & ((p_bd->sector_size << 3) - 1);
++
++ sector = START_SECTOR(p_fs->map_clu) + i;
++
++ exfat_bitmap_clear((u8 *)p_fs->vol_amap[i]->b_data, b);
++
++ return sector_write(sb, sector, p_fs->vol_amap[i], 0);
++
++#ifdef CONFIG_EXFAT_DISCARD
++ if (opts->discard) {
++ ret = sb_issue_discard(sb, START_SECTOR(clu),
++ (1 << p_fs->sectors_per_clu_bits),
++ GFP_NOFS, 0);
++ if (ret == -EOPNOTSUPP) {
++ pr_warn("discard not supported by device, disabling");
++ opts->discard = 0;
++ }
++ }
++#endif /* CONFIG_EXFAT_DISCARD */
++}
++
++static u32 test_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, map_i, map_b;
++ u32 clu_base, clu_free;
++ u8 k, clu_mask;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ clu_base = (clu & ~(0x7)) + 2;
++ clu_mask = (1 << (clu - clu_base + 2)) - 1;
++
++ map_i = clu >> (p_bd->sector_size_bits + 3);
++ map_b = (clu >> 3) & p_bd->sector_size_mask;
++
++ for (i = 2; i < p_fs->num_clusters; i += 8) {
++ k = *(((u8 *)p_fs->vol_amap[map_i]->b_data) + map_b);
++ if (clu_mask > 0) {
++ k |= clu_mask;
++ clu_mask = 0;
++ }
++ if (k < 0xFF) {
++ clu_free = clu_base + free_bit[k];
++ if (clu_free < p_fs->num_clusters)
++ return clu_free;
++ }
++ clu_base += 8;
++
++ if (((++map_b) >= p_bd->sector_size) ||
++ (clu_base >= p_fs->num_clusters)) {
++ if ((++map_i) >= p_fs->map_sectors) {
++ clu_base = 2;
++ map_i = 0;
++ }
++ map_b = 0;
++ }
++ }
++
++ return CLUSTER_32(~0);
++}
++
+ static s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ struct chain_t *p_chain)
+ {
+@@ -468,97 +559,6 @@ void free_alloc_bitmap(struct super_block *sb)
+ p_fs->vol_amap = NULL;
+ }
+
+-s32 set_alloc_bitmap(struct super_block *sb, u32 clu)
+-{
+- int i, b;
+- sector_t sector;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+-
+- i = clu >> (p_bd->sector_size_bits + 3);
+- b = clu & ((p_bd->sector_size << 3) - 1);
+-
+- sector = START_SECTOR(p_fs->map_clu) + i;
+-
+- exfat_bitmap_set((u8 *)p_fs->vol_amap[i]->b_data, b);
+-
+- return sector_write(sb, sector, p_fs->vol_amap[i], 0);
+-}
+-
+-s32 clr_alloc_bitmap(struct super_block *sb, u32 clu)
+-{
+- int i, b;
+- sector_t sector;
+-#ifdef CONFIG_EXFAT_DISCARD
+- struct exfat_sb_info *sbi = EXFAT_SB(sb);
+- struct exfat_mount_options *opts = &sbi->options;
+- int ret;
+-#endif /* CONFIG_EXFAT_DISCARD */
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+-
+- i = clu >> (p_bd->sector_size_bits + 3);
+- b = clu & ((p_bd->sector_size << 3) - 1);
+-
+- sector = START_SECTOR(p_fs->map_clu) + i;
+-
+- exfat_bitmap_clear((u8 *)p_fs->vol_amap[i]->b_data, b);
+-
+- return sector_write(sb, sector, p_fs->vol_amap[i], 0);
+-
+-#ifdef CONFIG_EXFAT_DISCARD
+- if (opts->discard) {
+- ret = sb_issue_discard(sb, START_SECTOR(clu),
+- (1 << p_fs->sectors_per_clu_bits),
+- GFP_NOFS, 0);
+- if (ret == -EOPNOTSUPP) {
+- pr_warn("discard not supported by device, disabling");
+- opts->discard = 0;
+- }
+- }
+-#endif /* CONFIG_EXFAT_DISCARD */
+-}
+-
+-u32 test_alloc_bitmap(struct super_block *sb, u32 clu)
+-{
+- int i, map_i, map_b;
+- u32 clu_base, clu_free;
+- u8 k, clu_mask;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+-
+- clu_base = (clu & ~(0x7)) + 2;
+- clu_mask = (1 << (clu - clu_base + 2)) - 1;
+-
+- map_i = clu >> (p_bd->sector_size_bits + 3);
+- map_b = (clu >> 3) & p_bd->sector_size_mask;
+-
+- for (i = 2; i < p_fs->num_clusters; i += 8) {
+- k = *(((u8 *)p_fs->vol_amap[map_i]->b_data) + map_b);
+- if (clu_mask > 0) {
+- k |= clu_mask;
+- clu_mask = 0;
+- }
+- if (k < 0xFF) {
+- clu_free = clu_base + free_bit[k];
+- if (clu_free < p_fs->num_clusters)
+- return clu_free;
+- }
+- clu_base += 8;
+-
+- if (((++map_b) >= p_bd->sector_size) ||
+- (clu_base >= p_fs->num_clusters)) {
+- if ((++map_i) >= p_fs->map_sectors) {
+- clu_base = 2;
+- map_i = 0;
+- }
+- map_b = 0;
+- }
+- }
+-
+- return CLUSTER_32(~0);
+-}
+-
+ void sync_alloc_bitmap(struct super_block *sb)
+ {
+ int i;commit 9435fa8d0601b22d30a6e0d0d78a28aca5e1a7b7
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:34 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 4
+
+ Relocating these functions to before first use lets us make them static
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-9-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 407dbb017c5f..48267dd11e9d 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -775,10 +775,6 @@ void free_upcase_table(struct super_block *sb);
+
+ /* dir entry management functions */
+ struct timestamp_t *tm_current(struct timestamp_t *tm);
+-void init_file_entry(struct file_dentry_t *ep, u32 type);
+-void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
+- u64 size);
+-void init_name_entry(struct name_dentry_t *ep, u16 *uniname);
+
+ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, sector_t *sector);
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 3ea51d12c38d..24700b251acb 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -971,6 +971,45 @@ static void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *t
+ }
+ }
+
++static void init_file_entry(struct file_dentry_t *ep, u32 type)
++{
++ struct timestamp_t tm, *tp;
++
++ exfat_set_entry_type((struct dentry_t *)ep, type);
++
++ tp = tm_current(&tm);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_CREATE);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_MODIFY);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_ACCESS);
++ ep->create_time_ms = 0;
++ ep->modify_time_ms = 0;
++ ep->access_time_ms = 0;
++}
++
++static void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu, u64 size)
++{
++ exfat_set_entry_type((struct dentry_t *)ep, TYPE_STREAM);
++ ep->flags = flags;
++ SET32_A(ep->start_clu, start_clu);
++ SET64_A(ep->valid_size, size);
++ SET64_A(ep->size, size);
++}
++
++static void init_name_entry(struct name_dentry_t *ep, u16 *uniname)
++{
++ int i;
++
++ exfat_set_entry_type((struct dentry_t *)ep, TYPE_EXTEND);
++ ep->flags = 0x0;
++
++ for (i = 0; i < 30; i++, i++) {
++ SET16_A(ep->unicode_0_14 + i, *uniname);
++ if (*uniname == 0x0)
++ break;
++ uniname++;
++ }
++}
++
+ static s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, u32 type, u32 start_clu, u64 size)
+ {
+@@ -1047,45 +1086,6 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-void init_file_entry(struct file_dentry_t *ep, u32 type)
+-{
+- struct timestamp_t tm, *tp;
+-
+- exfat_set_entry_type((struct dentry_t *)ep, type);
+-
+- tp = tm_current(&tm);
+- exfat_set_entry_time((struct dentry_t *)ep, tp, TM_CREATE);
+- exfat_set_entry_time((struct dentry_t *)ep, tp, TM_MODIFY);
+- exfat_set_entry_time((struct dentry_t *)ep, tp, TM_ACCESS);
+- ep->create_time_ms = 0;
+- ep->modify_time_ms = 0;
+- ep->access_time_ms = 0;
+-}
+-
+-void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu, u64 size)
+-{
+- exfat_set_entry_type((struct dentry_t *)ep, TYPE_STREAM);
+- ep->flags = flags;
+- SET32_A(ep->start_clu, start_clu);
+- SET64_A(ep->valid_size, size);
+- SET64_A(ep->size, size);
+-}
+-
+-void init_name_entry(struct name_dentry_t *ep, u16 *uniname)
+-{
+- int i;
+-
+- exfat_set_entry_type((struct dentry_t *)ep, TYPE_EXTEND);
+- ep->flags = 0x0;
+-
+- for (i = 0; i < 30; i++, i++) {
+- SET16_A(ep->unicode_0_14 + i, *uniname);
+- if (*uniname == 0x0)
+- break;
+- uniname++;
+- }
+-}
+-
+ static void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 order, s32 num_entries)
+ {commit 388cd66808d52cd761c2885defd22f7f52ce4c52
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:33 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 3
+
+ These functions are only used in the local file, make them static
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-8-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 5044523ccb97..407dbb017c5f 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -758,8 +758,6 @@ void fs_set_vol_flags(struct super_block *sb, u32 new_flag);
+ void fs_error(struct super_block *sb);
+
+ /* cluster management functions */
+-s32 clear_cluster(struct super_block *sb, u32 clu);
+-u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain);
+ s32 count_num_clusters(struct super_block *sb, struct chain_t *dir);
+ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len);
+
+@@ -782,8 +780,6 @@ void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
+ u64 size);
+ void init_name_entry(struct name_dentry_t *ep, u16 *uniname);
+
+-s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+- sector_t *sector, s32 *offset);
+ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, sector_t *sector);
+ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+@@ -797,8 +793,6 @@ s32 write_partial_entries_in_entry_set(struct super_block *sb,
+ struct dentry_t *ep, u32 count);
+ s32 search_deleted_or_unused_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 num_entries);
+-s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir,
+- s32 num_entries);
+ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ u32 type);
+ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 5a01fc25f31d..3ea51d12c38d 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -125,7 +125,7 @@ void fs_error(struct super_block *sb)
+ * Cluster Management Functions
+ */
+
+-s32 clear_cluster(struct super_block *sb, u32 clu)
++static s32 clear_cluster(struct super_block *sb, u32 clu)
+ {
+ sector_t s, n;
+ s32 ret = 0;
+@@ -294,7 +294,7 @@ static void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ p_fs->used_clusters -= num_clusters;
+ }
+
+-u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain)
++static u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain)
+ {
+ u32 clu, next;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+@@ -1186,7 +1186,7 @@ static s32 _walk_fat_chain(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
++static s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ sector_t *sector, s32 *offset)
+ {
+ s32 off, ret;
+@@ -1583,7 +1583,7 @@ s32 search_deleted_or_unused_entry(struct super_block *sb,
+ return -1;
+ }
+
+-s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries)
++static s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries)
+ {
+ s32 ret, dentry;
+ u32 last_clu;
+ commit ed5916c1e8db99eeab6cbbf7cba150a5cee90c0f
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:32 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 2
+
+ Rename all the bdev_* to exfat_bdev_*
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-7-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 5efba3d4259b..5044523ccb97 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -842,13 +842,13 @@ int multi_sector_read(struct super_block *sb, sector_t sec,
+ int multi_sector_write(struct super_block *sb, sector_t sec,
+ struct buffer_head *bh, s32 num_secs, bool sync);
+
+-void bdev_open(struct super_block *sb);
+-void bdev_close(struct super_block *sb);
+-int bdev_read(struct super_block *sb, sector_t secno,
++void exfat_bdev_open(struct super_block *sb);
++void exfat_bdev_close(struct super_block *sb);
++int exfat_bdev_read(struct super_block *sb, sector_t secno,
+ struct buffer_head **bh, u32 num_secs, bool read);
+-int bdev_write(struct super_block *sb, sector_t secno,
++int exfat_bdev_write(struct super_block *sb, sector_t secno,
+ struct buffer_head *bh, u32 num_secs, bool sync);
+-int bdev_sync(struct super_block *sb);
++int exfat_bdev_sync(struct super_block *sb);
+
+ extern const u8 uni_upcase[];
+ #endif /* _EXFAT_H */
+diff --git a/drivers/staging/exfat/exfat_blkdev.c b/drivers/staging/exfat/exfat_blkdev.c
+index 0abae041f632..7bcd98b13109 100644
+--- a/drivers/staging/exfat/exfat_blkdev.c
++++ b/drivers/staging/exfat/exfat_blkdev.c
+@@ -8,7 +8,7 @@
+ #include <linux/fs.h>
+ #include "exfat.h"
+
+-void bdev_open(struct super_block *sb)
++void exfat_bdev_open(struct super_block *sb)
+ {
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+@@ -23,14 +23,14 @@ void bdev_open(struct super_block *sb)
+ p_bd->opened = true;
+ }
+
+-void bdev_close(struct super_block *sb)
++void exfat_bdev_close(struct super_block *sb)
+ {
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+ p_bd->opened = false;
+ }
+
+-int bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
++int exfat_bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
+ u32 num_secs, bool read)
+ {
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+@@ -65,7 +65,7 @@ int bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
+ return -EIO;
+ }
+
+-int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
++int exfat_bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+ u32 num_secs, bool sync)
+ {
+ s32 count;
+@@ -118,7 +118,7 @@ int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+ return -EIO;
+ }
+
+-int bdev_sync(struct super_block *sb)
++int exfat_bdev_sync(struct super_block *sb)
+ {
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+ #ifdef CONFIG_EXFAT_KERNEL_DEBUG
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 2dc07e81bad0..5a01fc25f31d 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -2569,7 +2569,7 @@ int sector_read(struct super_block *sb, sector_t sec, struct buffer_head **bh,
+ }
+
+ if (!p_fs->dev_ejected) {
+- ret = bdev_read(sb, sec, bh, 1, read);
++ ret = exfat_bdev_read(sb, sec, bh, 1, read);
+ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+@@ -2598,7 +2598,7 @@ int sector_write(struct super_block *sb, sector_t sec, struct buffer_head *bh,
+ }
+
+ if (!p_fs->dev_ejected) {
+- ret = bdev_write(sb, sec, bh, 1, sync);
++ ret = exfat_bdev_write(sb, sec, bh, 1, sync);
+ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+@@ -2621,7 +2621,7 @@ int multi_sector_read(struct super_block *sb, sector_t sec,
+ }
+
+ if (!p_fs->dev_ejected) {
+- ret = bdev_read(sb, sec, bh, num_secs, read);
++ ret = exfat_bdev_read(sb, sec, bh, num_secs, read);
+ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+@@ -2649,7 +2649,7 @@ int multi_sector_write(struct super_block *sb, sector_t sec,
+ }
+
+ if (!p_fs->dev_ejected) {
+- ret = bdev_write(sb, sec, bh, num_secs, sync);
++ ret = exfat_bdev_write(sb, sec, bh, num_secs, sync);
+ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 259cb5a7bd81..3828150bca3f 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -289,7 +289,7 @@ static DEFINE_MUTEX(z_mutex);
+ static inline void fs_sync(struct super_block *sb, bool do_sync)
+ {
+ if (do_sync)
+- bdev_sync(sb);
++ exfat_bdev_sync(sb);
+ }
+
+ /*
+@@ -361,7 +361,7 @@ static int ffsMountVol(struct super_block *sb)
+ p_fs->dev_ejected = 0;
+
+ /* open the block device */
+- bdev_open(sb);
++ exfat_bdev_open(sb);
+
+ if (p_bd->sector_size < sb->s_blocksize) {
+ printk(KERN_INFO "EXFAT: maont failed - sector size %d less than blocksize %ld\n",
+@@ -385,7 +385,7 @@ static int ffsMountVol(struct super_block *sb)
+ /* check the validity of PBR */
+ if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
+ brelse(tmp_bh);
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+ ret = -EFSCORRUPTED;
+ goto out;
+ }
+@@ -407,26 +407,26 @@ static int ffsMountVol(struct super_block *sb)
+ brelse(tmp_bh);
+
+ if (ret) {
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+ goto out;
+ }
+
+ ret = load_alloc_bitmap(sb);
+ if (ret) {
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+ goto out;
+ }
+ ret = load_upcase_table(sb);
+ if (ret) {
+ free_alloc_bitmap(sb);
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+ goto out;
+ }
+
+ if (p_fs->dev_ejected) {
+ free_upcase_table(sb);
+ free_alloc_bitmap(sb);
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+ ret = -EIO;
+ goto out;
+ }
+@@ -461,7 +461,7 @@ static int ffsUmountVol(struct super_block *sb)
+ buf_release_all(sb);
+
+ /* close the block device */
+- bdev_close(sb);
++ exfat_bdev_close(sb);
+
+ if (p_fs->dev_ejected) {
+ pr_info("[EXFAT] unmounted with media errors. Device is already ejected.\n");commit 19e2bfe6ed135ed45d6adb6860181cad49dbb90e
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:31 2019 -0500
+
+ staging: exfat: Clean up the namespace pollution part 1
+
+ Everything referenced in the struct fs_func exfat_fs_func is located
+ in that same .c file. Make them static and remove from exfat.h
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-6-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 470e409ef536..5efba3d4259b 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -759,13 +759,8 @@ void fs_error(struct super_block *sb);
+
+ /* cluster management functions */
+ s32 clear_cluster(struct super_block *sb, u32 clu);
+-s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+- struct chain_t *p_chain);
+-void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+- s32 do_relse);
+ u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain);
+ s32 count_num_clusters(struct super_block *sb, struct chain_t *dir);
+-s32 exfat_count_used_clusters(struct super_block *sb);
+ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len);
+
+ /* allocation bitmap management functions */
+@@ -781,29 +776,11 @@ s32 load_upcase_table(struct super_block *sb);
+ void free_upcase_table(struct super_block *sb);
+
+ /* dir entry management functions */
+-u32 exfat_get_entry_type(struct dentry_t *p_entry);
+-void exfat_set_entry_type(struct dentry_t *p_entry, u32 type);
+-u32 exfat_get_entry_attr(struct dentry_t *p_entry);
+-void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr);
+-u8 exfat_get_entry_flag(struct dentry_t *p_entry);
+-void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flag);
+-u32 exfat_get_entry_clu0(struct dentry_t *p_entry);
+-void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu);
+-u64 exfat_get_entry_size(struct dentry_t *p_entry);
+-void exfat_set_entry_size(struct dentry_t *p_entry, u64 size);
+ struct timestamp_t *tm_current(struct timestamp_t *tm);
+-void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode);
+-void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode);
+-s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, u32 type, u32 start_clu, u64 size);
+ void init_file_entry(struct file_dentry_t *ep, u32 type);
+ void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
+ u64 size);
+ void init_name_entry(struct name_dentry_t *ep, u16 *uniname);
+-void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 order, s32 num_entries);
+
+ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ sector_t *sector, s32 *offset);
+@@ -822,11 +799,6 @@ s32 search_deleted_or_unused_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 num_entries);
+ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir,
+ s32 num_entries);
+-s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- struct uni_name_t *p_uniname, s32 num_entries,
+- struct dos_name_t *p_dosname, u32 type);
+-s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, struct dentry_t *p_entry);
+ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ u32 type);
+ void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
+@@ -839,12 +811,8 @@ bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir);
+ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 *entries,
+ struct dos_name_t *p_dosname);
+-void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+- struct chain_t *p_dir, s32 entry,
+- u16 *uniname);
+ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep,
+ u16 *uniname, s32 order);
+-s32 exfat_calc_num_entries(struct uni_name_t *p_uniname);
+ u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type);
+
+ /* name resolution functions */
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index c3454e883e3c..2dc07e81bad0 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -156,7 +156,7 @@ s32 clear_cluster(struct super_block *sb, u32 clu)
+ return ret;
+ }
+
+-s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
++static s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ struct chain_t *p_chain)
+ {
+ s32 num_clusters = 0;
+@@ -235,7 +235,7 @@ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ return num_clusters;
+ }
+
+-void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
++static void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ s32 do_relse)
+ {
+ s32 num_clusters = 0;
+@@ -341,7 +341,7 @@ s32 count_num_clusters(struct super_block *sb, struct chain_t *p_chain)
+ return count;
+ }
+
+-s32 exfat_count_used_clusters(struct super_block *sb)
++static s32 exfat_count_used_clusters(struct super_block *sb)
+ {
+ int i, map_i, map_b, count = 0;
+ u8 k;
+@@ -785,7 +785,7 @@ void free_upcase_table(struct super_block *sb)
+ * Directory Entry Management Functions
+ */
+
+-u32 exfat_get_entry_type(struct dentry_t *p_entry)
++static u32 exfat_get_entry_type(struct dentry_t *p_entry)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+
+@@ -830,7 +830,7 @@ u32 exfat_get_entry_type(struct dentry_t *p_entry)
+ return TYPE_BENIGN_SEC;
+ }
+
+-void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
++static void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+
+@@ -860,56 +860,56 @@ void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
+ }
+ }
+
+-u32 exfat_get_entry_attr(struct dentry_t *p_entry)
++static u32 exfat_get_entry_attr(struct dentry_t *p_entry)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+
+ return (u32)GET16_A(ep->attr);
+ }
+
+-void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
++static void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+
+ SET16_A(ep->attr, (u16)attr);
+ }
+
+-u8 exfat_get_entry_flag(struct dentry_t *p_entry)
++static u8 exfat_get_entry_flag(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+ return ep->flags;
+ }
+
+-void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
++static void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+ ep->flags = flags;
+ }
+
+-u32 exfat_get_entry_clu0(struct dentry_t *p_entry)
++static u32 exfat_get_entry_clu0(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+ return GET32_A(ep->start_clu);
+ }
+
+-void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
++static void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+ SET32_A(ep->start_clu, start_clu);
+ }
+
+-u64 exfat_get_entry_size(struct dentry_t *p_entry)
++static u64 exfat_get_entry_size(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+ return GET64_A(ep->valid_size);
+ }
+
+-void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
++static void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+
+@@ -917,7 +917,7 @@ void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
+ SET64_A(ep->size, size);
+ }
+
+-void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++static void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode)
+ {
+ u16 t = 0x00, d = 0x21;
+@@ -946,7 +946,7 @@ void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ tp->year = (d >> 9);
+ }
+
+-void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++static void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode)
+ {
+ u16 t, d;
+@@ -971,7 +971,7 @@ void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ }
+ }
+
+-s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++static s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, u32 type, u32 start_clu, u64 size)
+ {
+ sector_t sector;
+@@ -1086,7 +1086,7 @@ void init_name_entry(struct name_dentry_t *ep, u16 *uniname)
+ }
+ }
+
+-void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++static void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 order, s32 num_entries)
+ {
+ int i;
+@@ -1670,7 +1670,7 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ * -1 : (root dir, ".") it is the root dir itself
+ * -2 : entry with the name does not exist
+ */
+-s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++static s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 num_entries,
+ struct dos_name_t *p_dosname, u32 type)
+ {
+@@ -1813,7 +1813,7 @@ s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ return -2;
+ }
+
+-s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
++static s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, struct dentry_t *p_entry)
+ {
+ int i, count = 0;
+@@ -1976,7 +1976,7 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
++static void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 entry,
+ u16 *uniname)
+ {
+@@ -2030,7 +2030,7 @@ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
+ return len;
+ }
+
+-s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
++static s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
+ {
+ s32 len;
+ commit 35a829c1b797d1a927bf54b6a958e154eb248026
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:30 2019 -0500
+
+ staging: exfat: Remove FAT/VFAT mount support, part 4
+
+ The code simplification from the previous patch rendered a few more
+ routines unreferenced, so heave them over the side as well.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-5-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 9ea865f607af..470e409ef536 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -729,14 +729,7 @@ static inline struct exfat_inode_info *EXFAT_I(struct inode *inode)
+
+ /* NLS management function */
+ u16 nls_upper(struct super_block *sb, u16 a);
+-int nls_dosname_cmp(struct super_block *sb, u8 *a, u8 *b);
+ int nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b);
+-void nls_uniname_to_dosname(struct super_block *sb,
+- struct dos_name_t *p_dosname,
+- struct uni_name_t *p_uniname, bool *p_lossy);
+-void nls_dosname_to_uniname(struct super_block *sb,
+- struct uni_name_t *p_uniname,
+- struct dos_name_t *p_dosname);
+ void nls_uniname_to_cstring(struct super_block *sb, u8 *p_cstring,
+ struct uni_name_t *p_uniname);
+ void nls_cstring_to_uniname(struct super_block *sb,
+@@ -805,10 +798,6 @@ void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode);
+ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, u32 type, u32 start_clu, u64 size);
+-s32 exfat_init_ext_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 num_entries,
+- struct uni_name_t *p_uniname,
+- struct dos_name_t *p_dosname);
+ void init_file_entry(struct file_dentry_t *ep, u32 type);
+ void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
+ u64 size);
+@@ -850,25 +839,17 @@ bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir);
+ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 *entries,
+ struct dos_name_t *p_dosname);
+-void get_uni_name_from_dos_entry(struct super_block *sb,
+- struct dos_dentry_t *ep,
+- struct uni_name_t *p_uniname, u8 mode);
+ void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 entry,
+ u16 *uniname);
+ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep,
+ u16 *uniname, s32 order);
+-s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+- struct dos_name_t *p_dosname);
+-void fat_attach_count_to_dos_name(u8 *dosname, s32 count);
+-s32 fat_calc_num_entries(struct uni_name_t *p_uniname);
+ s32 exfat_calc_num_entries(struct uni_name_t *p_uniname);
+ u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type);
+
+ /* name resolution functions */
+ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname);
+-s32 resolve_name(u8 *name, u8 **arg);
+
+ /* file operation functions */
+ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 77b826dfdeda..c3454e883e3c 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -1976,21 +1976,6 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-void get_uni_name_from_dos_entry(struct super_block *sb,
+- struct dos_dentry_t *ep,
+- struct uni_name_t *p_uniname, u8 mode)
+-{
+- struct dos_name_t dos_name;
+-
+- if (mode == 0x0)
+- dos_name.name_case = 0x0;
+- else
+- dos_name.name_case = ep->lcase;
+-
+- memcpy(dos_name.name, ep->name, DOS_NAME_LENGTH);
+- nls_dosname_to_uniname(sb, p_uniname, &dos_name);
+-}
+-
+ void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 entry,
+ u16 *uniname)
+@@ -2045,128 +2030,6 @@ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
+ return len;
+ }
+
+-s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+- struct dos_name_t *p_dosname)
+-{
+- int i, j, count = 0;
+- bool count_begin = false;
+- s32 dentries_per_clu;
+- u32 type;
+- u8 bmap[128/* 1 ~ 1023 */];
+- struct chain_t clu;
+- struct dos_dentry_t *ep;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- memset(bmap, 0, sizeof(bmap));
+- exfat_bitmap_set(bmap, 0);
+-
+- if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
+- dentries_per_clu = p_fs->dentries_in_root;
+- else
+- dentries_per_clu = p_fs->dentries_per_clu;
+-
+- clu.dir = p_dir->dir;
+- clu.flags = p_dir->flags;
+-
+- while (clu.dir != CLUSTER_32(~0)) {
+- if (p_fs->dev_ejected)
+- break;
+-
+- for (i = 0; i < dentries_per_clu; i++) {
+- ep = (struct dos_dentry_t *)get_entry_in_dir(sb, &clu,
+- i, NULL);
+- if (!ep)
+- return -ENOENT;
+-
+- type = p_fs->fs_func->get_entry_type((struct dentry_t *)
+- ep);
+-
+- if (type == TYPE_UNUSED)
+- break;
+- if ((type != TYPE_FILE) && (type != TYPE_DIR))
+- continue;
+-
+- count = 0;
+- count_begin = false;
+-
+- for (j = 0; j < 8; j++) {
+- if (ep->name[j] == ' ')
+- break;
+-
+- if (ep->name[j] == '~') {
+- count_begin = true;
+- } else if (count_begin) {
+- if ((ep->name[j] >= '0') &&
+- (ep->name[j] <= '9')) {
+- count = count * 10 +
+- (ep->name[j] - '0');
+- } else {
+- count = 0;
+- count_begin = false;
+- }
+- }
+- }
+-
+- if ((count > 0) && (count < 1024))
+- exfat_bitmap_set(bmap, count);
+- }
+-
+- if (p_dir->dir == CLUSTER_32(0))
+- break; /* FAT16 root_dir */
+-
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return -EIO;
+- }
+-
+- count = 0;
+- for (i = 0; i < 128; i++) {
+- if (bmap[i] != 0xFF) {
+- for (j = 0; j < 8; j++) {
+- if (exfat_bitmap_test(&bmap[i], j) == 0) {
+- count = (i << 3) + j;
+- break;
+- }
+- }
+- if (count != 0)
+- break;
+- }
+- }
+-
+- if ((count == 0) || (count >= 1024))
+- return -EEXIST;
+- fat_attach_count_to_dos_name(p_dosname->name, count);
+-
+- /* Now dos_name has DOS~????.EXT */
+- return 0;
+-}
+-
+-void fat_attach_count_to_dos_name(u8 *dosname, s32 count)
+-{
+- int i, j, length;
+- char str_count[6];
+-
+- snprintf(str_count, sizeof(str_count), "~%d", count);
+- length = strlen(str_count);
+-
+- i = 0;
+- j = 0;
+- while (j <= (8 - length)) {
+- i = j;
+- if (dosname[j] == ' ')
+- break;
+- if (dosname[j] & 0x80)
+- j += 2;
+- else
+- j++;
+- }
+-
+- for (j = 0; j < length; i++, j++)
+- dosname[i] = (u8)str_count[j];
+-
+- if (i == 7)
+- dosname[7] = ' ';
+-}
+-
+ s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
+ {
+ s32 len;
+diff --git a/drivers/staging/exfat/exfat_nls.c b/drivers/staging/exfat/exfat_nls.c
+index a5c4b68925fb..91e8b0c4dce7 100644
+--- a/drivers/staging/exfat/exfat_nls.c
++++ b/drivers/staging/exfat/exfat_nls.c
+@@ -7,13 +7,6 @@
+ #include <linux/nls.h>
+ #include "exfat.h"
+
+-static u16 bad_dos_chars[] = {
+- /* + , ; = [ ] */
+- 0x002B, 0x002C, 0x003B, 0x003D, 0x005B, 0x005D,
+- 0xFF0B, 0xFF0C, 0xFF1B, 0xFF1D, 0xFF3B, 0xFF3D,
+- 0
+-};
+-
+ static u16 bad_uni_chars[] = {
+ /* " * / : < > ? \ | */
+ 0x0022, 0x002A, 0x002F, 0x003A,
+@@ -96,11 +89,6 @@ static u16 *nls_wstrchr(u16 *str, u16 wchar)
+ return NULL;
+ }
+
+-int nls_dosname_cmp(struct super_block *sb, u8 *a, u8 *b)
+-{
+- return strncmp(a, b, DOS_NAME_LENGTH);
+-}
+-
+ int nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b)
+ {
+ int i;
+@@ -114,186 +102,6 @@ int nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b)
+ return 0;
+ }
+
+-void nls_uniname_to_dosname(struct super_block *sb,
+- struct dos_name_t *p_dosname,
+- struct uni_name_t *p_uniname, bool *p_lossy)
+-{
+- int i, j, len;
+- bool lossy = false;
+- u8 buf[MAX_CHARSET_SIZE];
+- u8 lower = 0, upper = 0;
+- u8 *dosname = p_dosname->name;
+- u16 *uniname = p_uniname->name;
+- u16 *p, *last_period;
+- struct nls_table *nls = EXFAT_SB(sb)->nls_disk;
+-
+- for (i = 0; i < DOS_NAME_LENGTH; i++)
+- *(dosname + i) = ' ';
+-
+- if (!nls_uniname_cmp(sb, uniname, (u16 *)UNI_CUR_DIR_NAME)) {
+- *(dosname) = '.';
+- p_dosname->name_case = 0x0;
+- if (p_lossy)
+- *p_lossy = false;
+- return;
+- }
+-
+- if (!nls_uniname_cmp(sb, uniname, (u16 *)UNI_PAR_DIR_NAME)) {
+- *(dosname) = '.';
+- *(dosname + 1) = '.';
+- p_dosname->name_case = 0x0;
+- if (p_lossy)
+- *p_lossy = false;
+- return;
+- }
+-
+- /* search for the last embedded period */
+- last_period = NULL;
+- for (p = uniname; *p; p++) {
+- if (*p == (u16)'.')
+- last_period = p;
+- }
+-
+- i = 0;
+- while (i < DOS_NAME_LENGTH) {
+- if (i == 8) {
+- if (!last_period)
+- break;
+-
+- if (uniname <= last_period) {
+- if (uniname < last_period)
+- lossy = true;
+- uniname = last_period + 1;
+- }
+- }
+-
+- if (*uniname == (u16)'\0') {
+- break;
+- } else if (*uniname == (u16)' ') {
+- lossy = true;
+- } else if (*uniname == (u16)'.') {
+- if (uniname < last_period)
+- lossy = true;
+- else
+- i = 8;
+- } else if (nls_wstrchr(bad_dos_chars, *uniname)) {
+- lossy = true;
+- *(dosname + i) = '_';
+- i++;
+- } else {
+- len = convert_uni_to_ch(nls, buf, *uniname, &lossy);
+-
+- if (len > 1) {
+- if ((i >= 8) && ((i + len) > DOS_NAME_LENGTH))
+- break;
+-
+- if ((i < 8) && ((i + len) > 8)) {
+- i = 8;
+- continue;
+- }
+-
+- lower = 0xFF;
+-
+- for (j = 0; j < len; j++, i++)
+- *(dosname + i) = *(buf + j);
+- } else { /* len == 1 */
+- if ((*buf >= 'a') && (*buf <= 'z')) {
+- *(dosname + i) = *buf - ('a' - 'A');
+-
+- if (i < 8)
+- lower |= 0x08;
+- else
+- lower |= 0x10;
+- } else if ((*buf >= 'A') && (*buf <= 'Z')) {
+- *(dosname + i) = *buf;
+-
+- if (i < 8)
+- upper |= 0x08;
+- else
+- upper |= 0x10;
+- } else {
+- *(dosname + i) = *buf;
+- }
+- i++;
+- }
+- }
+-
+- uniname++;
+- }
+-
+- if (*dosname == 0xE5)
+- *dosname = 0x05;
+-
+- if (*uniname != 0x0)
+- lossy = true;
+-
+- if (upper & lower)
+- p_dosname->name_case = 0xFF;
+- else
+- p_dosname->name_case = lower;
+-
+- if (p_lossy)
+- *p_lossy = lossy;
+-}
+-
+-void nls_dosname_to_uniname(struct super_block *sb,
+- struct uni_name_t *p_uniname,
+- struct dos_name_t *p_dosname)
+-{
+- int i = 0, j, n = 0;
+- u8 buf[DOS_NAME_LENGTH + 2];
+- u8 *dosname = p_dosname->name;
+- u16 *uniname = p_uniname->name;
+- struct nls_table *nls = EXFAT_SB(sb)->nls_disk;
+-
+- if (*dosname == 0x05) {
+- *buf = 0xE5;
+- i++;
+- n++;
+- }
+-
+- for (; i < 8; i++, n++) {
+- if (*(dosname + i) == ' ')
+- break;
+-
+- if ((*(dosname + i) >= 'A') && (*(dosname + i) <= 'Z') &&
+- (p_dosname->name_case & 0x08))
+- *(buf + n) = *(dosname + i) + ('a' - 'A');
+- else
+- *(buf + n) = *(dosname + i);
+- }
+- if (*(dosname + 8) != ' ') {
+- *(buf + n) = '.';
+- n++;
+- }
+-
+- for (i = 8; i < DOS_NAME_LENGTH; i++, n++) {
+- if (*(dosname + i) == ' ')
+- break;
+-
+- if ((*(dosname + i) >= 'A') && (*(dosname + i) <= 'Z') &&
+- (p_dosname->name_case & 0x10))
+- *(buf + n) = *(dosname + i) + ('a' - 'A');
+- else
+- *(buf + n) = *(dosname + i);
+- }
+- *(buf + n) = '\0';
+-
+- i = 0;
+- j = 0;
+- while (j < (MAX_NAME_LENGTH - 1)) {
+- if (*(buf + i) == '\0')
+- break;
+-
+- i += convert_ch_to_uni(nls, uniname, (buf + i), NULL);
+-
+- uniname++;
+- j++;
+- }
+-
+- *uniname = (u16)'\0';
+-}
+-
+ void nls_uniname_to_cstring(struct super_block *sb, u8 *p_cstring,
+ struct uni_name_t *p_uniname)
+ {commit 2a17b09fdecd580c88a5b80fd7ccd33bee576e4d
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:29 2019 -0500
+
+ staging: exfat: Remove FAT/VFAT mount support, part 3
+
+ In this patch, we straighten out most of the cases where the
+ code was testing 'p_fs->vol_type == EXFAT' and '!= EXFAT'
+
+ There's still some ?: ops and a few places where the code
+ is doing checks for '.' and '..' that require looking at,
+ but those are future patches
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-4-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c
+index 28a67f8139ea..1d344c5f3e15 100644
+--- a/drivers/staging/exfat/exfat_cache.c
++++ b/drivers/staging/exfat/exfat_cache.c
+@@ -202,107 +202,22 @@ static int __FAT_read(struct super_block *sb, u32 loc, u32 *content)
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+- if (p_fs->vol_type == FAT12) {
+- sec = p_fs->FAT1_start_sector +
+- ((loc + (loc >> 1)) >> p_bd->sector_size_bits);
+- off = (loc + (loc >> 1)) & p_bd->sector_size_mask;
+-
+- if (off == (p_bd->sector_size - 1)) {
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- _content = (u32)fat_sector[off];
+-
+- fat_sector = FAT_getblk(sb, ++sec);
+- if (!fat_sector)
+- return -1;
+-
+- _content |= (u32)fat_sector[0] << 8;
+- } else {
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+- _content = GET16(fat_entry);
+- }
+-
+- if (loc & 1)
+- _content >>= 4;
+-
+- _content &= 0x00000FFF;
+-
+- if (_content >= CLUSTER_16(0x0FF8)) {
+- *content = CLUSTER_32(~0);
+- return 0;
+- }
+- *content = CLUSTER_32(_content);
+- return 0;
+- } else if (p_fs->vol_type == FAT16) {
+- sec = p_fs->FAT1_start_sector +
+- (loc >> (p_bd->sector_size_bits - 1));
+- off = (loc << 1) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+-
+- _content = GET16_A(fat_entry);
+-
+- _content &= 0x0000FFFF;
+-
+- if (_content >= CLUSTER_16(0xFFF8)) {
+- *content = CLUSTER_32(~0);
+- return 0;
+- }
+- *content = CLUSTER_32(_content);
+- return 0;
+- } else if (p_fs->vol_type == FAT32) {
+- sec = p_fs->FAT1_start_sector +
+- (loc >> (p_bd->sector_size_bits - 2));
+- off = (loc << 2) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
++ sec = p_fs->FAT1_start_sector +
++ (loc >> (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
+
+- fat_entry = &fat_sector[off];
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
+
+- _content = GET32_A(fat_entry);
++ fat_entry = &fat_sector[off];
++ _content = GET32_A(fat_entry);
+
+- _content &= 0x0FFFFFFF;
+-
+- if (_content >= CLUSTER_32(0x0FFFFFF8)) {
+- *content = CLUSTER_32(~0);
+- return 0;
+- }
+- *content = CLUSTER_32(_content);
+- return 0;
+- } else if (p_fs->vol_type == EXFAT) {
+- sec = p_fs->FAT1_start_sector +
+- (loc >> (p_bd->sector_size_bits - 2));
+- off = (loc << 2) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+- _content = GET32_A(fat_entry);
+-
+- if (_content >= CLUSTER_32(0xFFFFFFF8)) {
+- *content = CLUSTER_32(~0);
+- return 0;
+- }
+- *content = CLUSTER_32(_content);
++ if (_content >= CLUSTER_32(0xFFFFFFF8)) {
++ *content = CLUSTER_32(~0);
+ return 0;
+ }
+-
+- /* Unknown volume type, throw in the towel and go home */
+- *content = CLUSTER_32(~0);
++ *content = CLUSTER_32(_content);
+ return 0;
+ }
+
+@@ -330,101 +245,17 @@ static s32 __FAT_write(struct super_block *sb, u32 loc, u32 content)
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+- if (p_fs->vol_type == FAT12) {
+- content &= 0x00000FFF;
++ sec = p_fs->FAT1_start_sector + (loc >>
++ (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
+
+- sec = p_fs->FAT1_start_sector +
+- ((loc + (loc >> 1)) >> p_bd->sector_size_bits);
+- off = (loc + (loc >> 1)) & p_bd->sector_size_mask;
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
+
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
++ fat_entry = &fat_sector[off];
+
+- if (loc & 1) { /* odd */
+- content <<= 4;
+-
+- if (off == (p_bd->sector_size - 1)) {
+- fat_sector[off] = (u8)(content |
+- (fat_sector[off] &
+- 0x0F));
+- FAT_modify(sb, sec);
+-
+- fat_sector = FAT_getblk(sb, ++sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_sector[0] = (u8)(content >> 8);
+- } else {
+- fat_entry = &fat_sector[off];
+- content |= GET16(fat_entry) & 0x000F;
+-
+- SET16(fat_entry, content);
+- }
+- } else { /* even */
+- fat_sector[off] = (u8)(content);
+-
+- if (off == (p_bd->sector_size - 1)) {
+- fat_sector[off] = (u8)(content);
+- FAT_modify(sb, sec);
+-
+- fat_sector = FAT_getblk(sb, ++sec);
+- if (!fat_sector)
+- return -1;
+- fat_sector[0] = (u8)((fat_sector[0] & 0xF0) |
+- (content >> 8));
+- } else {
+- fat_entry = &fat_sector[off];
+- content |= GET16(fat_entry) & 0xF000;
+-
+- SET16(fat_entry, content);
+- }
+- }
+- }
+-
+- else if (p_fs->vol_type == FAT16) {
+- content &= 0x0000FFFF;
+-
+- sec = p_fs->FAT1_start_sector + (loc >>
+- (p_bd->sector_size_bits - 1));
+- off = (loc << 1) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+-
+- SET16_A(fat_entry, content);
+- } else if (p_fs->vol_type == FAT32) {
+- content &= 0x0FFFFFFF;
+-
+- sec = p_fs->FAT1_start_sector + (loc >>
+- (p_bd->sector_size_bits - 2));
+- off = (loc << 2) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+-
+- content |= GET32_A(fat_entry) & 0xF0000000;
+-
+- SET32_A(fat_entry, content);
+- } else { /* p_fs->vol_type == EXFAT */
+- sec = p_fs->FAT1_start_sector + (loc >>
+- (p_bd->sector_size_bits - 2));
+- off = (loc << 2) & p_bd->sector_size_mask;
+-
+- fat_sector = FAT_getblk(sb, sec);
+- if (!fat_sector)
+- return -1;
+-
+- fat_entry = &fat_sector[off];
+-
+- SET32_A(fat_entry, content);
+- }
++ SET32_A(fat_entry, content);
+
+ FAT_modify(sb, sec);
+ return 0;
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index ed9e4521ec04..77b826dfdeda 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -20,15 +20,6 @@ static void __set_sb_dirty(struct super_block *sb)
+
+ static u8 name_buf[MAX_PATH_LENGTH * MAX_CHARSET_SIZE];
+
+-static char *reserved_names[] = {
+- "AUX ", "CON ", "NUL ", "PRN ",
+- "COM1 ", "COM2 ", "COM3 ", "COM4 ",
+- "COM5 ", "COM6 ", "COM7 ", "COM8 ", "COM9 ",
+- "LPT1 ", "LPT2 ", "LPT3 ", "LPT4 ",
+- "LPT5 ", "LPT6 ", "LPT7 ", "LPT8 ", "LPT9 ",
+- NULL
+-};
+-
+ static u8 free_bit[] = {
+ 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, /* 0 ~ 19 */
+ 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, 0, 1, 0, 2, 0, 1, 0, 3, /* 20 ~ 39 */
+@@ -99,25 +90,23 @@ void fs_set_vol_flags(struct super_block *sb, u32 new_flag)
+
+ p_fs->vol_flag = new_flag;
+
+- if (p_fs->vol_type == EXFAT) {
+- if (!p_fs->pbr_bh) {
+- if (sector_read(sb, p_fs->PBR_sector,
+- &p_fs->pbr_bh, 1) != 0)
+- return;
+- }
++ if (!p_fs->pbr_bh) {
++ if (sector_read(sb, p_fs->PBR_sector,
++ &p_fs->pbr_bh, 1) != 0)
++ return;
++ }
+
+- p_pbr = (struct pbr_sector_t *)p_fs->pbr_bh->b_data;
+- p_bpb = (struct bpbex_t *)p_pbr->bpb;
+- SET16(p_bpb->vol_flags, (u16)new_flag);
++ p_pbr = (struct pbr_sector_t *)p_fs->pbr_bh->b_data;
++ p_bpb = (struct bpbex_t *)p_pbr->bpb;
++ SET16(p_bpb->vol_flags, (u16)new_flag);
+
+- /* XXX duyoung
+- * what can we do here? (cuz fs_set_vol_flags() is void)
+- */
+- if ((new_flag == VOL_DIRTY) && (!buffer_dirty(p_fs->pbr_bh)))
+- sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 1);
+- else
+- sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 0);
+- }
++ /* XXX duyoung
++ * what can we do here? (cuz fs_set_vol_flags() is void)
++ */
++ if ((new_flag == VOL_DIRTY) && (!buffer_dirty(p_fs->pbr_bh)))
++ sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 1);
++ else
++ sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 0);
+ }
+
+ void fs_error(struct super_block *sb)
+@@ -1613,10 +1602,8 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ if (p_fs->dev_ejected)
+ break;
+
+- if (p_fs->vol_type == EXFAT) {
+- if (p_dir->dir != p_fs->root_dir)
+- size = i_size_read(inode);
+- }
++ if (p_dir->dir != p_fs->root_dir)
++ size = i_size_read(inode);
+
+ last_clu = find_last_cluster(sb, p_dir);
+ clu.dir = last_clu + 1;
+@@ -1653,21 +1640,19 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ p_dir->size++;
+
+ /* (3) update the directory entry */
+- if (p_fs->vol_type == EXFAT) {
+- if (p_dir->dir != p_fs->root_dir) {
+- size += p_fs->cluster_size;
+-
+- ep = get_entry_in_dir(sb, &fid->dir,
+- fid->entry + 1, §or);
+- if (!ep)
+- return -ENOENT;
+- p_fs->fs_func->set_entry_size(ep, size);
+- p_fs->fs_func->set_entry_flag(ep, p_dir->flags);
+- buf_modify(sb, sector);
+-
+- update_dir_checksum(sb, &fid->dir,
+- fid->entry);
+- }
++ if (p_dir->dir != p_fs->root_dir) {
++ size += p_fs->cluster_size;
++
++ ep = get_entry_in_dir(sb, &fid->dir,
++ fid->entry + 1, §or);
++ if (!ep)
++ return -ENOENT;
++ p_fs->fs_func->set_entry_size(ep, size);
++ p_fs->fs_func->set_entry_flag(ep, p_dir->flags);
++ buf_modify(sb, sector);
++
++ update_dir_checksum(sb, &fid->dir,
++ fid->entry);
+ }
+
+ i_size_write(inode, i_size_read(inode) + p_fs->cluster_size);
+@@ -1979,36 +1964,13 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 *entries,
+ struct dos_name_t *p_dosname)
+ {
+- s32 ret, num_entries;
+- bool lossy = false;
+- char **r;
++ s32 num_entries;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ num_entries = p_fs->fs_func->calc_num_entries(p_uniname);
+ if (num_entries == 0)
+ return -EINVAL;
+
+- if (p_fs->vol_type != EXFAT) {
+- nls_uniname_to_dosname(sb, p_dosname, p_uniname, &lossy);
+-
+- if (lossy) {
+- ret = fat_generate_dos_name(sb, p_dir, p_dosname);
+- if (ret)
+- return ret;
+- } else {
+- for (r = reserved_names; *r; r++) {
+- if (!strncmp((void *)p_dosname->name, *r, 8))
+- return -EINVAL;
+- }
+-
+- if (p_dosname->name_case != 0xFF)
+- num_entries = 1;
+- }
+-
+- if (num_entries > 1)
+- p_dosname->name_case = 0x0;
+- }
+-
+ *entries = num_entries;
+
+ return 0;
+@@ -2392,7 +2354,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ s32 ret, dentry, num_entries;
+ u64 size;
+ struct chain_t clu;
+- struct dos_name_t dos_name, dot_name;
++ struct dos_name_t dos_name;
+ struct super_block *sb = inode->i_sb;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+ struct fs_func *fs_func = p_fs->fs_func;
+@@ -2422,45 +2384,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ if (ret != 0)
+ return ret;
+
+- if (p_fs->vol_type == EXFAT) {
+- size = p_fs->cluster_size;
+- } else {
+- size = 0;
+-
+- /* initialize the . and .. entry
+- * Information for . points to itself
+- * Information for .. points to parent dir
+- */
+-
+- dot_name.name_case = 0x0;
+- memcpy(dot_name.name, DOS_CUR_DIR_NAME, DOS_NAME_LENGTH);
+-
+- ret = fs_func->init_dir_entry(sb, &clu, 0, TYPE_DIR, clu.dir,
+- 0);
+- if (ret != 0)
+- return ret;
+-
+- ret = fs_func->init_ext_entry(sb, &clu, 0, 1, NULL, &dot_name);
+- if (ret != 0)
+- return ret;
+-
+- memcpy(dot_name.name, DOS_PAR_DIR_NAME, DOS_NAME_LENGTH);
+-
+- if (p_dir->dir == p_fs->root_dir)
+- ret = fs_func->init_dir_entry(sb, &clu, 1, TYPE_DIR,
+- CLUSTER_32(0), 0);
+- else
+- ret = fs_func->init_dir_entry(sb, &clu, 1, TYPE_DIR,
+- p_dir->dir, 0);
+-
+- if (ret != 0)
+- return ret;
+-
+- ret = p_fs->fs_func->init_ext_entry(sb, &clu, 1, 1, NULL,
+- &dot_name);
+- if (ret != 0)
+- return ret;
+- }
++ size = p_fs->cluster_size;
+
+ /* (2) update the directory entry */
+ /* make sub-dir entry in parent directory */
+@@ -2626,23 +2550,21 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ buf_modify(sb, sector_new);
+ buf_unlock(sb, sector_old);
+
+- if (p_fs->vol_type == EXFAT) {
+- epold = get_entry_in_dir(sb, p_dir, oldentry + 1,
+- §or_old);
+- buf_lock(sb, sector_old);
+- epnew = get_entry_in_dir(sb, p_dir, newentry + 1,
+- §or_new);
+-
+- if (!epold || !epnew) {
+- buf_unlock(sb, sector_old);
+- return -ENOENT;
+- }
++ epold = get_entry_in_dir(sb, p_dir, oldentry + 1,
++ §or_old);
++ buf_lock(sb, sector_old);
++ epnew = get_entry_in_dir(sb, p_dir, newentry + 1,
++ §or_new);
+
+- memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
+- buf_modify(sb, sector_new);
++ if (!epold || !epnew) {
+ buf_unlock(sb, sector_old);
++ return -ENOENT;
+ }
+
++ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_old);
++
+ ret = fs_func->init_ext_entry(sb, p_dir, newentry,
+ num_new_entries, p_uniname,
+ &dos_name);
+@@ -2681,7 +2603,6 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ {
+ s32 ret, newentry, num_new_entries, num_old_entries;
+ sector_t sector_mov, sector_new;
+- struct chain_t clu;
+ struct dos_name_t dos_name;
+ struct dentry_t *epmov, *epnew;
+ struct super_block *sb = inode->i_sb;
+@@ -2736,36 +2657,20 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ buf_modify(sb, sector_new);
+ buf_unlock(sb, sector_mov);
+
+- if (p_fs->vol_type == EXFAT) {
+- epmov = get_entry_in_dir(sb, p_olddir, oldentry + 1,
+- §or_mov);
+- buf_lock(sb, sector_mov);
+- epnew = get_entry_in_dir(sb, p_newdir, newentry + 1,
+- §or_new);
+- if (!epmov || !epnew) {
+- buf_unlock(sb, sector_mov);
+- return -ENOENT;
+- }
+-
+- memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
+- buf_modify(sb, sector_new);
++ epmov = get_entry_in_dir(sb, p_olddir, oldentry + 1,
++ §or_mov);
++ buf_lock(sb, sector_mov);
++ epnew = get_entry_in_dir(sb, p_newdir, newentry + 1,
++ §or_new);
++ if (!epmov || !epnew) {
+ buf_unlock(sb, sector_mov);
+- } else if (fs_func->get_entry_type(epnew) == TYPE_DIR) {
+- /* change ".." pointer to new parent dir */
+- clu.dir = fs_func->get_entry_clu0(epnew);
+- clu.flags = 0x01;
+-
+- epnew = get_entry_in_dir(sb, &clu, 1, §or_new);
+- if (!epnew)
+- return -ENOENT;
+-
+- if (p_newdir->dir == p_fs->root_dir)
+- fs_func->set_entry_clu0(epnew, CLUSTER_32(0));
+- else
+- fs_func->set_entry_clu0(epnew, p_newdir->dir);
+- buf_modify(sb, sector_new);
++ return -ENOENT;
+ }
+
++ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_mov);
++
+ ret = fs_func->init_ext_entry(sb, p_newdir, newentry, num_new_entries,
+ p_uniname, &dos_name);
+ if (ret != 0)
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 0ebf342122da..259cb5a7bd81 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -411,25 +411,21 @@ static int ffsMountVol(struct super_block *sb)
+ goto out;
+ }
+
+- if (p_fs->vol_type == EXFAT) {
+- ret = load_alloc_bitmap(sb);
+- if (ret) {
+- bdev_close(sb);
+- goto out;
+- }
+- ret = load_upcase_table(sb);
+- if (ret) {
+- free_alloc_bitmap(sb);
+- bdev_close(sb);
+- goto out;
+- }
++ ret = load_alloc_bitmap(sb);
++ if (ret) {
++ bdev_close(sb);
++ goto out;
++ }
++ ret = load_upcase_table(sb);
++ if (ret) {
++ free_alloc_bitmap(sb);
++ bdev_close(sb);
++ goto out;
+ }
+
+ if (p_fs->dev_ejected) {
+- if (p_fs->vol_type == EXFAT) {
+- free_upcase_table(sb);
+- free_alloc_bitmap(sb);
+- }
++ free_upcase_table(sb);
++ free_alloc_bitmap(sb);
+ bdev_close(sb);
+ ret = -EIO;
+ goto out;
+@@ -458,10 +454,8 @@ static int ffsUmountVol(struct super_block *sb)
+ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+
+- if (p_fs->vol_type == EXFAT) {
+- free_upcase_table(sb);
+- free_alloc_bitmap(sb);
+- }
++ free_upcase_table(sb);
++ free_alloc_bitmap(sb);
+
+ FAT_release_all(sb);
+ buf_release_all(sb);
+@@ -593,22 +587,13 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+ fid->size = 0;
+ fid->start_clu = p_fs->root_dir;
+ } else {
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &dir, dentry,
+- ES_2_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep + 1;
+- } else {
+- ep = get_entry_in_dir(sb, &dir, dentry, NULL);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep;
++ es = get_entry_set_in_dir(sb, &dir, dentry,
++ ES_2_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
++ ep2 = ep + 1;
+
+ fid->type = p_fs->fs_func->get_entry_type(ep);
+ fid->rwoffset = 0;
+@@ -624,8 +609,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+ fid->start_clu = p_fs->fs_func->get_entry_clu0(ep2);
+ }
+
+- if (p_fs->vol_type == EXFAT)
+- release_entry_set(es);
++ release_entry_set(es);
+ }
+
+ if (p_fs->dev_ejected)
+@@ -812,7 +796,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ s32 num_clusters, num_alloc, num_alloced = (s32)~0;
+ int ret = 0;
+ u32 clu, last_clu;
+- sector_t LogSector, sector = 0;
++ sector_t LogSector;
+ u64 oneblkwrite, write_bytes;
+ struct chain_t new_clu;
+ struct timestamp_t tm;
+@@ -1001,25 +985,15 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ brelse(tmp_bh);
+
+ /* (3) update the direcoty entry */
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_ALL_ENTRIES, &ep);
+- if (!es)
+- goto err_out;
+- ep2 = ep + 1;
+- } else {
+- ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+- if (!ep)
+- goto err_out;
+- ep2 = ep;
+- }
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (!es)
++ goto err_out;
++ ep2 = ep + 1;
+
+ p_fs->fs_func->set_entry_time(ep, tm_current(&tm), TM_MODIFY);
+ p_fs->fs_func->set_entry_attr(ep, fid->attr);
+
+- if (p_fs->vol_type != EXFAT)
+- buf_modify(sb, sector);
+-
+ if (modified) {
+ if (p_fs->fs_func->get_entry_flag(ep2) != fid->flags)
+ p_fs->fs_func->set_entry_flag(ep2, fid->flags);
+@@ -1029,15 +1003,10 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+
+ if (p_fs->fs_func->get_entry_clu0(ep2) != fid->start_clu)
+ p_fs->fs_func->set_entry_clu0(ep2, fid->start_clu);
+-
+- if (p_fs->vol_type != EXFAT)
+- buf_modify(sb, sector);
+ }
+
+- if (p_fs->vol_type == EXFAT) {
+- update_dir_checksum_with_entry_set(sb, es);
+- release_entry_set(es);
+- }
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
+
+ #ifndef CONFIG_EXFAT_DELAYED_SYNC
+ fs_sync(sb, true);
+@@ -1067,7 +1036,6 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ s32 num_clusters;
+ u32 last_clu = CLUSTER_32(0);
+ int ret = 0;
+- sector_t sector = 0;
+ struct chain_t clu;
+ struct timestamp_t tm;
+ struct dentry_t *ep, *ep2;
+@@ -1132,22 +1100,13 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ }
+
+ /* (1) update the directory entry */
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_ALL_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep + 1;
+- } else {
+- ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
+- ep2 = ep;
+- }
++ ep2 = ep + 1;
+
+ p_fs->fs_func->set_entry_time(ep, tm_current(&tm), TM_MODIFY);
+ p_fs->fs_func->set_entry_attr(ep, fid->attr);
+@@ -1158,12 +1117,8 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ p_fs->fs_func->set_entry_clu0(ep2, CLUSTER_32(0));
+ }
+
+- if (p_fs->vol_type != EXFAT) {
+- buf_modify(sb, sector);
+- } else {
+- update_dir_checksum_with_entry_set(sb, es);
+- release_entry_set(es);
+- }
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
+
+ /* (2) cut off from the FAT chain */
+ if (last_clu != CLUSTER_32(0)) {
+@@ -1436,19 +1391,11 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ mutex_lock(&p_fs->v_mutex);
+
+ /* get the directory entry of given file */
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_ALL_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- } else {
+- ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
+
+ type = p_fs->fs_func->get_entry_type(ep);
+@@ -1460,8 +1407,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ else
+ ret = -EINVAL;
+
+- if (p_fs->vol_type == EXFAT)
+- release_entry_set(es);
++ release_entry_set(es);
+ goto out;
+ }
+
+@@ -1471,12 +1417,8 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ fid->attr = attr;
+ p_fs->fs_func->set_entry_attr(ep, attr);
+
+- if (p_fs->vol_type != EXFAT) {
+- buf_modify(sb, sector);
+- } else {
+- update_dir_checksum_with_entry_set(sb, es);
+- release_entry_set(es);
+- }
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
+
+ #ifndef CONFIG_EXFAT_DELAYED_SYNC
+ fs_sync(sb, true);
+@@ -1495,7 +1437,6 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+
+ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ {
+- sector_t sector = 0;
+ s32 count;
+ int ret = 0;
+ struct chain_t dir;
+@@ -1552,23 +1493,13 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ }
+
+ /* get the directory entry of given file or directory */
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_2_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep + 1;
+- } else {
+- ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep;
+- buf_lock(sb, sector);
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_2_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
++ ep2 = ep + 1;
+
+ /* set FILE_INFO structure using the acquired struct dentry_t */
+ info->Attr = p_fs->fs_func->get_entry_attr(ep);
+@@ -1599,25 +1530,13 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ */
+ p_fs->fs_func->get_uni_name_from_ext_entry(sb, &fid->dir, fid->entry,
+ uni_name.name);
+- if (*uni_name.name == 0x0 && p_fs->vol_type != EXFAT)
+- get_uni_name_from_dos_entry(sb, (struct dos_dentry_t *)ep,
+- &uni_name, 0x1);
+ nls_uniname_to_cstring(sb, info->Name, &uni_name);
+
+- if (p_fs->vol_type == EXFAT) {
+- info->NumSubdirs = 2;
+- } else {
+- buf_unlock(sb, sector);
+- get_uni_name_from_dos_entry(sb, (struct dos_dentry_t *)ep,
+- &uni_name, 0x0);
+- nls_uniname_to_cstring(sb, info->ShortName, &uni_name);
+- info->NumSubdirs = 0;
+- }
++ info->NumSubdirs = 2;
+
+ info->Size = p_fs->fs_func->get_entry_size(ep2);
+
+- if (p_fs->vol_type == EXFAT)
+- release_entry_set(es);
++ release_entry_set(es);
+
+ if (is_dir) {
+ dir.dir = fid->start_clu;
+@@ -1648,7 +1567,6 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+
+ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ {
+- sector_t sector = 0;
+ int ret = 0;
+ struct timestamp_t tm;
+ struct dentry_t *ep, *ep2;
+@@ -1676,23 +1594,13 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ fs_set_vol_flags(sb, VOL_DIRTY);
+
+ /* get the directory entry of given file or directory */
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_ALL_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep + 1;
+- } else {
+- /* for other than exfat */
+- ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
+- ep2 = ep;
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
++ ep2 = ep + 1;
+
+ p_fs->fs_func->set_entry_attr(ep, info->Attr);
+
+@@ -1715,12 +1623,8 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+
+ p_fs->fs_func->set_entry_size(ep2, info->Size);
+
+- if (p_fs->vol_type != EXFAT) {
+- buf_modify(sb, sector);
+- } else {
+- update_dir_checksum_with_entry_set(sb, es);
+- release_entry_set(es);
+- }
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
+
+ if (p_fs->dev_ejected)
+ ret = -EIO;
+@@ -1740,7 +1644,6 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ bool modified = false;
+ u32 last_clu;
+ int ret = 0;
+- sector_t sector = 0;
+ struct chain_t new_clu;
+ struct dentry_t *ep;
+ struct entry_set_cache_t *es = NULL;
+@@ -1830,28 +1733,17 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ num_clusters += num_alloced;
+ *clu = new_clu.dir;
+
+- if (p_fs->vol_type == EXFAT) {
+- es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+- ES_ALL_ENTRIES, &ep);
+- if (!es) {
+- ret = -ENOENT;
+- goto out;
+- }
+- /* get stream entry */
+- ep++;
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (!es) {
++ ret = -ENOENT;
++ goto out;
+ }
++ /* get stream entry */
++ ep++;
+
+ /* (3) update directory entry */
+ if (modified) {
+- if (p_fs->vol_type != EXFAT) {
+- ep = get_entry_in_dir(sb, &fid->dir,
+- fid->entry, §or);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
+- }
+-
+ if (p_fs->fs_func->get_entry_flag(ep) != fid->flags)
+ p_fs->fs_func->set_entry_flag(ep, fid->flags);
+
+@@ -1859,14 +1751,10 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ p_fs->fs_func->set_entry_clu0(ep,
+ fid->start_clu);
+
+- if (p_fs->vol_type != EXFAT)
+- buf_modify(sb, sector);
+ }
+
+- if (p_fs->vol_type == EXFAT) {
+- update_dir_checksum_with_entry_set(sb, es);
+- release_entry_set(es);
+- }
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
+
+ /* add number of new blocks to inode */
+ inode->i_blocks += num_alloced << (p_fs->cluster_size_bits - 9);
+@@ -2060,25 +1948,13 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ *uni_name.name = 0x0;
+ fs_func->get_uni_name_from_ext_entry(sb, &dir, dentry,
+ uni_name.name);
+- if (*uni_name.name == 0x0 && p_fs->vol_type != EXFAT)
+- get_uni_name_from_dos_entry(sb,
+- (struct dos_dentry_t *)ep,
+- &uni_name, 0x1);
+ nls_uniname_to_cstring(sb, dir_entry->Name, &uni_name);
+ buf_unlock(sb, sector);
+
+- if (p_fs->vol_type == EXFAT) {
+- ep = get_entry_in_dir(sb, &clu, i + 1, NULL);
+- if (!ep) {
+- ret = -ENOENT;
+- goto out;
+- }
+- } else {
+- get_uni_name_from_dos_entry(sb,
+- (struct dos_dentry_t *)ep,
+- &uni_name, 0x0);
+- nls_uniname_to_cstring(sb, dir_entry->ShortName,
+- &uni_name);
++ ep = get_entry_in_dir(sb, &clu, i + 1, NULL);
++ if (!ep) {
++ ret = -ENOENT;
++ goto out;
+ }
+
+ dir_entry->Size = fs_func->get_entry_size(ep);
+@@ -3056,7 +2932,6 @@ static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys,
+ struct super_block *sb = inode->i_sb;
+ struct exfat_sb_info *sbi = EXFAT_SB(sb);
+ struct fs_info_t *p_fs = &sbi->fs_info;
+- struct bd_info_t *p_bd = &sbi->bd_info;
+ const unsigned long blocksize = sb->s_blocksize;
+ const unsigned char blocksize_bits = sb->s_blocksize_bits;
+ sector_t last_block;
+@@ -3066,18 +2941,6 @@ static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys,
+ *phys = 0;
+ *mapped_blocks = 0;
+
+- if ((p_fs->vol_type == FAT12) || (p_fs->vol_type == FAT16)) {
+- if (inode->i_ino == EXFAT_ROOT_INO) {
+- if (sector <
+- (p_fs->dentries_in_root >>
+- (p_bd->sector_size_bits - DENTRY_SIZE_BITS))) {
+- *phys = sector + p_fs->root_start_sector;
+- *mapped_blocks = 1;
+- }
+- return 0;
+- }
+- }
+-
+ last_block = (i_size_read(inode) + (blocksize - 1)) >> blocksize_bits;
+ if (sector >= last_block) {
+ if (*create == 0)
+@@ -3823,7 +3686,6 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent)
+ struct exfat_sb_info *sbi;
+ int debug, ret;
+ long error;
+- char buf[50];
+
+ /*
+ * GFP_KERNEL is ok here, because while we do hold the
+@@ -3870,17 +3732,6 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent)
+ * if (FAT_FIRST_ENT(sb, media) != first)
+ */
+
+- /* codepage is not meaningful in exfat */
+- if (sbi->fs_info.vol_type != EXFAT) {
+- error = -EINVAL;
+- sprintf(buf, "cp%d", sbi->options.codepage);
+- sbi->nls_disk = load_nls(buf);
+- if (!sbi->nls_disk) {
+- pr_err("[EXFAT] Codepage %s not found\n", buf);
+- goto out_fail2;
+- }
+- }
+-
+ sbi->nls_io = load_nls(sbi->options.iocharset);
+
+ error = -ENOMEM;commit 7c6d78eb7c9c55952e354fe9fd212d45d9af0807
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:28 2019 -0500
+
+ staging: exfat: Remove FAT/VFAT mount support, part 2
+
+ Remove no longer referenced FAT/VFAT routines.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-3-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 68f79e13af2b..9ea865f607af 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -766,17 +766,12 @@ void fs_error(struct super_block *sb);
+
+ /* cluster management functions */
+ s32 clear_cluster(struct super_block *sb, u32 clu);
+-s32 fat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+- struct chain_t *p_chain);
+ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ struct chain_t *p_chain);
+-void fat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+- s32 do_relse);
+ void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ s32 do_relse);
+ u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain);
+ s32 count_num_clusters(struct super_block *sb, struct chain_t *dir);
+-s32 fat_count_used_clusters(struct super_block *sb);
+ s32 exfat_count_used_clusters(struct super_block *sb);
+ void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len);
+
+@@ -793,63 +788,36 @@ s32 load_upcase_table(struct super_block *sb);
+ void free_upcase_table(struct super_block *sb);
+
+ /* dir entry management functions */
+-u32 fat_get_entry_type(struct dentry_t *p_entry);
+ u32 exfat_get_entry_type(struct dentry_t *p_entry);
+-void fat_set_entry_type(struct dentry_t *p_entry, u32 type);
+ void exfat_set_entry_type(struct dentry_t *p_entry, u32 type);
+-u32 fat_get_entry_attr(struct dentry_t *p_entry);
+ u32 exfat_get_entry_attr(struct dentry_t *p_entry);
+-void fat_set_entry_attr(struct dentry_t *p_entry, u32 attr);
+ void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr);
+-u8 fat_get_entry_flag(struct dentry_t *p_entry);
+ u8 exfat_get_entry_flag(struct dentry_t *p_entry);
+-void fat_set_entry_flag(struct dentry_t *p_entry, u8 flag);
+ void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flag);
+-u32 fat_get_entry_clu0(struct dentry_t *p_entry);
+ u32 exfat_get_entry_clu0(struct dentry_t *p_entry);
+-void fat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu);
+ void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu);
+-u64 fat_get_entry_size(struct dentry_t *p_entry);
+ u64 exfat_get_entry_size(struct dentry_t *p_entry);
+-void fat_set_entry_size(struct dentry_t *p_entry, u64 size);
+ void exfat_set_entry_size(struct dentry_t *p_entry, u64 size);
+ struct timestamp_t *tm_current(struct timestamp_t *tm);
+-void fat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode);
+ void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode);
+-void fat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode);
+ void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode);
+-s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+- u32 type, u32 start_clu, u64 size);
+ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, u32 type, u32 start_clu, u64 size);
+-s32 fat_init_ext_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 num_entries,
+- struct uni_name_t *p_uniname,
+- struct dos_name_t *p_dosname);
+ s32 exfat_init_ext_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 num_entries,
+ struct uni_name_t *p_uniname,
+ struct dos_name_t *p_dosname);
+-void init_dos_entry(struct dos_dentry_t *ep, u32 type, u32 start_clu);
+-void init_ext_entry(struct ext_dentry_t *ep, s32 order, u8 chksum,
+- u16 *uniname);
+ void init_file_entry(struct file_dentry_t *ep, u32 type);
+ void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
+ u64 size);
+ void init_name_entry(struct name_dentry_t *ep, u16 *uniname);
+-void fat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 order, s32 num_entries);
+ void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 order, s32 num_entries);
+
+ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ sector_t *sector, s32 *offset);
+-struct dentry_t *get_entry_with_sector(struct super_block *sb, sector_t sector,
+- s32 offset);
+ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, sector_t *sector);
+ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+@@ -865,14 +833,9 @@ s32 search_deleted_or_unused_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 num_entries);
+ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir,
+ s32 num_entries);
+-s32 fat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- struct uni_name_t *p_uniname, s32 num_entries,
+- struct dos_name_t *p_dosname, u32 type);
+ s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, s32 num_entries,
+ struct dos_name_t *p_dosname, u32 type);
+-s32 fat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, struct dentry_t *p_entry);
+ s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, struct dentry_t *p_entry);
+ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+@@ -890,14 +853,9 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ void get_uni_name_from_dos_entry(struct super_block *sb,
+ struct dos_dentry_t *ep,
+ struct uni_name_t *p_uniname, u8 mode);
+-void fat_get_uni_name_from_ext_entry(struct super_block *sb,
+- struct chain_t *p_dir, s32 entry,
+- u16 *uniname);
+ void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 entry,
+ u16 *uniname);
+-s32 extract_uni_name_from_ext_entry(struct ext_dentry_t *ep,
+- u16 *uniname, s32 order);
+ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep,
+ u16 *uniname, s32 order);
+ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+@@ -905,9 +863,7 @@ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ void fat_attach_count_to_dos_name(u8 *dosname, s32 count);
+ s32 fat_calc_num_entries(struct uni_name_t *p_uniname);
+ s32 exfat_calc_num_entries(struct uni_name_t *p_uniname);
+-u8 calc_checksum_1byte(void *data, s32 len, u8 chksum);
+ u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type);
+-u32 calc_checksum_4byte(void *data, s32 len, u32 chksum, s32 type);
+
+ /* name resolution functions */
+ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 89bed7460162..ed9e4521ec04 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -167,60 +167,6 @@ s32 clear_cluster(struct super_block *sb, u32 clu)
+ return ret;
+ }
+
+-s32 fat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+- struct chain_t *p_chain)
+-{
+- int i, num_clusters = 0;
+- u32 new_clu, last_clu = CLUSTER_32(~0), read_clu;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- new_clu = p_chain->dir;
+- if (new_clu == CLUSTER_32(~0))
+- new_clu = p_fs->clu_srch_ptr;
+- else if (new_clu >= p_fs->num_clusters)
+- new_clu = 2;
+-
+- __set_sb_dirty(sb);
+-
+- p_chain->dir = CLUSTER_32(~0);
+-
+- for (i = 2; i < p_fs->num_clusters; i++) {
+- if (FAT_read(sb, new_clu, &read_clu) != 0)
+- return -1;
+-
+- if (read_clu == CLUSTER_32(0)) {
+- if (FAT_write(sb, new_clu, CLUSTER_32(~0)) < 0)
+- return -1;
+- num_clusters++;
+-
+- if (p_chain->dir == CLUSTER_32(~0)) {
+- p_chain->dir = new_clu;
+- } else {
+- if (FAT_write(sb, last_clu, new_clu) < 0)
+- return -1;
+- }
+-
+- last_clu = new_clu;
+-
+- if ((--num_alloc) == 0) {
+- p_fs->clu_srch_ptr = new_clu;
+- if (p_fs->used_clusters != UINT_MAX)
+- p_fs->used_clusters += num_clusters;
+-
+- return num_clusters;
+- }
+- }
+- if ((++new_clu) >= p_fs->num_clusters)
+- new_clu = 2;
+- }
+-
+- p_fs->clu_srch_ptr = new_clu;
+- if (p_fs->used_clusters != UINT_MAX)
+- p_fs->used_clusters += num_clusters;
+-
+- return num_clusters;
+-}
+-
+ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ struct chain_t *p_chain)
+ {
+@@ -300,47 +246,6 @@ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ return num_clusters;
+ }
+
+-void fat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+- s32 do_relse)
+-{
+- s32 num_clusters = 0;
+- u32 clu, prev;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- int i;
+- sector_t sector;
+-
+- if ((p_chain->dir == CLUSTER_32(0)) || (p_chain->dir == CLUSTER_32(~0)))
+- return;
+- __set_sb_dirty(sb);
+- clu = p_chain->dir;
+-
+- if (p_chain->size <= 0)
+- return;
+-
+- do {
+- if (p_fs->dev_ejected)
+- break;
+-
+- if (do_relse) {
+- sector = START_SECTOR(clu);
+- for (i = 0; i < p_fs->sectors_per_clu; i++)
+- buf_release(sb, sector + i);
+- }
+-
+- prev = clu;
+- if (FAT_read(sb, clu, &clu) == -1)
+- break;
+-
+- if (FAT_write(sb, prev, CLUSTER_32(0)) < 0)
+- break;
+- num_clusters++;
+-
+- } while (clu != CLUSTER_32(~0));
+-
+- if (p_fs->used_clusters != UINT_MAX)
+- p_fs->used_clusters -= num_clusters;
+-}
+-
+ void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ s32 do_relse)
+ {
+@@ -447,22 +352,6 @@ s32 count_num_clusters(struct super_block *sb, struct chain_t *p_chain)
+ return count;
+ }
+
+-s32 fat_count_used_clusters(struct super_block *sb)
+-{
+- int i, count = 0;
+- u32 clu;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- for (i = 2; i < p_fs->num_clusters; i++) {
+- if (FAT_read(sb, i, &clu) != 0)
+- break;
+- if (clu != CLUSTER_32(0))
+- count++;
+- }
+-
+- return count;
+-}
+-
+ s32 exfat_count_used_clusters(struct super_block *sb)
+ {
+ int i, map_i, map_b, count = 0;
+@@ -907,28 +796,6 @@ void free_upcase_table(struct super_block *sb)
+ * Directory Entry Management Functions
+ */
+
+-u32 fat_get_entry_type(struct dentry_t *p_entry)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- if (*ep->name == 0x0)
+- return TYPE_UNUSED;
+-
+- else if (*ep->name == 0xE5)
+- return TYPE_DELETED;
+-
+- else if (ep->attr == ATTR_EXTEND)
+- return TYPE_EXTEND;
+-
+- else if ((ep->attr & (ATTR_SUBDIR | ATTR_VOLUME)) == ATTR_VOLUME)
+- return TYPE_VOLUME;
+-
+- else if ((ep->attr & (ATTR_SUBDIR | ATTR_VOLUME)) == ATTR_SUBDIR)
+- return TYPE_DIR;
+-
+- return TYPE_FILE;
+-}
+-
+ u32 exfat_get_entry_type(struct dentry_t *p_entry)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+@@ -974,29 +841,6 @@ u32 exfat_get_entry_type(struct dentry_t *p_entry)
+ return TYPE_BENIGN_SEC;
+ }
+
+-void fat_set_entry_type(struct dentry_t *p_entry, u32 type)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- if (type == TYPE_UNUSED)
+- *ep->name = 0x0;
+-
+- else if (type == TYPE_DELETED)
+- *ep->name = 0xE5;
+-
+- else if (type == TYPE_EXTEND)
+- ep->attr = ATTR_EXTEND;
+-
+- else if (type == TYPE_DIR)
+- ep->attr = ATTR_SUBDIR;
+-
+- else if (type == TYPE_FILE)
+- ep->attr = ATTR_ARCHIVE;
+-
+- else if (type == TYPE_SYMLINK)
+- ep->attr = ATTR_ARCHIVE | ATTR_SYMLINK;
+-}
+-
+ void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+@@ -1027,13 +871,6 @@ void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
+ }
+ }
+
+-u32 fat_get_entry_attr(struct dentry_t *p_entry)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- return (u32)ep->attr;
+-}
+-
+ u32 exfat_get_entry_attr(struct dentry_t *p_entry)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+@@ -1041,13 +878,6 @@ u32 exfat_get_entry_attr(struct dentry_t *p_entry)
+ return (u32)GET16_A(ep->attr);
+ }
+
+-void fat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- ep->attr = (u8)attr;
+-}
+-
+ void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
+ {
+ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
+@@ -1055,11 +885,6 @@ void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
+ SET16_A(ep->attr, (u16)attr);
+ }
+
+-u8 fat_get_entry_flag(struct dentry_t *p_entry)
+-{
+- return 0x01;
+-}
+-
+ u8 exfat_get_entry_flag(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1067,10 +892,6 @@ u8 exfat_get_entry_flag(struct dentry_t *p_entry)
+ return ep->flags;
+ }
+
+-void fat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
+-{
+-}
+-
+ void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1078,14 +899,6 @@ void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
+ ep->flags = flags;
+ }
+
+-u32 fat_get_entry_clu0(struct dentry_t *p_entry)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- return ((u32)GET16_A(ep->start_clu_hi) << 16) |
+- GET16_A(ep->start_clu_lo);
+-}
+-
+ u32 exfat_get_entry_clu0(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1093,14 +906,6 @@ u32 exfat_get_entry_clu0(struct dentry_t *p_entry)
+ return GET32_A(ep->start_clu);
+ }
+
+-void fat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- SET16_A(ep->start_clu_lo, CLUSTER_16(start_clu));
+- SET16_A(ep->start_clu_hi, CLUSTER_16(start_clu >> 16));
+-}
+-
+ void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1108,13 +913,6 @@ void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
+ SET32_A(ep->start_clu, start_clu);
+ }
+
+-u64 fat_get_entry_size(struct dentry_t *p_entry)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- return (u64)GET32_A(ep->size);
+-}
+-
+ u64 exfat_get_entry_size(struct dentry_t *p_entry)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1122,13 +920,6 @@ u64 exfat_get_entry_size(struct dentry_t *p_entry)
+ return GET64_A(ep->valid_size);
+ }
+
+-void fat_set_entry_size(struct dentry_t *p_entry, u64 size)
+-{
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- SET32_A(ep->size, (u32)size);
+-}
+-
+ void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
+ {
+ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
+@@ -1137,31 +928,6 @@ void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
+ SET64_A(ep->size, size);
+ }
+
+-void fat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode)
+-{
+- u16 t = 0x00, d = 0x21;
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- switch (mode) {
+- case TM_CREATE:
+- t = GET16_A(ep->create_time);
+- d = GET16_A(ep->create_date);
+- break;
+- case TM_MODIFY:
+- t = GET16_A(ep->modify_time);
+- d = GET16_A(ep->modify_date);
+- break;
+- }
+-
+- tp->sec = (t & 0x001F) << 1;
+- tp->min = (t >> 5) & 0x003F;
+- tp->hour = (t >> 11);
+- tp->day = (d & 0x001F);
+- tp->mon = (d >> 5) & 0x000F;
+- tp->year = (d >> 9);
+-}
+-
+ void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode)
+ {
+@@ -1191,27 +957,6 @@ void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ tp->year = (d >> 9);
+ }
+
+-void fat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+- u8 mode)
+-{
+- u16 t, d;
+- struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
+-
+- t = (tp->hour << 11) | (tp->min << 5) | (tp->sec >> 1);
+- d = (tp->year << 9) | (tp->mon << 5) | tp->day;
+-
+- switch (mode) {
+- case TM_CREATE:
+- SET16_A(ep->create_time, t);
+- SET16_A(ep->create_date, d);
+- break;
+- case TM_MODIFY:
+- SET16_A(ep->modify_time, t);
+- SET16_A(ep->modify_date, d);
+- break;
+- }
+-}
+-
+ void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ u8 mode)
+ {
+@@ -1237,23 +982,6 @@ void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
+ }
+ }
+
+-s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+- u32 type, u32 start_clu, u64 size)
+-{
+- sector_t sector;
+- struct dos_dentry_t *dos_ep;
+-
+- dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+- §or);
+- if (!dos_ep)
+- return -EIO;
+-
+- init_dos_entry(dos_ep, type, start_clu);
+- buf_modify(sb, sector);
+-
+- return 0;
+-}
+-
+ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, u32 type, u32 start_clu, u64 size)
+ {
+@@ -1330,70 +1058,6 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-void init_dos_entry(struct dos_dentry_t *ep, u32 type, u32 start_clu)
+-{
+- struct timestamp_t tm, *tp;
+-
+- fat_set_entry_type((struct dentry_t *)ep, type);
+- SET16_A(ep->start_clu_lo, CLUSTER_16(start_clu));
+- SET16_A(ep->start_clu_hi, CLUSTER_16(start_clu >> 16));
+- SET32_A(ep->size, 0);
+-
+- tp = tm_current(&tm);
+- fat_set_entry_time((struct dentry_t *)ep, tp, TM_CREATE);
+- fat_set_entry_time((struct dentry_t *)ep, tp, TM_MODIFY);
+- SET16_A(ep->access_date, 0);
+- ep->create_time_ms = 0;
+-}
+-
+-void init_ext_entry(struct ext_dentry_t *ep, s32 order, u8 chksum, u16 *uniname)
+-{
+- int i;
+- bool end = false;
+-
+- fat_set_entry_type((struct dentry_t *)ep, TYPE_EXTEND);
+- ep->order = (u8)order;
+- ep->sysid = 0;
+- ep->checksum = chksum;
+- SET16_A(ep->start_clu, 0);
+-
+- for (i = 0; i < 10; i += 2) {
+- if (!end) {
+- SET16(ep->unicode_0_4 + i, *uniname);
+- if (*uniname == 0x0)
+- end = true;
+- else
+- uniname++;
+- } else {
+- SET16(ep->unicode_0_4 + i, 0xFFFF);
+- }
+- }
+-
+- for (i = 0; i < 12; i += 2) {
+- if (!end) {
+- SET16_A(ep->unicode_5_10 + i, *uniname);
+- if (*uniname == 0x0)
+- end = true;
+- else
+- uniname++;
+- } else {
+- SET16_A(ep->unicode_5_10 + i, 0xFFFF);
+- }
+- }
+-
+- for (i = 0; i < 4; i += 2) {
+- if (!end) {
+- SET16_A(ep->unicode_11_12 + i, *uniname);
+- if (*uniname == 0x0)
+- end = true;
+- else
+- uniname++;
+- } else {
+- SET16_A(ep->unicode_11_12 + i, 0xFFFF);
+- }
+- }
+-}
+-
+ void init_file_entry(struct file_dentry_t *ep, u32 type)
+ {
+ struct timestamp_t tm, *tp;
+@@ -1433,24 +1097,6 @@ void init_name_entry(struct name_dentry_t *ep, u16 *uniname)
+ }
+ }
+
+-void fat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 order, s32 num_entries)
+-{
+- int i;
+- sector_t sector;
+- struct dentry_t *ep;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- for (i = num_entries - 1; i >= order; i--) {
+- ep = get_entry_in_dir(sb, p_dir, entry - i, §or);
+- if (!ep)
+- return;
+-
+- p_fs->fs_func->set_entry_type(ep, TYPE_DELETED);
+- buf_modify(sb, sector);
+- }
+-}
+-
+ void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 order, s32 num_entries)
+ {
+@@ -1583,19 +1229,6 @@ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ return 0;
+ }
+
+-struct dentry_t *get_entry_with_sector(struct super_block *sb, sector_t sector,
+- s32 offset)
+-{
+- u8 *buf;
+-
+- buf = buf_getblk(sb, sector);
+-
+- if (!buf)
+- return NULL;
+-
+- return (struct dentry_t *)(buf + offset);
+-}
+-
+ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, sector_t *sector)
+ {
+@@ -1866,46 +1499,6 @@ s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es)
+ es->num_entries);
+ }
+
+-/* write back some entries in entry set */
+-s32 write_partial_entries_in_entry_set(struct super_block *sb,
+- struct entry_set_cache_t *es,
+- struct dentry_t *ep, u32 count)
+-{
+- s32 ret, byte_offset, off;
+- u32 clu = 0;
+- sector_t sec;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+- struct chain_t dir;
+-
+- /* vaidity check */
+- if (ep + count > ((struct dentry_t *)&es->__buf) + es->num_entries)
+- return -EINVAL;
+-
+- dir.dir = GET_CLUSTER_FROM_SECTOR(es->sector);
+- dir.flags = es->alloc_flag;
+- dir.size = 0xffffffff; /* XXX */
+-
+- byte_offset = (es->sector - START_SECTOR(dir.dir)) <<
+- p_bd->sector_size_bits;
+- byte_offset += ((void **)ep - &es->__buf) + es->offset;
+-
+- ret = _walk_fat_chain(sb, &dir, byte_offset, &clu);
+- if (ret != 0)
+- return ret;
+-
+- /* byte offset in cluster */
+- byte_offset &= p_fs->cluster_size - 1;
+-
+- /* byte offset in sector */
+- off = byte_offset & p_bd->sector_size_mask;
+-
+- /* sector offset in cluster */
+- sec = byte_offset >> p_bd->sector_size_bits;
+- sec += START_SECTOR(clu);
+- return __write_partial_entries_in_entry_set(sb, es, sec, off, count);
+-}
+-
+ /* search EMPTY CONTINUOUS "num_entries" entries */
+ s32 search_deleted_or_unused_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 num_entries)
+@@ -2087,104 +1680,6 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ return dentry;
+ }
+
+-/* return values of fat_find_dir_entry()
+- * >= 0 : return dir entiry position with the name in dir
+- * -1 : (root dir, ".") it is the root dir itself
+- * -2 : entry with the name does not exist
+- */
+-s32 fat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+- struct uni_name_t *p_uniname, s32 num_entries,
+- struct dos_name_t *p_dosname, u32 type)
+-{
+- int i, dentry = 0, len;
+- s32 order = 0;
+- bool is_feasible_entry = true, has_ext_entry = false;
+- s32 dentries_per_clu;
+- u32 entry_type;
+- u16 entry_uniname[14], *uniname = NULL, unichar;
+- struct chain_t clu;
+- struct dentry_t *ep;
+- struct dos_dentry_t *dos_ep;
+- struct ext_dentry_t *ext_ep;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- if (p_dir->dir == p_fs->root_dir) {
+- if ((!nls_uniname_cmp(sb, p_uniname->name,
+- (u16 *)UNI_CUR_DIR_NAME)) ||
+- (!nls_uniname_cmp(sb, p_uniname->name,
+- (u16 *)UNI_PAR_DIR_NAME)))
+- return -1; // special case, root directory itself
+- }
+-
+- if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
+- dentries_per_clu = p_fs->dentries_in_root;
+- else
+- dentries_per_clu = p_fs->dentries_per_clu;
+-
+- clu.dir = p_dir->dir;
+- clu.flags = p_dir->flags;
+-
+- while (clu.dir != CLUSTER_32(~0)) {
+- if (p_fs->dev_ejected)
+- break;
+-
+- for (i = 0; i < dentries_per_clu; i++, dentry++) {
+- ep = get_entry_in_dir(sb, &clu, i, NULL);
+- if (!ep)
+- return -2;
+-
+- entry_type = p_fs->fs_func->get_entry_type(ep);
+-
+- if ((entry_type == TYPE_FILE) || (entry_type == TYPE_DIR)) {
+- if ((type == TYPE_ALL) || (type == entry_type)) {
+- if (is_feasible_entry && has_ext_entry)
+- return dentry;
+-
+- dos_ep = (struct dos_dentry_t *)ep;
+- if (!nls_dosname_cmp(sb, p_dosname->name, dos_ep->name))
+- return dentry;
+- }
+- is_feasible_entry = true;
+- has_ext_entry = false;
+- } else if (entry_type == TYPE_EXTEND) {
+- if (is_feasible_entry) {
+- ext_ep = (struct ext_dentry_t *)ep;
+- if (ext_ep->order > 0x40) {
+- order = (s32)(ext_ep->order - 0x40);
+- uniname = p_uniname->name + 13 * (order - 1);
+- } else {
+- order = (s32)ext_ep->order;
+- uniname -= 13;
+- }
+-
+- len = extract_uni_name_from_ext_entry(ext_ep, entry_uniname, order);
+-
+- unichar = *(uniname + len);
+- *(uniname + len) = 0x0;
+-
+- if (nls_uniname_cmp(sb, uniname, entry_uniname))
+- is_feasible_entry = false;
+-
+- *(uniname + len) = unichar;
+- }
+- has_ext_entry = true;
+- } else if (entry_type == TYPE_UNUSED) {
+- return -2;
+- }
+- is_feasible_entry = true;
+- has_ext_entry = false;
+- }
+-
+- if (p_dir->dir == CLUSTER_32(0))
+- break; /* FAT16 root_dir */
+-
+- if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return -2;
+- }
+-
+- return -2;
+-}
+-
+ /* return values of exfat_find_dir_entry()
+ * >= 0 : return dir entiry position with the name in dir
+ * -1 : (root dir, ".") it is the root dir itself
+@@ -2333,36 +1828,6 @@ s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ return -2;
+ }
+
+-s32 fat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, struct dentry_t *p_entry)
+-{
+- s32 count = 0;
+- u8 chksum;
+- struct dos_dentry_t *dos_ep = (struct dos_dentry_t *)p_entry;
+- struct ext_dentry_t *ext_ep;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- chksum = calc_checksum_1byte((void *)dos_ep->name, DOS_NAME_LENGTH, 0);
+-
+- for (entry--; entry >= 0; entry--) {
+- ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir,
+- entry, NULL);
+- if (!ext_ep)
+- return -1;
+-
+- if ((p_fs->fs_func->get_entry_type((struct dentry_t *)ext_ep) ==
+- TYPE_EXTEND) && (ext_ep->checksum == chksum)) {
+- count++;
+- if (ext_ep->order > 0x40)
+- return count;
+- } else {
+- return count;
+- }
+- }
+-
+- return count;
+-}
+-
+ s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, struct dentry_t *p_entry)
+ {
+@@ -2564,33 +2029,6 @@ void get_uni_name_from_dos_entry(struct super_block *sb,
+ nls_dosname_to_uniname(sb, p_uniname, &dos_name);
+ }
+
+-void fat_get_uni_name_from_ext_entry(struct super_block *sb,
+- struct chain_t *p_dir, s32 entry,
+- u16 *uniname)
+-{
+- int i;
+- struct ext_dentry_t *ep;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+-
+- for (entry--, i = 1; entry >= 0; entry--, i++) {
+- ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+- NULL);
+- if (!ep)
+- return;
+-
+- if (p_fs->fs_func->get_entry_type((struct dentry_t *)ep) ==
+- TYPE_EXTEND) {
+- extract_uni_name_from_ext_entry(ep, uniname, i);
+- if (ep->order > 0x40)
+- return;
+- } else {
+- return;
+- }
+-
+- uniname += 13;
+- }
+-}
+-
+ void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ struct chain_t *p_dir, s32 entry,
+ u16 *uniname)
+@@ -2628,51 +2066,6 @@ void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
+ release_entry_set(es);
+ }
+
+-s32 extract_uni_name_from_ext_entry(struct ext_dentry_t *ep, u16 *uniname,
+- s32 order)
+-{
+- int i, len = 0;
+-
+- for (i = 0; i < 10; i += 2) {
+- *uniname = GET16(ep->unicode_0_4 + i);
+- if (*uniname == 0x0)
+- return len;
+- uniname++;
+- len++;
+- }
+-
+- if (order < 20) {
+- for (i = 0; i < 12; i += 2) {
+- *uniname = GET16_A(ep->unicode_5_10 + i);
+- if (*uniname == 0x0)
+- return len;
+- uniname++;
+- len++;
+- }
+- } else {
+- for (i = 0; i < 8; i += 2) {
+- *uniname = GET16_A(ep->unicode_5_10 + i);
+- if (*uniname == 0x0)
+- return len;
+- uniname++;
+- len++;
+- }
+- *uniname = 0x0; /* uniname[MAX_NAME_LENGTH-1] */
+- return len;
+- }
+-
+- for (i = 0; i < 4; i += 2) {
+- *uniname = GET16_A(ep->unicode_11_12 + i);
+- if (*uniname == 0x0)
+- return len;
+- uniname++;
+- len++;
+- }
+-
+- *uniname = 0x0;
+- return len;
+-}
+-
+ s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
+ s32 order)
+ {
+@@ -2812,18 +2205,6 @@ void fat_attach_count_to_dos_name(u8 *dosname, s32 count)
+ dosname[7] = ' ';
+ }
+
+-s32 fat_calc_num_entries(struct uni_name_t *p_uniname)
+-{
+- s32 len;
+-
+- len = p_uniname->name_len;
+- if (len == 0)
+- return 0;
+-
+- /* 1 dos name entry + extended entries */
+- return (len - 1) / 13 + 2;
+-}
+-
+ s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
+ {
+ s32 len;commit 04a991cd9066dd182602a82e234bf91b1ea423d7
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Nov 12 16:12:27 2019 -0500
+
+ staging: exfat: Remove FAT/VFAT mount support, part 1
+
+ Remove the top-level mount functionality, to make this driver handle
+ only exfat file systems.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112211238.156490-2-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
+index ce32dfe33bec..0130019cbec2 100644
+--- a/drivers/staging/exfat/Kconfig
++++ b/drivers/staging/exfat/Kconfig
+@@ -6,15 +6,6 @@ config EXFAT_FS
+ help
+ This adds support for the exFAT file system.
+
+-config EXFAT_DONT_MOUNT_VFAT
+- bool "Prohibit mounting of fat/vfat filesystems by exFAT"
+- depends on EXFAT_FS
+- default y
+- help
+- By default, the exFAT driver will only mount exFAT filesystems, and refuse
+- to mount fat/vfat filesystems. Set this to 'n' to allow the exFAT driver
+- to mount these filesystems.
+-
+ config EXFAT_DISCARD
+ bool "enable discard support"
+ depends on EXFAT_FS
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 72cf40e123de..68f79e13af2b 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -915,8 +915,6 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+ s32 resolve_name(u8 *name, u8 **arg);
+
+ /* file operation functions */
+-s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
+-s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
+ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
+ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ struct uni_name_t *p_uniname, struct file_id_t *fid);
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 1f0ef94bdd47..89bed7460162 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -1284,57 +1284,6 @@ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ return 0;
+ }
+
+-static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+- s32 entry, s32 num_entries,
+- struct uni_name_t *p_uniname,
+- struct dos_name_t *p_dosname)
+-{
+- int i;
+- sector_t sector;
+- u8 chksum;
+- u16 *uniname = p_uniname->name;
+- struct dos_dentry_t *dos_ep;
+- struct ext_dentry_t *ext_ep;
+-
+- dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+- §or);
+- if (!dos_ep)
+- return -EIO;
+-
+- dos_ep->lcase = p_dosname->name_case;
+- memcpy(dos_ep->name, p_dosname->name, DOS_NAME_LENGTH);
+- buf_modify(sb, sector);
+-
+- if ((--num_entries) > 0) {
+- chksum = calc_checksum_1byte((void *)dos_ep->name,
+- DOS_NAME_LENGTH, 0);
+-
+- for (i = 1; i < num_entries; i++) {
+- ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb,
+- p_dir,
+- entry - i,
+- §or);
+- if (!ext_ep)
+- return -EIO;
+-
+- init_ext_entry(ext_ep, i, chksum, uniname);
+- buf_modify(sb, sector);
+- uniname += 13;
+- }
+-
+- ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir,
+- entry - i,
+- §or);
+- if (!ext_ep)
+- return -EIO;
+-
+- init_ext_entry(ext_ep, i + 0x40, chksum, uniname);
+- buf_modify(sb, sector);
+- }
+-
+- return 0;
+-}
+-
+ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ s32 entry, s32 num_entries,
+ struct uni_name_t *p_uniname,
+@@ -2981,148 +2930,6 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+ /*
+ * File Operation Functions
+ */
+-static struct fs_func fat_fs_func = {
+- .alloc_cluster = fat_alloc_cluster,
+- .free_cluster = fat_free_cluster,
+- .count_used_clusters = fat_count_used_clusters,
+-
+- .init_dir_entry = fat_init_dir_entry,
+- .init_ext_entry = fat_init_ext_entry,
+- .find_dir_entry = fat_find_dir_entry,
+- .delete_dir_entry = fat_delete_dir_entry,
+- .get_uni_name_from_ext_entry = fat_get_uni_name_from_ext_entry,
+- .count_ext_entries = fat_count_ext_entries,
+- .calc_num_entries = fat_calc_num_entries,
+-
+- .get_entry_type = fat_get_entry_type,
+- .set_entry_type = fat_set_entry_type,
+- .get_entry_attr = fat_get_entry_attr,
+- .set_entry_attr = fat_set_entry_attr,
+- .get_entry_flag = fat_get_entry_flag,
+- .set_entry_flag = fat_set_entry_flag,
+- .get_entry_clu0 = fat_get_entry_clu0,
+- .set_entry_clu0 = fat_set_entry_clu0,
+- .get_entry_size = fat_get_entry_size,
+- .set_entry_size = fat_set_entry_size,
+- .get_entry_time = fat_get_entry_time,
+- .set_entry_time = fat_set_entry_time,
+-};
+-
+-s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+-{
+- s32 num_reserved, num_root_sectors;
+- struct bpb16_t *p_bpb = (struct bpb16_t *)p_pbr->bpb;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+-
+- if (p_bpb->num_fats == 0)
+- return -EFSCORRUPTED;
+-
+- num_root_sectors = GET16(p_bpb->num_root_entries) << DENTRY_SIZE_BITS;
+- num_root_sectors = ((num_root_sectors - 1) >>
+- p_bd->sector_size_bits) + 1;
+-
+- p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
+- p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
+- p_fs->cluster_size_bits = p_fs->sectors_per_clu_bits +
+- p_bd->sector_size_bits;
+- p_fs->cluster_size = 1 << p_fs->cluster_size_bits;
+-
+- p_fs->num_FAT_sectors = GET16(p_bpb->num_fat_sectors);
+-
+- p_fs->FAT1_start_sector = p_fs->PBR_sector + GET16(p_bpb->num_reserved);
+- if (p_bpb->num_fats == 1)
+- p_fs->FAT2_start_sector = p_fs->FAT1_start_sector;
+- else
+- p_fs->FAT2_start_sector = p_fs->FAT1_start_sector +
+- p_fs->num_FAT_sectors;
+-
+- p_fs->root_start_sector = p_fs->FAT2_start_sector +
+- p_fs->num_FAT_sectors;
+- p_fs->data_start_sector = p_fs->root_start_sector + num_root_sectors;
+-
+- p_fs->num_sectors = GET16(p_bpb->num_sectors);
+- if (p_fs->num_sectors == 0)
+- p_fs->num_sectors = GET32(p_bpb->num_huge_sectors);
+-
+- num_reserved = p_fs->data_start_sector - p_fs->PBR_sector;
+- p_fs->num_clusters = ((p_fs->num_sectors - num_reserved) >>
+- p_fs->sectors_per_clu_bits) + 2;
+- /* because the cluster index starts with 2 */
+-
+- if (p_fs->num_clusters < FAT12_THRESHOLD)
+- p_fs->vol_type = FAT12;
+- else
+- p_fs->vol_type = FAT16;
+- p_fs->vol_id = GET32(p_bpb->vol_serial);
+-
+- p_fs->root_dir = 0;
+- p_fs->dentries_in_root = GET16(p_bpb->num_root_entries);
+- p_fs->dentries_per_clu = 1 << (p_fs->cluster_size_bits -
+- DENTRY_SIZE_BITS);
+-
+- p_fs->vol_flag = VOL_CLEAN;
+- p_fs->clu_srch_ptr = 2;
+- p_fs->used_clusters = UINT_MAX;
+-
+- p_fs->fs_func = &fat_fs_func;
+-
+- return 0;
+-}
+-
+-s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+-{
+- s32 num_reserved;
+- struct bpb32_t *p_bpb = (struct bpb32_t *)p_pbr->bpb;
+- struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+-
+- if (p_bpb->num_fats == 0)
+- return -EFSCORRUPTED;
+-
+- p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
+- p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
+- p_fs->cluster_size_bits = p_fs->sectors_per_clu_bits +
+- p_bd->sector_size_bits;
+- p_fs->cluster_size = 1 << p_fs->cluster_size_bits;
+-
+- p_fs->num_FAT_sectors = GET32(p_bpb->num_fat32_sectors);
+-
+- p_fs->FAT1_start_sector = p_fs->PBR_sector + GET16(p_bpb->num_reserved);
+- if (p_bpb->num_fats == 1)
+- p_fs->FAT2_start_sector = p_fs->FAT1_start_sector;
+- else
+- p_fs->FAT2_start_sector = p_fs->FAT1_start_sector +
+- p_fs->num_FAT_sectors;
+-
+- p_fs->root_start_sector = p_fs->FAT2_start_sector +
+- p_fs->num_FAT_sectors;
+- p_fs->data_start_sector = p_fs->root_start_sector;
+-
+- p_fs->num_sectors = GET32(p_bpb->num_huge_sectors);
+- num_reserved = p_fs->data_start_sector - p_fs->PBR_sector;
+-
+- p_fs->num_clusters = ((p_fs->num_sectors - num_reserved) >>
+- p_fs->sectors_per_clu_bits) + 2;
+- /* because the cluster index starts with 2 */
+-
+- p_fs->vol_type = FAT32;
+- p_fs->vol_id = GET32(p_bpb->vol_serial);
+-
+- p_fs->root_dir = GET32(p_bpb->root_cluster);
+- p_fs->dentries_in_root = 0;
+- p_fs->dentries_per_clu = 1 << (p_fs->cluster_size_bits -
+- DENTRY_SIZE_BITS);
+-
+- p_fs->vol_flag = VOL_CLEAN;
+- p_fs->clu_srch_ptr = 2;
+- p_fs->used_clusters = UINT_MAX;
+-
+- p_fs->fs_func = &fat_fs_func;
+-
+- return 0;
+-}
+-
+ static struct fs_func exfat_fs_func = {
+ .alloc_cluster = exfat_alloc_cluster,
+ .free_cluster = exfat_free_cluster,
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 4c8afe60d48b..0ebf342122da 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -396,16 +396,10 @@ static int ffsMountVol(struct super_block *sb)
+ break;
+
+ if (i < 53) {
+-#ifdef CONFIG_EXFAT_DONT_MOUNT_VFAT
++ /* Not sure how we'd get here, but complain if it does */
+ ret = -EINVAL;
+ pr_info("EXFAT: Attempted to mount VFAT filesystem\n");
+ goto out;
+-#else
+- if (GET16(p_pbr->bpb + 11)) /* num_fat_sectors */
+- ret = fat16_mount(sb, p_pbr);
+- else
+- ret = fat32_mount(sb, p_pbr);
+-#endif
+ } else {
+ ret = exfat_mount(sb, p_pbr);
+ }commit ecbc9e989f62e59cdd3e87b1e7babacc765041ba
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:57 2019 -0500
+
+ staging: exfat: Correct return code
+
+ Use -ENOTEMPTY rather than -EEXIST for attempting to remove
+ a directory that still has files in it.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-10-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 3e13e002cd14..4c8afe60d48b 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -2167,7 +2167,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ clu_to_free.flags = fid->flags;
+
+ if (!is_dir_empty(sb, &clu_to_free)) {
+- ret = -EEXIST;
++ ret = -ENOTEMPTY;
+ goto out;
+ }
+ commit ad03f80f7b7229f39623f6a11fe8cb07cab1c05e
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:56 2019 -0500
+
+ staging: exfat: Collapse redundant return code translations
+
+ Now that we no longer use odd internal return codes, we can
+ heave the translation code over the side, and just pass the
+ error code back up the call chain.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-9-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 7941944ec09f..3e13e002cd14 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -650,7 +650,7 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode,
+ struct uni_name_t uni_name;
+ struct super_block *sb = inode->i_sb;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- int ret;
++ int ret = 0;
+
+ /* check the validity of pointer parameters */
+ if (!fid || !path || (*path == '\0'))
+@@ -2366,19 +2366,9 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+ pr_debug("%s entered\n", __func__);
+
+ err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_REGULAR, &fid);
+- if (err) {
+- if (err == -EINVAL)
+- err = -EINVAL;
+- else if (err == -EEXIST)
+- err = -EEXIST;
+- else if (err == -ENOSPC)
+- err = -ENOSPC;
+- else if (err == -ENAMETOOLONG)
+- err = -ENAMETOOLONG;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+ INC_IVERSION(dir);
+ curtime = current_time(dir);
+ dir->i_ctime = curtime;
+@@ -2543,13 +2533,9 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
+ EXFAT_I(inode)->fid.size = i_size_read(inode);
+
+ err = ffsRemoveFile(dir, &(EXFAT_I(inode)->fid));
+- if (err) {
+- if (err == -EPERM)
+- err = -EPERM;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+ INC_IVERSION(dir);
+ curtime = current_time(dir);
+ dir->i_mtime = curtime;
+@@ -2589,27 +2575,14 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry,
+ pr_debug("%s entered\n", __func__);
+
+ err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_SYMLINK, &fid);
+- if (err) {
+- if (err == -EINVAL)
+- err = -EINVAL;
+- else if (err == -EEXIST)
+- err = -EEXIST;
+- else if (err == -ENOSPC)
+- err = -ENOSPC;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+
+ err = ffsWriteFile(dir, &fid, (char *)target, len, &ret);
+
+ if (err) {
+ ffsRemoveFile(dir, &fid);
+-
+- if (err == -ENOSPC)
+- err = -ENOSPC;
+- else
+- err = -EIO;
+ goto out;
+ }
+
+@@ -2666,19 +2639,9 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+ pr_debug("%s entered\n", __func__);
+
+ err = ffsCreateDir(dir, (u8 *)dentry->d_name.name, &fid);
+- if (err) {
+- if (err == -EINVAL)
+- err = -EINVAL;
+- else if (err == -EEXIST)
+- err = -EEXIST;
+- else if (err == -ENOSPC)
+- err = -ENOSPC;
+- else if (err == -ENAMETOOLONG)
+- err = -ENAMETOOLONG;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+ INC_IVERSION(dir);
+ curtime = current_time(dir);
+ dir->i_ctime = curtime;
+@@ -2727,19 +2690,9 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
+ EXFAT_I(inode)->fid.size = i_size_read(inode);
+
+ err = ffsRemoveDir(dir, &(EXFAT_I(inode)->fid));
+- if (err) {
+- if (err == -EINVAL)
+- err = -EINVAL;
+- else if (err == -EEXIST)
+- err = -ENOTEMPTY;
+- else if (err == -ENOENT)
+- err = -ENOENT;
+- else if (err == -EBUSY)
+- err = -EBUSY;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+ INC_IVERSION(dir);
+ curtime = current_time(dir);
+ dir->i_mtime = curtime;
+@@ -2787,21 +2740,9 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+
+ err = ffsMoveFile(old_dir, &(EXFAT_I(old_inode)->fid), new_dir,
+ new_dentry);
+- if (err) {
+- if (err == -EPERM)
+- err = -EPERM;
+- else if (err == -EINVAL)
+- err = -EINVAL;
+- else if (err == -EEXIST)
+- err = -EEXIST;
+- else if (err == -ENOENT)
+- err = -ENOENT;
+- else if (err == -ENOSPC)
+- err = -ENOSPC;
+- else
+- err = -EIO;
++ if (err)
+ goto out;
+- }
++
+ INC_IVERSION(new_dir);
+ curtime = current_time(new_dir);
+ new_dir->i_ctime = curtime;
+@@ -3161,12 +3102,7 @@ static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys,
+
+ err = ffsMapCluster(inode, clu_offset, &cluster);
+
+- if (err) {
+- if (err == -ENOSPC)
+- return -ENOSPC;
+- else
+- return -EIO;
+- } else if (cluster != CLUSTER_32(~0)) {
++ if (!err && (cluster != CLUSTER_32(~0))) {
+ *phys = START_SECTOR(cluster) + sec_offset;
+ *mapped_blocks = p_fs->sectors_per_clu - sec_offset;
+ }commit 4b18672132332d3ec429ea9370d0b380dae730cd
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:55 2019 -0500
+
+ staging: exfat: Clean up return codes - FFS_SUCCESS
+
+ Convert FFS_SUCCESS to 0.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-8-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index b3fc9bb06c24..72cf40e123de 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -208,9 +208,6 @@ static inline u16 get_row_index(u16 i)
+ #define FM_REGULAR 0x00
+ #define FM_SYMLINK 0x40
+
+-/* return values */
+-#define FFS_SUCCESS 0
+-
+ #define NUM_UPCASE 2918
+
+ #define DOS_CUR_DIR_NAME ". "
+diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c
+index 467b93630d86..28a67f8139ea 100644
+--- a/drivers/staging/exfat/exfat_cache.c
++++ b/drivers/staging/exfat/exfat_cache.c
+@@ -462,7 +462,7 @@ u8 *FAT_getblk(struct super_block *sb, sector_t sec)
+
+ FAT_cache_insert_hash(sb, bp);
+
+- if (sector_read(sb, sec, &bp->buf_bh, 1) != FFS_SUCCESS) {
++ if (sector_read(sb, sec, &bp->buf_bh, 1) != 0) {
+ FAT_cache_remove_hash(bp);
+ bp->drv = -1;
+ bp->sec = ~0;
+@@ -582,7 +582,7 @@ static u8 *__buf_getblk(struct super_block *sb, sector_t sec)
+
+ buf_cache_insert_hash(sb, bp);
+
+- if (sector_read(sb, sec, &bp->buf_bh, 1) != FFS_SUCCESS) {
++ if (sector_read(sb, sec, &bp->buf_bh, 1) != 0) {
+ buf_cache_remove_hash(bp);
+ bp->drv = -1;
+ bp->sec = ~0;
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index ffcad6867ecb..1f0ef94bdd47 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -102,7 +102,7 @@ void fs_set_vol_flags(struct super_block *sb, u32 new_flag)
+ if (p_fs->vol_type == EXFAT) {
+ if (!p_fs->pbr_bh) {
+ if (sector_read(sb, p_fs->PBR_sector,
+- &p_fs->pbr_bh, 1) != FFS_SUCCESS)
++ &p_fs->pbr_bh, 1) != 0)
+ return;
+ }
+
+@@ -139,7 +139,7 @@ void fs_error(struct super_block *sb)
+ s32 clear_cluster(struct super_block *sb, u32 clu)
+ {
+ sector_t s, n;
+- s32 ret = FFS_SUCCESS;
++ s32 ret = 0;
+ struct buffer_head *tmp_bh = NULL;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+@@ -154,12 +154,12 @@ s32 clear_cluster(struct super_block *sb, u32 clu)
+
+ for (; s < n; s++) {
+ ret = sector_read(sb, s, &tmp_bh, 0);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ memset((char *)tmp_bh->b_data, 0x0, p_bd->sector_size);
+ ret = sector_write(sb, s, tmp_bh, 0);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ break;
+ }
+
+@@ -251,7 +251,7 @@ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ }
+ }
+
+- if (set_alloc_bitmap(sb, new_clu - 2) != FFS_SUCCESS)
++ if (set_alloc_bitmap(sb, new_clu - 2) != 0)
+ return -EIO;
+
+ num_clusters++;
+@@ -370,7 +370,7 @@ void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ buf_release(sb, sector + i);
+ }
+
+- if (clr_alloc_bitmap(sb, clu - 2) != FFS_SUCCESS)
++ if (clr_alloc_bitmap(sb, clu - 2) != 0)
+ break;
+ clu++;
+
+@@ -387,7 +387,7 @@ void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
+ buf_release(sb, sector + i);
+ }
+
+- if (clr_alloc_bitmap(sb, clu - 2) != FFS_SUCCESS)
++ if (clr_alloc_bitmap(sb, clu - 2) != 0)
+ break;
+
+ if (FAT_read(sb, clu, &clu) == -1)
+@@ -552,7 +552,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ for (j = 0; j < p_fs->map_sectors; j++) {
+ p_fs->vol_amap[j] = NULL;
+ ret = sector_read(sb, sector + j, &p_fs->vol_amap[j], 1);
+- if (ret != FFS_SUCCESS) {
++ if (ret != 0) {
+ /* release all buffers and free vol_amap */
+ i = 0;
+ while (i < j)
+@@ -565,7 +565,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ }
+
+ p_fs->pbr_bh = NULL;
+- return FFS_SUCCESS;
++ return 0;
+ }
+ }
+
+@@ -721,7 +721,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+
+ while (sector < end_sector) {
+ ret = sector_read(sb, sector, &tmp_bh, 1);
+- if (ret != FFS_SUCCESS) {
++ if (ret != 0) {
+ pr_debug("sector read (0x%llX)fail\n",
+ (unsigned long long)sector);
+ goto error;
+@@ -772,7 +772,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+ if (index >= 0xFFFF && utbl_checksum == checksum) {
+ if (tmp_bh)
+ brelse(tmp_bh);
+- return FFS_SUCCESS;
++ return 0;
+ }
+ ret = -EINVAL;
+ error:
+@@ -833,7 +833,7 @@ static s32 __load_default_upcase_table(struct super_block *sb)
+ }
+
+ if (index >= 0xFFFF)
+- return FFS_SUCCESS;
++ return 0;
+
+ error:
+ /* FATAL error: default upcase table has error */
+@@ -878,9 +878,9 @@ s32 load_upcase_table(struct super_block *sb)
+ sector = START_SECTOR(tbl_clu);
+ num_sectors = ((tbl_size - 1) >> p_bd->sector_size_bits) + 1;
+ if (__load_upcase_table(sb, sector, num_sectors,
+- GET32_A(ep->checksum)) != FFS_SUCCESS)
++ GET32_A(ep->checksum)) != 0)
+ break;
+- return FFS_SUCCESS;
++ return 0;
+ }
+ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+ return -EIO;
+@@ -1251,7 +1251,7 @@ s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ init_dos_entry(dos_ep, type, start_clu);
+ buf_modify(sb, sector);
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+@@ -1281,7 +1281,7 @@ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ init_strm_entry(strm_ep, flags, start_clu, size);
+ buf_modify(sb, sector);
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+@@ -1332,7 +1332,7 @@ static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ buf_modify(sb, sector);
+ }
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+@@ -1378,7 +1378,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+
+ update_dir_checksum(sb, p_dir, entry);
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ void init_dos_entry(struct dos_dentry_t *ep, u32 type, u32 start_clu)
+@@ -1599,7 +1599,7 @@ static s32 _walk_fat_chain(struct super_block *sb, struct chain_t *p_dir,
+
+ if (clu)
+ *clu = cur_clu;
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+@@ -1618,7 +1618,7 @@ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ *sector += p_fs->root_start_sector;
+ } else {
+ ret = _walk_fat_chain(sb, p_dir, off, &clu);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ /* byte offset in cluster */
+@@ -1631,7 +1631,7 @@ s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ *sector = off >> p_bd->sector_size_bits;
+ *sector += START_SECTOR(clu);
+ }
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ struct dentry_t *get_entry_with_sector(struct super_block *sb, sector_t sector,
+@@ -1654,7 +1654,7 @@ struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
+ sector_t sec;
+ u8 *buf;
+
+- if (find_location(sb, p_dir, entry, &sec, &off) != FFS_SUCCESS)
++ if (find_location(sb, p_dir, entry, &sec, &off) != 0)
+ return NULL;
+
+ buf = buf_getblk(sb, sec);
+@@ -1708,7 +1708,7 @@ struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
+
+ byte_offset = entry << DENTRY_SIZE_BITS;
+ ret = _walk_fat_chain(sb, p_dir, byte_offset, &clu);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return NULL;
+
+ /* byte offset in cluster */
+@@ -1903,7 +1903,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+ }
+
+ pr_debug("%s exited successfully\n", __func__);
+- return FFS_SUCCESS;
++ return 0;
+ err_out:
+ pr_debug("%s failed\n", __func__);
+ return -EINVAL;
+@@ -1942,7 +1942,7 @@ s32 write_partial_entries_in_entry_set(struct super_block *sb,
+ byte_offset += ((void **)ep - &es->__buf) + es->offset;
+
+ ret = _walk_fat_chain(sb, &dir, byte_offset, &clu);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ /* byte offset in cluster */
+@@ -2086,7 +2086,7 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ if (ret < 1)
+ return -EIO;
+
+- if (clear_cluster(sb, clu.dir) != FFS_SUCCESS)
++ if (clear_cluster(sb, clu.dir) != 0)
+ return -EIO;
+
+ /* (2) append to the FAT chain */
+@@ -2597,7 +2597,7 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+
+ *entries = num_entries;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ void get_uni_name_from_dos_entry(struct super_block *sb,
+@@ -2833,7 +2833,7 @@ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ fat_attach_count_to_dos_name(p_dosname->name, count);
+
+ /* Now dos_name has DOS~????.EXT */
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ void fat_attach_count_to_dos_name(u8 *dosname, s32 count)
+@@ -2975,7 +2975,7 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+ p_dir->size = (s32)(fid->size >> p_fs->cluster_size_bits);
+ p_dir->flags = fid->flags;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ /*
+@@ -3067,7 +3067,7 @@ s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+
+ p_fs->fs_func = &fat_fs_func;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+@@ -3120,7 +3120,7 @@ s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+
+ p_fs->fs_func = &fat_fs_func;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ static struct fs_func exfat_fs_func = {
+@@ -3195,7 +3195,7 @@ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+
+ p_fs->fs_func = &exfat_fs_func;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+@@ -3231,7 +3231,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ return -ENOSPC;
+
+ ret = clear_cluster(sb, clu.dir);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ if (p_fs->vol_type == EXFAT) {
+@@ -3249,11 +3249,11 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+
+ ret = fs_func->init_dir_entry(sb, &clu, 0, TYPE_DIR, clu.dir,
+ 0);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ ret = fs_func->init_ext_entry(sb, &clu, 0, 1, NULL, &dot_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ memcpy(dot_name.name, DOS_PAR_DIR_NAME, DOS_NAME_LENGTH);
+@@ -3265,12 +3265,12 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ ret = fs_func->init_dir_entry(sb, &clu, 1, TYPE_DIR,
+ p_dir->dir, 0);
+
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ ret = p_fs->fs_func->init_ext_entry(sb, &clu, 1, 1, NULL,
+ &dot_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+ }
+
+@@ -3278,12 +3278,12 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ /* make sub-dir entry in parent directory */
+ ret = fs_func->init_dir_entry(sb, p_dir, dentry, TYPE_DIR, clu.dir,
+ size);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ ret = fs_func->init_ext_entry(sb, p_dir, dentry, num_entries, p_uniname,
+ &dos_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ fid->dir.dir = p_dir->dir;
+@@ -3300,7 +3300,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ fid->rwoffset = 0;
+ fid->hint_last_off = -1;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 create_file(struct inode *inode, struct chain_t *p_dir,
+@@ -3328,12 +3328,12 @@ s32 create_file(struct inode *inode, struct chain_t *p_dir,
+ */
+ ret = fs_func->init_dir_entry(sb, p_dir, dentry, TYPE_FILE | mode,
+ CLUSTER_32(0), 0);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ ret = fs_func->init_ext_entry(sb, p_dir, dentry, num_entries, p_uniname,
+ &dos_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ fid->dir.dir = p_dir->dir;
+@@ -3350,7 +3350,7 @@ s32 create_file(struct inode *inode, struct chain_t *p_dir,
+ fid->rwoffset = 0;
+ fid->hint_last_off = -1;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ void remove_file(struct inode *inode, struct chain_t *p_dir, s32 entry)
+@@ -3458,7 +3458,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ ret = fs_func->init_ext_entry(sb, p_dir, newentry,
+ num_new_entries, p_uniname,
+ &dos_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ fs_func->delete_dir_entry(sb, p_dir, oldentry, 0,
+@@ -3477,14 +3477,14 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ ret = fs_func->init_ext_entry(sb, p_dir, oldentry,
+ num_new_entries, p_uniname,
+ &dos_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ fs_func->delete_dir_entry(sb, p_dir, oldentry, num_new_entries,
+ num_old_entries);
+ }
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+@@ -3580,7 +3580,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+
+ ret = fs_func->init_ext_entry(sb, p_newdir, newentry, num_new_entries,
+ p_uniname, &dos_name);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ return ret;
+
+ fs_func->delete_dir_entry(sb, p_olddir, oldentry, 0, num_old_entries);
+@@ -3591,7 +3591,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+
+ fid->entry = newentry;
+
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ /*
+@@ -3614,7 +3614,7 @@ int sector_read(struct super_block *sb, sector_t sec, struct buffer_head **bh,
+
+ if (!p_fs->dev_ejected) {
+ ret = bdev_read(sb, sec, bh, 1, read);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+
+@@ -3643,7 +3643,7 @@ int sector_write(struct super_block *sb, sector_t sec, struct buffer_head *bh,
+
+ if (!p_fs->dev_ejected) {
+ ret = bdev_write(sb, sec, bh, 1, sync);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+
+@@ -3666,7 +3666,7 @@ int multi_sector_read(struct super_block *sb, sector_t sec,
+
+ if (!p_fs->dev_ejected) {
+ ret = bdev_read(sb, sec, bh, num_secs, read);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+
+@@ -3694,7 +3694,7 @@ int multi_sector_write(struct super_block *sb, sector_t sec,
+
+ if (!p_fs->dev_ejected) {
+ ret = bdev_write(sb, sec, bh, num_secs, sync);
+- if (ret != FFS_SUCCESS)
++ if (ret != 0)
+ p_fs->dev_ejected = 1;
+ }
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 2f199d78bfa6..7941944ec09f 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -373,7 +373,7 @@ static int ffsMountVol(struct super_block *sb)
+ sb_set_blocksize(sb, p_bd->sector_size);
+
+ /* read Sector 0 */
+- if (sector_read(sb, 0, &tmp_bh, 1) != FFS_SUCCESS) {
++ if (sector_read(sb, 0, &tmp_bh, 1) != 0) {
+ ret = -EIO;
+ goto out;
+ }
+@@ -452,7 +452,7 @@ static int ffsMountVol(struct super_block *sb)
+ static int ffsUmountVol(struct super_block *sb)
+ {
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+- int err = FFS_SUCCESS;
++ int err = 0;
+
+ pr_info("[EXFAT] trying to unmount...\n");
+
+@@ -493,7 +493,7 @@ static int ffsUmountVol(struct super_block *sb)
+
+ static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info)
+ {
+- int err = FFS_SUCCESS;
++ int err = 0;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ /* check the validity of pointer parameters */
+@@ -523,7 +523,7 @@ static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info)
+
+ static int ffsSyncVol(struct super_block *sb, bool do_sync)
+ {
+- int err = FFS_SUCCESS;
++ int err = 0;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ /* acquire the lock for file system critical section */
+@@ -776,13 +776,13 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+
+ if ((offset == 0) && (oneblkread == p_bd->sector_size)) {
+ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
+- FFS_SUCCESS)
++ 0)
+ goto err_out;
+ memcpy((char *)buffer + read_bytes,
+ (char *)tmp_bh->b_data, (s32)oneblkread);
+ } else {
+ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
+- FFS_SUCCESS)
++ 0)
+ goto err_out;
+ memcpy((char *)buffer + read_bytes,
+ (char *)tmp_bh->b_data + offset,
+@@ -852,7 +852,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ if (count == 0) {
+ if (wcount)
+ *wcount = 0;
+- ret = FFS_SUCCESS;
++ ret = 0;
+ goto out;
+ }
+
+@@ -962,12 +962,12 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+
+ if ((offset == 0) && (oneblkwrite == p_bd->sector_size)) {
+ if (sector_read(sb, LogSector, &tmp_bh, 0) !=
+- FFS_SUCCESS)
++ 0)
+ goto err_out;
+ memcpy((char *)tmp_bh->b_data,
+ (char *)buffer + write_bytes, (s32)oneblkwrite);
+ if (sector_write(sb, LogSector, tmp_bh, 0) !=
+- FFS_SUCCESS) {
++ 0) {
+ brelse(tmp_bh);
+ goto err_out;
+ }
+@@ -975,18 +975,18 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ if ((offset > 0) ||
+ ((fid->rwoffset + oneblkwrite) < fid->size)) {
+ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
+- FFS_SUCCESS)
++ 0)
+ goto err_out;
+ } else {
+ if (sector_read(sb, LogSector, &tmp_bh, 0) !=
+- FFS_SUCCESS)
++ 0)
+ goto err_out;
+ }
+
+ memcpy((char *)tmp_bh->b_data + offset,
+ (char *)buffer + write_bytes, (s32)oneblkwrite);
+ if (sector_write(sb, LogSector, tmp_bh, 0) !=
+- FFS_SUCCESS) {
++ 0) {
+ brelse(tmp_bh);
+ goto err_out;
+ }
+@@ -1100,7 +1100,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ }
+
+ if (old_size <= new_size) {
+- ret = FFS_SUCCESS;
++ ret = 0;
+ goto out;
+ }
+
+@@ -1319,7 +1319,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ ret = move_file(new_parent_inode, &olddir, dentry, &newdir,
+ &uni_name, fid);
+
+- if ((ret == FFS_SUCCESS) && new_inode) {
++ if ((ret == 0) && new_inode) {
+ /* delete entries of new_dir */
+ ep = get_entry_in_dir(sb, p_dir, new_entry, NULL);
+ if (!ep)
+@@ -1350,7 +1350,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+ {
+ s32 dentry;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ struct chain_t dir, clu_to_free;
+ struct dentry_t *ep;
+ struct super_block *sb = inode->i_sb;
+@@ -1414,7 +1414,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+ static int ffsSetAttr(struct inode *inode, u32 attr)
+ {
+ u32 type;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ sector_t sector = 0;
+ struct dentry_t *ep;
+ struct super_block *sb = inode->i_sb;
+@@ -1426,7 +1426,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ if (fid->attr == attr) {
+ if (p_fs->dev_ejected)
+ return -EIO;
+- return FFS_SUCCESS;
++ return 0;
+ }
+
+ if (is_dir) {
+@@ -1434,7 +1434,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ (fid->entry == -1)) {
+ if (p_fs->dev_ejected)
+ return -EIO;
+- return FFS_SUCCESS;
++ return 0;
+ }
+ }
+
+@@ -1503,7 +1503,7 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ {
+ sector_t sector = 0;
+ s32 count;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ struct chain_t dir;
+ struct uni_name_t uni_name;
+ struct timestamp_t tm;
+@@ -1655,7 +1655,7 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ {
+ sector_t sector = 0;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ struct timestamp_t tm;
+ struct dentry_t *ep, *ep2;
+ struct entry_set_cache_t *es = NULL;
+@@ -1674,7 +1674,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ (fid->entry == -1)) {
+ if (p_fs->dev_ejected)
+ ret = -EIO;
+- ret = FFS_SUCCESS;
++ ret = 0;
+ goto out;
+ }
+ }
+@@ -1745,7 +1745,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ s32 num_clusters, num_alloced;
+ bool modified = false;
+ u32 last_clu;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ sector_t sector = 0;
+ struct chain_t new_clu;
+ struct dentry_t *ep;
+@@ -1898,7 +1898,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+
+ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
+ {
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ struct chain_t dir;
+ struct uni_name_t uni_name;
+ struct super_block *sb = inode->i_sb;
+@@ -1939,7 +1939,7 @@ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
+ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ {
+ int i, dentry, clu_offset;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ s32 dentries_per_clu, dentries_per_clu_bits = 0;
+ u32 type;
+ sector_t sector;
+@@ -2138,7 +2138,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ {
+ s32 dentry;
+- int ret = FFS_SUCCESS;
++ int ret = 0;
+ struct chain_t dir, clu_to_free;
+ struct super_block *sb = inode->i_sb;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);commit 97eab6cee3a6ac679a2f531a248df3c994182522 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Mon Nov 11 21:09:54 2019 -0500 + + staging: exfat: Clean up return codes - remove unused codes + + There are 6 FFS_* error values not used at all. Remove them. + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Link: https://lore.kernel.org/r/20191112021000.42091-7-Valdis.Kletnieks@vt.edu + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h +index 443fafe1d89d..b3fc9bb06c24 100644 +--- a/drivers/staging/exfat/exfat.h ++++ b/drivers/staging/exfat/exfat.h +@@ -210,12 +210,6 @@ static inline u16 get_row_index(u16 i) + + /* return values */ + #define FFS_SUCCESS 0 +-#define FFS_MOUNTED 3 +-#define FFS_NOTMOUNTED 4 +-#define FFS_ALIGNMENTERR 5 +-#define FFS_SEMAPHOREERR 6 +-#define FFS_NOTOPENED 12 +-#define FFS_MAXOPENED 13 + + #define NUM_UPCASE 2918 ++
commit 0a7ef8d9483b96bea89c8b99b7b509697d48701d
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:53 2019 -0500
+
+ staging: exfat: Clean up return codes - FFS_ERROR
+
+ Convert FFS_ERROR to -EINVAL
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-6-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 7a817405c624..443fafe1d89d 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -216,7 +216,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_SEMAPHOREERR 6
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+-#define FFS_ERROR 19
+
+ #define NUM_UPCASE 2918
+
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 2f6e9d724625..ffcad6867ecb 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -699,7 +699,7 @@ void sync_alloc_bitmap(struct super_block *sb)
+ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+ u32 num_sectors, u32 utbl_checksum)
+ {
+- int i, ret = FFS_ERROR;
++ int i, ret = -EINVAL;
+ u32 j;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+@@ -774,7 +774,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+ brelse(tmp_bh);
+ return FFS_SUCCESS;
+ }
+- ret = FFS_ERROR;
++ ret = -EINVAL;
+ error:
+ if (tmp_bh)
+ brelse(tmp_bh);
+@@ -784,7 +784,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+
+ static s32 __load_default_upcase_table(struct super_block *sb)
+ {
+- int i, ret = FFS_ERROR;
++ int i, ret = -EINVAL;
+ u32 j;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+@@ -1906,7 +1906,7 @@ static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
+ return FFS_SUCCESS;
+ err_out:
+ pr_debug("%s failed\n", __func__);
+- return FFS_ERROR;
++ return -EINVAL;
+ }
+
+ /* write back all entries in entry set */
+@@ -1931,7 +1931,7 @@ s32 write_partial_entries_in_entry_set(struct super_block *sb,
+
+ /* vaidity check */
+ if (ep + count > ((struct dentry_t *)&es->__buf) + es->num_entries)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ dir.dir = GET_CLUSTER_FROM_SECTOR(es->sector);
+ dir.flags = es->alloc_flag;
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index a9129b569523..2f199d78bfa6 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -498,7 +498,7 @@ static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info)
+
+ /* check the validity of pointer parameters */
+ if (!info)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -561,7 +561,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+
+ /* check the validity of pointer parameters */
+ if (!fid || !path || (*path == '\0'))
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -654,7 +654,7 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode,
+
+ /* check the validity of pointer parameters */
+ if (!fid || !path || (*path == '\0'))
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -703,7 +703,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+
+ /* check the validity of pointer parameters */
+ if (!buffer)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -835,7 +835,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+
+ /* check the validity of pointer parameters */
+ if (!buffer)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -1241,7 +1241,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+
+ /* check the validity of pointer parameters */
+ if (!new_path || (*new_path == '\0'))
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -1464,7 +1464,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ if (p_fs->dev_ejected)
+ ret = -EIO;
+ else
+- ret = FFS_ERROR;
++ ret = -EINVAL;
+
+ if (p_fs->vol_type == EXFAT)
+ release_entry_set(es);
+@@ -1756,7 +1756,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+
+ /* check the validity of pointer parameters */
+ if (!clu)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -1908,7 +1908,7 @@ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
+
+ /* check the validity of pointer parameters */
+ if (!fid || !path || (*path == '\0'))
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -1954,7 +1954,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+
+ /* check the validity of pointer parameters */
+ if (!dir_entry)
+- return FFS_ERROR;
++ return -EINVAL;
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_DIR)commit 7785913b079fafd461a668034c76d604fe513770 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Mon Nov 11 21:09:52 2019 -0500 + + staging: exfat: Clean up return codes - FFS_INVALIDFID + + Covert FFS_INVALIDFID to -EINVAL + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Link: https://lore.kernel.org/r/20191112021000.42091-5-Valdis.Kletnieks@vt.edu + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h +index 292af85e3cd2..7a817405c624 100644 +--- a/drivers/staging/exfat/exfat.h ++++ b/drivers/staging/exfat/exfat.h +@@ -214,7 +214,6 @@ static inline u16 get_row_index(u16 i) + #define FFS_NOTMOUNTED 4 + #define FFS_ALIGNMENTERR 5 + #define FFS_SEMAPHOREERR 6 +-#define FFS_INVALIDFID 8 + #define FFS_NOTOPENED 12 + #define FFS_MAXOPENED 13 + #define FFS_ERROR 19 +diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c +index 77e00d007ad3..a9129b569523 100644 +--- a/drivers/staging/exfat/exfat_super.c ++++ b/drivers/staging/exfat/exfat_super.c +@@ -699,7 +699,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer, + + /* check the validity of the given file id */ + if (!fid) +- return FFS_INVALIDFID; ++ return -EINVAL; + + /* check the validity of pointer parameters */ + if (!buffer) +@@ -831,7 +831,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid, + + /* check the validity of the given file id */ + if (!fid) +- return FFS_INVALIDFID; ++ return -EINVAL; + + /* check the validity of pointer parameters */ + if (!buffer) +@@ -1237,7 +1237,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid, + + /* check the validity of the given file id */ + if (!fid) +- return FFS_INVALIDFID; ++ return -EINVAL; + + /* check the validity of pointer parameters */ + if (!new_path || (*new_path == '\0')) +@@ -1358,7 +1358,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid) + + /* check the validity of the given file id */ + if (!fid) +- return FFS_INVALIDFID; ++ return -EINVAL; + + /* acquire the lock for file system critical section */ + mutex_lock(&p_fs->v_mutex); +@@ -2145,7 +2145,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid) + + /* check the validity of the given file id */ + if (!fid) +- return FFS_INVALIDFID; ++ return -EINVAL; + + dir.dir = fid->dir.dir; + dir.size = fid->dir.size;
commit f9c53abb42997d5af1232712a39f81c7f1ba1c01
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:51 2019 -0500
+
+ staging: exfat: Clean up return codes - FFS_EOF
+
+ Convert FFS_EOF to return 0 for a zero-length read() as per 'man 2 read'.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-4-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 286605262345..292af85e3cd2 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -217,7 +217,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_INVALIDFID 8
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+-#define FFS_EOF 15
+ #define FFS_ERROR 19
+
+ #define NUM_UPCASE 2918
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 1a906579724c..77e00d007ad3 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -723,7 +723,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+ if (count == 0) {
+ if (rcount)
+ *rcount = 0;
+- ret = FFS_EOF;
++ ret = 0;
+ goto out;
+ }
+ commit a75500c5d3106d1b8f967b26edfcb9f945871516
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:50 2019 -0500
+
+ staging: exfat: Clean up return codes - FFS_MEDIAERR
+
+ Convert FFS_MEDIAERR to (mostly) -ENOENT and -EIO. Some additional code surgery
+ needed to propogate correct error codes upwards.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-3-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 4f9ba235d967..286605262345 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -210,7 +210,6 @@ static inline u16 get_row_index(u16 i)
+
+ /* return values */
+ #define FFS_SUCCESS 0
+-#define FFS_MEDIAERR 1
+ #define FFS_MOUNTED 3
+ #define FFS_NOTMOUNTED 4
+ #define FFS_ALIGNMENTERR 5
+diff --git a/drivers/staging/exfat/exfat_blkdev.c b/drivers/staging/exfat/exfat_blkdev.c
+index 81d20e6241c6..0abae041f632 100644
+--- a/drivers/staging/exfat/exfat_blkdev.c
++++ b/drivers/staging/exfat/exfat_blkdev.c
+@@ -40,11 +40,11 @@ int bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
+ long flags = sbi->debug_flags;
+
+ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
+- return FFS_MEDIAERR;
++ return -EIO;
+ #endif /* CONFIG_EXFAT_KERNEL_DEBUG */
+
+ if (!p_bd->opened)
+- return FFS_MEDIAERR;
++ return -ENODEV;
+
+ if (*bh)
+ __brelse(*bh);
+@@ -62,7 +62,7 @@ int bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
+ WARN(!p_fs->dev_ejected,
+ "[EXFAT] No bh, device seems wrong or to be ejected.\n");
+
+- return FFS_MEDIAERR;
++ return -EIO;
+ }
+
+ int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+@@ -77,11 +77,11 @@ int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+ long flags = sbi->debug_flags;
+
+ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
+- return FFS_MEDIAERR;
++ return -EIO;
+ #endif /* CONFIG_EXFAT_KERNEL_DEBUG */
+
+ if (!p_bd->opened)
+- return FFS_MEDIAERR;
++ return -ENODEV;
+
+ if (secno == bh->b_blocknr) {
+ lock_buffer(bh);
+@@ -89,7 +89,7 @@ int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+ mark_buffer_dirty(bh);
+ unlock_buffer(bh);
+ if (sync && (sync_dirty_buffer(bh) != 0))
+- return FFS_MEDIAERR;
++ return -EIO;
+ } else {
+ count = num_secs << p_bd->sector_size_bits;
+
+@@ -115,7 +115,7 @@ int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
+ WARN(!p_fs->dev_ejected,
+ "[EXFAT] No bh, device seems wrong or to be ejected.\n");
+
+- return FFS_MEDIAERR;
++ return -EIO;
+ }
+
+ int bdev_sync(struct super_block *sb)
+@@ -126,11 +126,11 @@ int bdev_sync(struct super_block *sb)
+ long flags = sbi->debug_flags;
+
+ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
+- return FFS_MEDIAERR;
++ return -EIO;
+ #endif /* CONFIG_EXFAT_KERNEL_DEBUG */
+
+ if (!p_bd->opened)
+- return FFS_MEDIAERR;
++ return -ENODEV;
+
+ return sync_blockdev(sb->s_bdev);
+ }
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index e90b54a17150..2f6e9d724625 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -252,13 +252,13 @@ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ }
+
+ if (set_alloc_bitmap(sb, new_clu - 2) != FFS_SUCCESS)
+- return -1;
++ return -EIO;
+
+ num_clusters++;
+
+ if (p_chain->flags == 0x01) {
+ if (FAT_write(sb, new_clu, CLUSTER_32(~0)) < 0)
+- return -1;
++ return -EIO;
+ }
+
+ if (p_chain->dir == CLUSTER_32(~0)) {
+@@ -266,7 +266,7 @@ s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
+ } else {
+ if (p_chain->flags == 0x01) {
+ if (FAT_write(sb, last_clu, new_clu) < 0)
+- return -1;
++ return -EIO;
+ }
+ }
+ last_clu = new_clu;
+@@ -526,7 +526,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ ep = (struct bmap_dentry_t *)get_entry_in_dir(sb, &clu,
+ i, NULL);
+ if (!ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ type = p_fs->fs_func->get_entry_type((struct dentry_t *)ep);
+
+@@ -570,7 +570,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ }
+
+ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return FFS_MEDIAERR;
++ return -EIO;
+ }
+
+ return -EFSCORRUPTED;
+@@ -856,14 +856,14 @@ s32 load_upcase_table(struct super_block *sb)
+ clu.flags = 0x01;
+
+ if (p_fs->dev_ejected)
+- return FFS_MEDIAERR;
++ return -EIO;
+
+ while (clu.dir != CLUSTER_32(~0)) {
+ for (i = 0; i < p_fs->dentries_per_clu; i++) {
+ ep = (struct case_dentry_t *)get_entry_in_dir(sb, &clu,
+ i, NULL);
+ if (!ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ type = p_fs->fs_func->get_entry_type((struct dentry_t *)ep);
+
+@@ -883,7 +883,7 @@ s32 load_upcase_table(struct super_block *sb)
+ return FFS_SUCCESS;
+ }
+ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return FFS_MEDIAERR;
++ return -EIO;
+ }
+ /* load default upcase table */
+ return __load_default_upcase_table(sb);
+@@ -1246,7 +1246,7 @@ s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
+ dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+ §or);
+ if (!dos_ep)
+- return FFS_MEDIAERR;
++ return -EIO;
+
+ init_dos_entry(dos_ep, type, start_clu);
+ buf_modify(sb, sector);
+@@ -1268,12 +1268,12 @@ s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
+ file_ep = (struct file_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+ §or);
+ if (!file_ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ strm_ep = (struct strm_dentry_t *)get_entry_in_dir(sb, p_dir, entry + 1,
+ §or);
+ if (!strm_ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ init_file_entry(file_ep, type);
+ buf_modify(sb, sector);
+@@ -1299,7 +1299,7 @@ static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+ §or);
+ if (!dos_ep)
+- return FFS_MEDIAERR;
++ return -EIO;
+
+ dos_ep->lcase = p_dosname->name_case;
+ memcpy(dos_ep->name, p_dosname->name, DOS_NAME_LENGTH);
+@@ -1315,7 +1315,7 @@ static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ entry - i,
+ §or);
+ if (!ext_ep)
+- return FFS_MEDIAERR;
++ return -EIO;
+
+ init_ext_entry(ext_ep, i, chksum, uniname);
+ buf_modify(sb, sector);
+@@ -1326,7 +1326,7 @@ static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ entry - i,
+ §or);
+ if (!ext_ep)
+- return FFS_MEDIAERR;
++ return -EIO;
+
+ init_ext_entry(ext_ep, i + 0x40, chksum, uniname);
+ buf_modify(sb, sector);
+@@ -1350,7 +1350,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ file_ep = (struct file_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
+ §or);
+ if (!file_ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ file_ep->num_ext = (u8)(num_entries - 1);
+ buf_modify(sb, sector);
+@@ -1358,7 +1358,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ strm_ep = (struct strm_dentry_t *)get_entry_in_dir(sb, p_dir, entry + 1,
+ §or);
+ if (!strm_ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ strm_ep->name_len = p_uniname->name_len;
+ SET16_A(strm_ep->name_hash, p_uniname->name_hash);
+@@ -1369,7 +1369,7 @@ static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
+ entry + i,
+ §or);
+ if (!name_ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ init_name_entry(name_ep, uniname);
+ buf_modify(sb, sector);
+@@ -1592,7 +1592,7 @@ static s32 _walk_fat_chain(struct super_block *sb, struct chain_t *p_dir,
+ } else {
+ while (clu_offset > 0) {
+ if (FAT_read(sb, cur_clu, &cur_clu) == -1)
+- return FFS_MEDIAERR;
++ return -EIO;
+ clu_offset--;
+ }
+ }
+@@ -2084,10 +2084,10 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ /* (1) allocate a cluster */
+ ret = p_fs->fs_func->alloc_cluster(sb, 1, &clu);
+ if (ret < 1)
+- return -1;
++ return -EIO;
+
+ if (clear_cluster(sb, clu.dir) != FFS_SUCCESS)
+- return -1;
++ return -EIO;
+
+ /* (2) append to the FAT chain */
+ if (clu.flags != p_dir->flags) {
+@@ -2097,7 +2097,7 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ }
+ if (clu.flags == 0x01)
+ if (FAT_write(sb, last_clu, clu.dir) < 0)
+- return -1;
++ return -EIO;
+
+ if (p_fs->hint_uentry.entry == -1) {
+ p_fs->hint_uentry.dir = p_dir->dir;
+@@ -2118,7 +2118,7 @@ s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries
+ ep = get_entry_in_dir(sb, &fid->dir,
+ fid->entry + 1, §or);
+ if (!ep)
+- return -1;
++ return -ENOENT;
+ p_fs->fs_func->set_entry_size(ep, size);
+ p_fs->fs_func->set_entry_flag(ep, p_dir->flags);
+ buf_modify(sb, sector);
+@@ -2464,7 +2464,7 @@ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ for (i = 0; i < dentries_per_clu; i++) {
+ ep = get_entry_in_dir(sb, &clu, i, NULL);
+ if (!ep)
+- return -1;
++ return -ENOENT;
+
+ entry_type = p_fs->fs_func->get_entry_type(ep);
+
+@@ -2488,7 +2488,7 @@ s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
+ clu.dir = CLUSTER_32(~0);
+ } else {
+ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return -1;
++ return -EIO;
+ }
+ }
+
+@@ -2772,7 +2772,7 @@ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ ep = (struct dos_dentry_t *)get_entry_in_dir(sb, &clu,
+ i, NULL);
+ if (!ep)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ type = p_fs->fs_func->get_entry_type((struct dentry_t *)
+ ep);
+@@ -2811,7 +2811,7 @@ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ break; /* FAT16 root_dir */
+
+ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
+- return FFS_MEDIAERR;
++ return -EIO;
+ }
+
+ count = 0;
+@@ -3226,7 +3226,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ /* (1) allocate a cluster */
+ ret = fs_func->alloc_cluster(sb, 1, &clu);
+ if (ret < 0)
+- return FFS_MEDIAERR;
++ return ret;
+ else if (ret == 0)
+ return -ENOSPC;
+
+@@ -3395,7 +3395,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+
+ epold = get_entry_in_dir(sb, p_dir, oldentry, §or_old);
+ if (!epold)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ buf_lock(sb, sector_old);
+
+@@ -3404,7 +3404,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ epold);
+ if (num_old_entries < 0) {
+ buf_unlock(sb, sector_old);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+ num_old_entries++;
+
+@@ -3425,7 +3425,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ epnew = get_entry_in_dir(sb, p_dir, newentry, §or_new);
+ if (!epnew) {
+ buf_unlock(sb, sector_old);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
+@@ -3447,7 +3447,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+
+ if (!epold || !epnew) {
+ buf_unlock(sb, sector_old);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
+@@ -3502,7 +3502,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+
+ epmov = get_entry_in_dir(sb, p_olddir, oldentry, §or_mov);
+ if (!epmov)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ /* check if the source and target directory is the same */
+ if (fs_func->get_entry_type(epmov) == TYPE_DIR &&
+@@ -3516,7 +3516,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ epmov);
+ if (num_old_entries < 0) {
+ buf_unlock(sb, sector_mov);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+ num_old_entries++;
+
+@@ -3536,7 +3536,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ epnew = get_entry_in_dir(sb, p_newdir, newentry, §or_new);
+ if (!epnew) {
+ buf_unlock(sb, sector_mov);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
+@@ -3556,7 +3556,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ §or_new);
+ if (!epmov || !epnew) {
+ buf_unlock(sb, sector_mov);
+- return FFS_MEDIAERR;
++ return -ENOENT;
+ }
+
+ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
+@@ -3569,7 +3569,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+
+ epnew = get_entry_in_dir(sb, &clu, 1, §or_new);
+ if (!epnew)
+- return FFS_MEDIAERR;
++ return -ENOENT;
+
+ if (p_newdir->dir == p_fs->root_dir)
+ fs_func->set_entry_clu0(epnew, CLUSTER_32(0));
+@@ -3601,7 +3601,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ int sector_read(struct super_block *sb, sector_t sec, struct buffer_head **bh,
+ bool read)
+ {
+- s32 ret = FFS_MEDIAERR;
++ s32 ret = -EIO;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ if ((sec >= (p_fs->PBR_sector + p_fs->num_sectors)) &&
+@@ -3624,7 +3624,7 @@ int sector_read(struct super_block *sb, sector_t sec, struct buffer_head **bh,
+ int sector_write(struct super_block *sb, sector_t sec, struct buffer_head *bh,
+ bool sync)
+ {
+- s32 ret = FFS_MEDIAERR;
++ s32 ret = -EIO;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ if (sec >= (p_fs->PBR_sector + p_fs->num_sectors) &&
+@@ -3653,7 +3653,7 @@ int sector_write(struct super_block *sb, sector_t sec, struct buffer_head *bh,
+ int multi_sector_read(struct super_block *sb, sector_t sec,
+ struct buffer_head **bh, s32 num_secs, bool read)
+ {
+- s32 ret = FFS_MEDIAERR;
++ s32 ret = -EIO;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ if (((sec + num_secs) > (p_fs->PBR_sector + p_fs->num_sectors)) &&
+@@ -3676,7 +3676,7 @@ int multi_sector_read(struct super_block *sb, sector_t sec,
+ int multi_sector_write(struct super_block *sb, sector_t sec,
+ struct buffer_head *bh, s32 num_secs, bool sync)
+ {
+- s32 ret = FFS_MEDIAERR;
++ s32 ret = -EIO;
+ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
+
+ if ((sec + num_secs) > (p_fs->PBR_sector + p_fs->num_sectors) &&
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 9337fd4caaae..1a906579724c 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -364,7 +364,9 @@ static int ffsMountVol(struct super_block *sb)
+ bdev_open(sb);
+
+ if (p_bd->sector_size < sb->s_blocksize) {
+- ret = FFS_MEDIAERR;
++ printk(KERN_INFO "EXFAT: maont failed - sector size %d less than blocksize %ld\n",
++ p_bd->sector_size, sb->s_blocksize);
++ ret = -EINVAL;
+ goto out;
+ }
+ if (p_bd->sector_size > sb->s_blocksize)
+@@ -372,7 +374,7 @@ static int ffsMountVol(struct super_block *sb)
+
+ /* read Sector 0 */
+ if (sector_read(sb, 0, &tmp_bh, 1) != FFS_SUCCESS) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+
+@@ -435,7 +437,7 @@ static int ffsMountVol(struct super_block *sb)
+ free_alloc_bitmap(sb);
+ }
+ bdev_close(sb);
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+
+@@ -475,7 +477,7 @@ static int ffsUmountVol(struct super_block *sb)
+
+ if (p_fs->dev_ejected) {
+ pr_info("[EXFAT] unmounted with media errors. Device is already ejected.\n");
+- err = FFS_MEDIAERR;
++ err = -EIO;
+ }
+
+ buf_shutdown(sb);
+@@ -511,7 +513,7 @@ static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info)
+ info->FreeClusters = info->NumClusters - info->UsedClusters;
+
+ if (p_fs->dev_ejected)
+- err = FFS_MEDIAERR;
++ err = -EIO;
+
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -532,7 +534,7 @@ static int ffsSyncVol(struct super_block *sb, bool do_sync)
+ fs_set_vol_flags(sb, VOL_CLEAN);
+
+ if (p_fs->dev_ejected)
+- err = FFS_MEDIAERR;
++ err = -EIO;
+
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -601,14 +603,14 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+ es = get_entry_set_in_dir(sb, &dir, dentry,
+ ES_2_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep + 1;
+ } else {
+ ep = get_entry_in_dir(sb, &dir, dentry, NULL);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep;
+@@ -633,7 +635,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+ }
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ out:
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -673,7 +675,7 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode,
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -744,7 +746,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+ while (clu_offset > 0) {
+ /* clu = FAT_read(sb, clu); */
+ if (FAT_read(sb, clu, &clu) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+
+@@ -799,7 +801,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+ *rcount = read_bytes;
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -890,7 +892,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ last_clu = clu;
+ /* clu = FAT_read(sb, clu); */
+ if (FAT_read(sb, clu, &clu) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ clu_offset--;
+@@ -912,7 +914,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ if (num_alloced == 0)
+ break;
+ if (num_alloced < 0) {
+- ret = FFS_MEDIAERR;
++ ret = num_alloced;
+ goto out;
+ }
+
+@@ -1057,7 +1059,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ ret = -ENOSPC;
+
+ else if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -1118,7 +1120,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ while (num_clusters > 0) {
+ last_clu = clu.dir;
+ if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ num_clusters--;
+@@ -1140,14 +1142,14 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+ ES_ALL_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep + 1;
+ } else {
+ ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep;
+@@ -1189,7 +1191,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ pr_debug("%s exited (%d)\n", __func__, ret);
+@@ -1262,7 +1264,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+
+ ep = get_entry_in_dir(sb, &olddir, dentry, NULL);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out2;
+ }
+
+@@ -1275,7 +1277,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ if (new_inode) {
+ u32 entry_type;
+
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ new_fid = &EXFAT_I(new_inode)->fid;
+
+ update_parent_info(new_fid, new_parent_inode);
+@@ -1337,7 +1339,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ out2:
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -1369,7 +1371,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+
+ ep = get_entry_in_dir(sb, &dir, dentry, NULL);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+
+@@ -1399,7 +1401,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ out:
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -1423,7 +1425,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+
+ if (fid->attr == attr) {
+ if (p_fs->dev_ejected)
+- return FFS_MEDIAERR;
++ return -EIO;
+ return FFS_SUCCESS;
+ }
+
+@@ -1431,7 +1433,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ if ((fid->dir.dir == p_fs->root_dir) &&
+ (fid->entry == -1)) {
+ if (p_fs->dev_ejected)
+- return FFS_MEDIAERR;
++ return -EIO;
+ return FFS_SUCCESS;
+ }
+ }
+@@ -1444,13 +1446,13 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+ ES_ALL_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ } else {
+ ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ }
+@@ -1460,7 +1462,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ if (((type == TYPE_FILE) && (attr & ATTR_SUBDIR)) ||
+ ((type == TYPE_DIR) && (!(attr & ATTR_SUBDIR)))) {
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ else
+ ret = FFS_ERROR;
+
+@@ -1488,7 +1490,7 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ out:
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -1544,13 +1546,13 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+
+ count = count_dos_name_entries(sb, &dir, TYPE_DIR);
+ if (count < 0) {
+- ret = FFS_MEDIAERR;
++ ret = count; /* propogate error upward */
+ goto out;
+ }
+ info->NumSubdirs = count;
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ }
+@@ -1560,14 +1562,14 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+ ES_2_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep + 1;
+ } else {
+ ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep;
+@@ -1633,14 +1635,14 @@ static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
+
+ count = count_dos_name_entries(sb, &dir, TYPE_DIR);
+ if (count < 0) {
+- ret = FFS_MEDIAERR;
++ ret = count; /* propogate error upward */
+ goto out;
+ }
+ info->NumSubdirs += count;
+ }
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -1671,7 +1673,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ if ((fid->dir.dir == p_fs->root_dir) &&
+ (fid->entry == -1)) {
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ ret = FFS_SUCCESS;
+ goto out;
+ }
+@@ -1684,7 +1686,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+ ES_ALL_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep + 1;
+@@ -1692,7 +1694,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ /* for other than exfat */
+ ep = get_entry_in_dir(sb, &fid->dir, fid->entry, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ ep2 = ep;
+@@ -1727,7 +1729,7 @@ static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
+ }
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -1789,7 +1791,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ while ((clu_offset > 0) && (*clu != CLUSTER_32(~0))) {
+ last_clu = *clu;
+ if (FAT_read(sb, *clu, clu) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ clu_offset--;
+@@ -1807,7 +1809,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ /* (1) allocate a cluster */
+ num_alloced = p_fs->fs_func->alloc_cluster(sb, 1, &new_clu);
+ if (num_alloced < 0) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ } else if (num_alloced == 0) {
+ ret = -ENOSPC;
+@@ -1838,7 +1840,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
+ ES_ALL_ENTRIES, &ep);
+ if (!es) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ /* get stream entry */
+@@ -1851,7 +1853,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ ep = get_entry_in_dir(sb, &fid->dir,
+ fid->entry, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ }
+@@ -1881,7 +1883,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ fid->hint_last_clu = *clu;
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -1926,7 +1928,7 @@ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ out:
+ /* release the lock for file system critical section */
+ mutex_unlock(&p_fs->v_mutex);
+@@ -1956,7 +1958,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_DIR)
+- return -EPERM;
++ return -ENOTDIR;
+
+ /* acquire the lock for file system critical section */
+ mutex_lock(&p_fs->v_mutex);
+@@ -2006,7 +2008,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ while (clu_offset > 0) {
+ /* clu.dir = FAT_read(sb, clu.dir); */
+ if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ clu_offset--;
+@@ -2026,7 +2028,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ for ( ; i < dentries_per_clu; i++, dentry++) {
+ ep = get_entry_in_dir(sb, &clu, i, §or);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ type = fs_func->get_entry_type(ep);
+@@ -2074,7 +2076,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ if (p_fs->vol_type == EXFAT) {
+ ep = get_entry_in_dir(sb, &clu, i + 1, NULL);
+ if (!ep) {
+- ret = FFS_MEDIAERR;
++ ret = -ENOENT;
+ goto out;
+ }
+ } else {
+@@ -2098,7 +2100,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ fid->rwoffset = (s64)(++dentry);
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+
+@@ -2113,7 +2115,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ } else {
+ /* clu.dir = FAT_read(sb, clu.dir); */
+ if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+ goto out;
+ }
+ }
+@@ -2124,7 +2126,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+ fid->rwoffset = (s64)(++dentry);
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -2187,7 +2189,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ #endif
+
+ if (p_fs->dev_ejected)
+- ret = FFS_MEDIAERR;
++ ret = -EIO;
+
+ out:
+ /* release the lock for file system critical section */
+@@ -2247,12 +2249,11 @@ static int exfat_readdir(struct file *filp, struct dir_context *ctx)
+ /* at least we tried to read a sector
+ * move cpos to next sector position (should be aligned)
+ */
+- if (err == FFS_MEDIAERR) {
++ if (err == -EIO) {
+ cpos += 1 << p_bd->sector_size_bits;
+ cpos &= ~((1 << p_bd->sector_size_bits) - 1);
+ }
+
+- err = -EIO;
+ goto end_of_dir;
+ }
+
+@@ -3550,7 +3551,7 @@ static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)
+ struct vol_info_t info;
+
+ if (p_fs->used_clusters == UINT_MAX) {
+- if (ffsGetVolInfo(sb, &info) == FFS_MEDIAERR)
++ if (ffsGetVolInfo(sb, &info) == -EIO)
+ return -EIO;
+
+ } else {commit 133c887424712b50f184731b1cfe26ed7201cd6b
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Mon Nov 11 21:09:49 2019 -0500
+
+ staging: exfat: Clean up return codes - FFS_FORMATERR
+
+ Convert FFS_FORMATERR to -EFSCORRUPTED
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191112021000.42091-2-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index acb73f47a253..4f9ba235d967 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -30,6 +30,8 @@
+ #undef DEBUG
+ #endif
+
++#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
++
+ #define DENTRY_SIZE 32 /* dir entry size */
+ #define DENTRY_SIZE_BITS 5
+
+@@ -209,7 +211,6 @@ static inline u16 get_row_index(u16 i)
+ /* return values */
+ #define FFS_SUCCESS 0
+ #define FFS_MEDIAERR 1
+-#define FFS_FORMATERR 2
+ #define FFS_MOUNTED 3
+ #define FFS_NOTMOUNTED 4
+ #define FFS_ALIGNMENTERR 5
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index b23fbf3ebaa5..e90b54a17150 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -573,7 +573,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ return FFS_MEDIAERR;
+ }
+
+- return FFS_FORMATERR;
++ return -EFSCORRUPTED;
+ }
+
+ void free_alloc_bitmap(struct super_block *sb)
+@@ -3016,7 +3016,7 @@ s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+ if (p_bpb->num_fats == 0)
+- return FFS_FORMATERR;
++ return -EFSCORRUPTED;
+
+ num_root_sectors = GET16(p_bpb->num_root_entries) << DENTRY_SIZE_BITS;
+ num_root_sectors = ((num_root_sectors - 1) >>
+@@ -3078,7 +3078,7 @@ s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+ if (p_bpb->num_fats == 0)
+- return FFS_FORMATERR;
++ return -EFSCORRUPTED;
+
+ p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
+ p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
+@@ -3157,7 +3157,7 @@ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
+ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
+
+ if (p_bpb->num_fats == 0)
+- return FFS_FORMATERR;
++ return -EFSCORRUPTED;
+
+ p_fs->sectors_per_clu = 1 << p_bpb->sectors_per_clu_bits;
+ p_fs->sectors_per_clu_bits = p_bpb->sectors_per_clu_bits;
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index ee3d64178069..9337fd4caaae 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -384,7 +384,7 @@ static int ffsMountVol(struct super_block *sb)
+ if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
+ brelse(tmp_bh);
+ bdev_close(sb);
+- ret = FFS_FORMATERR;
++ ret = -EFSCORRUPTED;
+ goto out;
+ }
+ commit 37c250fd3844037fb53ad92366f3389e7876ab1d +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Oct 23 01:53:53 2019 -0400 + + staging: exfat: Update MAINTAINERS file + + Add a L: tag so get_maintainers.pl output includes the linux-fsdevel list + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Link: https://lore.kernel.org/r/20191023055353.695275-1-Valdis.Kletnieks@vt.edu + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/MAINTAINERS b/MAINTAINERS +index dfe76fb1ed5a..9034b76fe1df 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -6159,6 +6159,7 @@ F: include/uapi/linux/mii.h + + EXFAT FILE SYSTEM + M: Valdis Kletnieks <valdis.kletnieks@vt.edu> ++L: linux-fsdevel@vger.kernel.org + S: Maintained + F: drivers/staging/exfat/ +
commit 630d00b8b26de7d0487df6c45a3afbdae66475e6
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:19 2019 -0400
+
+ staging: exfat: Clean up return code - FFS_MEMORYERR
+
+ Convert FFS_MEMORYERR to -ENOMEM
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-9-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 8cb6d2e2ad8d..6142e880f682 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -218,7 +218,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+ #define FFS_EOF 15
+-#define FFS_MEMORYERR 17
+ #define FFS_ERROR 19
+
+ #define NUM_UPCASE 2918
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 0331fa6724ff..80fd3f0d6db4 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -544,7 +544,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
+ sizeof(struct buffer_head *),
+ GFP_KERNEL);
+ if (!p_fs->vol_amap)
+- return FFS_MEMORYERR;
++ return -ENOMEM;
+
+ sector = START_SECTOR(p_fs->map_clu);
+
+@@ -715,7 +715,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+ upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
+ GFP_KERNEL);
+ if (!upcase_table)
+- return FFS_MEMORYERR;
++ return -ENOMEM;
+ memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
+
+ while (sector < end_sector) {
+@@ -755,7 +755,7 @@ static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
+ upcase_table[col_index] = kmalloc_array(UTBL_ROW_COUNT,
+ sizeof(u16), GFP_KERNEL);
+ if (!upcase_table[col_index]) {
+- ret = FFS_MEMORYERR;
++ ret = -ENOMEM;
+ goto error;
+ }
+
+@@ -795,7 +795,7 @@ static s32 __load_default_upcase_table(struct super_block *sb)
+ upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
+ GFP_KERNEL);
+ if (!upcase_table)
+- return FFS_MEMORYERR;
++ return -ENOMEM;
+ memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
+
+ for (i = 0; index <= 0xFFFF && i < NUM_UPCASE * 2; i += 2) {
+@@ -818,7 +818,7 @@ static s32 __load_default_upcase_table(struct super_block *sb)
+ sizeof(u16),
+ GFP_KERNEL);
+ if (!upcase_table[col_index]) {
+- ret = FFS_MEMORYERR;
++ ret = -ENOMEM;
+ goto error;
+ }
+ commit 03eac8d594738fc6a678a4df2176d17f9ee130f4
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:18 2019 -0400
+
+ staging: exfat: Clean up return codes - FFS_INVALIDPATH
+
+ Convert FFS_INVALIDPATH to -EINVAL
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-8-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index b7dac748aaf9..8cb6d2e2ad8d 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -214,7 +214,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_NOTMOUNTED 4
+ #define FFS_ALIGNMENTERR 5
+ #define FFS_SEMAPHOREERR 6
+-#define FFS_INVALIDPATH 7
+ #define FFS_INVALIDFID 8
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 43aaa9566260..0331fa6724ff 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -2571,7 +2571,7 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+
+ num_entries = p_fs->fs_func->calc_num_entries(p_uniname);
+ if (num_entries == 0)
+- return FFS_INVALIDPATH;
++ return -EINVAL;
+
+ if (p_fs->vol_type != EXFAT) {
+ nls_uniname_to_dosname(sb, p_dosname, p_uniname, &lossy);
+@@ -2583,7 +2583,7 @@ s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ } else {
+ for (r = reserved_names; *r; r++) {
+ if (!strncmp((void *)p_dosname->name, *r, 8))
+- return FFS_INVALIDPATH;
++ return -EINVAL;
+ }
+
+ if (p_dosname->name_case != 0xFF)
+@@ -2962,11 +2962,11 @@ s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
+ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
+
+ if (strscpy(name_buf, path, sizeof(name_buf)) < 0)
+- return FFS_INVALIDPATH;
++ return -EINVAL;
+
+ nls_cstring_to_uniname(sb, p_uniname, name_buf, &lossy);
+ if (lossy)
+- return FFS_INVALIDPATH;
++ return -EINVAL;
+
+ fid->size = i_size_read(inode);
+
+@@ -3506,7 +3506,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ /* check if the source and target directory is the same */
+ if (fs_func->get_entry_type(epmov) == TYPE_DIR &&
+ fs_func->get_entry_clu0(epmov) == p_newdir->dir)
+- return FFS_INVALIDPATH;
++ return -EINVAL;
+
+ buf_lock(sb, sector_mov);
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index bc175b3366ac..dcf90b5f147b 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -2362,7 +2362,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+
+ err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_REGULAR, &fid);
+ if (err) {
+- if (err == FFS_INVALIDPATH)
++ if (err == -EINVAL)
+ err = -EINVAL;
+ else if (err == -EEXIST)
+ err = -EEXIST;
+@@ -2573,7 +2573,7 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry,
+
+ err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_SYMLINK, &fid);
+ if (err) {
+- if (err == FFS_INVALIDPATH)
++ if (err == -EINVAL)
+ err = -EINVAL;
+ else if (err == -EEXIST)
+ err = -EEXIST;
+@@ -2643,7 +2643,7 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+
+ err = ffsCreateDir(dir, (u8 *)dentry->d_name.name, &fid);
+ if (err) {
+- if (err == FFS_INVALIDPATH)
++ if (err == -EINVAL)
+ err = -EINVAL;
+ else if (err == -EEXIST)
+ err = -EEXIST;
+@@ -2697,7 +2697,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
+
+ err = ffsRemoveDir(dir, &(EXFAT_I(inode)->fid));
+ if (err) {
+- if (err == FFS_INVALIDPATH)
++ if (err == -EINVAL)
+ err = -EINVAL;
+ else if (err == -EEXIST)
+ err = -ENOTEMPTY;
+@@ -2754,7 +2754,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ if (err) {
+ if (err == -EPERM)
+ err = -EPERM;
+- else if (err == FFS_INVALIDPATH)
++ else if (err == -EINVAL)
+ err = -EINVAL;
+ else if (err == -EEXIST)
+ err = -EEXIST;commit c76c4ad5470cd907ed9c432f0e8cabd924cc2b54
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:17 2019 -0400
+
+ staging: exfat: Clean up return codes - FFS_FILEEXIST
+
+ Convert FFS_FILEEXIST to -EEXIST
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-7-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 0c8e8606472b..b7dac748aaf9 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -216,7 +216,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_SEMAPHOREERR 6
+ #define FFS_INVALIDPATH 7
+ #define FFS_INVALIDFID 8
+-#define FFS_FILEEXIST 10
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+ #define FFS_EOF 15
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 5ac57e573764..43aaa9566260 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -2828,7 +2828,7 @@ s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
+ }
+
+ if ((count == 0) || (count >= 1024))
+- return FFS_FILEEXIST;
++ return -EEXIST;
+ fat_attach_count_to_dos_name(p_dosname->name, count);
+
+ /* Now dos_name has DOS~????.EXT */
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index cf0300a4e0f4..bc175b3366ac 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -1294,7 +1294,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ new_clu.flags = new_fid->flags;
+
+ if (!is_dir_empty(sb, &new_clu)) {
+- ret = FFS_FILEEXIST;
++ ret = -EEXIST;
+ goto out;
+ }
+ }
+@@ -2162,7 +2162,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ clu_to_free.flags = fid->flags;
+
+ if (!is_dir_empty(sb, &clu_to_free)) {
+- ret = FFS_FILEEXIST;
++ ret = -EEXIST;
+ goto out;
+ }
+
+@@ -2364,7 +2364,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+ if (err) {
+ if (err == FFS_INVALIDPATH)
+ err = -EINVAL;
+- else if (err == FFS_FILEEXIST)
++ else if (err == -EEXIST)
+ err = -EEXIST;
+ else if (err == -ENOSPC)
+ err = -ENOSPC;
+@@ -2575,7 +2575,7 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry,
+ if (err) {
+ if (err == FFS_INVALIDPATH)
+ err = -EINVAL;
+- else if (err == FFS_FILEEXIST)
++ else if (err == -EEXIST)
+ err = -EEXIST;
+ else if (err == -ENOSPC)
+ err = -ENOSPC;
+@@ -2645,7 +2645,7 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+ if (err) {
+ if (err == FFS_INVALIDPATH)
+ err = -EINVAL;
+- else if (err == FFS_FILEEXIST)
++ else if (err == -EEXIST)
+ err = -EEXIST;
+ else if (err == -ENOSPC)
+ err = -ENOSPC;
+@@ -2699,7 +2699,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
+ if (err) {
+ if (err == FFS_INVALIDPATH)
+ err = -EINVAL;
+- else if (err == FFS_FILEEXIST)
++ else if (err == -EEXIST)
+ err = -ENOTEMPTY;
+ else if (err == -ENOENT)
+ err = -ENOENT;
+@@ -2756,7 +2756,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ err = -EPERM;
+ else if (err == FFS_INVALIDPATH)
+ err = -EINVAL;
+- else if (err == FFS_FILEEXIST)
++ else if (err == -EEXIST)
+ err = -EEXIST;
+ else if (err == -ENOENT)
+ err = -ENOENT;commit ab5a321da0082f1877dab619f56b966997dbc4fb +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Oct 24 11:53:16 2019 -0400 + + staging: exfat: Clean up return codes - FFS_NAMETOOLONG + + Convert FFS_NOTNAMETOOLONG to -ENAMETOOLONG + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Link: https://lore.kernel.org/r/20191024155327.1095907-6-Valdis.Kletnieks@vt.edu + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h +index a6e0c79ba6a4..0c8e8606472b 100644 +--- a/drivers/staging/exfat/exfat.h ++++ b/drivers/staging/exfat/exfat.h +@@ -221,7 +221,6 @@ static inline u16 get_row_index(u16 i) + #define FFS_MAXOPENED 13 + #define FFS_EOF 15 + #define FFS_MEMORYERR 17 +-#define FFS_NAMETOOLONG 18 + #define FFS_ERROR 19 + + #define NUM_UPCASE 2918 +diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c +index afa687a786a3..cf0300a4e0f4 100644 +--- a/drivers/staging/exfat/exfat_super.c ++++ b/drivers/staging/exfat/exfat_super.c +@@ -2368,7 +2368,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, + err = -EEXIST; + else if (err == -ENOSPC) + err = -ENOSPC; +- else if (err == FFS_NAMETOOLONG) ++ else if (err == -ENAMETOOLONG) + err = -ENAMETOOLONG; + else + err = -EIO; +@@ -2649,7 +2649,7 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) + err = -EEXIST; + else if (err == -ENOSPC) + err = -ENOSPC; +- else if (err == FFS_NAMETOOLONG) ++ else if (err == -ENAMETOOLONG) + err = -ENAMETOOLONG; + else + err = -EIO;+
commit 7ca8049f09807004639dc7d44f1476ac6ef7c917
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:15 2019 -0400
+
+ staging: exfat: Clean up return codes - FFS_PERMISSIONERR
+
+ Convert FFS_PERMISSIONERR to -EPERM
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-5-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index f3736b33ca56..a6e0c79ba6a4 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -217,7 +217,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_INVALIDPATH 7
+ #define FFS_INVALIDFID 8
+ #define FFS_FILEEXIST 10
+-#define FFS_PERMISSIONERR 11
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+ #define FFS_EOF 15
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 638de11eb625..afa687a786a3 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -708,7 +708,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_FILE) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out;
+ }
+
+@@ -838,7 +838,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_FILE) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out;
+ }
+
+@@ -1085,7 +1085,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_FILE) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out;
+ }
+
+@@ -1252,7 +1252,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ /* check if the old file is "." or ".." */
+ if (p_fs->vol_type != EXFAT) {
+ if ((olddir.dir != p_fs->root_dir) && (dentry < 2)) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out2;
+ }
+ }
+@@ -1264,7 +1264,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ }
+
+ if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out2;
+ }
+
+@@ -1371,7 +1371,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+ }
+
+ if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
+- ret = FFS_PERMISSIONERR;
++ ret = -EPERM;
+ goto out;
+ }
+ fs_set_vol_flags(sb, VOL_DIRTY);
+@@ -1953,7 +1953,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
+
+ /* check if the given file ID is opened */
+ if (fid->type != TYPE_DIR)
+- return FFS_PERMISSIONERR;
++ return -EPERM;
+
+ /* acquire the lock for file system critical section */
+ down(&p_fs->v_sem);
+@@ -2151,7 +2151,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ /* check if the file is "." or ".." */
+ if (p_fs->vol_type != EXFAT) {
+ if ((dir.dir != p_fs->root_dir) && (dentry < 2))
+- return FFS_PERMISSIONERR;
++ return -EPERM;
+ }
+
+ /* acquire the lock for file system critical section */
+@@ -2532,7 +2532,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
+
+ err = ffsRemoveFile(dir, &(EXFAT_I(inode)->fid));
+ if (err) {
+- if (err == FFS_PERMISSIONERR)
++ if (err == -EPERM)
+ err = -EPERM;
+ else
+ err = -EIO;
+@@ -2752,7 +2752,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ err = ffsMoveFile(old_dir, &(EXFAT_I(old_inode)->fid), new_dir,
+ new_dentry);
+ if (err) {
+- if (err == FFS_PERMISSIONERR)
++ if (err == -EPERM)
+ err = -EPERM;
+ else if (err == FFS_INVALIDPATH)
+ err = -EINVAL;commit df7098f84f7eff2cb0a669557f2519f1ee68a74e +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Oct 24 11:53:14 2019 -0400 + + staging: exfat: Clean up return codes - FFS_DIRBUSY + + Convert FFS_DIRBUSY to -EBUSY + + Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> + Link: https://lore.kernel.org/r/20191024155327.1095907-4-Valdis.Kletnieks@vt.edu + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h +index 26120dfcaba5..f3736b33ca56 100644 +--- a/drivers/staging/exfat/exfat.h ++++ b/drivers/staging/exfat/exfat.h +@@ -221,7 +221,6 @@ static inline u16 get_row_index(u16 i) + #define FFS_NOTOPENED 12 + #define FFS_MAXOPENED 13 + #define FFS_EOF 15 +-#define FFS_DIRBUSY 16 + #define FFS_MEMORYERR 17 + #define FFS_NAMETOOLONG 18 + #define FFS_ERROR 19 +diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c +index 7b1ed81efadd..638de11eb625 100644 +--- a/drivers/staging/exfat/exfat_super.c ++++ b/drivers/staging/exfat/exfat_super.c +@@ -2703,7 +2703,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry) + err = -ENOTEMPTY; + else if (err == -ENOENT) + err = -ENOENT; +- else if (err == FFS_DIRBUSY) ++ else if (err == -EBUSY) + err = -EBUSY; + else + err = -EIO;
commit 67f8224c3b52908c100311bfef9d0fb60ae5b449
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:13 2019 -0400
+
+ staging: exfat: Clean up return codes - FFS_NOTFOUND
+
+ Convert FFS_NOTFOUND to -ENOENT
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-3-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 548b7ada3c44..26120dfcaba5 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -216,7 +216,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_SEMAPHOREERR 6
+ #define FFS_INVALIDPATH 7
+ #define FFS_INVALIDFID 8
+-#define FFS_NOTFOUND 9
+ #define FFS_FILEEXIST 10
+ #define FFS_PERMISSIONERR 11
+ #define FFS_NOTOPENED 12
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 90ae0f2841f2..7b1ed81efadd 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -578,7 +578,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
+ dentry = p_fs->fs_func->find_dir_entry(sb, &dir, &uni_name, num_entries,
+ &dos_name, TYPE_ALL);
+ if (dentry < -1) {
+- ret = FFS_NOTFOUND;
++ ret = -ENOENT;
+ goto out;
+ }
+
+@@ -2701,7 +2701,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
+ err = -EINVAL;
+ else if (err == FFS_FILEEXIST)
+ err = -ENOTEMPTY;
+- else if (err == FFS_NOTFOUND)
++ else if (err == -ENOENT)
+ err = -ENOENT;
+ else if (err == FFS_DIRBUSY)
+ err = -EBUSY;
+@@ -2758,7 +2758,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ err = -EINVAL;
+ else if (err == FFS_FILEEXIST)
+ err = -EEXIST;
+- else if (err == FFS_NOTFOUND)
++ else if (err == -ENOENT)
+ err = -ENOENT;
+ else if (err == -ENOSPC)
+ err = -ENOSPC;commit 2f2e28866bd7bb1b4d73e338d22100d4edf710ec
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Oct 24 11:53:12 2019 -0400
+
+ staging: exfat: Clean up return codes - FFS_FULL
+
+ Start cleaning up the odd scheme of return codes, starting with FFS_FULL
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/20191024155327.1095907-2-Valdis.Kletnieks@vt.edu
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+index 3abab33e932c..548b7ada3c44 100644
+--- a/drivers/staging/exfat/exfat.h
++++ b/drivers/staging/exfat/exfat.h
+@@ -221,7 +221,6 @@ static inline u16 get_row_index(u16 i)
+ #define FFS_PERMISSIONERR 11
+ #define FFS_NOTOPENED 12
+ #define FFS_MAXOPENED 13
+-#define FFS_FULL 14
+ #define FFS_EOF 15
+ #define FFS_DIRBUSY 16
+ #define FFS_MEMORYERR 17
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+index 79174e5c4145..5ac57e573764 100644
+--- a/drivers/staging/exfat/exfat_core.c
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -3216,7 +3216,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ /* find_empty_entry must be called before alloc_cluster */
+ dentry = find_empty_entry(inode, p_dir, num_entries);
+ if (dentry < 0)
+- return FFS_FULL;
++ return -ENOSPC;
+
+ clu.dir = CLUSTER_32(~0);
+ clu.size = 0;
+@@ -3227,7 +3227,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir,
+ if (ret < 0)
+ return FFS_MEDIAERR;
+ else if (ret == 0)
+- return FFS_FULL;
++ return -ENOSPC;
+
+ ret = clear_cluster(sb, clu.dir);
+ if (ret != FFS_SUCCESS)
+@@ -3319,7 +3319,7 @@ s32 create_file(struct inode *inode, struct chain_t *p_dir,
+ /* find_empty_entry must be called before alloc_cluster() */
+ dentry = find_empty_entry(inode, p_dir, num_entries);
+ if (dentry < 0)
+- return FFS_FULL;
++ return -ENOSPC;
+
+ /* (1) update the directory entry */
+ /* fill the dos name directory entry information of the created file.
+@@ -3418,7 +3418,7 @@ s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
+ newentry = find_empty_entry(inode, p_dir, num_new_entries);
+ if (newentry < 0) {
+ buf_unlock(sb, sector_old);
+- return FFS_FULL;
++ return -ENOSPC;
+ }
+
+ epnew = get_entry_in_dir(sb, p_dir, newentry, §or_new);
+@@ -3529,7 +3529,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
+ newentry = find_empty_entry(inode, p_newdir, num_new_entries);
+ if (newentry < 0) {
+ buf_unlock(sb, sector_mov);
+- return FFS_FULL;
++ return -ENOSPC;
+ }
+
+ epnew = get_entry_in_dir(sb, p_newdir, newentry, §or_new);
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 86ace780a60b..90ae0f2841f2 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -1051,7 +1051,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ *wcount = write_bytes;
+
+ if (num_alloced == 0)
+- ret = FFS_FULL;
++ ret = -ENOSPC;
+
+ else if (p_fs->dev_ejected)
+ ret = FFS_MEDIAERR;
+@@ -1807,7 +1807,7 @@ static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
+ ret = FFS_MEDIAERR;
+ goto out;
+ } else if (num_alloced == 0) {
+- ret = FFS_FULL;
++ ret = -ENOSPC;
+ goto out;
+ }
+
+@@ -2366,7 +2366,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
+ err = -EINVAL;
+ else if (err == FFS_FILEEXIST)
+ err = -EEXIST;
+- else if (err == FFS_FULL)
++ else if (err == -ENOSPC)
+ err = -ENOSPC;
+ else if (err == FFS_NAMETOOLONG)
+ err = -ENAMETOOLONG;
+@@ -2577,7 +2577,7 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry,
+ err = -EINVAL;
+ else if (err == FFS_FILEEXIST)
+ err = -EEXIST;
+- else if (err == FFS_FULL)
++ else if (err == -ENOSPC)
+ err = -ENOSPC;
+ else
+ err = -EIO;
+@@ -2589,7 +2589,7 @@ static int exfat_symlink(struct inode *dir, struct dentry *dentry,
+ if (err) {
+ ffsRemoveFile(dir, &fid);
+
+- if (err == FFS_FULL)
++ if (err == -ENOSPC)
+ err = -ENOSPC;
+ else
+ err = -EIO;
+@@ -2647,7 +2647,7 @@ static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
+ err = -EINVAL;
+ else if (err == FFS_FILEEXIST)
+ err = -EEXIST;
+- else if (err == FFS_FULL)
++ else if (err == -ENOSPC)
+ err = -ENOSPC;
+ else if (err == FFS_NAMETOOLONG)
+ err = -ENAMETOOLONG;
+@@ -2760,7 +2760,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
+ err = -EEXIST;
+ else if (err == FFS_NOTFOUND)
+ err = -ENOENT;
+- else if (err == FFS_FULL)
++ else if (err == -ENOSPC)
+ err = -ENOSPC;
+ else
+ err = -EIO;
+@@ -3115,7 +3115,7 @@ static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys,
+ err = ffsMapCluster(inode, clu_offset, &cluster);
+
+ if (err) {
+- if (err == FFS_FULL)
++ if (err == -ENOSPC)
+ return -ENOSPC;
+ else
+ return -EIO;commit d98bb9c2fec01254d2e04e1eed51dde9ae611314
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Oct 2 15:01:35 2019 -0400
+
+ staging: exfat: explain the fs_sync() issue in TODO
+
+ We've seen several incorrect patches for fs_sync() calls in the exfat driver.
+ Add code to the TODO that explains this isn't just a delete code and refactor,
+ but that actual analysis of when the filesystem should be flushed to disk
+ needs to be done.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+
+ Link: https://lore.kernel.org/r/9837.1570042895@turing-police
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/TODO b/drivers/staging/exfat/TODO
+index a3eb282f9efc..b60e50b9cf4e 100644
+--- a/drivers/staging/exfat/TODO
++++ b/drivers/staging/exfat/TODO
+@@ -3,6 +3,15 @@ same for ffsWriteFile.
+
+ exfat_core.c - fs_sync(sb,0) all over the place looks fishy as hell.
+ There's only one place that calls it with a non-zero argument.
++Randomly removing fs_sync() calls is *not* the right answer, especially
++if the removal then leaves a call to fs_set_vol_flags(VOL_CLEAN), as that
++says the file system is clean and synced when we *know* it isn't.
++The proper fix here is to go through and actually analyze how DELAYED_SYNC
++should work, and any time we're setting VOL_CLEAN, ensure the file system
++has in fact been synced to disk. In other words, changing the 'false' to
++'true' is probably more correct. Also, it's likely that the one current
++place where it actually does an bdev_sync isn't sufficient in the DELAYED_SYNC
++case.
+
+ ffsTruncateFile - if (old_size <= new_size) {
+ That doesn't look right. How did it ever work? Are they relying on lazycommit 8789f13ddc77723e9451548b984382605340899c
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Oct 2 15:16:24 2019 -0400
+
+ staging: exfat: fix fs_sync() calls.
+
+ The majority of them were totally backwards. Change the logic
+ so that if DELAYED_SYNC *isn't* in the config, we actually flush to disk
+ before flagging the file system as clean.
+
+ That leaves two calls in the DELAYED_SYNC case. More detailed
+ analysis is needed to make sure that's what's really needed, or if other
+ call sites also need a fs_sync() call. This patch is at least "less wrong"
+ than the code was, but further changes should be another patch.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+
+ Link: https://lore.kernel.org/r/11092.1570043784@turing-police
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 5f6caee819a6..2526044569ee 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -458,7 +458,7 @@ static int ffsUmountVol(struct super_block *sb)
+ /* acquire the lock for file system critical section */
+ down(&p_fs->v_sem);
+
+- fs_sync(sb, false);
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+
+ if (p_fs->vol_type == EXFAT) {
+@@ -666,8 +666,8 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode,
+ /* create a new file */
+ ret = create_file(inode, &dir, &uni_name, mode, fid);
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1039,8 +1039,8 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
+ release_entry_set(es);
+ }
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1179,8 +1179,8 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
+ if (fid->rwoffset > fid->size)
+ fid->rwoffset = fid->size;
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1327,8 +1327,8 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
+ num_entries + 1);
+ }
+ out:
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1389,8 +1389,8 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
+ fid->start_clu = CLUSTER_32(~0);
+ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1478,8 +1478,8 @@ static int ffsSetAttr(struct inode *inode, u32 attr)
+ release_entry_set(es);
+ }
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -1916,8 +1916,8 @@ static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
+
+ ret = create_dir(inode, &dir, &uni_name, fid);
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+
+@@ -2177,8 +2177,8 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
+ fid->start_clu = CLUSTER_32(~0);
+ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
+
+-#ifdef CONFIG_EXFAT_DELAYED_SYNC
+- fs_sync(sb, false);
++#ifndef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, true);
+ fs_set_vol_flags(sb, VOL_CLEAN);
+ #endif
+ commit a358eea07c78d9d0c246738ed1c6349d72d41920 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Sep 18 20:38:08 2019 -0400 + + staging: exfat - fix SPDX tags.. + + The copyright notices as I got them said "GPLv2 or later", which I + screwed up when putting in the SPDX tags. Fix them to match the + license I got the code under. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + + Link: https://lore.kernel.org/r/122590.1568853488@turing-police + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/exfat/Makefile b/drivers/staging/exfat/Makefile +index 84944dfbae28..6c90aec83feb 100644 +--- a/drivers/staging/exfat/Makefile ++++ b/drivers/staging/exfat/Makefile +@@ -1,4 +1,4 @@ +-# SPDX-License-Identifier: GPL-2.0 ++# SPDX-License-Identifier: GPL-2.0-or-later + + obj-$(CONFIG_EXFAT_FS) += exfat.o + +diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h +index 6c12f2d79f4d..3abab33e932c 100644 +--- a/drivers/staging/exfat/exfat.h ++++ b/drivers/staging/exfat/exfat.h +@@ -1,4 +1,4 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ ++/* SPDX-License-Identifier: GPL-2.0-or-later */ + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_blkdev.c b/drivers/staging/exfat/exfat_blkdev.c +index f086c75e7076..81d20e6241c6 100644 +--- a/drivers/staging/exfat/exfat_blkdev.c ++++ b/drivers/staging/exfat/exfat_blkdev.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c +index 1565ce65d39f..e1b001718709 100644 +--- a/drivers/staging/exfat/exfat_cache.c ++++ b/drivers/staging/exfat/exfat_cache.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c +index b3e9cf725cf5..79174e5c4145 100644 +--- a/drivers/staging/exfat/exfat_core.c ++++ b/drivers/staging/exfat/exfat_core.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_nls.c b/drivers/staging/exfat/exfat_nls.c +index 03cb8290b5d2..a5c4b68925fb 100644 +--- a/drivers/staging/exfat/exfat_nls.c ++++ b/drivers/staging/exfat/exfat_nls.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c +index 5f6caee819a6..229ecabe7a93 100644 +--- a/drivers/staging/exfat/exfat_super.c ++++ b/drivers/staging/exfat/exfat_super.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */ +diff --git a/drivers/staging/exfat/exfat_upcase.c b/drivers/staging/exfat/exfat_upcase.c +index 366082fb3dab..b91a1faa0e50 100644 +--- a/drivers/staging/exfat/exfat_upcase.c ++++ b/drivers/staging/exfat/exfat_upcase.c +@@ -1,4 +1,4 @@ +-// SPDX-License-Identifier: GPL-2.0 ++// SPDX-License-Identifier: GPL-2.0-or-later + /* + * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd. + */
commit 8e72a7a44df5534ae7664240c1fa75e71e11c64a +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Sep 25 16:46:26 2019 -0700 + + lib/extable.c: add missing prototypes + + When building with W=1, a number of warnings are issued: + + CC lib/extable.o + lib/extable.c:63:6: warning: no previous prototype for 'sort_extable' [-Wmissing-prototypes] + 63 | void sort_extable(struct exception_table_entry *start, + | ^~~~~~~~~~~~ + lib/extable.c:75:6: warning: no previous prototype for 'trim_init_extable' [-Wmissing-prototypes] + 75 | void trim_init_extable(struct module *m) + | ^~~~~~~~~~~~~~~~~ + lib/extable.c:115:1: warning: no previous prototype for 'search_extable' [-Wmissing-prototypes] + 115 | search_extable(const struct exception_table_entry *base, + | ^~~~~~~~~~~~~~ + + Add the missing #include for the prototypes. + + Link: http://lkml.kernel.org/r/45574.1565235784@turing-police + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/lib/extable.c b/lib/extable.c +index 25da4071122a..c3e59caf7ffa 100644 +--- a/lib/extable.c ++++ b/lib/extable.c +@@ -10,6 +10,7 @@ + #include <linux/init.h> + #include <linux/sort.h> + #include <linux/uaccess.h> ++#include <linux/extable.h> + + #ifndef ARCH_HAS_RELATIVE_EXTABLE + #define ex_to_insn(x) ((x)->insn)
commit e3f4faa42095cacceeb33c68fda647a8e6d48a90
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Sep 25 16:46:23 2019 -0700
+
+ lib/generic-radix-tree.c: make 2 functions static inline
+
+ When building with W=1, we get some warnings:
+
+ l CC lib/generic-radix-tree.o
+ lib/generic-radix-tree.c:39:10: warning: no previous prototype for 'genradix_root_to_depth' [-Wmissing-prototypes]
+ 39 | unsigned genradix_root_to_depth(struct genradix_root *r)
+ | ^~~~~~~~~~~~~~~~~~~~~~
+ lib/generic-radix-tree.c:44:23: warning: no previous prototype for 'genradix_root_to_node' [-Wmissing-prototypes]
+ 44 | struct genradix_node *genradix_root_to_node(struct genradix_root *r)
+ | ^~~~~~~~~~~~~~~~~~~~~
+
+ They're not used anywhere else, so make them static inline.
+
+ Link: http://lkml.kernel.org/r/46923.1565236485@turing-police
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Cc: Kent Overstreet <kent.overstreet@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c
+index a7bafc413730..ae25e2fa2187 100644
+--- a/lib/generic-radix-tree.c
++++ b/lib/generic-radix-tree.c
+@@ -36,12 +36,12 @@ static inline size_t genradix_depth_size(unsigned depth)
+ #define GENRADIX_DEPTH_MASK \
+ ((unsigned long) (roundup_pow_of_two(GENRADIX_MAX_DEPTH + 1) - 1))
+
+-unsigned genradix_root_to_depth(struct genradix_root *r)
++static inline unsigned genradix_root_to_depth(struct genradix_root *r)
+ {
+ return (unsigned long) r & GENRADIX_DEPTH_MASK;
+ }
+
+-struct genradix_node *genradix_root_to_node(struct genradix_root *r)
++static inline struct genradix_node *genradix_root_to_node(struct genradix_root *r)
+ {
+ return (void *) ((unsigned long) r & ~GENRADIX_DEPTH_MASK);
+ }commit 0f74914071ab7e7b78731ed62bf350e3a344e0a5
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Sep 25 16:45:59 2019 -0700
+
+ kernel/elfcore.c: include proper prototypes
+
+ When building with W=1, gcc properly complains that there's no prototypes:
+
+ CC kernel/elfcore.o
+ kernel/elfcore.c:7:17: warning: no previous prototype for 'elf_core_extra_phdrs' [-Wmissing-prototypes]
+ 7 | Elf_Half __weak elf_core_extra_phdrs(void)
+ | ^~~~~~~~~~~~~~~~~~~~
+ kernel/elfcore.c:12:12: warning: no previous prototype for 'elf_core_write_extra_phdrs' [-Wmissing-prototypes]
+ 12 | int __weak elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~
+ kernel/elfcore.c:17:12: warning: no previous prototype for 'elf_core_write_extra_data' [-Wmissing-prototypes]
+ 17 | int __weak elf_core_write_extra_data(struct coredump_params *cprm)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~
+ kernel/elfcore.c:22:15: warning: no previous prototype for 'elf_core_extra_data_size' [-Wmissing-prototypes]
+ 22 | size_t __weak elf_core_extra_data_size(void)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~
+
+ Provide the include file so gcc is happy, and we don't have potential code drift
+
+ Link: http://lkml.kernel.org/r/29875.1565224705@turing-police
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/elfcore.c b/kernel/elfcore.c
+index fc482c8e0bd8..57fb4dcff434 100644
+--- a/kernel/elfcore.c
++++ b/kernel/elfcore.c
+@@ -3,6 +3,7 @@
+ #include <linux/fs.h>
+ #include <linux/mm.h>
+ #include <linux/binfmts.h>
++#include <linux/elfcore.h>
+
+ Elf_Half __weak elf_core_extra_phdrs(void)
+ {
+ commit b6326fc025aa998daa62672731ecfdcc22f43771
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Aug 7 21:51:58 2019 -0400
+
+ rtlwifi: fix non-kerneldoc comment in usb.c
+
+ Fix spurious warning message when building with W=1:
+
+ CC [M] drivers/net/wireless/realtek/rtlwifi/usb.o
+ drivers/net/wireless/realtek/rtlwifi/usb.c:243: warning: Cannot understand * on line 243 - I thought it was a doc line
+ drivers/net/wireless/realtek/rtlwifi/usb.c:760: warning: Cannot understand * on line 760 - I thought it was a doc line
+ drivers/net/wireless/realtek/rtlwifi/usb.c:790: warning: Cannot understand * on line 790 - I thought it was a doc line
+
+ Clean up the comment format.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+
+diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c
+index 34d68dbf4b4c..4b59f3b46b28 100644
+--- a/drivers/net/wireless/realtek/rtlwifi/usb.c
++++ b/drivers/net/wireless/realtek/rtlwifi/usb.c
+@@ -239,10 +239,7 @@ static void _rtl_usb_io_handler_release(struct ieee80211_hw *hw)
+ mutex_destroy(&rtlpriv->io.bb_mutex);
+ }
+
+-/**
+- *
+- * Default aggregation handler. Do nothing and just return the oldest skb.
+- */
++/* Default aggregation handler. Do nothing and just return the oldest skb. */
+ static struct sk_buff *_none_usb_tx_aggregate_hdl(struct ieee80211_hw *hw,
+ struct sk_buff_head *list)
+ {
+@@ -756,11 +753,6 @@ static int rtl_usb_start(struct ieee80211_hw *hw)
+ return err;
+ }
+
+-/**
+- *
+- *
+- */
+-
+ /*======================= tx =========================================*/
+ static void rtl_usb_cleanup(struct ieee80211_hw *hw)
+ {
+@@ -786,11 +778,7 @@ static void rtl_usb_cleanup(struct ieee80211_hw *hw)
+ usb_kill_anchored_urbs(&rtlusb->tx_submitted);
+ }
+
+-/**
+- *
+- * We may add some struct into struct rtl_usb later. Do deinit here.
+- *
+- */
++/* We may add some struct into struct rtl_usb later. Do deinit here. */
+ static void rtl_usb_deinit(struct ieee80211_hw *hw)
+ {
+ rtl_usb_cleanup(hw);commit d9f3b450f206332b7ef3d78b5a85b6c20ad00fd2
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Aug 8 13:44:02 2019 -0400
+
+ perf/x86: Make more stuff static
+
+ When building with C=2, sparse makes note of a number of things:
+
+ arch/x86/events/intel/rapl.c:637:30: warning: symbol 'rapl_attr_update' was not declared. Should it be static?
+ arch/x86/events/intel/cstate.c:449:30: warning: symbol 'core_attr_update' was not declared. Should it be static?
+ arch/x86/events/intel/cstate.c:457:30: warning: symbol 'pkg_attr_update' was not declared. Should it be static?
+ arch/x86/events/msr.c:170:30: warning: symbol 'attr_update' was not declared. Should it be static?
+ arch/x86/events/intel/lbr.c:276:1: warning: symbol 'lbr_from_quirk_key' was not declared. Should it be static?
+
+ And they can all indeed be static.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+ Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+ Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+ Cc: Jiri Olsa <jolsa@redhat.com>
+ Cc: Linus Torvalds <torvalds@linux-foundation.org>
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Cc: Thomas Gleixner <tglx@linutronix.de>
+ Link: https://lkml.kernel.org/r/128059.1565286242@turing-police
+ Signed-off-by: Ingo Molnar <mingo@kernel.org>
+
+diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
+index 688592b34564..db498b5d4aae 100644
+--- a/arch/x86/events/intel/cstate.c
++++ b/arch/x86/events/intel/cstate.c
+@@ -446,7 +446,7 @@ static int cstate_cpu_init(unsigned int cpu)
+ return 0;
+ }
+
+-const struct attribute_group *core_attr_update[] = {
++static const struct attribute_group *core_attr_update[] = {
+ &group_cstate_core_c1,
+ &group_cstate_core_c3,
+ &group_cstate_core_c6,
+@@ -454,7 +454,7 @@ const struct attribute_group *core_attr_update[] = {
+ NULL,
+ };
+
+-const struct attribute_group *pkg_attr_update[] = {
++static const struct attribute_group *pkg_attr_update[] = {
+ &group_cstate_pkg_c2,
+ &group_cstate_pkg_c3,
+ &group_cstate_pkg_c6,
+diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
+index 6f814a27416b..ea54634eabf3 100644
+--- a/arch/x86/events/intel/lbr.c
++++ b/arch/x86/events/intel/lbr.c
+@@ -273,7 +273,7 @@ static inline bool lbr_from_signext_quirk_needed(void)
+ return !tsx_support && (lbr_desc[lbr_format] & LBR_TSX);
+ }
+
+-DEFINE_STATIC_KEY_FALSE(lbr_from_quirk_key);
++static DEFINE_STATIC_KEY_FALSE(lbr_from_quirk_key);
+
+ /* If quirk is enabled, ensure sign extension is 63 bits: */
+ inline u64 lbr_from_signext_quirk_wr(u64 val)
+diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
+index 64ab51ffdf06..f34b9491ea6e 100644
+--- a/arch/x86/events/intel/rapl.c
++++ b/arch/x86/events/intel/rapl.c
+@@ -634,7 +634,7 @@ static void cleanup_rapl_pmus(void)
+ kfree(rapl_pmus);
+ }
+
+-const struct attribute_group *rapl_attr_update[] = {
++static const struct attribute_group *rapl_attr_update[] = {
+ &rapl_events_cores_group,
+ &rapl_events_pkg_group,
+ &rapl_events_ram_group,
+diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
+index 9431447541e9..5812e8747d1f 100644
+--- a/arch/x86/events/msr.c
++++ b/arch/x86/events/msr.c
+@@ -167,7 +167,7 @@ static const struct attribute_group *attr_groups[] = {
+ NULL,
+ };
+
+-const struct attribute_group *attr_update[] = {
++static const struct attribute_group *attr_update[] = {
+ &group_aperf,
+ &group_mperf,
+ &group_pperf,commit 58985a9d2d03e977db93bf574a16162766a318fe
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Fri Aug 30 12:42:39 2019 -0400
+
+ drivers/staging/exfat - by default, prohibit mount of fat/vfat
+
+ Concerns have been raised about the exfat driver accidentally mounting
+ fat/vfat file systems. Add an extra configure option to help prevent that.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Link: https://lore.kernel.org/r/245727.1567183359@turing-police
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
+index 78b32aa2ca19..f52129c67f97 100644
+--- a/drivers/staging/exfat/Kconfig
++++ b/drivers/staging/exfat/Kconfig
+@@ -4,6 +4,14 @@ config EXFAT_FS
+ help
+ This adds support for the exFAT file system.
+
++config EXFAT_DONT_MOUNT_VFAT
++ bool "Prohibit mounting of fat/vfat filesysems by exFAT"
++ default y
++ help
++ By default, the exFAT driver will only mount exFAT filesystems, and refuse
++ to mount fat/vfat filesystems. Set this to 'n' to allow the exFAT driver
++ to mount these filesystems.
++
+ config EXFAT_DISCARD
+ bool "enable discard support"
+ depends on EXFAT_FS
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+index 5b5c2ca8c9aa..d9787635a373 100644
+--- a/drivers/staging/exfat/exfat_super.c
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -486,10 +486,16 @@ static int ffsMountVol(struct super_block *sb)
+ break;
+
+ if (i < 53) {
++#ifdef CONFIG_EXFAT_DONT_MOUNT_VFAT
++ ret = -EINVAL;
++ printk(KERN_INFO "EXFAT: Attempted to mount VFAT filesystem\n");
++ goto out;
++#else
+ if (GET16(p_pbr->bpb + 11)) /* num_fat_sectors */
+ ret = fat16_mount(sb, p_pbr);
+ else
+ ret = fat32_mount(sb, p_pbr);
++#endif
+ } else {
+ ret = exfat_mount(sb, p_pbr);
+ }commit c48c9f7ff32b8b3965a08e40eb6763682d905b5d
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Aug 28 18:08:17 2019 +0200
+
+ staging: exfat: add exfat filesystem code to staging
+
+ The exfat code needs a lot of work to get it into "real" shape for
+ the fs/ part of the kernel, so put it into drivers/staging/ for now so
+ that it can be worked on by everyone in the community.
+
+ The full specification of the filesystem can be found at:
+ https://docs.microsoft.com/en-us/windows/win32/fileio/exfat-specification
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Link: https://lore.kernel.org/r/20190828160817.6250-1-gregkh@linuxfoundation.org
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index e3242687cd19..a484b36e5117 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -6097,6 +6097,11 @@ F: include/trace/events/mdio.h
+ F: include/uapi/linux/mdio.h
+ F: include/uapi/linux/mii.h
+
++EXFAT FILE SYSTEM
++M: Valdis Kletnieks <valdis.kletnieks@vt.edu>
++S: Maintained
++F: fs/exfat/
++
+ EXT2 FILE SYSTEM
+ M: Jan Kara <jack@suse.com>
+ L: linux-ext4@vger.kernel.org
+diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
+index d972ec8e71fb..fbdc33874780 100644
+--- a/drivers/staging/Kconfig
++++ b/drivers/staging/Kconfig
+@@ -118,4 +118,6 @@ source "drivers/staging/kpc2000/Kconfig"
+
+ source "drivers/staging/isdn/Kconfig"
+
++source "drivers/staging/exfat/Kconfig"
++
+ endif # STAGING
+diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
+index 6018b9a4a077..ca13f87b1e1b 100644
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -49,3 +49,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
+ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
+ obj-$(CONFIG_KPC2000) += kpc2000/
+ obj-$(CONFIG_ISDN_CAPI) += isdn/
++obj-$(CONFIG_EXFAT_FS) += exfat/
+diff --git a/drivers/staging/exfat/Kconfig b/drivers/staging/exfat/Kconfig
+new file mode 100644
+index 000000000000..78b32aa2ca19
+--- /dev/null
++++ b/drivers/staging/exfat/Kconfig
+@@ -0,0 +1,39 @@
++config EXFAT_FS
++ tristate "exFAT fs support"
++ select NLS
++ help
++ This adds support for the exFAT file system.
++
++config EXFAT_DISCARD
++ bool "enable discard support"
++ depends on EXFAT_FS
++ default y
++
++config EXFAT_DELAYED_SYNC
++ bool "enable delayed sync"
++ depends on EXFAT_FS
++ default n
++
++config EXFAT_KERNEL_DEBUG
++ bool "enable kernel debug features via ioctl"
++ depends on EXFAT_FS
++ default n
++
++config EXFAT_DEBUG_MSG
++ bool "print debug messages"
++ depends on EXFAT_FS
++ default n
++
++config EXFAT_DEFAULT_CODEPAGE
++ int "Default codepage for exFAT"
++ default 437
++ depends on EXFAT_FS
++ help
++ This option should be set to the codepage of your exFAT filesystems.
++
++config EXFAT_DEFAULT_IOCHARSET
++ string "Default iocharset for exFAT"
++ default "utf8"
++ depends on EXFAT_FS
++ help
++ Set this to the default input/output character set you'd like exFAT to use.
+diff --git a/drivers/staging/exfat/Makefile b/drivers/staging/exfat/Makefile
+new file mode 100644
+index 000000000000..84944dfbae28
+--- /dev/null
++++ b/drivers/staging/exfat/Makefile
+@@ -0,0 +1,10 @@
++# SPDX-License-Identifier: GPL-2.0
++
++obj-$(CONFIG_EXFAT_FS) += exfat.o
++
++exfat-y := exfat_core.o \
++ exfat_super.o \
++ exfat_blkdev.o \
++ exfat_cache.o \
++ exfat_nls.o \
++ exfat_upcase.o
+diff --git a/drivers/staging/exfat/TODO b/drivers/staging/exfat/TODO
+new file mode 100644
+index 000000000000..a3eb282f9efc
+--- /dev/null
++++ b/drivers/staging/exfat/TODO
+@@ -0,0 +1,12 @@
++exfat_core.c - ffsReadFile - the goto err_out seem to leak a brelse().
++same for ffsWriteFile.
++
++exfat_core.c - fs_sync(sb,0) all over the place looks fishy as hell.
++There's only one place that calls it with a non-zero argument.
++
++ffsTruncateFile - if (old_size <= new_size) {
++That doesn't look right. How did it ever work? Are they relying on lazy
++block allocation when actual writes happen? If nothing else, it never
++does the 'fid->size = new_size' and do the inode update....
++
++ffsSetAttr() is just dangling in the breeze, not wired up at all...
+diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
+new file mode 100644
+index 000000000000..bae180e10609
+--- /dev/null
++++ b/drivers/staging/exfat/exfat.h
+@@ -0,0 +1,973 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#ifndef _EXFAT_H
++#define _EXFAT_H
++
++#include <linux/types.h>
++#include <linux/buffer_head.h>
++
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ /* For Debugging Purpose */
++ /* IOCTL code 'f' used by
++ * - file systems typically #0~0x1F
++ * - embedded terminal devices #128~
++ * - exts for debugging purpose #99
++ * number 100 and 101 is available now but has possible conflicts
++ */
++#define EXFAT_IOC_GET_DEBUGFLAGS _IOR('f', 100, long)
++#define EXFAT_IOC_SET_DEBUGFLAGS _IOW('f', 101, long)
++
++#define EXFAT_DEBUGFLAGS_INVALID_UMOUNT 0x01
++#define EXFAT_DEBUGFLAGS_ERROR_RW 0x02
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++#ifdef CONFIG_EXFAT_DEBUG_MSG
++#define DEBUG 1
++#else
++#undef DEBUG
++#endif
++
++#define DENTRY_SIZE 32 /* dir entry size */
++#define DENTRY_SIZE_BITS 5
++
++/* PBR entries */
++#define PBR_SIGNATURE 0xAA55
++#define EXT_SIGNATURE 0xAA550000
++#define VOL_LABEL "NO NAME " /* size should be 11 */
++#define OEM_NAME "MSWIN4.1" /* size should be 8 */
++#define STR_FAT12 "FAT12 " /* size should be 8 */
++#define STR_FAT16 "FAT16 " /* size should be 8 */
++#define STR_FAT32 "FAT32 " /* size should be 8 */
++#define STR_EXFAT "EXFAT " /* size should be 8 */
++#define VOL_CLEAN 0x0000
++#define VOL_DIRTY 0x0002
++
++/* max number of clusters */
++#define FAT12_THRESHOLD 4087 /* 2^12 - 1 + 2 (clu 0 & 1) */
++#define FAT16_THRESHOLD 65527 /* 2^16 - 1 + 2 */
++#define FAT32_THRESHOLD 268435457 /* 2^28 - 1 + 2 */
++#define EXFAT_THRESHOLD 268435457 /* 2^28 - 1 + 2 */
++
++/* file types */
++#define TYPE_UNUSED 0x0000
++#define TYPE_DELETED 0x0001
++#define TYPE_INVALID 0x0002
++#define TYPE_CRITICAL_PRI 0x0100
++#define TYPE_BITMAP 0x0101
++#define TYPE_UPCASE 0x0102
++#define TYPE_VOLUME 0x0103
++#define TYPE_DIR 0x0104
++#define TYPE_FILE 0x011F
++#define TYPE_SYMLINK 0x015F
++#define TYPE_CRITICAL_SEC 0x0200
++#define TYPE_STREAM 0x0201
++#define TYPE_EXTEND 0x0202
++#define TYPE_ACL 0x0203
++#define TYPE_BENIGN_PRI 0x0400
++#define TYPE_GUID 0x0401
++#define TYPE_PADDING 0x0402
++#define TYPE_ACLTAB 0x0403
++#define TYPE_BENIGN_SEC 0x0800
++#define TYPE_ALL 0x0FFF
++
++/* time modes */
++#define TM_CREATE 0
++#define TM_MODIFY 1
++#define TM_ACCESS 2
++
++/* checksum types */
++#define CS_DIR_ENTRY 0
++#define CS_PBR_SECTOR 1
++#define CS_DEFAULT 2
++
++#define CLUSTER_16(x) ((u16)(x))
++#define CLUSTER_32(x) ((u32)(x))
++
++#define FALSE 0
++#define TRUE 1
++
++#define START_SECTOR(x) \
++ ((((sector_t)((x) - 2)) << p_fs->sectors_per_clu_bits) + \
++ p_fs->data_start_sector)
++
++#define IS_LAST_SECTOR_IN_CLUSTER(sec) \
++ ((((sec) - p_fs->data_start_sector + 1) & \
++ ((1 << p_fs->sectors_per_clu_bits) - 1)) == 0)
++
++#define GET_CLUSTER_FROM_SECTOR(sec) \
++ ((u32)((((sec) - p_fs->data_start_sector) >> \
++ p_fs->sectors_per_clu_bits) + 2))
++
++#define GET16(p_src) \
++ (((u16)(p_src)[0]) | (((u16)(p_src)[1]) << 8))
++#define GET32(p_src) \
++ (((u32)(p_src)[0]) | (((u32)(p_src)[1]) << 8) | \
++ (((u32)(p_src)[2]) << 16) | (((u32)(p_src)[3]) << 24))
++#define GET64(p_src) \
++ (((u64)(p_src)[0]) | (((u64)(p_src)[1]) << 8) | \
++ (((u64)(p_src)[2]) << 16) | (((u64)(p_src)[3]) << 24) | \
++ (((u64)(p_src)[4]) << 32) | (((u64)(p_src)[5]) << 40) | \
++ (((u64)(p_src)[6]) << 48) | (((u64)(p_src)[7]) << 56))
++
++#define SET16(p_dst, src) \
++ do { \
++ (p_dst)[0] = (u8)(src); \
++ (p_dst)[1] = (u8)(((u16)(src)) >> 8); \
++ } while (0)
++#define SET32(p_dst, src) \
++ do { \
++ (p_dst)[0] = (u8)(src); \
++ (p_dst)[1] = (u8)(((u32)(src)) >> 8); \
++ (p_dst)[2] = (u8)(((u32)(src)) >> 16); \
++ (p_dst)[3] = (u8)(((u32)(src)) >> 24); \
++ } while (0)
++#define SET64(p_dst, src) \
++ do { \
++ (p_dst)[0] = (u8)(src); \
++ (p_dst)[1] = (u8)(((u64)(src)) >> 8); \
++ (p_dst)[2] = (u8)(((u64)(src)) >> 16); \
++ (p_dst)[3] = (u8)(((u64)(src)) >> 24); \
++ (p_dst)[4] = (u8)(((u64)(src)) >> 32); \
++ (p_dst)[5] = (u8)(((u64)(src)) >> 40); \
++ (p_dst)[6] = (u8)(((u64)(src)) >> 48); \
++ (p_dst)[7] = (u8)(((u64)(src)) >> 56); \
++ } while (0)
++
++#ifdef __LITTLE_ENDIAN
++#define GET16_A(p_src) (*((u16 *)(p_src)))
++#define GET32_A(p_src) (*((u32 *)(p_src)))
++#define GET64_A(p_src) (*((u64 *)(p_src)))
++#define SET16_A(p_dst, src) (*((u16 *)(p_dst)) = (u16)(src))
++#define SET32_A(p_dst, src) (*((u32 *)(p_dst)) = (u32)(src))
++#define SET64_A(p_dst, src) (*((u64 *)(p_dst)) = (u64)(src))
++#else /* BIG_ENDIAN */
++#define GET16_A(p_src) GET16(p_src)
++#define GET32_A(p_src) GET32(p_src)
++#define GET64_A(p_src) GET64(p_src)
++#define SET16_A(p_dst, src) SET16(p_dst, src)
++#define SET32_A(p_dst, src) SET32(p_dst, src)
++#define SET64_A(p_dst, src) SET64(p_dst, src)
++#endif
++
++/* cache size (in number of sectors) */
++/* (should be an exponential value of 2) */
++#define FAT_CACHE_SIZE 128
++#define FAT_CACHE_HASH_SIZE 64
++#define BUF_CACHE_SIZE 256
++#define BUF_CACHE_HASH_SIZE 64
++
++/* Upcase table macro */
++#define HIGH_INDEX_BIT (8)
++#define HIGH_INDEX_MASK (0xFF00)
++#define LOW_INDEX_BIT (16-HIGH_INDEX_BIT)
++#define UTBL_ROW_COUNT (1<<LOW_INDEX_BIT)
++#define UTBL_COL_COUNT (1<<HIGH_INDEX_BIT)
++
++static inline u16 get_col_index(u16 i)
++{
++ return i >> LOW_INDEX_BIT;
++}
++static inline u16 get_row_index(u16 i)
++{
++ return i & ~HIGH_INDEX_MASK;
++}
++
++#define EXFAT_SUPER_MAGIC (0x2011BAB0L)
++#define EXFAT_ROOT_INO 1
++
++/* FAT types */
++#define FAT12 0x01 /* FAT12 */
++#define FAT16 0x0E /* Win95 FAT16 (LBA) */
++#define FAT32 0x0C /* Win95 FAT32 (LBA) */
++#define EXFAT 0x07 /* exFAT */
++
++/* file name lengths */
++#define MAX_CHARSET_SIZE 3 /* max size of multi-byte character */
++#define MAX_PATH_DEPTH 15 /* max depth of path name */
++#define MAX_NAME_LENGTH 256 /* max len of filename including NULL */
++#define MAX_PATH_LENGTH 260 /* max len of pathname including NULL */
++#define DOS_NAME_LENGTH 11 /* DOS filename length excluding NULL */
++#define DOS_PATH_LENGTH 80 /* DOS pathname length excluding NULL */
++
++/* file attributes */
++#define ATTR_NORMAL 0x0000
++#define ATTR_READONLY 0x0001
++#define ATTR_HIDDEN 0x0002
++#define ATTR_SYSTEM 0x0004
++#define ATTR_VOLUME 0x0008
++#define ATTR_SUBDIR 0x0010
++#define ATTR_ARCHIVE 0x0020
++#define ATTR_SYMLINK 0x0040
++#define ATTR_EXTEND 0x000F
++#define ATTR_RWMASK 0x007E
++
++/* file creation modes */
++#define FM_REGULAR 0x00
++#define FM_SYMLINK 0x40
++
++/* return values */
++#define FFS_SUCCESS 0
++#define FFS_MEDIAERR 1
++#define FFS_FORMATERR 2
++#define FFS_MOUNTED 3
++#define FFS_NOTMOUNTED 4
++#define FFS_ALIGNMENTERR 5
++#define FFS_SEMAPHOREERR 6
++#define FFS_INVALIDPATH 7
++#define FFS_INVALIDFID 8
++#define FFS_NOTFOUND 9
++#define FFS_FILEEXIST 10
++#define FFS_PERMISSIONERR 11
++#define FFS_NOTOPENED 12
++#define FFS_MAXOPENED 13
++#define FFS_FULL 14
++#define FFS_EOF 15
++#define FFS_DIRBUSY 16
++#define FFS_MEMORYERR 17
++#define FFS_NAMETOOLONG 18
++#define FFS_ERROR 19
++
++#define NUM_UPCASE 2918
++
++#define DOS_CUR_DIR_NAME ". "
++#define DOS_PAR_DIR_NAME ".. "
++
++#ifdef __LITTLE_ENDIAN
++#define UNI_CUR_DIR_NAME ".\0"
++#define UNI_PAR_DIR_NAME ".\0.\0"
++#else
++#define UNI_CUR_DIR_NAME "\0."
++#define UNI_PAR_DIR_NAME "\0.\0."
++#endif
++
++struct date_time_t {
++ u16 Year;
++ u16 Month;
++ u16 Day;
++ u16 Hour;
++ u16 Minute;
++ u16 Second;
++ u16 MilliSecond;
++};
++
++struct part_info_t {
++ u32 Offset; /* start sector number of the partition */
++ u32 Size; /* in sectors */
++};
++
++struct dev_info_t {
++ u32 SecSize; /* sector size in bytes */
++ u32 DevSize; /* block device size in sectors */
++};
++
++struct vol_info_t {
++ u32 FatType;
++ u32 ClusterSize;
++ u32 NumClusters;
++ u32 FreeClusters;
++ u32 UsedClusters;
++};
++
++/* directory structure */
++struct chain_t {
++ u32 dir;
++ s32 size;
++ u8 flags;
++};
++
++struct file_id_t {
++ struct chain_t dir;
++ s32 entry;
++ u32 type;
++ u32 attr;
++ u32 start_clu;
++ u64 size;
++ u8 flags;
++ s64 rwoffset;
++ s32 hint_last_off;
++ u32 hint_last_clu;
++};
++
++struct dir_entry_t {
++ char Name[MAX_NAME_LENGTH * MAX_CHARSET_SIZE];
++
++ /* used only for FAT12/16/32, not used for exFAT */
++ char ShortName[DOS_NAME_LENGTH + 2];
++
++ u32 Attr;
++ u64 Size;
++ u32 NumSubdirs;
++ struct date_time_t CreateTimestamp;
++ struct date_time_t ModifyTimestamp;
++ struct date_time_t AccessTimestamp;
++};
++
++struct timestamp_t {
++ u16 sec; /* 0 ~ 59 */
++ u16 min; /* 0 ~ 59 */
++ u16 hour; /* 0 ~ 23 */
++ u16 day; /* 1 ~ 31 */
++ u16 mon; /* 1 ~ 12 */
++ u16 year; /* 0 ~ 127 (since 1980) */
++};
++
++/* MS_DOS FAT partition boot record (512 bytes) */
++struct pbr_sector_t {
++ u8 jmp_boot[3];
++ u8 oem_name[8];
++ u8 bpb[109];
++ u8 boot_code[390];
++ u8 signature[2];
++};
++
++/* MS-DOS FAT12/16 BIOS parameter block (51 bytes) */
++struct bpb16_t {
++ u8 sector_size[2];
++ u8 sectors_per_clu;
++ u8 num_reserved[2];
++ u8 num_fats;
++ u8 num_root_entries[2];
++ u8 num_sectors[2];
++ u8 media_type;
++ u8 num_fat_sectors[2];
++ u8 sectors_in_track[2];
++ u8 num_heads[2];
++ u8 num_hid_sectors[4];
++ u8 num_huge_sectors[4];
++
++ u8 phy_drv_no;
++ u8 reserved;
++ u8 ext_signature;
++ u8 vol_serial[4];
++ u8 vol_label[11];
++ u8 vol_type[8];
++};
++
++/* MS-DOS FAT32 BIOS parameter block (79 bytes) */
++struct bpb32_t {
++ u8 sector_size[2];
++ u8 sectors_per_clu;
++ u8 num_reserved[2];
++ u8 num_fats;
++ u8 num_root_entries[2];
++ u8 num_sectors[2];
++ u8 media_type;
++ u8 num_fat_sectors[2];
++ u8 sectors_in_track[2];
++ u8 num_heads[2];
++ u8 num_hid_sectors[4];
++ u8 num_huge_sectors[4];
++ u8 num_fat32_sectors[4];
++ u8 ext_flags[2];
++ u8 fs_version[2];
++ u8 root_cluster[4];
++ u8 fsinfo_sector[2];
++ u8 backup_sector[2];
++ u8 reserved[12];
++
++ u8 phy_drv_no;
++ u8 ext_reserved;
++ u8 ext_signature;
++ u8 vol_serial[4];
++ u8 vol_label[11];
++ u8 vol_type[8];
++};
++
++/* MS-DOS EXFAT BIOS parameter block (109 bytes) */
++struct bpbex_t {
++ u8 reserved1[53];
++ u8 vol_offset[8];
++ u8 vol_length[8];
++ u8 fat_offset[4];
++ u8 fat_length[4];
++ u8 clu_offset[4];
++ u8 clu_count[4];
++ u8 root_cluster[4];
++ u8 vol_serial[4];
++ u8 fs_version[2];
++ u8 vol_flags[2];
++ u8 sector_size_bits;
++ u8 sectors_per_clu_bits;
++ u8 num_fats;
++ u8 phy_drv_no;
++ u8 perc_in_use;
++ u8 reserved2[7];
++};
++
++/* MS-DOS FAT file system information sector (512 bytes) */
++struct fsi_sector_t {
++ u8 signature1[4];
++ u8 reserved1[480];
++ u8 signature2[4];
++ u8 free_cluster[4];
++ u8 next_cluster[4];
++ u8 reserved2[14];
++ u8 signature3[2];
++};
++
++/* MS-DOS FAT directory entry (32 bytes) */
++struct dentry_t {
++ u8 dummy[32];
++};
++
++struct dos_dentry_t {
++ u8 name[DOS_NAME_LENGTH];
++ u8 attr;
++ u8 lcase;
++ u8 create_time_ms;
++ u8 create_time[2];
++ u8 create_date[2];
++ u8 access_date[2];
++ u8 start_clu_hi[2];
++ u8 modify_time[2];
++ u8 modify_date[2];
++ u8 start_clu_lo[2];
++ u8 size[4];
++};
++
++/* MS-DOS FAT extended directory entry (32 bytes) */
++struct ext_dentry_t {
++ u8 order;
++ u8 unicode_0_4[10];
++ u8 attr;
++ u8 sysid;
++ u8 checksum;
++ u8 unicode_5_10[12];
++ u8 start_clu[2];
++ u8 unicode_11_12[4];
++};
++
++/* MS-DOS EXFAT file directory entry (32 bytes) */
++struct file_dentry_t {
++ u8 type;
++ u8 num_ext;
++ u8 checksum[2];
++ u8 attr[2];
++ u8 reserved1[2];
++ u8 create_time[2];
++ u8 create_date[2];
++ u8 modify_time[2];
++ u8 modify_date[2];
++ u8 access_time[2];
++ u8 access_date[2];
++ u8 create_time_ms;
++ u8 modify_time_ms;
++ u8 access_time_ms;
++ u8 reserved2[9];
++};
++
++/* MS-DOS EXFAT stream extension directory entry (32 bytes) */
++struct strm_dentry_t {
++ u8 type;
++ u8 flags;
++ u8 reserved1;
++ u8 name_len;
++ u8 name_hash[2];
++ u8 reserved2[2];
++ u8 valid_size[8];
++ u8 reserved3[4];
++ u8 start_clu[4];
++ u8 size[8];
++};
++
++/* MS-DOS EXFAT file name directory entry (32 bytes) */
++struct name_dentry_t {
++ u8 type;
++ u8 flags;
++ u8 unicode_0_14[30];
++};
++
++/* MS-DOS EXFAT allocation bitmap directory entry (32 bytes) */
++struct bmap_dentry_t {
++ u8 type;
++ u8 flags;
++ u8 reserved[18];
++ u8 start_clu[4];
++ u8 size[8];
++};
++
++/* MS-DOS EXFAT up-case table directory entry (32 bytes) */
++struct case_dentry_t {
++ u8 type;
++ u8 reserved1[3];
++ u8 checksum[4];
++ u8 reserved2[12];
++ u8 start_clu[4];
++ u8 size[8];
++};
++
++/* MS-DOS EXFAT volume label directory entry (32 bytes) */
++struct volm_dentry_t {
++ u8 type;
++ u8 label_len;
++ u8 unicode_0_10[22];
++ u8 reserved[8];
++};
++
++/* unused entry hint information */
++struct uentry_t {
++ u32 dir;
++ s32 entry;
++ struct chain_t clu;
++};
++
++/* DOS name structure */
++struct dos_name_t {
++ u8 name[DOS_NAME_LENGTH];
++ u8 name_case;
++};
++
++/* unicode name structure */
++struct uni_name_t {
++ u16 name[MAX_NAME_LENGTH];
++ u16 name_hash;
++ u8 name_len;
++};
++
++struct buf_cache_t {
++ struct buf_cache_t *next;
++ struct buf_cache_t *prev;
++ struct buf_cache_t *hash_next;
++ struct buf_cache_t *hash_prev;
++ s32 drv;
++ sector_t sec;
++ u32 flag;
++ struct buffer_head *buf_bh;
++};
++
++struct fs_func {
++ s32 (*alloc_cluster)(struct super_block *sb, s32 num_alloc,
++ struct chain_t *p_chain);
++ void (*free_cluster)(struct super_block *sb, struct chain_t *p_chain,
++ s32 do_relse);
++ s32 (*count_used_clusters)(struct super_block *sb);
++
++ s32 (*init_dir_entry)(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, u32 type, u32 start_clu, u64 size);
++ s32 (*init_ext_entry)(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 num_entries,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname);
++ s32 (*find_dir_entry)(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 num_entries,
++ struct dos_name_t *p_dosname, u32 type);
++ void (*delete_dir_entry)(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ s32 offset, s32 num_entries);
++ void (*get_uni_name_from_ext_entry)(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u16 *uniname);
++ s32 (*count_ext_entries)(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ struct dentry_t *p_entry);
++ s32 (*calc_num_entries)(struct uni_name_t *p_uniname);
++
++ u32 (*get_entry_type)(struct dentry_t *p_entry);
++ void (*set_entry_type)(struct dentry_t *p_entry, u32 type);
++ u32 (*get_entry_attr)(struct dentry_t *p_entry);
++ void (*set_entry_attr)(struct dentry_t *p_entry, u32 attr);
++ u8 (*get_entry_flag)(struct dentry_t *p_entry);
++ void (*set_entry_flag)(struct dentry_t *p_entry, u8 flag);
++ u32 (*get_entry_clu0)(struct dentry_t *p_entry);
++ void (*set_entry_clu0)(struct dentry_t *p_entry, u32 clu0);
++ u64 (*get_entry_size)(struct dentry_t *p_entry);
++ void (*set_entry_size)(struct dentry_t *p_entry, u64 size);
++ void (*get_entry_time)(struct dentry_t *p_entry,
++ struct timestamp_t *tp, u8 mode);
++ void (*set_entry_time)(struct dentry_t *p_entry,
++ struct timestamp_t *tp, u8 mode);
++};
++
++struct fs_info_t {
++ u32 drv; /* drive ID */
++ u32 vol_type; /* volume FAT type */
++ u32 vol_id; /* volume serial number */
++
++ u64 num_sectors; /* num of sectors in volume */
++ u32 num_clusters; /* num of clusters in volume */
++ u32 cluster_size; /* cluster size in bytes */
++ u32 cluster_size_bits;
++ u32 sectors_per_clu; /* cluster size in sectors */
++ u32 sectors_per_clu_bits;
++
++ u32 PBR_sector; /* PBR sector */
++ u32 FAT1_start_sector; /* FAT1 start sector */
++ u32 FAT2_start_sector; /* FAT2 start sector */
++ u32 root_start_sector; /* root dir start sector */
++ u32 data_start_sector; /* data area start sector */
++ u32 num_FAT_sectors; /* num of FAT sectors */
++
++ u32 root_dir; /* root dir cluster */
++ u32 dentries_in_root; /* num of dentries in root dir */
++ u32 dentries_per_clu; /* num of dentries per cluster */
++
++ u32 vol_flag; /* volume dirty flag */
++ struct buffer_head *pbr_bh; /* PBR sector */
++
++ u32 map_clu; /* allocation bitmap start cluster */
++ u32 map_sectors; /* num of allocation bitmap sectors */
++ struct buffer_head **vol_amap; /* allocation bitmap */
++
++ u16 **vol_utbl; /* upcase table */
++
++ u32 clu_srch_ptr; /* cluster search pointer */
++ u32 used_clusters; /* number of used clusters */
++ struct uentry_t hint_uentry; /* unused entry hint information */
++
++ u32 dev_ejected; /* block device operation error flag */
++
++ struct fs_func *fs_func;
++ struct semaphore v_sem;
++
++ /* FAT cache */
++ struct buf_cache_t FAT_cache_array[FAT_CACHE_SIZE];
++ struct buf_cache_t FAT_cache_lru_list;
++ struct buf_cache_t FAT_cache_hash_list[FAT_CACHE_HASH_SIZE];
++
++ /* buf cache */
++ struct buf_cache_t buf_cache_array[BUF_CACHE_SIZE];
++ struct buf_cache_t buf_cache_lru_list;
++ struct buf_cache_t buf_cache_hash_list[BUF_CACHE_HASH_SIZE];
++};
++
++#define ES_2_ENTRIES 2
++#define ES_3_ENTRIES 3
++#define ES_ALL_ENTRIES 0
++
++struct entry_set_cache_t {
++ /* sector number that contains file_entry */
++ sector_t sector;
++
++ /* byte offset in the sector */
++ s32 offset;
++
++ /*
++ * flag in stream entry.
++ * 01 for cluster chain,
++ * 03 for contig. clusteres.
++ */
++ s32 alloc_flag;
++
++ u32 num_entries;
++
++ /* __buf should be the last member */
++ void *__buf;
++};
++
++#define EXFAT_ERRORS_CONT 1 /* ignore error and continue */
++#define EXFAT_ERRORS_PANIC 2 /* panic on error */
++#define EXFAT_ERRORS_RO 3 /* remount r/o on error */
++
++/* ioctl command */
++#define EXFAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x12, __u32)
++
++struct exfat_mount_options {
++ kuid_t fs_uid;
++ kgid_t fs_gid;
++ unsigned short fs_fmask;
++ unsigned short fs_dmask;
++
++ /* permission for setting the [am]time */
++ unsigned short allow_utime;
++
++ /* codepage for shortname conversions */
++ unsigned short codepage;
++
++ /* charset for filename input/display */
++ char *iocharset;
++
++ unsigned char casesensitive;
++
++ /* on error: continue, panic, remount-ro */
++ unsigned char errors;
++#ifdef CONFIG_EXFAT_DISCARD
++ /* flag on if -o dicard specified and device support discard() */
++ unsigned char discard;
++#endif /* CONFIG_EXFAT_DISCARD */
++};
++
++#define EXFAT_HASH_BITS 8
++#define EXFAT_HASH_SIZE (1UL << EXFAT_HASH_BITS)
++
++/*
++ * EXFAT file system in-core superblock data
++ */
++struct bd_info_t {
++ s32 sector_size; /* in bytes */
++ s32 sector_size_bits;
++ s32 sector_size_mask;
++
++ /* total number of sectors in this block device */
++ s32 num_sectors;
++
++ /* opened or not */
++ bool opened;
++};
++
++struct exfat_sb_info {
++ struct fs_info_t fs_info;
++ struct bd_info_t bd_info;
++
++ struct exfat_mount_options options;
++
++ int s_dirt;
++ struct mutex s_lock;
++ struct nls_table *nls_disk; /* Codepage used on disk */
++ struct nls_table *nls_io; /* Charset used for input and display */
++
++ struct inode *fat_inode;
++
++ spinlock_t inode_hash_lock;
++ struct hlist_head inode_hashtable[EXFAT_HASH_SIZE];
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ long debug_flags;
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++};
++
++/*
++ * EXFAT file system inode data in memory
++ */
++struct exfat_inode_info {
++ struct file_id_t fid;
++ char *target;
++ /* NOTE: mmu_private is 64bits, so must hold ->i_mutex to access */
++ loff_t mmu_private; /* physically allocated size */
++ loff_t i_pos; /* on-disk position of directory entry or 0 */
++ struct hlist_node i_hash_fat; /* hash by i_location */
++ struct rw_semaphore truncate_lock;
++ struct inode vfs_inode;
++ struct rw_semaphore i_alloc_sem; /* protect bmap against truncate */
++};
++
++#define EXFAT_SB(sb) ((struct exfat_sb_info *)((sb)->s_fs_info))
++
++static inline struct exfat_inode_info *EXFAT_I(struct inode *inode)
++{
++ return container_of(inode, struct exfat_inode_info, vfs_inode);
++}
++
++/* NLS management function */
++u16 nls_upper(struct super_block *sb, u16 a);
++int nls_dosname_cmp(struct super_block *sb, u8 *a, u8 *b);
++int nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b);
++void nls_uniname_to_dosname(struct super_block *sb,
++ struct dos_name_t *p_dosname,
++ struct uni_name_t *p_uniname, bool *p_lossy);
++void nls_dosname_to_uniname(struct super_block *sb,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname);
++void nls_uniname_to_cstring(struct super_block *sb, u8 *p_cstring,
++ struct uni_name_t *p_uniname);
++void nls_cstring_to_uniname(struct super_block *sb,
++ struct uni_name_t *p_uniname, u8 *p_cstring,
++ bool *p_lossy);
++
++/* buffer cache management */
++void buf_init(struct super_block *sb);
++void buf_shutdown(struct super_block *sb);
++int FAT_read(struct super_block *sb, u32 loc, u32 *content);
++s32 FAT_write(struct super_block *sb, u32 loc, u32 content);
++u8 *FAT_getblk(struct super_block *sb, sector_t sec);
++void FAT_modify(struct super_block *sb, sector_t sec);
++void FAT_release_all(struct super_block *sb);
++void FAT_sync(struct super_block *sb);
++u8 *buf_getblk(struct super_block *sb, sector_t sec);
++void buf_modify(struct super_block *sb, sector_t sec);
++void buf_lock(struct super_block *sb, sector_t sec);
++void buf_unlock(struct super_block *sb, sector_t sec);
++void buf_release(struct super_block *sb, sector_t sec);
++void buf_release_all(struct super_block *sb);
++void buf_sync(struct super_block *sb);
++
++/* fs management functions */
++void fs_set_vol_flags(struct super_block *sb, u32 new_flag);
++void fs_error(struct super_block *sb);
++
++/* cluster management functions */
++s32 clear_cluster(struct super_block *sb, u32 clu);
++s32 fat_alloc_cluster(struct super_block *sb, s32 num_alloc,
++ struct chain_t *p_chain);
++s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
++ struct chain_t *p_chain);
++void fat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
++ s32 do_relse);
++void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
++ s32 do_relse);
++u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain);
++s32 count_num_clusters(struct super_block *sb, struct chain_t *dir);
++s32 fat_count_used_clusters(struct super_block *sb);
++s32 exfat_count_used_clusters(struct super_block *sb);
++void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len);
++
++/* allocation bitmap management functions */
++s32 load_alloc_bitmap(struct super_block *sb);
++void free_alloc_bitmap(struct super_block *sb);
++s32 set_alloc_bitmap(struct super_block *sb, u32 clu);
++s32 clr_alloc_bitmap(struct super_block *sb, u32 clu);
++u32 test_alloc_bitmap(struct super_block *sb, u32 clu);
++void sync_alloc_bitmap(struct super_block *sb);
++
++/* upcase table management functions */
++s32 load_upcase_table(struct super_block *sb);
++void free_upcase_table(struct super_block *sb);
++
++/* dir entry management functions */
++u32 fat_get_entry_type(struct dentry_t *p_entry);
++u32 exfat_get_entry_type(struct dentry_t *p_entry);
++void fat_set_entry_type(struct dentry_t *p_entry, u32 type);
++void exfat_set_entry_type(struct dentry_t *p_entry, u32 type);
++u32 fat_get_entry_attr(struct dentry_t *p_entry);
++u32 exfat_get_entry_attr(struct dentry_t *p_entry);
++void fat_set_entry_attr(struct dentry_t *p_entry, u32 attr);
++void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr);
++u8 fat_get_entry_flag(struct dentry_t *p_entry);
++u8 exfat_get_entry_flag(struct dentry_t *p_entry);
++void fat_set_entry_flag(struct dentry_t *p_entry, u8 flag);
++void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flag);
++u32 fat_get_entry_clu0(struct dentry_t *p_entry);
++u32 exfat_get_entry_clu0(struct dentry_t *p_entry);
++void fat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu);
++void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu);
++u64 fat_get_entry_size(struct dentry_t *p_entry);
++u64 exfat_get_entry_size(struct dentry_t *p_entry);
++void fat_set_entry_size(struct dentry_t *p_entry, u64 size);
++void exfat_set_entry_size(struct dentry_t *p_entry, u64 size);
++struct timestamp_t *tm_current(struct timestamp_t *tm);
++void fat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode);
++void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode);
++void fat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode);
++void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode);
++s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
++ u32 type, u32 start_clu, u64 size);
++s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, u32 type, u32 start_clu, u64 size);
++s32 fat_init_ext_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 num_entries,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname);
++s32 exfat_init_ext_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 num_entries,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname);
++void init_dos_entry(struct dos_dentry_t *ep, u32 type, u32 start_clu);
++void init_ext_entry(struct ext_dentry_t *ep, s32 order, u8 chksum,
++ u16 *uniname);
++void init_file_entry(struct file_dentry_t *ep, u32 type);
++void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu,
++ u64 size);
++void init_name_entry(struct name_dentry_t *ep, u16 *uniname);
++void fat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 order, s32 num_entries);
++void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 order, s32 num_entries);
++
++s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
++ sector_t *sector, s32 *offset);
++struct dentry_t *get_entry_with_sector(struct super_block *sb, sector_t sector,
++ s32 offset);
++struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, sector_t *sector);
++struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u32 type,
++ struct dentry_t **file_ep);
++void release_entry_set(struct entry_set_cache_t *es);
++s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es);
++s32 write_partial_entries_in_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es,
++ struct dentry_t *ep, u32 count);
++s32 search_deleted_or_unused_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 num_entries);
++s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir,
++ s32 num_entries);
++s32 fat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 num_entries,
++ struct dos_name_t *p_dosname, u32 type);
++s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 num_entries,
++ struct dos_name_t *p_dosname, u32 type);
++s32 fat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, struct dentry_t *p_entry);
++s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, struct dentry_t *p_entry);
++s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
++ u32 type);
++void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry);
++void update_dir_checksum_with_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es);
++bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir);
++
++/* name conversion functions */
++s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 *entries,
++ struct dos_name_t *p_dosname);
++void get_uni_name_from_dos_entry(struct super_block *sb,
++ struct dos_dentry_t *ep,
++ struct uni_name_t *p_uniname, u8 mode);
++void fat_get_uni_name_from_ext_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u16 *uniname);
++void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u16 *uniname);
++s32 extract_uni_name_from_ext_entry(struct ext_dentry_t *ep,
++ u16 *uniname, s32 order);
++s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep,
++ u16 *uniname, s32 order);
++s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
++ struct dos_name_t *p_dosname);
++void fat_attach_count_to_dos_name(u8 *dosname, s32 count);
++s32 fat_calc_num_entries(struct uni_name_t *p_uniname);
++s32 exfat_calc_num_entries(struct uni_name_t *p_uniname);
++u8 calc_checksum_1byte(void *data, s32 len, u8 chksum);
++u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type);
++u32 calc_checksum_4byte(void *data, s32 len, u32 chksum, s32 type);
++
++/* name resolution functions */
++s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname);
++s32 resolve_name(u8 *name, u8 **arg);
++
++/* file operation functions */
++s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
++s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
++s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr);
++s32 create_dir(struct inode *inode, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, struct file_id_t *fid);
++s32 create_file(struct inode *inode, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, u8 mode, struct file_id_t *fid);
++void remove_file(struct inode *inode, struct chain_t *p_dir, s32 entry);
++s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 old_entry,
++ struct uni_name_t *p_uniname, struct file_id_t *fid);
++s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
++ struct chain_t *p_newdir, struct uni_name_t *p_uniname,
++ struct file_id_t *fid);
++
++/* sector read/write functions */
++int sector_read(struct super_block *sb, sector_t sec,
++ struct buffer_head **bh, bool read);
++int sector_write(struct super_block *sb, sector_t sec,
++ struct buffer_head *bh, bool sync);
++int multi_sector_read(struct super_block *sb, sector_t sec,
++ struct buffer_head **bh, s32 num_secs, bool read);
++int multi_sector_write(struct super_block *sb, sector_t sec,
++ struct buffer_head *bh, s32 num_secs, bool sync);
++
++void bdev_open(struct super_block *sb);
++void bdev_close(struct super_block *sb);
++int bdev_read(struct super_block *sb, sector_t secno,
++ struct buffer_head **bh, u32 num_secs, bool read);
++int bdev_write(struct super_block *sb, sector_t secno,
++ struct buffer_head *bh, u32 num_secs, bool sync);
++int bdev_sync(struct super_block *sb);
++
++extern const u8 uni_upcase[];
++#endif /* _EXFAT_H */
+diff --git a/drivers/staging/exfat/exfat_blkdev.c b/drivers/staging/exfat/exfat_blkdev.c
+new file mode 100644
+index 000000000000..f086c75e7076
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_blkdev.c
+@@ -0,0 +1,136 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/blkdev.h>
++#include <linux/buffer_head.h>
++#include <linux/fs.h>
++#include "exfat.h"
++
++void bdev_open(struct super_block *sb)
++{
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_bd->opened)
++ return;
++
++ p_bd->sector_size = bdev_logical_block_size(sb->s_bdev);
++ p_bd->sector_size_bits = ilog2(p_bd->sector_size);
++ p_bd->sector_size_mask = p_bd->sector_size - 1;
++ p_bd->num_sectors = i_size_read(sb->s_bdev->bd_inode) >>
++ p_bd->sector_size_bits;
++ p_bd->opened = true;
++}
++
++void bdev_close(struct super_block *sb)
++{
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ p_bd->opened = false;
++}
++
++int bdev_read(struct super_block *sb, sector_t secno, struct buffer_head **bh,
++ u32 num_secs, bool read)
++{
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ long flags = sbi->debug_flags;
++
++ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
++ return FFS_MEDIAERR;
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++ if (!p_bd->opened)
++ return FFS_MEDIAERR;
++
++ if (*bh)
++ __brelse(*bh);
++
++ if (read)
++ *bh = __bread(sb->s_bdev, secno,
++ num_secs << p_bd->sector_size_bits);
++ else
++ *bh = __getblk(sb->s_bdev, secno,
++ num_secs << p_bd->sector_size_bits);
++
++ if (*bh)
++ return 0;
++
++ WARN(!p_fs->dev_ejected,
++ "[EXFAT] No bh, device seems wrong or to be ejected.\n");
++
++ return FFS_MEDIAERR;
++}
++
++int bdev_write(struct super_block *sb, sector_t secno, struct buffer_head *bh,
++ u32 num_secs, bool sync)
++{
++ s32 count;
++ struct buffer_head *bh2;
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ long flags = sbi->debug_flags;
++
++ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
++ return FFS_MEDIAERR;
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++ if (!p_bd->opened)
++ return FFS_MEDIAERR;
++
++ if (secno == bh->b_blocknr) {
++ lock_buffer(bh);
++ set_buffer_uptodate(bh);
++ mark_buffer_dirty(bh);
++ unlock_buffer(bh);
++ if (sync && (sync_dirty_buffer(bh) != 0))
++ return FFS_MEDIAERR;
++ } else {
++ count = num_secs << p_bd->sector_size_bits;
++
++ bh2 = __getblk(sb->s_bdev, secno, count);
++ if (!bh2)
++ goto no_bh;
++
++ lock_buffer(bh2);
++ memcpy(bh2->b_data, bh->b_data, count);
++ set_buffer_uptodate(bh2);
++ mark_buffer_dirty(bh2);
++ unlock_buffer(bh2);
++ if (sync && (sync_dirty_buffer(bh2) != 0)) {
++ __brelse(bh2);
++ goto no_bh;
++ }
++ __brelse(bh2);
++ }
++
++ return 0;
++
++no_bh:
++ WARN(!p_fs->dev_ejected,
++ "[EXFAT] No bh, device seems wrong or to be ejected.\n");
++
++ return FFS_MEDIAERR;
++}
++
++int bdev_sync(struct super_block *sb)
++{
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ long flags = sbi->debug_flags;
++
++ if (flags & EXFAT_DEBUGFLAGS_ERROR_RW)
++ return FFS_MEDIAERR;
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++ if (!p_bd->opened)
++ return FFS_MEDIAERR;
++
++ return sync_blockdev(sb->s_bdev);
++}
+diff --git a/drivers/staging/exfat/exfat_cache.c b/drivers/staging/exfat/exfat_cache.c
+new file mode 100644
+index 000000000000..f05d692c2b1e
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_cache.c
+@@ -0,0 +1,722 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/buffer_head.h>
++#include <linux/fs.h>
++#include <linux/mutex.h>
++#include "exfat.h"
++
++#define LOCKBIT 0x01
++#define DIRTYBIT 0x02
++
++/* Local variables */
++static DEFINE_SEMAPHORE(f_sem);
++static DEFINE_SEMAPHORE(b_sem);
++
++static struct buf_cache_t *FAT_cache_find(struct super_block *sb, sector_t sec)
++{
++ s32 off;
++ struct buf_cache_t *bp, *hp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ off = (sec +
++ (sec >> p_fs->sectors_per_clu_bits)) & (FAT_CACHE_HASH_SIZE - 1);
++
++ hp = &p_fs->FAT_cache_hash_list[off];
++ for (bp = hp->hash_next; bp != hp; bp = bp->hash_next) {
++ if ((bp->drv == p_fs->drv) && (bp->sec == sec)) {
++ WARN(!bp->buf_bh,
++ "[EXFAT] FAT_cache has no bh. It will make system panic.\n");
++
++ touch_buffer(bp->buf_bh);
++ return bp;
++ }
++ }
++ return NULL;
++}
++
++static void push_to_mru(struct buf_cache_t *bp, struct buf_cache_t *list)
++{
++ bp->next = list->next;
++ bp->prev = list;
++ list->next->prev = bp;
++ list->next = bp;
++}
++
++static void push_to_lru(struct buf_cache_t *bp, struct buf_cache_t *list)
++{
++ bp->prev = list->prev;
++ bp->next = list;
++ list->prev->next = bp;
++ list->prev = bp;
++}
++
++static void move_to_mru(struct buf_cache_t *bp, struct buf_cache_t *list)
++{
++ bp->prev->next = bp->next;
++ bp->next->prev = bp->prev;
++ push_to_mru(bp, list);
++}
++
++static void move_to_lru(struct buf_cache_t *bp, struct buf_cache_t *list)
++{
++ bp->prev->next = bp->next;
++ bp->next->prev = bp->prev;
++ push_to_lru(bp, list);
++}
++
++static struct buf_cache_t *FAT_cache_get(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ bp = p_fs->FAT_cache_lru_list.prev;
++
++ move_to_mru(bp, &p_fs->FAT_cache_lru_list);
++ return bp;
++}
++
++static void FAT_cache_insert_hash(struct super_block *sb,
++ struct buf_cache_t *bp)
++{
++ s32 off;
++ struct buf_cache_t *hp;
++ struct fs_info_t *p_fs;
++
++ p_fs = &(EXFAT_SB(sb)->fs_info);
++ off = (bp->sec +
++ (bp->sec >> p_fs->sectors_per_clu_bits)) &
++ (FAT_CACHE_HASH_SIZE - 1);
++
++ hp = &p_fs->FAT_cache_hash_list[off];
++ bp->hash_next = hp->hash_next;
++ bp->hash_prev = hp;
++ hp->hash_next->hash_prev = bp;
++ hp->hash_next = bp;
++}
++
++static void FAT_cache_remove_hash(struct buf_cache_t *bp)
++{
++ (bp->hash_prev)->hash_next = bp->hash_next;
++ (bp->hash_next)->hash_prev = bp->hash_prev;
++}
++
++static void buf_cache_insert_hash(struct super_block *sb,
++ struct buf_cache_t *bp)
++{
++ s32 off;
++ struct buf_cache_t *hp;
++ struct fs_info_t *p_fs;
++
++ p_fs = &(EXFAT_SB(sb)->fs_info);
++ off = (bp->sec +
++ (bp->sec >> p_fs->sectors_per_clu_bits)) &
++ (BUF_CACHE_HASH_SIZE - 1);
++
++ hp = &p_fs->buf_cache_hash_list[off];
++ bp->hash_next = hp->hash_next;
++ bp->hash_prev = hp;
++ hp->hash_next->hash_prev = bp;
++ hp->hash_next = bp;
++}
++
++static void buf_cache_remove_hash(struct buf_cache_t *bp)
++{
++ (bp->hash_prev)->hash_next = bp->hash_next;
++ (bp->hash_next)->hash_prev = bp->hash_prev;
++}
++
++void buf_init(struct super_block *sb)
++{
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ int i;
++
++ /* LRU list */
++ p_fs->FAT_cache_lru_list.next = &p_fs->FAT_cache_lru_list;
++ p_fs->FAT_cache_lru_list.prev = &p_fs->FAT_cache_lru_list;
++
++ for (i = 0; i < FAT_CACHE_SIZE; i++) {
++ p_fs->FAT_cache_array[i].drv = -1;
++ p_fs->FAT_cache_array[i].sec = ~0;
++ p_fs->FAT_cache_array[i].flag = 0;
++ p_fs->FAT_cache_array[i].buf_bh = NULL;
++ p_fs->FAT_cache_array[i].prev = NULL;
++ p_fs->FAT_cache_array[i].next = NULL;
++ push_to_mru(&p_fs->FAT_cache_array[i],
++ &p_fs->FAT_cache_lru_list);
++ }
++
++ p_fs->buf_cache_lru_list.next = &p_fs->buf_cache_lru_list;
++ p_fs->buf_cache_lru_list.prev = &p_fs->buf_cache_lru_list;
++
++ for (i = 0; i < BUF_CACHE_SIZE; i++) {
++ p_fs->buf_cache_array[i].drv = -1;
++ p_fs->buf_cache_array[i].sec = ~0;
++ p_fs->buf_cache_array[i].flag = 0;
++ p_fs->buf_cache_array[i].buf_bh = NULL;
++ p_fs->buf_cache_array[i].prev = NULL;
++ p_fs->buf_cache_array[i].next = NULL;
++ push_to_mru(&p_fs->buf_cache_array[i],
++ &p_fs->buf_cache_lru_list);
++ }
++
++ /* HASH list */
++ for (i = 0; i < FAT_CACHE_HASH_SIZE; i++) {
++ p_fs->FAT_cache_hash_list[i].drv = -1;
++ p_fs->FAT_cache_hash_list[i].sec = ~0;
++ p_fs->FAT_cache_hash_list[i].hash_next =
++ &p_fs->FAT_cache_hash_list[i];
++ p_fs->FAT_cache_hash_list[i].hash_prev =
++ &p_fs->FAT_cache_hash_list[i];
++ }
++
++ for (i = 0; i < FAT_CACHE_SIZE; i++)
++ FAT_cache_insert_hash(sb, &p_fs->FAT_cache_array[i]);
++
++ for (i = 0; i < BUF_CACHE_HASH_SIZE; i++) {
++ p_fs->buf_cache_hash_list[i].drv = -1;
++ p_fs->buf_cache_hash_list[i].sec = ~0;
++ p_fs->buf_cache_hash_list[i].hash_next =
++ &p_fs->buf_cache_hash_list[i];
++ p_fs->buf_cache_hash_list[i].hash_prev =
++ &p_fs->buf_cache_hash_list[i];
++ }
++
++ for (i = 0; i < BUF_CACHE_SIZE; i++)
++ buf_cache_insert_hash(sb, &p_fs->buf_cache_array[i]);
++}
++
++void buf_shutdown(struct super_block *sb)
++{
++}
++
++static int __FAT_read(struct super_block *sb, u32 loc, u32 *content)
++{
++ s32 off;
++ u32 _content;
++ sector_t sec;
++ u8 *fat_sector, *fat_entry;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_fs->vol_type == FAT12) {
++ sec = p_fs->FAT1_start_sector +
++ ((loc + (loc >> 1)) >> p_bd->sector_size_bits);
++ off = (loc + (loc >> 1)) & p_bd->sector_size_mask;
++
++ if (off == (p_bd->sector_size - 1)) {
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ _content = (u32)fat_sector[off];
++
++ fat_sector = FAT_getblk(sb, ++sec);
++ if (!fat_sector)
++ return -1;
++
++ _content |= (u32)fat_sector[0] << 8;
++ } else {
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++ _content = GET16(fat_entry);
++ }
++
++ if (loc & 1)
++ _content >>= 4;
++
++ _content &= 0x00000FFF;
++
++ if (_content >= CLUSTER_16(0x0FF8)) {
++ *content = CLUSTER_32(~0);
++ return 0;
++ }
++ *content = CLUSTER_32(_content);
++ return 0;
++ } else if (p_fs->vol_type == FAT16) {
++ sec = p_fs->FAT1_start_sector +
++ (loc >> (p_bd->sector_size_bits - 1));
++ off = (loc << 1) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++
++ _content = GET16_A(fat_entry);
++
++ _content &= 0x0000FFFF;
++
++ if (_content >= CLUSTER_16(0xFFF8)) {
++ *content = CLUSTER_32(~0);
++ return 0;
++ }
++ *content = CLUSTER_32(_content);
++ return 0;
++ } else if (p_fs->vol_type == FAT32) {
++ sec = p_fs->FAT1_start_sector +
++ (loc >> (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++
++ _content = GET32_A(fat_entry);
++
++ _content &= 0x0FFFFFFF;
++
++ if (_content >= CLUSTER_32(0x0FFFFFF8)) {
++ *content = CLUSTER_32(~0);
++ return 0;
++ }
++ *content = CLUSTER_32(_content);
++ return 0;
++ } else if (p_fs->vol_type == EXFAT) {
++ sec = p_fs->FAT1_start_sector +
++ (loc >> (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++ _content = GET32_A(fat_entry);
++
++ if (_content >= CLUSTER_32(0xFFFFFFF8)) {
++ *content = CLUSTER_32(~0);
++ return 0;
++ }
++ *content = CLUSTER_32(_content);
++ return 0;
++ }
++
++ /* Unknown volume type, throw in the towel and go home */
++ *content = CLUSTER_32(~0);
++ return 0;
++}
++
++/* in : sb, loc
++ * out: content
++ * returns 0 on success
++ * -1 on error
++ */
++int FAT_read(struct super_block *sb, u32 loc, u32 *content)
++{
++ s32 ret;
++
++ down(&f_sem);
++ ret = __FAT_read(sb, loc, content);
++ up(&f_sem);
++
++ return ret;
++}
++
++static s32 __FAT_write(struct super_block *sb, u32 loc, u32 content)
++{
++ s32 off;
++ sector_t sec;
++ u8 *fat_sector, *fat_entry;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_fs->vol_type == FAT12) {
++ content &= 0x00000FFF;
++
++ sec = p_fs->FAT1_start_sector +
++ ((loc + (loc >> 1)) >> p_bd->sector_size_bits);
++ off = (loc + (loc >> 1)) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ if (loc & 1) { /* odd */
++ content <<= 4;
++
++ if (off == (p_bd->sector_size - 1)) {
++ fat_sector[off] = (u8)(content |
++ (fat_sector[off] &
++ 0x0F));
++ FAT_modify(sb, sec);
++
++ fat_sector = FAT_getblk(sb, ++sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_sector[0] = (u8)(content >> 8);
++ } else {
++ fat_entry = &fat_sector[off];
++ content |= GET16(fat_entry) & 0x000F;
++
++ SET16(fat_entry, content);
++ }
++ } else { /* even */
++ fat_sector[off] = (u8)(content);
++
++ if (off == (p_bd->sector_size - 1)) {
++ fat_sector[off] = (u8)(content);
++ FAT_modify(sb, sec);
++
++ fat_sector = FAT_getblk(sb, ++sec);
++ fat_sector[0] = (u8)((fat_sector[0] & 0xF0) |
++ (content >> 8));
++ } else {
++ fat_entry = &fat_sector[off];
++ content |= GET16(fat_entry) & 0xF000;
++
++ SET16(fat_entry, content);
++ }
++ }
++ }
++
++ else if (p_fs->vol_type == FAT16) {
++ content &= 0x0000FFFF;
++
++ sec = p_fs->FAT1_start_sector + (loc >>
++ (p_bd->sector_size_bits - 1));
++ off = (loc << 1) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++
++ SET16_A(fat_entry, content);
++ } else if (p_fs->vol_type == FAT32) {
++ content &= 0x0FFFFFFF;
++
++ sec = p_fs->FAT1_start_sector + (loc >>
++ (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++
++ content |= GET32_A(fat_entry) & 0xF0000000;
++
++ SET32_A(fat_entry, content);
++ } else { /* p_fs->vol_type == EXFAT */
++ sec = p_fs->FAT1_start_sector + (loc >>
++ (p_bd->sector_size_bits - 2));
++ off = (loc << 2) & p_bd->sector_size_mask;
++
++ fat_sector = FAT_getblk(sb, sec);
++ if (!fat_sector)
++ return -1;
++
++ fat_entry = &fat_sector[off];
++
++ SET32_A(fat_entry, content);
++ }
++
++ FAT_modify(sb, sec);
++ return 0;
++}
++
++int FAT_write(struct super_block *sb, u32 loc, u32 content)
++{
++ s32 ret;
++
++ down(&f_sem);
++ ret = __FAT_write(sb, loc, content);
++ up(&f_sem);
++
++ return ret;
++}
++
++u8 *FAT_getblk(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ bp = FAT_cache_find(sb, sec);
++ if (bp) {
++ move_to_mru(bp, &p_fs->FAT_cache_lru_list);
++ return bp->buf_bh->b_data;
++ }
++
++ bp = FAT_cache_get(sb, sec);
++
++ FAT_cache_remove_hash(bp);
++
++ bp->drv = p_fs->drv;
++ bp->sec = sec;
++ bp->flag = 0;
++
++ FAT_cache_insert_hash(sb, bp);
++
++ if (sector_read(sb, sec, &bp->buf_bh, 1) != FFS_SUCCESS) {
++ FAT_cache_remove_hash(bp);
++ bp->drv = -1;
++ bp->sec = ~0;
++ bp->flag = 0;
++ bp->buf_bh = NULL;
++
++ move_to_lru(bp, &p_fs->FAT_cache_lru_list);
++ return NULL;
++ }
++
++ return bp->buf_bh->b_data;
++}
++
++void FAT_modify(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++
++ bp = FAT_cache_find(sb, sec);
++ if (bp)
++ sector_write(sb, sec, bp->buf_bh, 0);
++}
++
++void FAT_release_all(struct super_block *sb)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ down(&f_sem);
++
++ bp = p_fs->FAT_cache_lru_list.next;
++ while (bp != &p_fs->FAT_cache_lru_list) {
++ if (bp->drv == p_fs->drv) {
++ bp->drv = -1;
++ bp->sec = ~0;
++ bp->flag = 0;
++
++ if (bp->buf_bh) {
++ __brelse(bp->buf_bh);
++ bp->buf_bh = NULL;
++ }
++ }
++ bp = bp->next;
++ }
++
++ up(&f_sem);
++}
++
++void FAT_sync(struct super_block *sb)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ down(&f_sem);
++
++ bp = p_fs->FAT_cache_lru_list.next;
++ while (bp != &p_fs->FAT_cache_lru_list) {
++ if ((bp->drv == p_fs->drv) && (bp->flag & DIRTYBIT)) {
++ sync_dirty_buffer(bp->buf_bh);
++ bp->flag &= ~(DIRTYBIT);
++ }
++ bp = bp->next;
++ }
++
++ up(&f_sem);
++}
++
++static struct buf_cache_t *buf_cache_find(struct super_block *sb, sector_t sec)
++{
++ s32 off;
++ struct buf_cache_t *bp, *hp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ off = (sec + (sec >> p_fs->sectors_per_clu_bits)) &
++ (BUF_CACHE_HASH_SIZE - 1);
++
++ hp = &p_fs->buf_cache_hash_list[off];
++ for (bp = hp->hash_next; bp != hp; bp = bp->hash_next) {
++ if ((bp->drv == p_fs->drv) && (bp->sec == sec)) {
++ touch_buffer(bp->buf_bh);
++ return bp;
++ }
++ }
++ return NULL;
++}
++
++static struct buf_cache_t *buf_cache_get(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ bp = p_fs->buf_cache_lru_list.prev;
++ while (bp->flag & LOCKBIT)
++ bp = bp->prev;
++
++ move_to_mru(bp, &p_fs->buf_cache_lru_list);
++ return bp;
++}
++
++static u8 *__buf_getblk(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ bp = buf_cache_find(sb, sec);
++ if (bp) {
++ move_to_mru(bp, &p_fs->buf_cache_lru_list);
++ return bp->buf_bh->b_data;
++ }
++
++ bp = buf_cache_get(sb, sec);
++
++ buf_cache_remove_hash(bp);
++
++ bp->drv = p_fs->drv;
++ bp->sec = sec;
++ bp->flag = 0;
++
++ buf_cache_insert_hash(sb, bp);
++
++ if (sector_read(sb, sec, &bp->buf_bh, 1) != FFS_SUCCESS) {
++ buf_cache_remove_hash(bp);
++ bp->drv = -1;
++ bp->sec = ~0;
++ bp->flag = 0;
++ bp->buf_bh = NULL;
++
++ move_to_lru(bp, &p_fs->buf_cache_lru_list);
++ return NULL;
++ }
++
++ return bp->buf_bh->b_data;
++}
++
++u8 *buf_getblk(struct super_block *sb, sector_t sec)
++{
++ u8 *buf;
++
++ down(&b_sem);
++ buf = __buf_getblk(sb, sec);
++ up(&b_sem);
++
++ return buf;
++}
++
++void buf_modify(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++
++ down(&b_sem);
++
++ bp = buf_cache_find(sb, sec);
++ if (likely(bp))
++ sector_write(sb, sec, bp->buf_bh, 0);
++
++ WARN(!bp, "[EXFAT] failed to find buffer_cache(sector:%llu).\n",
++ (unsigned long long)sec);
++
++ up(&b_sem);
++}
++
++void buf_lock(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++
++ down(&b_sem);
++
++ bp = buf_cache_find(sb, sec);
++ if (likely(bp))
++ bp->flag |= LOCKBIT;
++
++ WARN(!bp, "[EXFAT] failed to find buffer_cache(sector:%llu).\n",
++ (unsigned long long)sec);
++
++ up(&b_sem);
++}
++
++void buf_unlock(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++
++ down(&b_sem);
++
++ bp = buf_cache_find(sb, sec);
++ if (likely(bp))
++ bp->flag &= ~(LOCKBIT);
++
++ WARN(!bp, "[EXFAT] failed to find buffer_cache(sector:%llu).\n",
++ (unsigned long long)sec);
++
++ up(&b_sem);
++}
++
++void buf_release(struct super_block *sb, sector_t sec)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ down(&b_sem);
++
++ bp = buf_cache_find(sb, sec);
++ if (likely(bp)) {
++ bp->drv = -1;
++ bp->sec = ~0;
++ bp->flag = 0;
++
++ if (bp->buf_bh) {
++ __brelse(bp->buf_bh);
++ bp->buf_bh = NULL;
++ }
++
++ move_to_lru(bp, &p_fs->buf_cache_lru_list);
++ }
++
++ up(&b_sem);
++}
++
++void buf_release_all(struct super_block *sb)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ down(&b_sem);
++
++ bp = p_fs->buf_cache_lru_list.next;
++ while (bp != &p_fs->buf_cache_lru_list) {
++ if (bp->drv == p_fs->drv) {
++ bp->drv = -1;
++ bp->sec = ~0;
++ bp->flag = 0;
++
++ if (bp->buf_bh) {
++ __brelse(bp->buf_bh);
++ bp->buf_bh = NULL;
++ }
++ }
++ bp = bp->next;
++ }
++
++ up(&b_sem);
++}
++
++void buf_sync(struct super_block *sb)
++{
++ struct buf_cache_t *bp;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ down(&b_sem);
++
++ bp = p_fs->buf_cache_lru_list.next;
++ while (bp != &p_fs->buf_cache_lru_list) {
++ if ((bp->drv == p_fs->drv) && (bp->flag & DIRTYBIT)) {
++ sync_dirty_buffer(bp->buf_bh);
++ bp->flag &= ~(DIRTYBIT);
++ }
++ bp = bp->next;
++ }
++
++ up(&b_sem);
++}
+diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
+new file mode 100644
+index 000000000000..9f76ca175c80
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_core.c
+@@ -0,0 +1,3704 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/types.h>
++#include <linux/buffer_head.h>
++#include <linux/fs.h>
++#include <linux/mutex.h>
++#include <linux/blkdev.h>
++#include <linux/slab.h>
++#include "exfat.h"
++
++
++static void __set_sb_dirty(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ sbi->s_dirt = 1;
++}
++
++static u8 name_buf[MAX_PATH_LENGTH * MAX_CHARSET_SIZE];
++
++static char *reserved_names[] = {
++ "AUX ", "CON ", "NUL ", "PRN ",
++ "COM1 ", "COM2 ", "COM3 ", "COM4 ",
++ "COM5 ", "COM6 ", "COM7 ", "COM8 ", "COM9 ",
++ "LPT1 ", "LPT2 ", "LPT3 ", "LPT4 ",
++ "LPT5 ", "LPT6 ", "LPT7 ", "LPT8 ", "LPT9 ",
++ NULL
++};
++
++static u8 free_bit[] = {
++ 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, /* 0 ~ 19 */
++ 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, 0, 1, 0, 2, 0, 1, 0, 3, /* 20 ~ 39 */
++ 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, /* 40 ~ 59 */
++ 0, 1, 0, 6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, /* 60 ~ 79 */
++ 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, 0, 1, 0, 2, /* 80 ~ 99 */
++ 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, /* 100 ~ 119 */
++ 0, 1, 0, 2, 0, 1, 0, 7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, /* 120 ~ 139 */
++ 0, 1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 5, /* 140 ~ 159 */
++ 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, /* 160 ~ 179 */
++ 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 6, 0, 1, 0, 2, 0, 1, 0, 3, /* 180 ~ 199 */
++ 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, /* 200 ~ 219 */
++ 0, 1, 0, 5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, /* 220 ~ 239 */
++ 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 /* 240 ~ 254 */
++};
++
++static u8 used_bit[] = {
++ 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, /* 0 ~ 19 */
++ 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, /* 20 ~ 39 */
++ 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, /* 40 ~ 59 */
++ 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, /* 60 ~ 79 */
++ 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, /* 80 ~ 99 */
++ 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, /* 100 ~ 119 */
++ 4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, /* 120 ~ 139 */
++ 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, /* 140 ~ 159 */
++ 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, /* 160 ~ 179 */
++ 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 2, 3, 3, 4, 3, 4, 4, 5, /* 180 ~ 199 */
++ 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, /* 200 ~ 219 */
++ 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, /* 220 ~ 239 */
++ 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8 /* 240 ~ 255 */
++};
++
++#define BITMAP_LOC(v) ((v) >> 3)
++#define BITMAP_SHIFT(v) ((v) & 0x07)
++
++static inline s32 exfat_bitmap_test(u8 *bitmap, int i)
++{
++ u8 data;
++
++ data = bitmap[BITMAP_LOC(i)];
++ if ((data >> BITMAP_SHIFT(i)) & 0x01)
++ return 1;
++ return 0;
++}
++
++static inline void exfat_bitmap_set(u8 *bitmap, int i)
++{
++ bitmap[BITMAP_LOC(i)] |= (0x01 << BITMAP_SHIFT(i));
++}
++
++static inline void exfat_bitmap_clear(u8 *bitmap, int i)
++{
++ bitmap[BITMAP_LOC(i)] &= ~(0x01 << BITMAP_SHIFT(i));
++}
++
++/*
++ * File System Management Functions
++ */
++
++void fs_set_vol_flags(struct super_block *sb, u32 new_flag)
++{
++ struct pbr_sector_t *p_pbr;
++ struct bpbex_t *p_bpb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_fs->vol_flag == new_flag)
++ return;
++
++ p_fs->vol_flag = new_flag;
++
++ if (p_fs->vol_type == EXFAT) {
++ if (p_fs->pbr_bh == NULL) {
++ if (sector_read(sb, p_fs->PBR_sector,
++ &p_fs->pbr_bh, 1) != FFS_SUCCESS)
++ return;
++ }
++
++ p_pbr = (struct pbr_sector_t *)p_fs->pbr_bh->b_data;
++ p_bpb = (struct bpbex_t *)p_pbr->bpb;
++ SET16(p_bpb->vol_flags, (u16)new_flag);
++
++ /* XXX duyoung
++ * what can we do here? (cuz fs_set_vol_flags() is void)
++ */
++ if ((new_flag == VOL_DIRTY) && (!buffer_dirty(p_fs->pbr_bh)))
++ sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 1);
++ else
++ sector_write(sb, p_fs->PBR_sector, p_fs->pbr_bh, 0);
++ }
++}
++
++void fs_error(struct super_block *sb)
++{
++ struct exfat_mount_options *opts = &EXFAT_SB(sb)->options;
++
++ if (opts->errors == EXFAT_ERRORS_PANIC) {
++ panic("[EXFAT] Filesystem panic from previous error\n");
++ } else if ((opts->errors == EXFAT_ERRORS_RO) && !sb_rdonly(sb)) {
++ sb->s_flags |= SB_RDONLY;
++ pr_err("[EXFAT] Filesystem has been set read-only\n");
++ }
++}
++
++/*
++ * Cluster Management Functions
++ */
++
++s32 clear_cluster(struct super_block *sb, u32 clu)
++{
++ sector_t s, n;
++ s32 ret = FFS_SUCCESS;
++ struct buffer_head *tmp_bh = NULL;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (clu == CLUSTER_32(0)) { /* FAT16 root_dir */
++ s = p_fs->root_start_sector;
++ n = p_fs->data_start_sector;
++ } else {
++ s = START_SECTOR(clu);
++ n = s + p_fs->sectors_per_clu;
++ }
++
++ for (; s < n; s++) {
++ ret = sector_read(sb, s, &tmp_bh, 0);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ memset((char *)tmp_bh->b_data, 0x0, p_bd->sector_size);
++ ret = sector_write(sb, s, tmp_bh, 0);
++ if (ret != FFS_SUCCESS)
++ break;
++ }
++
++ brelse(tmp_bh);
++ return ret;
++}
++
++s32 fat_alloc_cluster(struct super_block *sb, s32 num_alloc,
++ struct chain_t *p_chain)
++{
++ int i, num_clusters = 0;
++ u32 new_clu, last_clu = CLUSTER_32(~0), read_clu;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ new_clu = p_chain->dir;
++ if (new_clu == CLUSTER_32(~0))
++ new_clu = p_fs->clu_srch_ptr;
++ else if (new_clu >= p_fs->num_clusters)
++ new_clu = 2;
++
++ __set_sb_dirty(sb);
++
++ p_chain->dir = CLUSTER_32(~0);
++
++ for (i = 2; i < p_fs->num_clusters; i++) {
++ if (FAT_read(sb, new_clu, &read_clu) != 0)
++ return -1;
++
++ if (read_clu == CLUSTER_32(0)) {
++ if (FAT_write(sb, new_clu, CLUSTER_32(~0)) < 0)
++ return -1;
++ num_clusters++;
++
++ if (p_chain->dir == CLUSTER_32(~0)) {
++ p_chain->dir = new_clu;
++ } else {
++ if (FAT_write(sb, last_clu, new_clu) < 0)
++ return -1;
++ }
++
++ last_clu = new_clu;
++
++ if ((--num_alloc) == 0) {
++ p_fs->clu_srch_ptr = new_clu;
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters += num_clusters;
++
++ return num_clusters;
++ }
++ }
++ if ((++new_clu) >= p_fs->num_clusters)
++ new_clu = 2;
++ }
++
++ p_fs->clu_srch_ptr = new_clu;
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters += num_clusters;
++
++ return num_clusters;
++}
++
++s32 exfat_alloc_cluster(struct super_block *sb, s32 num_alloc,
++ struct chain_t *p_chain)
++{
++ s32 num_clusters = 0;
++ u32 hint_clu, new_clu, last_clu = CLUSTER_32(~0);
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ hint_clu = p_chain->dir;
++ if (hint_clu == CLUSTER_32(~0)) {
++ hint_clu = test_alloc_bitmap(sb, p_fs->clu_srch_ptr-2);
++ if (hint_clu == CLUSTER_32(~0))
++ return 0;
++ } else if (hint_clu >= p_fs->num_clusters) {
++ hint_clu = 2;
++ p_chain->flags = 0x01;
++ }
++
++ __set_sb_dirty(sb);
++
++ p_chain->dir = CLUSTER_32(~0);
++
++ while ((new_clu = test_alloc_bitmap(sb, hint_clu-2)) != CLUSTER_32(~0)) {
++ if (new_clu != hint_clu) {
++ if (p_chain->flags == 0x03) {
++ exfat_chain_cont_cluster(sb, p_chain->dir,
++ num_clusters);
++ p_chain->flags = 0x01;
++ }
++ }
++
++ if (set_alloc_bitmap(sb, new_clu-2) != FFS_SUCCESS)
++ return -1;
++
++ num_clusters++;
++
++ if (p_chain->flags == 0x01) {
++ if (FAT_write(sb, new_clu, CLUSTER_32(~0)) < 0)
++ return -1;
++ }
++
++ if (p_chain->dir == CLUSTER_32(~0)) {
++ p_chain->dir = new_clu;
++ } else {
++ if (p_chain->flags == 0x01) {
++ if (FAT_write(sb, last_clu, new_clu) < 0)
++ return -1;
++ }
++ }
++ last_clu = new_clu;
++
++ if ((--num_alloc) == 0) {
++ p_fs->clu_srch_ptr = hint_clu;
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters += num_clusters;
++
++ p_chain->size += num_clusters;
++ return num_clusters;
++ }
++
++ hint_clu = new_clu + 1;
++ if (hint_clu >= p_fs->num_clusters) {
++ hint_clu = 2;
++
++ if (p_chain->flags == 0x03) {
++ exfat_chain_cont_cluster(sb, p_chain->dir,
++ num_clusters);
++ p_chain->flags = 0x01;
++ }
++ }
++ }
++
++ p_fs->clu_srch_ptr = hint_clu;
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters += num_clusters;
++
++ p_chain->size += num_clusters;
++ return num_clusters;
++}
++
++void fat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
++ s32 do_relse)
++{
++ s32 num_clusters = 0;
++ u32 clu, prev;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ int i;
++ sector_t sector;
++
++ if ((p_chain->dir == CLUSTER_32(0)) || (p_chain->dir == CLUSTER_32(~0)))
++ return;
++ __set_sb_dirty(sb);
++ clu = p_chain->dir;
++
++ if (p_chain->size <= 0)
++ return;
++
++ do {
++ if (p_fs->dev_ejected)
++ break;
++
++ if (do_relse) {
++ sector = START_SECTOR(clu);
++ for (i = 0; i < p_fs->sectors_per_clu; i++)
++ buf_release(sb, sector+i);
++ }
++
++ prev = clu;
++ if (FAT_read(sb, clu, &clu) == -1)
++ break;
++
++ if (FAT_write(sb, prev, CLUSTER_32(0)) < 0)
++ break;
++ num_clusters++;
++
++ } while (clu != CLUSTER_32(~0));
++
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters -= num_clusters;
++}
++
++void exfat_free_cluster(struct super_block *sb, struct chain_t *p_chain,
++ s32 do_relse)
++{
++ s32 num_clusters = 0;
++ u32 clu;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ int i;
++ sector_t sector;
++
++ if ((p_chain->dir == CLUSTER_32(0)) || (p_chain->dir == CLUSTER_32(~0)))
++ return;
++
++ if (p_chain->size <= 0) {
++ pr_err("[EXFAT] free_cluster : skip free-req clu:%u, because of zero-size truncation\n",
++ p_chain->dir);
++ return;
++ }
++
++ __set_sb_dirty(sb);
++ clu = p_chain->dir;
++
++ if (p_chain->flags == 0x03) {
++ do {
++ if (do_relse) {
++ sector = START_SECTOR(clu);
++ for (i = 0; i < p_fs->sectors_per_clu; i++)
++ buf_release(sb, sector+i);
++ }
++
++ if (clr_alloc_bitmap(sb, clu-2) != FFS_SUCCESS)
++ break;
++ clu++;
++
++ num_clusters++;
++ } while (num_clusters < p_chain->size);
++ } else {
++ do {
++ if (p_fs->dev_ejected)
++ break;
++
++ if (do_relse) {
++ sector = START_SECTOR(clu);
++ for (i = 0; i < p_fs->sectors_per_clu; i++)
++ buf_release(sb, sector+i);
++ }
++
++ if (clr_alloc_bitmap(sb, clu-2) != FFS_SUCCESS)
++ break;
++
++ if (FAT_read(sb, clu, &clu) == -1)
++ break;
++ num_clusters++;
++ } while ((clu != CLUSTER_32(0)) && (clu != CLUSTER_32(~0)));
++ }
++
++ if (p_fs->used_clusters != (u32) ~0)
++ p_fs->used_clusters -= num_clusters;
++}
++
++u32 find_last_cluster(struct super_block *sb, struct chain_t *p_chain)
++{
++ u32 clu, next;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ clu = p_chain->dir;
++
++ if (p_chain->flags == 0x03) {
++ clu += p_chain->size - 1;
++ } else {
++ while ((FAT_read(sb, clu, &next) == 0) &&
++ (next != CLUSTER_32(~0))) {
++ if (p_fs->dev_ejected)
++ break;
++ clu = next;
++ }
++ }
++
++ return clu;
++}
++
++s32 count_num_clusters(struct super_block *sb, struct chain_t *p_chain)
++{
++ int i, count = 0;
++ u32 clu;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if ((p_chain->dir == CLUSTER_32(0)) || (p_chain->dir == CLUSTER_32(~0)))
++ return 0;
++
++ clu = p_chain->dir;
++
++ if (p_chain->flags == 0x03) {
++ count = p_chain->size;
++ } else {
++ for (i = 2; i < p_fs->num_clusters; i++) {
++ count++;
++ if (FAT_read(sb, clu, &clu) != 0)
++ return 0;
++ if (clu == CLUSTER_32(~0))
++ break;
++ }
++ }
++
++ return count;
++}
++
++s32 fat_count_used_clusters(struct super_block *sb)
++{
++ int i, count = 0;
++ u32 clu;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ for (i = 2; i < p_fs->num_clusters; i++) {
++ if (FAT_read(sb, i, &clu) != 0)
++ break;
++ if (clu != CLUSTER_32(0))
++ count++;
++ }
++
++ return count;
++}
++
++s32 exfat_count_used_clusters(struct super_block *sb)
++{
++ int i, map_i, map_b, count = 0;
++ u8 k;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ map_i = map_b = 0;
++
++ for (i = 2; i < p_fs->num_clusters; i += 8) {
++ k = *(((u8 *) p_fs->vol_amap[map_i]->b_data) + map_b);
++ count += used_bit[k];
++
++ if ((++map_b) >= p_bd->sector_size) {
++ map_i++;
++ map_b = 0;
++ }
++ }
++
++ return count;
++}
++
++void exfat_chain_cont_cluster(struct super_block *sb, u32 chain, s32 len)
++{
++ if (len == 0)
++ return;
++
++ while (len > 1) {
++ if (FAT_write(sb, chain, chain+1) < 0)
++ break;
++ chain++;
++ len--;
++ }
++ FAT_write(sb, chain, CLUSTER_32(~0));
++}
++
++/*
++ * Allocation Bitmap Management Functions
++ */
++
++s32 load_alloc_bitmap(struct super_block *sb)
++{
++ int i, j, ret;
++ u32 map_size;
++ u32 type;
++ sector_t sector;
++ struct chain_t clu;
++ struct bmap_dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ clu.dir = p_fs->root_dir;
++ clu.flags = 0x01;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ for (i = 0; i < p_fs->dentries_per_clu; i++) {
++ ep = (struct bmap_dentry_t *)get_entry_in_dir(sb, &clu,
++ i, NULL);
++ if (!ep)
++ return FFS_MEDIAERR;
++
++ type = p_fs->fs_func->get_entry_type((struct dentry_t *)ep);
++
++ if (type == TYPE_UNUSED)
++ break;
++ if (type != TYPE_BITMAP)
++ continue;
++
++ if (ep->flags == 0x0) {
++ p_fs->map_clu = GET32_A(ep->start_clu);
++ map_size = (u32) GET64_A(ep->size);
++
++ p_fs->map_sectors = ((map_size-1) >> p_bd->sector_size_bits) + 1;
++
++ p_fs->vol_amap = kmalloc_array(p_fs->map_sectors,
++ sizeof(struct buffer_head *),
++ GFP_KERNEL);
++ if (p_fs->vol_amap == NULL)
++ return FFS_MEMORYERR;
++
++ sector = START_SECTOR(p_fs->map_clu);
++
++ for (j = 0; j < p_fs->map_sectors; j++) {
++ p_fs->vol_amap[j] = NULL;
++ ret = sector_read(sb, sector+j, &(p_fs->vol_amap[j]), 1);
++ if (ret != FFS_SUCCESS) {
++ /* release all buffers and free vol_amap */
++ i = 0;
++ while (i < j)
++ brelse(p_fs->vol_amap[i++]);
++
++ kfree(p_fs->vol_amap);
++ p_fs->vol_amap = NULL;
++ return ret;
++ }
++ }
++
++ p_fs->pbr_bh = NULL;
++ return FFS_SUCCESS;
++ }
++ }
++
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return FFS_MEDIAERR;
++ }
++
++ return FFS_FORMATERR;
++}
++
++void free_alloc_bitmap(struct super_block *sb)
++{
++ int i;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ brelse(p_fs->pbr_bh);
++
++ for (i = 0; i < p_fs->map_sectors; i++)
++ __brelse(p_fs->vol_amap[i]);
++
++ kfree(p_fs->vol_amap);
++ p_fs->vol_amap = NULL;
++}
++
++s32 set_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, b;
++ sector_t sector;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ i = clu >> (p_bd->sector_size_bits + 3);
++ b = clu & ((p_bd->sector_size << 3) - 1);
++
++ sector = START_SECTOR(p_fs->map_clu) + i;
++
++ exfat_bitmap_set((u8 *) p_fs->vol_amap[i]->b_data, b);
++
++ return sector_write(sb, sector, p_fs->vol_amap[i], 0);
++}
++
++s32 clr_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, b;
++ sector_t sector;
++#ifdef CONFIG_EXFAT_DISCARD
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct exfat_mount_options *opts = &sbi->options;
++ int ret;
++#endif /* CONFIG_EXFAT_DISCARD */
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ i = clu >> (p_bd->sector_size_bits + 3);
++ b = clu & ((p_bd->sector_size << 3) - 1);
++
++ sector = START_SECTOR(p_fs->map_clu) + i;
++
++ exfat_bitmap_clear((u8 *) p_fs->vol_amap[i]->b_data, b);
++
++ return sector_write(sb, sector, p_fs->vol_amap[i], 0);
++
++#ifdef CONFIG_EXFAT_DISCARD
++ if (opts->discard) {
++ ret = sb_issue_discard(sb, START_SECTOR(clu),
++ (1 << p_fs->sectors_per_clu_bits),
++ GFP_NOFS, 0);
++ if (ret == -EOPNOTSUPP) {
++ pr_warn("discard not supported by device, disabling");
++ opts->discard = 0;
++ }
++ }
++#endif /* CONFIG_EXFAT_DISCARD */
++}
++
++u32 test_alloc_bitmap(struct super_block *sb, u32 clu)
++{
++ int i, map_i, map_b;
++ u32 clu_base, clu_free;
++ u8 k, clu_mask;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ clu_base = (clu & ~(0x7)) + 2;
++ clu_mask = (1 << (clu - clu_base + 2)) - 1;
++
++ map_i = clu >> (p_bd->sector_size_bits + 3);
++ map_b = (clu >> 3) & p_bd->sector_size_mask;
++
++ for (i = 2; i < p_fs->num_clusters; i += 8) {
++ k = *(((u8 *) p_fs->vol_amap[map_i]->b_data) + map_b);
++ if (clu_mask > 0) {
++ k |= clu_mask;
++ clu_mask = 0;
++ }
++ if (k < 0xFF) {
++ clu_free = clu_base + free_bit[k];
++ if (clu_free < p_fs->num_clusters)
++ return clu_free;
++ }
++ clu_base += 8;
++
++ if (((++map_b) >= p_bd->sector_size) ||
++ (clu_base >= p_fs->num_clusters)) {
++ if ((++map_i) >= p_fs->map_sectors) {
++ clu_base = 2;
++ map_i = 0;
++ }
++ map_b = 0;
++ }
++ }
++
++ return CLUSTER_32(~0);
++}
++
++void sync_alloc_bitmap(struct super_block *sb)
++{
++ int i;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_fs->vol_amap == NULL)
++ return;
++
++ for (i = 0; i < p_fs->map_sectors; i++)
++ sync_dirty_buffer(p_fs->vol_amap[i]);
++}
++
++/*
++ * Upcase table Management Functions
++ */
++static s32 __load_upcase_table(struct super_block *sb, sector_t sector,
++ u32 num_sectors, u32 utbl_checksum)
++{
++ int i, ret = FFS_ERROR;
++ u32 j;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct buffer_head *tmp_bh = NULL;
++ sector_t end_sector = num_sectors + sector;
++
++ u8 skip = FALSE;
++ u32 index = 0;
++ u16 uni = 0;
++ u16 **upcase_table;
++
++ u32 checksum = 0;
++
++ upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
++ GFP_KERNEL);
++ if (upcase_table == NULL)
++ return FFS_MEMORYERR;
++ memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
++
++ while (sector < end_sector) {
++ ret = sector_read(sb, sector, &tmp_bh, 1);
++ if (ret != FFS_SUCCESS) {
++ pr_debug("sector read (0x%llX)fail\n",
++ (unsigned long long)sector);
++ goto error;
++ }
++ sector++;
++
++ for (i = 0; i < p_bd->sector_size && index <= 0xFFFF; i += 2) {
++ uni = GET16(((u8 *) tmp_bh->b_data)+i);
++
++ checksum = ((checksum & 1) ? 0x80000000 : 0) +
++ (checksum >> 1) + *(((u8 *)tmp_bh->b_data) +
++ i);
++ checksum = ((checksum & 1) ? 0x80000000 : 0) +
++ (checksum >> 1) + *(((u8 *)tmp_bh->b_data) +
++ (i + 1));
++
++ if (skip) {
++ pr_debug("skip from 0x%X ", index);
++ index += uni;
++ pr_debug("to 0x%X (amount of 0x%X)\n",
++ index, uni);
++ skip = FALSE;
++ } else if (uni == index)
++ index++;
++ else if (uni == 0xFFFF)
++ skip = TRUE;
++ else { /* uni != index , uni != 0xFFFF */
++ u16 col_index = get_col_index(index);
++
++ if (upcase_table[col_index] == NULL) {
++ pr_debug("alloc = 0x%X\n", col_index);
++ upcase_table[col_index] = kmalloc_array(UTBL_ROW_COUNT,
++ sizeof(u16), GFP_KERNEL);
++ if (upcase_table[col_index] == NULL) {
++ ret = FFS_MEMORYERR;
++ goto error;
++ }
++
++ for (j = 0; j < UTBL_ROW_COUNT; j++)
++ upcase_table[col_index][j] = (col_index << LOW_INDEX_BIT) | j;
++ }
++
++ upcase_table[col_index][get_row_index(index)] = uni;
++ index++;
++ }
++ }
++ }
++ if (index >= 0xFFFF && utbl_checksum == checksum) {
++ if (tmp_bh)
++ brelse(tmp_bh);
++ return FFS_SUCCESS;
++ }
++ ret = FFS_ERROR;
++error:
++ if (tmp_bh)
++ brelse(tmp_bh);
++ free_upcase_table(sb);
++ return ret;
++}
++
++static s32 __load_default_upcase_table(struct super_block *sb)
++{
++ int i, ret = FFS_ERROR;
++ u32 j;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ u8 skip = FALSE;
++ u32 index = 0;
++ u16 uni = 0;
++ u16 **upcase_table;
++
++ upcase_table = p_fs->vol_utbl = kmalloc(UTBL_COL_COUNT * sizeof(u16 *),
++ GFP_KERNEL);
++ if (upcase_table == NULL)
++ return FFS_MEMORYERR;
++ memset(upcase_table, 0, UTBL_COL_COUNT * sizeof(u16 *));
++
++ for (i = 0; index <= 0xFFFF && i < NUM_UPCASE*2; i += 2) {
++ uni = GET16(uni_upcase + i);
++ if (skip) {
++ pr_debug("skip from 0x%X ", index);
++ index += uni;
++ pr_debug("to 0x%X (amount of 0x%X)\n", index, uni);
++ skip = FALSE;
++ } else if (uni == index)
++ index++;
++ else if (uni == 0xFFFF)
++ skip = TRUE;
++ else { /* uni != index , uni != 0xFFFF */
++ u16 col_index = get_col_index(index);
++
++ if (upcase_table[col_index] == NULL) {
++ pr_debug("alloc = 0x%X\n", col_index);
++ upcase_table[col_index] = kmalloc_array(UTBL_ROW_COUNT,
++ sizeof(u16),
++ GFP_KERNEL);
++ if (upcase_table[col_index] == NULL) {
++ ret = FFS_MEMORYERR;
++ goto error;
++ }
++
++ for (j = 0; j < UTBL_ROW_COUNT; j++)
++ upcase_table[col_index][j] = (col_index << LOW_INDEX_BIT) | j;
++ }
++
++ upcase_table[col_index][get_row_index(index)] = uni;
++ index++;
++ }
++ }
++
++ if (index >= 0xFFFF)
++ return FFS_SUCCESS;
++
++error:
++ /* FATAL error: default upcase table has error */
++ free_upcase_table(sb);
++ return ret;
++}
++
++s32 load_upcase_table(struct super_block *sb)
++{
++ int i;
++ u32 tbl_clu, tbl_size;
++ sector_t sector;
++ u32 type, num_sectors;
++ struct chain_t clu;
++ struct case_dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ clu.dir = p_fs->root_dir;
++ clu.flags = 0x01;
++
++ if (p_fs->dev_ejected)
++ return FFS_MEDIAERR;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ for (i = 0; i < p_fs->dentries_per_clu; i++) {
++ ep = (struct case_dentry_t *)get_entry_in_dir(sb, &clu,
++ i, NULL);
++ if (!ep)
++ return FFS_MEDIAERR;
++
++ type = p_fs->fs_func->get_entry_type((struct dentry_t *)ep);
++
++ if (type == TYPE_UNUSED)
++ break;
++ if (type != TYPE_UPCASE)
++ continue;
++
++ tbl_clu = GET32_A(ep->start_clu);
++ tbl_size = (u32) GET64_A(ep->size);
++
++ sector = START_SECTOR(tbl_clu);
++ num_sectors = ((tbl_size-1) >> p_bd->sector_size_bits) + 1;
++ if (__load_upcase_table(sb, sector, num_sectors,
++ GET32_A(ep->checksum)) != FFS_SUCCESS)
++ break;
++ return FFS_SUCCESS;
++ }
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return FFS_MEDIAERR;
++ }
++ /* load default upcase table */
++ return __load_default_upcase_table(sb);
++}
++
++void free_upcase_table(struct super_block *sb)
++{
++ u32 i;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ u16 **upcase_table;
++
++ upcase_table = p_fs->vol_utbl;
++ for (i = 0; i < UTBL_COL_COUNT; i++)
++ kfree(upcase_table[i]);
++
++ kfree(p_fs->vol_utbl);
++ p_fs->vol_utbl = NULL;
++}
++
++/*
++ * Directory Entry Management Functions
++ */
++
++u32 fat_get_entry_type(struct dentry_t *p_entry)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *) p_entry;
++
++ if (*(ep->name) == 0x0)
++ return TYPE_UNUSED;
++
++ else if (*(ep->name) == 0xE5)
++ return TYPE_DELETED;
++
++ else if (ep->attr == ATTR_EXTEND)
++ return TYPE_EXTEND;
++
++ else if ((ep->attr & (ATTR_SUBDIR|ATTR_VOLUME)) == ATTR_VOLUME)
++ return TYPE_VOLUME;
++
++ else if ((ep->attr & (ATTR_SUBDIR|ATTR_VOLUME)) == ATTR_SUBDIR)
++ return TYPE_DIR;
++
++ return TYPE_FILE;
++}
++
++u32 exfat_get_entry_type(struct dentry_t *p_entry)
++{
++ struct file_dentry_t *ep = (struct file_dentry_t *) p_entry;
++
++ if (ep->type == 0x0) {
++ return TYPE_UNUSED;
++ } else if (ep->type < 0x80) {
++ return TYPE_DELETED;
++ } else if (ep->type == 0x80) {
++ return TYPE_INVALID;
++ } else if (ep->type < 0xA0) {
++ if (ep->type == 0x81) {
++ return TYPE_BITMAP;
++ } else if (ep->type == 0x82) {
++ return TYPE_UPCASE;
++ } else if (ep->type == 0x83) {
++ return TYPE_VOLUME;
++ } else if (ep->type == 0x85) {
++ if (GET16_A(ep->attr) & ATTR_SUBDIR)
++ return TYPE_DIR;
++ else
++ return TYPE_FILE;
++ }
++ return TYPE_CRITICAL_PRI;
++ } else if (ep->type < 0xC0) {
++ if (ep->type == 0xA0)
++ return TYPE_GUID;
++ else if (ep->type == 0xA1)
++ return TYPE_PADDING;
++ else if (ep->type == 0xA2)
++ return TYPE_ACLTAB;
++ return TYPE_BENIGN_PRI;
++ } else if (ep->type < 0xE0) {
++ if (ep->type == 0xC0)
++ return TYPE_STREAM;
++ else if (ep->type == 0xC1)
++ return TYPE_EXTEND;
++ else if (ep->type == 0xC2)
++ return TYPE_ACL;
++ return TYPE_CRITICAL_SEC;
++ }
++
++ return TYPE_BENIGN_SEC;
++}
++
++void fat_set_entry_type(struct dentry_t *p_entry, u32 type)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *) p_entry;
++
++ if (type == TYPE_UNUSED)
++ *(ep->name) = 0x0;
++
++ else if (type == TYPE_DELETED)
++ *(ep->name) = 0xE5;
++
++ else if (type == TYPE_EXTEND)
++ ep->attr = ATTR_EXTEND;
++
++ else if (type == TYPE_DIR)
++ ep->attr = ATTR_SUBDIR;
++
++ else if (type == TYPE_FILE)
++ ep->attr = ATTR_ARCHIVE;
++
++ else if (type == TYPE_SYMLINK)
++ ep->attr = ATTR_ARCHIVE | ATTR_SYMLINK;
++}
++
++void exfat_set_entry_type(struct dentry_t *p_entry, u32 type)
++{
++ struct file_dentry_t *ep = (struct file_dentry_t *) p_entry;
++
++ if (type == TYPE_UNUSED) {
++ ep->type = 0x0;
++ } else if (type == TYPE_DELETED) {
++ ep->type &= ~0x80;
++ } else if (type == TYPE_STREAM) {
++ ep->type = 0xC0;
++ } else if (type == TYPE_EXTEND) {
++ ep->type = 0xC1;
++ } else if (type == TYPE_BITMAP) {
++ ep->type = 0x81;
++ } else if (type == TYPE_UPCASE) {
++ ep->type = 0x82;
++ } else if (type == TYPE_VOLUME) {
++ ep->type = 0x83;
++ } else if (type == TYPE_DIR) {
++ ep->type = 0x85;
++ SET16_A(ep->attr, ATTR_SUBDIR);
++ } else if (type == TYPE_FILE) {
++ ep->type = 0x85;
++ SET16_A(ep->attr, ATTR_ARCHIVE);
++ } else if (type == TYPE_SYMLINK) {
++ ep->type = 0x85;
++ SET16_A(ep->attr, ATTR_ARCHIVE | ATTR_SYMLINK);
++ }
++}
++
++u32 fat_get_entry_attr(struct dentry_t *p_entry)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *) p_entry;
++
++ return (u32) ep->attr;
++}
++
++u32 exfat_get_entry_attr(struct dentry_t *p_entry)
++{
++ struct file_dentry_t *ep = (struct file_dentry_t *) p_entry;
++
++ return (u32) GET16_A(ep->attr);
++}
++
++void fat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *) p_entry;
++
++ ep->attr = (u8) attr;
++}
++
++void exfat_set_entry_attr(struct dentry_t *p_entry, u32 attr)
++{
++ struct file_dentry_t *ep = (struct file_dentry_t *) p_entry;
++
++ SET16_A(ep->attr, (u16) attr);
++}
++
++u8 fat_get_entry_flag(struct dentry_t *p_entry)
++{
++ return 0x01;
++}
++
++u8 exfat_get_entry_flag(struct dentry_t *p_entry)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *) p_entry;
++
++ return ep->flags;
++}
++
++void fat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
++{
++}
++
++void exfat_set_entry_flag(struct dentry_t *p_entry, u8 flags)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *) p_entry;
++
++ ep->flags = flags;
++}
++
++u32 fat_get_entry_clu0(struct dentry_t *p_entry)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *) p_entry;
++
++ return ((u32)GET16_A(ep->start_clu_hi) << 16) |
++ GET16_A(ep->start_clu_lo);
++}
++
++u32 exfat_get_entry_clu0(struct dentry_t *p_entry)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *) p_entry;
++
++ return GET32_A(ep->start_clu);
++}
++
++void fat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
++
++ SET16_A(ep->start_clu_lo, CLUSTER_16(start_clu));
++ SET16_A(ep->start_clu_hi, CLUSTER_16(start_clu >> 16));
++}
++
++void exfat_set_entry_clu0(struct dentry_t *p_entry, u32 start_clu)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
++
++ SET32_A(ep->start_clu, start_clu);
++}
++
++u64 fat_get_entry_size(struct dentry_t *p_entry)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
++
++ return (u64) GET32_A(ep->size);
++}
++
++u64 exfat_get_entry_size(struct dentry_t *p_entry)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
++
++ return GET64_A(ep->valid_size);
++}
++
++void fat_set_entry_size(struct dentry_t *p_entry, u64 size)
++{
++ struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
++
++ SET32_A(ep->size, (u32) size);
++}
++
++void exfat_set_entry_size(struct dentry_t *p_entry, u64 size)
++{
++ struct strm_dentry_t *ep = (struct strm_dentry_t *)p_entry;
++
++ SET64_A(ep->valid_size, size);
++ SET64_A(ep->size, size);
++}
++
++void fat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode)
++{
++ u16 t = 0x00, d = 0x21;
++ struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
++
++ switch (mode) {
++ case TM_CREATE:
++ t = GET16_A(ep->create_time);
++ d = GET16_A(ep->create_date);
++ break;
++ case TM_MODIFY:
++ t = GET16_A(ep->modify_time);
++ d = GET16_A(ep->modify_date);
++ break;
++ }
++
++ tp->sec = (t & 0x001F) << 1;
++ tp->min = (t >> 5) & 0x003F;
++ tp->hour = (t >> 11);
++ tp->day = (d & 0x001F);
++ tp->mon = (d >> 5) & 0x000F;
++ tp->year = (d >> 9);
++}
++
++void exfat_get_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode)
++{
++ u16 t = 0x00, d = 0x21;
++ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
++
++ switch (mode) {
++ case TM_CREATE:
++ t = GET16_A(ep->create_time);
++ d = GET16_A(ep->create_date);
++ break;
++ case TM_MODIFY:
++ t = GET16_A(ep->modify_time);
++ d = GET16_A(ep->modify_date);
++ break;
++ case TM_ACCESS:
++ t = GET16_A(ep->access_time);
++ d = GET16_A(ep->access_date);
++ break;
++ }
++
++ tp->sec = (t & 0x001F) << 1;
++ tp->min = (t >> 5) & 0x003F;
++ tp->hour = (t >> 11);
++ tp->day = (d & 0x001F);
++ tp->mon = (d >> 5) & 0x000F;
++ tp->year = (d >> 9);
++}
++
++void fat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode)
++{
++ u16 t, d;
++ struct dos_dentry_t *ep = (struct dos_dentry_t *)p_entry;
++
++ t = (tp->hour << 11) | (tp->min << 5) | (tp->sec >> 1);
++ d = (tp->year << 9) | (tp->mon << 5) | tp->day;
++
++ switch (mode) {
++ case TM_CREATE:
++ SET16_A(ep->create_time, t);
++ SET16_A(ep->create_date, d);
++ break;
++ case TM_MODIFY:
++ SET16_A(ep->modify_time, t);
++ SET16_A(ep->modify_date, d);
++ break;
++ }
++}
++
++void exfat_set_entry_time(struct dentry_t *p_entry, struct timestamp_t *tp,
++ u8 mode)
++{
++ u16 t, d;
++ struct file_dentry_t *ep = (struct file_dentry_t *)p_entry;
++
++ t = (tp->hour << 11) | (tp->min << 5) | (tp->sec >> 1);
++ d = (tp->year << 9) | (tp->mon << 5) | tp->day;
++
++ switch (mode) {
++ case TM_CREATE:
++ SET16_A(ep->create_time, t);
++ SET16_A(ep->create_date, d);
++ break;
++ case TM_MODIFY:
++ SET16_A(ep->modify_time, t);
++ SET16_A(ep->modify_date, d);
++ break;
++ case TM_ACCESS:
++ SET16_A(ep->access_time, t);
++ SET16_A(ep->access_date, d);
++ break;
++ }
++}
++
++s32 fat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir, s32 entry,
++ u32 type, u32 start_clu, u64 size)
++{
++ sector_t sector;
++ struct dos_dentry_t *dos_ep;
++
++ dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ §or);
++ if (!dos_ep)
++ return FFS_MEDIAERR;
++
++ init_dos_entry(dos_ep, type, start_clu);
++ buf_modify(sb, sector);
++
++ return FFS_SUCCESS;
++}
++
++s32 exfat_init_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, u32 type, u32 start_clu, u64 size)
++{
++ sector_t sector;
++ u8 flags;
++ struct file_dentry_t *file_ep;
++ struct strm_dentry_t *strm_ep;
++
++ flags = (type == TYPE_FILE) ? 0x01 : 0x03;
++
++ /* we cannot use get_entry_set_in_dir here because file ep is not initialized yet */
++ file_ep = (struct file_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ §or);
++ if (!file_ep)
++ return FFS_MEDIAERR;
++
++ strm_ep = (struct strm_dentry_t *)get_entry_in_dir(sb, p_dir, entry+1,
++ §or);
++ if (!strm_ep)
++ return FFS_MEDIAERR;
++
++ init_file_entry(file_ep, type);
++ buf_modify(sb, sector);
++
++ init_strm_entry(strm_ep, flags, start_clu, size);
++ buf_modify(sb, sector);
++
++ return FFS_SUCCESS;
++}
++
++static s32 fat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 num_entries,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname)
++{
++ int i;
++ sector_t sector;
++ u8 chksum;
++ u16 *uniname = p_uniname->name;
++ struct dos_dentry_t *dos_ep;
++ struct ext_dentry_t *ext_ep;
++
++ dos_ep = (struct dos_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ §or);
++ if (!dos_ep)
++ return FFS_MEDIAERR;
++
++ dos_ep->lcase = p_dosname->name_case;
++ memcpy(dos_ep->name, p_dosname->name, DOS_NAME_LENGTH);
++ buf_modify(sb, sector);
++
++ if ((--num_entries) > 0) {
++ chksum = calc_checksum_1byte((void *)dos_ep->name,
++ DOS_NAME_LENGTH, 0);
++
++ for (i = 1; i < num_entries; i++) {
++ ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb,
++ p_dir,
++ entry - i,
++ §or);
++ if (!ext_ep)
++ return FFS_MEDIAERR;
++
++ init_ext_entry(ext_ep, i, chksum, uniname);
++ buf_modify(sb, sector);
++ uniname += 13;
++ }
++
++ ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir,
++ entry - i,
++ §or);
++ if (!ext_ep)
++ return FFS_MEDIAERR;
++
++ init_ext_entry(ext_ep, i+0x40, chksum, uniname);
++ buf_modify(sb, sector);
++ }
++
++ return FFS_SUCCESS;
++}
++
++static s32 exfat_init_ext_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 num_entries,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname)
++{
++ int i;
++ sector_t sector;
++ u16 *uniname = p_uniname->name;
++ struct file_dentry_t *file_ep;
++ struct strm_dentry_t *strm_ep;
++ struct name_dentry_t *name_ep;
++
++ file_ep = (struct file_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ §or);
++ if (!file_ep)
++ return FFS_MEDIAERR;
++
++ file_ep->num_ext = (u8)(num_entries - 1);
++ buf_modify(sb, sector);
++
++ strm_ep = (struct strm_dentry_t *)get_entry_in_dir(sb, p_dir, entry+1,
++ §or);
++ if (!strm_ep)
++ return FFS_MEDIAERR;
++
++ strm_ep->name_len = p_uniname->name_len;
++ SET16_A(strm_ep->name_hash, p_uniname->name_hash);
++ buf_modify(sb, sector);
++
++ for (i = 2; i < num_entries; i++) {
++ name_ep = (struct name_dentry_t *)get_entry_in_dir(sb, p_dir,
++ entry + i,
++ §or);
++ if (!name_ep)
++ return FFS_MEDIAERR;
++
++ init_name_entry(name_ep, uniname);
++ buf_modify(sb, sector);
++ uniname += 15;
++ }
++
++ update_dir_checksum(sb, p_dir, entry);
++
++ return FFS_SUCCESS;
++}
++
++void init_dos_entry(struct dos_dentry_t *ep, u32 type, u32 start_clu)
++{
++ struct timestamp_t tm, *tp;
++
++ fat_set_entry_type((struct dentry_t *) ep, type);
++ SET16_A(ep->start_clu_lo, CLUSTER_16(start_clu));
++ SET16_A(ep->start_clu_hi, CLUSTER_16(start_clu >> 16));
++ SET32_A(ep->size, 0);
++
++ tp = tm_current(&tm);
++ fat_set_entry_time((struct dentry_t *) ep, tp, TM_CREATE);
++ fat_set_entry_time((struct dentry_t *) ep, tp, TM_MODIFY);
++ SET16_A(ep->access_date, 0);
++ ep->create_time_ms = 0;
++}
++
++void init_ext_entry(struct ext_dentry_t *ep, s32 order, u8 chksum, u16 *uniname)
++{
++ int i;
++ u8 end = FALSE;
++
++ fat_set_entry_type((struct dentry_t *) ep, TYPE_EXTEND);
++ ep->order = (u8) order;
++ ep->sysid = 0;
++ ep->checksum = chksum;
++ SET16_A(ep->start_clu, 0);
++
++ for (i = 0; i < 10; i += 2) {
++ if (!end) {
++ SET16(ep->unicode_0_4+i, *uniname);
++ if (*uniname == 0x0)
++ end = TRUE;
++ else
++ uniname++;
++ } else {
++ SET16(ep->unicode_0_4+i, 0xFFFF);
++ }
++ }
++
++ for (i = 0; i < 12; i += 2) {
++ if (!end) {
++ SET16_A(ep->unicode_5_10 + i, *uniname);
++ if (*uniname == 0x0)
++ end = TRUE;
++ else
++ uniname++;
++ } else {
++ SET16_A(ep->unicode_5_10 + i, 0xFFFF);
++ }
++ }
++
++ for (i = 0; i < 4; i += 2) {
++ if (!end) {
++ SET16_A(ep->unicode_11_12 + i, *uniname);
++ if (*uniname == 0x0)
++ end = TRUE;
++ else
++ uniname++;
++ } else {
++ SET16_A(ep->unicode_11_12 + i, 0xFFFF);
++ }
++ }
++}
++
++void init_file_entry(struct file_dentry_t *ep, u32 type)
++{
++ struct timestamp_t tm, *tp;
++
++ exfat_set_entry_type((struct dentry_t *)ep, type);
++
++ tp = tm_current(&tm);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_CREATE);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_MODIFY);
++ exfat_set_entry_time((struct dentry_t *)ep, tp, TM_ACCESS);
++ ep->create_time_ms = 0;
++ ep->modify_time_ms = 0;
++ ep->access_time_ms = 0;
++}
++
++void init_strm_entry(struct strm_dentry_t *ep, u8 flags, u32 start_clu, u64 size)
++{
++ exfat_set_entry_type((struct dentry_t *)ep, TYPE_STREAM);
++ ep->flags = flags;
++ SET32_A(ep->start_clu, start_clu);
++ SET64_A(ep->valid_size, size);
++ SET64_A(ep->size, size);
++}
++
++void init_name_entry(struct name_dentry_t *ep, u16 *uniname)
++{
++ int i;
++
++ exfat_set_entry_type((struct dentry_t *)ep, TYPE_EXTEND);
++ ep->flags = 0x0;
++
++ for (i = 0; i < 30; i++, i++) {
++ SET16_A(ep->unicode_0_14+i, *uniname);
++ if (*uniname == 0x0)
++ break;
++ uniname++;
++ }
++}
++
++void fat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 order, s32 num_entries)
++{
++ int i;
++ sector_t sector;
++ struct dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ for (i = num_entries-1; i >= order; i--) {
++ ep = get_entry_in_dir(sb, p_dir, entry-i, §or);
++ if (!ep)
++ return;
++
++ p_fs->fs_func->set_entry_type(ep, TYPE_DELETED);
++ buf_modify(sb, sector);
++ }
++}
++
++void exfat_delete_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, s32 order, s32 num_entries)
++{
++ int i;
++ sector_t sector;
++ struct dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ for (i = order; i < num_entries; i++) {
++ ep = get_entry_in_dir(sb, p_dir, entry+i, §or);
++ if (!ep)
++ return;
++
++ p_fs->fs_func->set_entry_type(ep, TYPE_DELETED);
++ buf_modify(sb, sector);
++ }
++}
++
++void update_dir_checksum(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry)
++{
++ int i, num_entries;
++ sector_t sector;
++ u16 chksum;
++ struct file_dentry_t *file_ep;
++ struct dentry_t *ep;
++
++ file_ep = (struct file_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ §or);
++ if (!file_ep)
++ return;
++
++ buf_lock(sb, sector);
++
++ num_entries = (s32) file_ep->num_ext + 1;
++ chksum = calc_checksum_2byte((void *)file_ep, DENTRY_SIZE, 0,
++ CS_DIR_ENTRY);
++
++ for (i = 1; i < num_entries; i++) {
++ ep = get_entry_in_dir(sb, p_dir, entry+i, NULL);
++ if (!ep) {
++ buf_unlock(sb, sector);
++ return;
++ }
++
++ chksum = calc_checksum_2byte((void *)ep, DENTRY_SIZE, chksum,
++ CS_DEFAULT);
++ }
++
++ SET16_A(file_ep->checksum, chksum);
++ buf_modify(sb, sector);
++ buf_unlock(sb, sector);
++}
++
++void update_dir_checksum_with_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es)
++{
++ struct dentry_t *ep;
++ u16 chksum = 0;
++ s32 chksum_type = CS_DIR_ENTRY, i;
++
++ ep = (struct dentry_t *)&(es->__buf);
++ for (i = 0; i < es->num_entries; i++) {
++ pr_debug("%s ep %p\n", __func__, ep);
++ chksum = calc_checksum_2byte((void *)ep, DENTRY_SIZE, chksum,
++ chksum_type);
++ ep++;
++ chksum_type = CS_DEFAULT;
++ }
++
++ ep = (struct dentry_t *)&(es->__buf);
++ SET16_A(((struct file_dentry_t *)ep)->checksum, chksum);
++ write_whole_entry_set(sb, es);
++}
++
++static s32 _walk_fat_chain(struct super_block *sb, struct chain_t *p_dir,
++ s32 byte_offset, u32 *clu)
++{
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ s32 clu_offset;
++ u32 cur_clu;
++
++ clu_offset = byte_offset >> p_fs->cluster_size_bits;
++ cur_clu = p_dir->dir;
++
++ if (p_dir->flags == 0x03) {
++ cur_clu += clu_offset;
++ } else {
++ while (clu_offset > 0) {
++ if (FAT_read(sb, cur_clu, &cur_clu) == -1)
++ return FFS_MEDIAERR;
++ clu_offset--;
++ }
++ }
++
++ if (clu)
++ *clu = cur_clu;
++ return FFS_SUCCESS;
++}
++
++s32 find_location(struct super_block *sb, struct chain_t *p_dir, s32 entry,
++ sector_t *sector, s32 *offset)
++{
++ s32 off, ret;
++ u32 clu = 0;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ off = entry << DENTRY_SIZE_BITS;
++
++ if (p_dir->dir == CLUSTER_32(0)) { /* FAT16 root_dir */
++ *offset = off & p_bd->sector_size_mask;
++ *sector = off >> p_bd->sector_size_bits;
++ *sector += p_fs->root_start_sector;
++ } else {
++ ret = _walk_fat_chain(sb, p_dir, off, &clu);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ /* byte offset in cluster */
++ off &= p_fs->cluster_size - 1;
++
++ /* byte offset in sector */
++ *offset = off & p_bd->sector_size_mask;
++
++ /* sector offset in cluster */
++ *sector = off >> p_bd->sector_size_bits;
++ *sector += START_SECTOR(clu);
++ }
++ return FFS_SUCCESS;
++}
++
++struct dentry_t *get_entry_with_sector(struct super_block *sb, sector_t sector,
++ s32 offset)
++{
++ u8 *buf;
++
++ buf = buf_getblk(sb, sector);
++
++ if (buf == NULL)
++ return NULL;
++
++ return (struct dentry_t *)(buf + offset);
++}
++
++struct dentry_t *get_entry_in_dir(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, sector_t *sector)
++{
++ s32 off;
++ sector_t sec;
++ u8 *buf;
++
++ if (find_location(sb, p_dir, entry, &sec, &off) != FFS_SUCCESS)
++ return NULL;
++
++ buf = buf_getblk(sb, sec);
++
++ if (buf == NULL)
++ return NULL;
++
++ if (sector != NULL)
++ *sector = sec;
++ return (struct dentry_t *)(buf + off);
++}
++
++/* returns a set of dentries for a file or dir.
++ * Note that this is a copy (dump) of dentries so that user should call write_entry_set()
++ * to apply changes made in this entry set to the real device.
++ * in:
++ * sb+p_dir+entry: indicates a file/dir
++ * type: specifies how many dentries should be included.
++ * out:
++ * file_ep: will point the first dentry(= file dentry) on success
++ * return:
++ * pointer of entry set on success,
++ * NULL on failure.
++ */
++
++#define ES_MODE_STARTED 0
++#define ES_MODE_GET_FILE_ENTRY 1
++#define ES_MODE_GET_STRM_ENTRY 2
++#define ES_MODE_GET_NAME_ENTRY 3
++#define ES_MODE_GET_CRITICAL_SEC_ENTRY 4
++struct entry_set_cache_t *get_entry_set_in_dir(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u32 type,
++ struct dentry_t **file_ep)
++{
++ s32 off, ret, byte_offset;
++ u32 clu = 0;
++ sector_t sec;
++ u32 entry_type;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct entry_set_cache_t *es = NULL;
++ struct dentry_t *ep, *pos;
++ u8 *buf;
++ u8 num_entries;
++ s32 mode = ES_MODE_STARTED;
++ size_t bufsize;
++
++ pr_debug("%s entered p_dir dir %u flags %x size %d\n",
++ __func__, p_dir->dir, p_dir->flags, p_dir->size);
++
++ byte_offset = entry << DENTRY_SIZE_BITS;
++ ret = _walk_fat_chain(sb, p_dir, byte_offset, &clu);
++ if (ret != FFS_SUCCESS)
++ return NULL;
++
++
++ /* byte offset in cluster */
++ byte_offset &= p_fs->cluster_size - 1;
++
++ /* byte offset in sector */
++ off = byte_offset & p_bd->sector_size_mask;
++
++ /* sector offset in cluster */
++ sec = byte_offset >> p_bd->sector_size_bits;
++ sec += START_SECTOR(clu);
++
++ buf = buf_getblk(sb, sec);
++ if (buf == NULL)
++ goto err_out;
++
++
++ ep = (struct dentry_t *)(buf + off);
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++
++ if ((entry_type != TYPE_FILE)
++ && (entry_type != TYPE_DIR))
++ goto err_out;
++
++ if (type == ES_ALL_ENTRIES)
++ num_entries = ((struct file_dentry_t *)ep)->num_ext+1;
++ else
++ num_entries = type;
++
++ bufsize = offsetof(struct entry_set_cache_t, __buf) + (num_entries) *
++ sizeof(struct dentry_t);
++ pr_debug("%s: trying to kmalloc %zx bytes for %d entries\n", __func__,
++ bufsize, num_entries);
++ es = kmalloc(bufsize, GFP_KERNEL);
++ if (es == NULL)
++ goto err_out;
++
++ es->num_entries = num_entries;
++ es->sector = sec;
++ es->offset = off;
++ es->alloc_flag = p_dir->flags;
++
++ pos = (struct dentry_t *) &(es->__buf);
++
++ while (num_entries) {
++ /*
++ * instead of copying whole sector, we will check every entry.
++ * this will provide minimum stablity and consistancy.
++ */
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++
++ if ((entry_type == TYPE_UNUSED) || (entry_type == TYPE_DELETED))
++ goto err_out;
++
++ switch (mode) {
++ case ES_MODE_STARTED:
++ if ((entry_type == TYPE_FILE) || (entry_type == TYPE_DIR))
++ mode = ES_MODE_GET_FILE_ENTRY;
++ else
++ goto err_out;
++ break;
++ case ES_MODE_GET_FILE_ENTRY:
++ if (entry_type == TYPE_STREAM)
++ mode = ES_MODE_GET_STRM_ENTRY;
++ else
++ goto err_out;
++ break;
++ case ES_MODE_GET_STRM_ENTRY:
++ if (entry_type == TYPE_EXTEND)
++ mode = ES_MODE_GET_NAME_ENTRY;
++ else
++ goto err_out;
++ break;
++ case ES_MODE_GET_NAME_ENTRY:
++ if (entry_type == TYPE_EXTEND)
++ break;
++ else if (entry_type == TYPE_STREAM)
++ goto err_out;
++ else if (entry_type & TYPE_CRITICAL_SEC)
++ mode = ES_MODE_GET_CRITICAL_SEC_ENTRY;
++ else
++ goto err_out;
++ break;
++ case ES_MODE_GET_CRITICAL_SEC_ENTRY:
++ if ((entry_type == TYPE_EXTEND) ||
++ (entry_type == TYPE_STREAM))
++ goto err_out;
++ else if ((entry_type & TYPE_CRITICAL_SEC) !=
++ TYPE_CRITICAL_SEC)
++ goto err_out;
++ break;
++ }
++
++ memcpy(pos, ep, sizeof(struct dentry_t));
++
++ if (--num_entries == 0)
++ break;
++
++ if (((off + DENTRY_SIZE) & p_bd->sector_size_mask) <
++ (off & p_bd->sector_size_mask)) {
++ /* get the next sector */
++ if (IS_LAST_SECTOR_IN_CLUSTER(sec)) {
++ if (es->alloc_flag == 0x03) {
++ clu++;
++ } else {
++ if (FAT_read(sb, clu, &clu) == -1)
++ goto err_out;
++ }
++ sec = START_SECTOR(clu);
++ } else {
++ sec++;
++ }
++ buf = buf_getblk(sb, sec);
++ if (buf == NULL)
++ goto err_out;
++ off = 0;
++ ep = (struct dentry_t *)(buf);
++ } else {
++ ep++;
++ off += DENTRY_SIZE;
++ }
++ pos++;
++ }
++
++ if (file_ep)
++ *file_ep = (struct dentry_t *)&(es->__buf);
++
++ pr_debug("%s exiting es %p sec %llu offset %d flags %d, num_entries %u buf ptr %p\n",
++ __func__, es, (unsigned long long)es->sector, es->offset,
++ es->alloc_flag, es->num_entries, &es->__buf);
++ return es;
++err_out:
++ pr_debug("%s exited NULL (es %p)\n", __func__, es);
++ kfree(es);
++ return NULL;
++}
++
++void release_entry_set(struct entry_set_cache_t *es)
++{
++ pr_debug("%s es=%p\n", __func__, es);
++ kfree(es);
++}
++
++
++static s32 __write_partial_entries_in_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es,
++ sector_t sec, s32 off, u32 count)
++{
++ s32 num_entries, buf_off = (off - es->offset);
++ u32 remaining_byte_in_sector, copy_entries;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ u32 clu;
++ u8 *buf, *esbuf = (u8 *)&(es->__buf);
++
++ pr_debug("%s entered es %p sec %llu off %d count %d\n",
++ __func__, es, (unsigned long long)sec, off, count);
++ num_entries = count;
++
++ while (num_entries) {
++ /* white per sector base */
++ remaining_byte_in_sector = (1 << p_bd->sector_size_bits) - off;
++ copy_entries = min_t(s32,
++ remaining_byte_in_sector >> DENTRY_SIZE_BITS,
++ num_entries);
++ buf = buf_getblk(sb, sec);
++ if (buf == NULL)
++ goto err_out;
++ pr_debug("es->buf %p buf_off %u\n", esbuf, buf_off);
++ pr_debug("copying %d entries from %p to sector %llu\n",
++ copy_entries, (esbuf + buf_off),
++ (unsigned long long)sec);
++ memcpy(buf + off, esbuf + buf_off,
++ copy_entries << DENTRY_SIZE_BITS);
++ buf_modify(sb, sec);
++ num_entries -= copy_entries;
++
++ if (num_entries) {
++ /* get next sector */
++ if (IS_LAST_SECTOR_IN_CLUSTER(sec)) {
++ clu = GET_CLUSTER_FROM_SECTOR(sec);
++ if (es->alloc_flag == 0x03) {
++ clu++;
++ } else {
++ if (FAT_read(sb, clu, &clu) == -1)
++ goto err_out;
++ }
++ sec = START_SECTOR(clu);
++ } else {
++ sec++;
++ }
++ off = 0;
++ buf_off += copy_entries << DENTRY_SIZE_BITS;
++ }
++ }
++
++ pr_debug("%s exited successfully\n", __func__);
++ return FFS_SUCCESS;
++err_out:
++ pr_debug("%s failed\n", __func__);
++ return FFS_ERROR;
++}
++
++/* write back all entries in entry set */
++s32 write_whole_entry_set(struct super_block *sb, struct entry_set_cache_t *es)
++{
++ return __write_partial_entries_in_entry_set(sb, es, es->sector,
++ es->offset,
++ es->num_entries);
++}
++
++/* write back some entries in entry set */
++s32 write_partial_entries_in_entry_set(struct super_block *sb,
++ struct entry_set_cache_t *es, struct dentry_t *ep, u32 count)
++{
++ s32 ret, byte_offset, off;
++ u32 clu = 0;
++ sector_t sec;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct chain_t dir;
++
++ /* vaidity check */
++ if (ep + count > ((struct dentry_t *)&(es->__buf)) + es->num_entries)
++ return FFS_ERROR;
++
++ dir.dir = GET_CLUSTER_FROM_SECTOR(es->sector);
++ dir.flags = es->alloc_flag;
++ dir.size = 0xffffffff; /* XXX */
++
++ byte_offset = (es->sector - START_SECTOR(dir.dir)) <<
++ p_bd->sector_size_bits;
++ byte_offset += ((void **)ep - &(es->__buf)) + es->offset;
++
++ ret = _walk_fat_chain(sb, &dir, byte_offset, &clu);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ /* byte offset in cluster */
++ byte_offset &= p_fs->cluster_size - 1;
++
++ /* byte offset in sector */
++ off = byte_offset & p_bd->sector_size_mask;
++
++ /* sector offset in cluster */
++ sec = byte_offset >> p_bd->sector_size_bits;
++ sec += START_SECTOR(clu);
++ return __write_partial_entries_in_entry_set(sb, es, sec, off, count);
++}
++
++/* search EMPTY CONTINUOUS "num_entries" entries */
++s32 search_deleted_or_unused_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 num_entries)
++{
++ int i, dentry, num_empty = 0;
++ s32 dentries_per_clu;
++ u32 type;
++ struct chain_t clu;
++ struct dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ if (p_fs->hint_uentry.dir == p_dir->dir) {
++ if (p_fs->hint_uentry.entry == -1)
++ return -1;
++
++ clu.dir = p_fs->hint_uentry.clu.dir;
++ clu.size = p_fs->hint_uentry.clu.size;
++ clu.flags = p_fs->hint_uentry.clu.flags;
++
++ dentry = p_fs->hint_uentry.entry;
++ } else {
++ p_fs->hint_uentry.entry = -1;
++
++ clu.dir = p_dir->dir;
++ clu.size = p_dir->size;
++ clu.flags = p_dir->flags;
++
++ dentry = 0;
++ }
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ i = dentry % dentries_per_clu;
++ else
++ i = dentry & (dentries_per_clu-1);
++
++ for (; i < dentries_per_clu; i++, dentry++) {
++ ep = get_entry_in_dir(sb, &clu, i, NULL);
++ if (!ep)
++ return -1;
++
++ type = p_fs->fs_func->get_entry_type(ep);
++
++ if (type == TYPE_UNUSED) {
++ num_empty++;
++ if (p_fs->hint_uentry.entry == -1) {
++ p_fs->hint_uentry.dir = p_dir->dir;
++ p_fs->hint_uentry.entry = dentry;
++
++ p_fs->hint_uentry.clu.dir = clu.dir;
++ p_fs->hint_uentry.clu.size = clu.size;
++ p_fs->hint_uentry.clu.flags = clu.flags;
++ }
++ } else if (type == TYPE_DELETED) {
++ num_empty++;
++ } else {
++ num_empty = 0;
++ }
++
++ if (num_empty >= num_entries) {
++ p_fs->hint_uentry.dir = CLUSTER_32(~0);
++ p_fs->hint_uentry.entry = -1;
++
++ if (p_fs->vol_type == EXFAT)
++ return dentry - (num_entries-1);
++ else
++ return dentry;
++ }
++ }
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (clu.flags == 0x03) {
++ if ((--clu.size) > 0)
++ clu.dir++;
++ else
++ clu.dir = CLUSTER_32(~0);
++ } else {
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return -1;
++ }
++ }
++
++ return -1;
++}
++
++s32 find_empty_entry(struct inode *inode, struct chain_t *p_dir, s32 num_entries)
++{
++ s32 ret, dentry;
++ u32 last_clu;
++ sector_t sector;
++ u64 size = 0;
++ struct chain_t clu;
++ struct dentry_t *ep = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ return search_deleted_or_unused_entry(sb, p_dir, num_entries);
++
++ while ((dentry = search_deleted_or_unused_entry(sb, p_dir, num_entries)) < 0) {
++ if (p_fs->dev_ejected)
++ break;
++
++ if (p_fs->vol_type == EXFAT) {
++ if (p_dir->dir != p_fs->root_dir)
++ size = i_size_read(inode);
++ }
++
++ last_clu = find_last_cluster(sb, p_dir);
++ clu.dir = last_clu + 1;
++ clu.size = 0;
++ clu.flags = p_dir->flags;
++
++ /* (1) allocate a cluster */
++ ret = p_fs->fs_func->alloc_cluster(sb, 1, &clu);
++ if (ret < 1)
++ return -1;
++
++ if (clear_cluster(sb, clu.dir) != FFS_SUCCESS)
++ return -1;
++
++ /* (2) append to the FAT chain */
++ if (clu.flags != p_dir->flags) {
++ exfat_chain_cont_cluster(sb, p_dir->dir, p_dir->size);
++ p_dir->flags = 0x01;
++ p_fs->hint_uentry.clu.flags = 0x01;
++ }
++ if (clu.flags == 0x01)
++ if (FAT_write(sb, last_clu, clu.dir) < 0)
++ return -1;
++
++ if (p_fs->hint_uentry.entry == -1) {
++ p_fs->hint_uentry.dir = p_dir->dir;
++ p_fs->hint_uentry.entry = p_dir->size << (p_fs->cluster_size_bits - DENTRY_SIZE_BITS);
++
++ p_fs->hint_uentry.clu.dir = clu.dir;
++ p_fs->hint_uentry.clu.size = 0;
++ p_fs->hint_uentry.clu.flags = clu.flags;
++ }
++ p_fs->hint_uentry.clu.size++;
++ p_dir->size++;
++
++ /* (3) update the directory entry */
++ if (p_fs->vol_type == EXFAT) {
++ if (p_dir->dir != p_fs->root_dir) {
++ size += p_fs->cluster_size;
++
++ ep = get_entry_in_dir(sb, &fid->dir,
++ fid->entry + 1, §or);
++ if (!ep)
++ return -1;
++ p_fs->fs_func->set_entry_size(ep, size);
++ p_fs->fs_func->set_entry_flag(ep, p_dir->flags);
++ buf_modify(sb, sector);
++
++ update_dir_checksum(sb, &(fid->dir),
++ fid->entry);
++ }
++ }
++
++ i_size_write(inode, i_size_read(inode)+p_fs->cluster_size);
++ EXFAT_I(inode)->mmu_private += p_fs->cluster_size;
++ EXFAT_I(inode)->fid.size += p_fs->cluster_size;
++ EXFAT_I(inode)->fid.flags = p_dir->flags;
++ inode->i_blocks += 1 << (p_fs->cluster_size_bits - 9);
++ }
++
++ return dentry;
++}
++
++/* return values of fat_find_dir_entry()
++ * >= 0 : return dir entiry position with the name in dir
++ * -1 : (root dir, ".") it is the root dir itself
++ * -2 : entry with the name does not exist
++ */
++s32 fat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 num_entries,
++ struct dos_name_t *p_dosname, u32 type)
++{
++ int i, dentry = 0, lossy = FALSE, len;
++ s32 order = 0, is_feasible_entry = TRUE, has_ext_entry = FALSE;
++ s32 dentries_per_clu;
++ u32 entry_type;
++ u16 entry_uniname[14], *uniname = NULL, unichar;
++ struct chain_t clu;
++ struct dentry_t *ep;
++ struct dos_dentry_t *dos_ep;
++ struct ext_dentry_t *ext_ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_dir->dir == p_fs->root_dir) {
++ if ((!nls_uniname_cmp(sb, p_uniname->name,
++ (u16 *)UNI_CUR_DIR_NAME)) ||
++ (!nls_uniname_cmp(sb, p_uniname->name,
++ (u16 *)UNI_PAR_DIR_NAME)))
++ return -1; // special case, root directory itself
++ }
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ clu.dir = p_dir->dir;
++ clu.flags = p_dir->flags;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ for (i = 0; i < dentries_per_clu; i++, dentry++) {
++ ep = get_entry_in_dir(sb, &clu, i, NULL);
++ if (!ep)
++ return -2;
++
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++
++ if ((entry_type == TYPE_FILE) || (entry_type == TYPE_DIR)) {
++ if ((type == TYPE_ALL) || (type == entry_type)) {
++ if (is_feasible_entry && has_ext_entry)
++ return dentry;
++
++ dos_ep = (struct dos_dentry_t *) ep;
++ if ((!lossy) && (!nls_dosname_cmp(sb, p_dosname->name, dos_ep->name)))
++ return dentry;
++ }
++ is_feasible_entry = TRUE;
++ has_ext_entry = FALSE;
++ } else if (entry_type == TYPE_EXTEND) {
++ if (is_feasible_entry) {
++ ext_ep = (struct ext_dentry_t *) ep;
++ if (ext_ep->order > 0x40) {
++ order = (s32)(ext_ep->order - 0x40);
++ uniname = p_uniname->name + 13 * (order-1);
++ } else {
++ order = (s32) ext_ep->order;
++ uniname -= 13;
++ }
++
++ len = extract_uni_name_from_ext_entry(ext_ep, entry_uniname, order);
++
++ unichar = *(uniname+len);
++ *(uniname+len) = 0x0;
++
++ if (nls_uniname_cmp(sb, uniname, entry_uniname))
++ is_feasible_entry = FALSE;
++
++ *(uniname+len) = unichar;
++ }
++ has_ext_entry = TRUE;
++ } else if (entry_type == TYPE_UNUSED) {
++ return -2;
++ }
++ is_feasible_entry = TRUE;
++ has_ext_entry = FALSE;
++ }
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return -2;
++ }
++
++ return -2;
++}
++
++/* return values of exfat_find_dir_entry()
++ * >= 0 : return dir entiry position with the name in dir
++ * -1 : (root dir, ".") it is the root dir itself
++ * -2 : entry with the name does not exist
++ */
++s32 exfat_find_dir_entry(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 num_entries,
++ struct dos_name_t *p_dosname, u32 type)
++{
++ int i = 0, dentry = 0, num_ext_entries = 0, len, step;
++ s32 order = 0, is_feasible_entry = FALSE;
++ s32 dentries_per_clu, num_empty = 0;
++ u32 entry_type;
++ u16 entry_uniname[16], *uniname = NULL, unichar;
++ struct chain_t clu;
++ struct dentry_t *ep;
++ struct file_dentry_t *file_ep;
++ struct strm_dentry_t *strm_ep;
++ struct name_dentry_t *name_ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_dir->dir == p_fs->root_dir) {
++ if ((!nls_uniname_cmp(sb, p_uniname->name,
++ (u16 *)UNI_CUR_DIR_NAME)) ||
++ (!nls_uniname_cmp(sb, p_uniname->name,
++ (u16 *)UNI_PAR_DIR_NAME)))
++ return -1; // special case, root directory itself
++ }
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ clu.dir = p_dir->dir;
++ clu.size = p_dir->size;
++ clu.flags = p_dir->flags;
++
++ p_fs->hint_uentry.dir = p_dir->dir;
++ p_fs->hint_uentry.entry = -1;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ while (i < dentries_per_clu) {
++ ep = get_entry_in_dir(sb, &clu, i, NULL);
++ if (!ep)
++ return -2;
++
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++ step = 1;
++
++ if ((entry_type == TYPE_UNUSED) || (entry_type == TYPE_DELETED)) {
++ is_feasible_entry = FALSE;
++
++ if (p_fs->hint_uentry.entry == -1) {
++ num_empty++;
++
++ if (num_empty == 1) {
++ p_fs->hint_uentry.clu.dir = clu.dir;
++ p_fs->hint_uentry.clu.size = clu.size;
++ p_fs->hint_uentry.clu.flags = clu.flags;
++ }
++ if ((num_empty >= num_entries) || (entry_type == TYPE_UNUSED))
++ p_fs->hint_uentry.entry = dentry - (num_empty-1);
++ }
++
++ if (entry_type == TYPE_UNUSED)
++ return -2;
++ } else {
++ num_empty = 0;
++
++ if ((entry_type == TYPE_FILE) || (entry_type == TYPE_DIR)) {
++ file_ep = (struct file_dentry_t *) ep;
++ if ((type == TYPE_ALL) || (type == entry_type)) {
++ num_ext_entries = file_ep->num_ext;
++ is_feasible_entry = TRUE;
++ } else {
++ is_feasible_entry = FALSE;
++ step = file_ep->num_ext + 1;
++ }
++ } else if (entry_type == TYPE_STREAM) {
++ if (is_feasible_entry) {
++ strm_ep = (struct strm_dentry_t *)ep;
++ if (p_uniname->name_hash == GET16_A(strm_ep->name_hash) &&
++ p_uniname->name_len == strm_ep->name_len) {
++ order = 1;
++ } else {
++ is_feasible_entry = FALSE;
++ step = num_ext_entries;
++ }
++ }
++ } else if (entry_type == TYPE_EXTEND) {
++ if (is_feasible_entry) {
++ name_ep = (struct name_dentry_t *)ep;
++
++ if ((++order) == 2)
++ uniname = p_uniname->name;
++ else
++ uniname += 15;
++
++ len = extract_uni_name_from_name_entry(name_ep,
++ entry_uniname, order);
++
++ unichar = *(uniname+len);
++ *(uniname+len) = 0x0;
++
++ if (nls_uniname_cmp(sb, uniname, entry_uniname)) {
++ is_feasible_entry = FALSE;
++ step = num_ext_entries - order + 1;
++ } else if (order == num_ext_entries) {
++ p_fs->hint_uentry.dir = CLUSTER_32(~0);
++ p_fs->hint_uentry.entry = -1;
++ return dentry - (num_ext_entries);
++ }
++
++ *(uniname+len) = unichar;
++ }
++ } else {
++ is_feasible_entry = FALSE;
++ }
++ }
++
++ i += step;
++ dentry += step;
++ }
++
++ i -= dentries_per_clu;
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (clu.flags == 0x03) {
++ if ((--clu.size) > 0)
++ clu.dir++;
++ else
++ clu.dir = CLUSTER_32(~0);
++ } else {
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return -2;
++ }
++ }
++
++ return -2;
++}
++
++s32 fat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, struct dentry_t *p_entry)
++{
++ s32 count = 0;
++ u8 chksum;
++ struct dos_dentry_t *dos_ep = (struct dos_dentry_t *) p_entry;
++ struct ext_dentry_t *ext_ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ chksum = calc_checksum_1byte((void *) dos_ep->name, DOS_NAME_LENGTH, 0);
++
++ for (entry--; entry >= 0; entry--) {
++ ext_ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir,
++ entry, NULL);
++ if (!ext_ep)
++ return -1;
++
++ if ((p_fs->fs_func->get_entry_type((struct dentry_t *)ext_ep) ==
++ TYPE_EXTEND) && (ext_ep->checksum == chksum)) {
++ count++;
++ if (ext_ep->order > 0x40)
++ return count;
++ } else {
++ return count;
++ }
++ }
++
++ return count;
++}
++
++s32 exfat_count_ext_entries(struct super_block *sb, struct chain_t *p_dir,
++ s32 entry, struct dentry_t *p_entry)
++{
++ int i, count = 0;
++ u32 type;
++ struct file_dentry_t *file_ep = (struct file_dentry_t *)p_entry;
++ struct dentry_t *ext_ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ for (i = 0, entry++; i < file_ep->num_ext; i++, entry++) {
++ ext_ep = get_entry_in_dir(sb, p_dir, entry, NULL);
++ if (!ext_ep)
++ return -1;
++
++ type = p_fs->fs_func->get_entry_type(ext_ep);
++ if ((type == TYPE_EXTEND) || (type == TYPE_STREAM))
++ count++;
++ else
++ return count;
++ }
++
++ return count;
++}
++
++s32 count_dos_name_entries(struct super_block *sb, struct chain_t *p_dir,
++ u32 type)
++{
++ int i, count = 0;
++ s32 dentries_per_clu;
++ u32 entry_type;
++ struct chain_t clu;
++ struct dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ clu.dir = p_dir->dir;
++ clu.size = p_dir->size;
++ clu.flags = p_dir->flags;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ for (i = 0; i < dentries_per_clu; i++) {
++ ep = get_entry_in_dir(sb, &clu, i, NULL);
++ if (!ep)
++ return -1;
++
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++
++ if (entry_type == TYPE_UNUSED)
++ return count;
++ if (!(type & TYPE_CRITICAL_PRI) &&
++ !(type & TYPE_BENIGN_PRI))
++ continue;
++
++ if ((type == TYPE_ALL) || (type == entry_type))
++ count++;
++ }
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (clu.flags == 0x03) {
++ if ((--clu.size) > 0)
++ clu.dir++;
++ else
++ clu.dir = CLUSTER_32(~0);
++ } else {
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return -1;
++ }
++ }
++
++ return count;
++}
++
++bool is_dir_empty(struct super_block *sb, struct chain_t *p_dir)
++{
++ int i, count = 0;
++ s32 dentries_per_clu;
++ u32 type;
++ struct chain_t clu;
++ struct dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ clu.dir = p_dir->dir;
++ clu.size = p_dir->size;
++ clu.flags = p_dir->flags;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ for (i = 0; i < dentries_per_clu; i++) {
++ ep = get_entry_in_dir(sb, &clu, i, NULL);
++ if (!ep)
++ break;
++
++ type = p_fs->fs_func->get_entry_type(ep);
++
++ if (type == TYPE_UNUSED)
++ return TRUE;
++ if ((type != TYPE_FILE) && (type != TYPE_DIR))
++ continue;
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ return FALSE;
++
++ if (p_fs->vol_type == EXFAT)
++ return FALSE;
++ if ((p_dir->dir == p_fs->root_dir) || ((++count) > 2))
++ return FALSE;
++ }
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (clu.flags == 0x03) {
++ if ((--clu.size) > 0)
++ clu.dir++;
++ else
++ clu.dir = CLUSTER_32(~0);
++ }
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ break;
++ }
++
++ return TRUE;
++}
++
++/*
++ * Name Conversion Functions
++ */
++
++/* input : dir, uni_name
++ * output : num_of_entry, dos_name(format : aaaaaa~1.bbb)
++ */
++s32 get_num_entries_and_dos_name(struct super_block *sb, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, s32 *entries,
++ struct dos_name_t *p_dosname)
++{
++ s32 ret, num_entries;
++ bool lossy = false;
++ char **r;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ num_entries = p_fs->fs_func->calc_num_entries(p_uniname);
++ if (num_entries == 0)
++ return FFS_INVALIDPATH;
++
++ if (p_fs->vol_type != EXFAT) {
++ nls_uniname_to_dosname(sb, p_dosname, p_uniname, &lossy);
++
++ if (lossy) {
++ ret = fat_generate_dos_name(sb, p_dir, p_dosname);
++ if (ret)
++ return ret;
++ } else {
++ for (r = reserved_names; *r; r++) {
++ if (!strncmp((void *)p_dosname->name, *r, 8))
++ return FFS_INVALIDPATH;
++ }
++
++ if (p_dosname->name_case != 0xFF)
++ num_entries = 1;
++ }
++
++ if (num_entries > 1)
++ p_dosname->name_case = 0x0;
++ }
++
++ *entries = num_entries;
++
++ return FFS_SUCCESS;
++}
++
++void get_uni_name_from_dos_entry(struct super_block *sb,
++ struct dos_dentry_t *ep,
++ struct uni_name_t *p_uniname, u8 mode)
++{
++ struct dos_name_t dos_name;
++
++ if (mode == 0x0)
++ dos_name.name_case = 0x0;
++ else
++ dos_name.name_case = ep->lcase;
++
++ memcpy(dos_name.name, ep->name, DOS_NAME_LENGTH);
++ nls_dosname_to_uniname(sb, p_uniname, &dos_name);
++}
++
++void fat_get_uni_name_from_ext_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u16 *uniname)
++{
++ int i;
++ struct ext_dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ for (entry--, i = 1; entry >= 0; entry--, i++) {
++ ep = (struct ext_dentry_t *)get_entry_in_dir(sb, p_dir, entry,
++ NULL);
++ if (!ep)
++ return;
++
++ if (p_fs->fs_func->get_entry_type((struct dentry_t *)ep) ==
++ TYPE_EXTEND) {
++ extract_uni_name_from_ext_entry(ep, uniname, i);
++ if (ep->order > 0x40)
++ return;
++ } else {
++ return;
++ }
++
++ uniname += 13;
++ }
++}
++
++void exfat_get_uni_name_from_ext_entry(struct super_block *sb,
++ struct chain_t *p_dir, s32 entry,
++ u16 *uniname)
++{
++ int i;
++ struct dentry_t *ep;
++ struct entry_set_cache_t *es;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ es = get_entry_set_in_dir(sb, p_dir, entry, ES_ALL_ENTRIES, &ep);
++ if (es == NULL || es->num_entries < 3) {
++ if (es)
++ release_entry_set(es);
++ return;
++ }
++
++ ep += 2;
++
++ /*
++ * First entry : file entry
++ * Second entry : stream-extension entry
++ * Third entry : first file-name entry
++ * So, the index of first file-name dentry should start from 2.
++ */
++ for (i = 2; i < es->num_entries; i++, ep++) {
++ if (p_fs->fs_func->get_entry_type(ep) == TYPE_EXTEND)
++ extract_uni_name_from_name_entry((struct name_dentry_t *)
++ ep, uniname, i);
++ else
++ goto out;
++ uniname += 15;
++ }
++
++out:
++ release_entry_set(es);
++}
++
++s32 extract_uni_name_from_ext_entry(struct ext_dentry_t *ep, u16 *uniname,
++ s32 order)
++{
++ int i, len = 0;
++
++ for (i = 0; i < 10; i += 2) {
++ *uniname = GET16(ep->unicode_0_4 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++
++ if (order < 20) {
++ for (i = 0; i < 12; i += 2) {
++ *uniname = GET16_A(ep->unicode_5_10 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++ } else {
++ for (i = 0; i < 8; i += 2) {
++ *uniname = GET16_A(ep->unicode_5_10 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++ *uniname = 0x0; /* uniname[MAX_NAME_LENGTH-1] */
++ return len;
++ }
++
++ for (i = 0; i < 4; i += 2) {
++ *uniname = GET16_A(ep->unicode_11_12 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++
++ *uniname = 0x0;
++ return len;
++}
++
++s32 extract_uni_name_from_name_entry(struct name_dentry_t *ep, u16 *uniname,
++ s32 order)
++{
++ int i, len = 0;
++
++ for (i = 0; i < 30; i += 2) {
++ *uniname = GET16_A(ep->unicode_0_14 + i);
++ if (*uniname == 0x0)
++ return len;
++ uniname++;
++ len++;
++ }
++
++ *uniname = 0x0;
++ return len;
++}
++
++s32 fat_generate_dos_name(struct super_block *sb, struct chain_t *p_dir,
++ struct dos_name_t *p_dosname)
++{
++ int i, j, count = 0, count_begin = FALSE;
++ s32 dentries_per_clu;
++ u32 type;
++ u8 bmap[128/* 1 ~ 1023 */];
++ struct chain_t clu;
++ struct dos_dentry_t *ep;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ memset(bmap, 0, sizeof(bmap));
++ exfat_bitmap_set(bmap, 0);
++
++ if (p_dir->dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++ else
++ dentries_per_clu = p_fs->dentries_per_clu;
++
++ clu.dir = p_dir->dir;
++ clu.flags = p_dir->flags;
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ for (i = 0; i < dentries_per_clu; i++) {
++ ep = (struct dos_dentry_t *)get_entry_in_dir(sb, &clu,
++ i, NULL);
++ if (!ep)
++ return FFS_MEDIAERR;
++
++ type = p_fs->fs_func->get_entry_type((struct dentry_t *)
++ ep);
++
++ if (type == TYPE_UNUSED)
++ break;
++ if ((type != TYPE_FILE) && (type != TYPE_DIR))
++ continue;
++
++ count = 0;
++ count_begin = FALSE;
++
++ for (j = 0; j < 8; j++) {
++ if (ep->name[j] == ' ')
++ break;
++
++ if (ep->name[j] == '~') {
++ count_begin = TRUE;
++ } else if (count_begin) {
++ if ((ep->name[j] >= '0') &&
++ (ep->name[j] <= '9')) {
++ count = count * 10 +
++ (ep->name[j] - '0');
++ } else {
++ count = 0;
++ count_begin = FALSE;
++ }
++ }
++ }
++
++ if ((count > 0) && (count < 1024))
++ exfat_bitmap_set(bmap, count);
++ }
++
++ if (p_dir->dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (FAT_read(sb, clu.dir, &clu.dir) != 0)
++ return FFS_MEDIAERR;
++ }
++
++ count = 0;
++ for (i = 0; i < 128; i++) {
++ if (bmap[i] != 0xFF) {
++ for (j = 0; j < 8; j++) {
++ if (exfat_bitmap_test(&bmap[i], j) == 0) {
++ count = (i << 3) + j;
++ break;
++ }
++ }
++ if (count != 0)
++ break;
++ }
++ }
++
++ if ((count == 0) || (count >= 1024))
++ return FFS_FILEEXIST;
++ fat_attach_count_to_dos_name(p_dosname->name, count);
++
++ /* Now dos_name has DOS~????.EXT */
++ return FFS_SUCCESS;
++}
++
++void fat_attach_count_to_dos_name(u8 *dosname, s32 count)
++{
++ int i, j, length;
++ char str_count[6];
++
++ snprintf(str_count, sizeof(str_count), "~%d", count);
++ length = strlen(str_count);
++
++ i = 0;
++ j = 0;
++ while (j <= (8 - length)) {
++ i = j;
++ if (dosname[j] == ' ')
++ break;
++ if (dosname[j] & 0x80)
++ j += 2;
++ else
++ j++;
++ }
++
++ for (j = 0; j < length; i++, j++)
++ dosname[i] = (u8)str_count[j];
++
++ if (i == 7)
++ dosname[7] = ' ';
++}
++
++s32 fat_calc_num_entries(struct uni_name_t *p_uniname)
++{
++ s32 len;
++
++ len = p_uniname->name_len;
++ if (len == 0)
++ return 0;
++
++ /* 1 dos name entry + extended entries */
++ return (len - 1) / 13 + 2;
++}
++
++s32 exfat_calc_num_entries(struct uni_name_t *p_uniname)
++{
++ s32 len;
++
++ len = p_uniname->name_len;
++ if (len == 0)
++ return 0;
++
++ /* 1 file entry + 1 stream entry + name entries */
++ return (len - 1) / 15 + 3;
++}
++
++u8 calc_checksum_1byte(void *data, s32 len, u8 chksum)
++{
++ int i;
++ u8 *c = (u8 *)data;
++
++ for (i = 0; i < len; i++, c++)
++ chksum = (((chksum & 1) << 7) | ((chksum & 0xFE) >> 1)) + *c;
++
++ return chksum;
++}
++
++u16 calc_checksum_2byte(void *data, s32 len, u16 chksum, s32 type)
++{
++ int i;
++ u8 *c = (u8 *)data;
++
++ switch (type) {
++ case CS_DIR_ENTRY:
++ for (i = 0; i < len; i++, c++) {
++ if ((i == 2) || (i == 3))
++ continue;
++ chksum = (((chksum & 1) << 15) |
++ ((chksum & 0xFFFE) >> 1)) + (u16)*c;
++ }
++ break;
++ default
++ :
++ for (i = 0; i < len; i++, c++)
++ chksum = (((chksum & 1) << 15) |
++ ((chksum & 0xFFFE) >> 1)) + (u16)*c;
++ }
++
++ return chksum;
++}
++
++u32 calc_checksum_4byte(void *data, s32 len, u32 chksum, s32 type)
++{
++ int i;
++ u8 *c = (u8 *)data;
++
++ switch (type) {
++ case CS_PBR_SECTOR:
++ for (i = 0; i < len; i++, c++) {
++ if ((i == 106) || (i == 107) || (i == 112))
++ continue;
++ chksum = (((chksum & 1) << 31) |
++ ((chksum & 0xFFFFFFFE) >> 1)) + (u32)*c;
++ }
++ break;
++ default
++ :
++ for (i = 0; i < len; i++, c++)
++ chksum = (((chksum & 1) << 31) |
++ ((chksum & 0xFFFFFFFE) >> 1)) + (u32)*c;
++ }
++
++ return chksum;
++}
++
++/*
++ * Name Resolution Functions
++ */
++
++/* return values of resolve_path()
++ * > 0 : return the length of the path
++ * < 0 : return error
++ */
++s32 resolve_path(struct inode *inode, char *path, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname)
++{
++ bool lossy = false;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++
++ if (strlen(path) >= (MAX_NAME_LENGTH * MAX_CHARSET_SIZE))
++ return FFS_INVALIDPATH;
++
++ strcpy(name_buf, path);
++
++ nls_cstring_to_uniname(sb, p_uniname, name_buf, &lossy);
++ if (lossy)
++ return FFS_INVALIDPATH;
++
++ fid->size = i_size_read(inode);
++
++ p_dir->dir = fid->start_clu;
++ p_dir->size = (s32)(fid->size >> p_fs->cluster_size_bits);
++ p_dir->flags = fid->flags;
++
++ return FFS_SUCCESS;
++}
++
++/*
++ * File Operation Functions
++ */
++static struct fs_func fat_fs_func = {
++ .alloc_cluster = fat_alloc_cluster,
++ .free_cluster = fat_free_cluster,
++ .count_used_clusters = fat_count_used_clusters,
++
++ .init_dir_entry = fat_init_dir_entry,
++ .init_ext_entry = fat_init_ext_entry,
++ .find_dir_entry = fat_find_dir_entry,
++ .delete_dir_entry = fat_delete_dir_entry,
++ .get_uni_name_from_ext_entry = fat_get_uni_name_from_ext_entry,
++ .count_ext_entries = fat_count_ext_entries,
++ .calc_num_entries = fat_calc_num_entries,
++
++ .get_entry_type = fat_get_entry_type,
++ .set_entry_type = fat_set_entry_type,
++ .get_entry_attr = fat_get_entry_attr,
++ .set_entry_attr = fat_set_entry_attr,
++ .get_entry_flag = fat_get_entry_flag,
++ .set_entry_flag = fat_set_entry_flag,
++ .get_entry_clu0 = fat_get_entry_clu0,
++ .set_entry_clu0 = fat_set_entry_clu0,
++ .get_entry_size = fat_get_entry_size,
++ .set_entry_size = fat_set_entry_size,
++ .get_entry_time = fat_get_entry_time,
++ .set_entry_time = fat_set_entry_time,
++};
++
++s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
++{
++ s32 num_reserved, num_root_sectors;
++ struct bpb16_t *p_bpb = (struct bpb16_t *)p_pbr->bpb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_bpb->num_fats == 0)
++ return FFS_FORMATERR;
++
++ num_root_sectors = GET16(p_bpb->num_root_entries) << DENTRY_SIZE_BITS;
++ num_root_sectors = ((num_root_sectors - 1) >>
++ p_bd->sector_size_bits) + 1;
++
++ p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
++ p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
++ p_fs->cluster_size_bits = p_fs->sectors_per_clu_bits +
++ p_bd->sector_size_bits;
++ p_fs->cluster_size = 1 << p_fs->cluster_size_bits;
++
++ p_fs->num_FAT_sectors = GET16(p_bpb->num_fat_sectors);
++
++ p_fs->FAT1_start_sector = p_fs->PBR_sector + GET16(p_bpb->num_reserved);
++ if (p_bpb->num_fats == 1)
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector;
++ else
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector +
++ p_fs->num_FAT_sectors;
++
++ p_fs->root_start_sector = p_fs->FAT2_start_sector +
++ p_fs->num_FAT_sectors;
++ p_fs->data_start_sector = p_fs->root_start_sector + num_root_sectors;
++
++ p_fs->num_sectors = GET16(p_bpb->num_sectors);
++ if (p_fs->num_sectors == 0)
++ p_fs->num_sectors = GET32(p_bpb->num_huge_sectors);
++
++ num_reserved = p_fs->data_start_sector - p_fs->PBR_sector;
++ p_fs->num_clusters = ((p_fs->num_sectors - num_reserved) >>
++ p_fs->sectors_per_clu_bits) + 2;
++ /* because the cluster index starts with 2 */
++
++ if (p_fs->num_clusters < FAT12_THRESHOLD)
++ p_fs->vol_type = FAT12;
++ else
++ p_fs->vol_type = FAT16;
++ p_fs->vol_id = GET32(p_bpb->vol_serial);
++
++ p_fs->root_dir = 0;
++ p_fs->dentries_in_root = GET16(p_bpb->num_root_entries);
++ p_fs->dentries_per_clu = 1 << (p_fs->cluster_size_bits -
++ DENTRY_SIZE_BITS);
++
++ p_fs->vol_flag = VOL_CLEAN;
++ p_fs->clu_srch_ptr = 2;
++ p_fs->used_clusters = (u32)~0;
++
++ p_fs->fs_func = &fat_fs_func;
++
++ return FFS_SUCCESS;
++}
++
++s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
++{
++ s32 num_reserved;
++ struct bpb32_t *p_bpb = (struct bpb32_t *)p_pbr->bpb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_bpb->num_fats == 0)
++ return FFS_FORMATERR;
++
++ p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
++ p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
++ p_fs->cluster_size_bits = p_fs->sectors_per_clu_bits +
++ p_bd->sector_size_bits;
++ p_fs->cluster_size = 1 << p_fs->cluster_size_bits;
++
++ p_fs->num_FAT_sectors = GET32(p_bpb->num_fat32_sectors);
++
++ p_fs->FAT1_start_sector = p_fs->PBR_sector + GET16(p_bpb->num_reserved);
++ if (p_bpb->num_fats == 1)
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector;
++ else
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector +
++ p_fs->num_FAT_sectors;
++
++ p_fs->root_start_sector = p_fs->FAT2_start_sector +
++ p_fs->num_FAT_sectors;
++ p_fs->data_start_sector = p_fs->root_start_sector;
++
++ p_fs->num_sectors = GET32(p_bpb->num_huge_sectors);
++ num_reserved = p_fs->data_start_sector - p_fs->PBR_sector;
++
++ p_fs->num_clusters = ((p_fs->num_sectors - num_reserved) >>
++ p_fs->sectors_per_clu_bits) + 2;
++ /* because the cluster index starts with 2 */
++
++ p_fs->vol_type = FAT32;
++ p_fs->vol_id = GET32(p_bpb->vol_serial);
++
++ p_fs->root_dir = GET32(p_bpb->root_cluster);
++ p_fs->dentries_in_root = 0;
++ p_fs->dentries_per_clu = 1 << (p_fs->cluster_size_bits -
++ DENTRY_SIZE_BITS);
++
++ p_fs->vol_flag = VOL_CLEAN;
++ p_fs->clu_srch_ptr = 2;
++ p_fs->used_clusters = (u32)~0;
++
++ p_fs->fs_func = &fat_fs_func;
++
++ return FFS_SUCCESS;
++}
++
++static struct fs_func exfat_fs_func = {
++ .alloc_cluster = exfat_alloc_cluster,
++ .free_cluster = exfat_free_cluster,
++ .count_used_clusters = exfat_count_used_clusters,
++
++ .init_dir_entry = exfat_init_dir_entry,
++ .init_ext_entry = exfat_init_ext_entry,
++ .find_dir_entry = exfat_find_dir_entry,
++ .delete_dir_entry = exfat_delete_dir_entry,
++ .get_uni_name_from_ext_entry = exfat_get_uni_name_from_ext_entry,
++ .count_ext_entries = exfat_count_ext_entries,
++ .calc_num_entries = exfat_calc_num_entries,
++
++ .get_entry_type = exfat_get_entry_type,
++ .set_entry_type = exfat_set_entry_type,
++ .get_entry_attr = exfat_get_entry_attr,
++ .set_entry_attr = exfat_set_entry_attr,
++ .get_entry_flag = exfat_get_entry_flag,
++ .set_entry_flag = exfat_set_entry_flag,
++ .get_entry_clu0 = exfat_get_entry_clu0,
++ .set_entry_clu0 = exfat_set_entry_clu0,
++ .get_entry_size = exfat_get_entry_size,
++ .set_entry_size = exfat_set_entry_size,
++ .get_entry_time = exfat_get_entry_time,
++ .set_entry_time = exfat_set_entry_time,
++};
++
++s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
++{
++ struct bpbex_t *p_bpb = (struct bpbex_t *)p_pbr->bpb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ if (p_bpb->num_fats == 0)
++ return FFS_FORMATERR;
++
++ p_fs->sectors_per_clu = 1 << p_bpb->sectors_per_clu_bits;
++ p_fs->sectors_per_clu_bits = p_bpb->sectors_per_clu_bits;
++ p_fs->cluster_size_bits = p_fs->sectors_per_clu_bits +
++ p_bd->sector_size_bits;
++ p_fs->cluster_size = 1 << p_fs->cluster_size_bits;
++
++ p_fs->num_FAT_sectors = GET32(p_bpb->fat_length);
++
++ p_fs->FAT1_start_sector = p_fs->PBR_sector + GET32(p_bpb->fat_offset);
++ if (p_bpb->num_fats == 1)
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector;
++ else
++ p_fs->FAT2_start_sector = p_fs->FAT1_start_sector +
++ p_fs->num_FAT_sectors;
++
++ p_fs->root_start_sector = p_fs->PBR_sector + GET32(p_bpb->clu_offset);
++ p_fs->data_start_sector = p_fs->root_start_sector;
++
++ p_fs->num_sectors = GET64(p_bpb->vol_length);
++ p_fs->num_clusters = GET32(p_bpb->clu_count) + 2;
++ /* because the cluster index starts with 2 */
++
++ p_fs->vol_type = EXFAT;
++ p_fs->vol_id = GET32(p_bpb->vol_serial);
++
++ p_fs->root_dir = GET32(p_bpb->root_cluster);
++ p_fs->dentries_in_root = 0;
++ p_fs->dentries_per_clu = 1 << (p_fs->cluster_size_bits -
++ DENTRY_SIZE_BITS);
++
++ p_fs->vol_flag = (u32)GET16(p_bpb->vol_flags);
++ p_fs->clu_srch_ptr = 2;
++ p_fs->used_clusters = (u32)~0;
++
++ p_fs->fs_func = &exfat_fs_func;
++
++ return FFS_SUCCESS;
++}
++
++s32 create_dir(struct inode *inode, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, struct file_id_t *fid)
++{
++ s32 ret, dentry, num_entries;
++ u64 size;
++ struct chain_t clu;
++ struct dos_name_t dos_name, dot_name;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++
++ ret = get_num_entries_and_dos_name(sb, p_dir, p_uniname, &num_entries,
++ &dos_name);
++ if (ret)
++ return ret;
++
++ /* find_empty_entry must be called before alloc_cluster */
++ dentry = find_empty_entry(inode, p_dir, num_entries);
++ if (dentry < 0)
++ return FFS_FULL;
++
++ clu.dir = CLUSTER_32(~0);
++ clu.size = 0;
++ clu.flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++
++ /* (1) allocate a cluster */
++ ret = fs_func->alloc_cluster(sb, 1, &clu);
++ if (ret < 0)
++ return FFS_MEDIAERR;
++ else if (ret == 0)
++ return FFS_FULL;
++
++ ret = clear_cluster(sb, clu.dir);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ if (p_fs->vol_type == EXFAT) {
++ size = p_fs->cluster_size;
++ } else {
++ size = 0;
++
++ /* initialize the . and .. entry
++ * Information for . points to itself
++ * Information for .. points to parent dir
++ */
++
++ dot_name.name_case = 0x0;
++ memcpy(dot_name.name, DOS_CUR_DIR_NAME, DOS_NAME_LENGTH);
++
++ ret = fs_func->init_dir_entry(sb, &clu, 0, TYPE_DIR, clu.dir,
++ 0);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ ret = fs_func->init_ext_entry(sb, &clu, 0, 1, NULL, &dot_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ memcpy(dot_name.name, DOS_PAR_DIR_NAME, DOS_NAME_LENGTH);
++
++ if (p_dir->dir == p_fs->root_dir)
++ ret = fs_func->init_dir_entry(sb, &clu, 1, TYPE_DIR,
++ CLUSTER_32(0), 0);
++ else
++ ret = fs_func->init_dir_entry(sb, &clu, 1, TYPE_DIR,
++ p_dir->dir, 0);
++
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ ret = p_fs->fs_func->init_ext_entry(sb, &clu, 1, 1, NULL,
++ &dot_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++ }
++
++ /* (2) update the directory entry */
++ /* make sub-dir entry in parent directory */
++ ret = fs_func->init_dir_entry(sb, p_dir, dentry, TYPE_DIR, clu.dir,
++ size);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ ret = fs_func->init_ext_entry(sb, p_dir, dentry, num_entries, p_uniname,
++ &dos_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ fid->dir.dir = p_dir->dir;
++ fid->dir.size = p_dir->size;
++ fid->dir.flags = p_dir->flags;
++ fid->entry = dentry;
++
++ fid->attr = ATTR_SUBDIR;
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++ fid->size = size;
++ fid->start_clu = clu.dir;
++
++ fid->type = TYPE_DIR;
++ fid->rwoffset = 0;
++ fid->hint_last_off = -1;
++
++ return FFS_SUCCESS;
++}
++
++s32 create_file(struct inode *inode, struct chain_t *p_dir,
++ struct uni_name_t *p_uniname, u8 mode, struct file_id_t *fid)
++{
++ s32 ret, dentry, num_entries;
++ struct dos_name_t dos_name;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++
++ ret = get_num_entries_and_dos_name(sb, p_dir, p_uniname, &num_entries,
++ &dos_name);
++ if (ret)
++ return ret;
++
++ /* find_empty_entry must be called before alloc_cluster() */
++ dentry = find_empty_entry(inode, p_dir, num_entries);
++ if (dentry < 0)
++ return FFS_FULL;
++
++ /* (1) update the directory entry */
++ /* fill the dos name directory entry information of the created file.
++ * the first cluster is not determined yet. (0)
++ */
++ ret = fs_func->init_dir_entry(sb, p_dir, dentry, TYPE_FILE | mode,
++ CLUSTER_32(0), 0);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ ret = fs_func->init_ext_entry(sb, p_dir, dentry, num_entries, p_uniname,
++ &dos_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ fid->dir.dir = p_dir->dir;
++ fid->dir.size = p_dir->size;
++ fid->dir.flags = p_dir->flags;
++ fid->entry = dentry;
++
++ fid->attr = ATTR_ARCHIVE | mode;
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++ fid->size = 0;
++ fid->start_clu = CLUSTER_32(~0);
++
++ fid->type = TYPE_FILE;
++ fid->rwoffset = 0;
++ fid->hint_last_off = -1;
++
++ return FFS_SUCCESS;
++}
++
++void remove_file(struct inode *inode, struct chain_t *p_dir, s32 entry)
++{
++ s32 num_entries;
++ sector_t sector;
++ struct dentry_t *ep;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++
++ ep = get_entry_in_dir(sb, p_dir, entry, §or);
++ if (!ep)
++ return;
++
++ buf_lock(sb, sector);
++
++ /* buf_lock() before call count_ext_entries() */
++ num_entries = fs_func->count_ext_entries(sb, p_dir, entry, ep);
++ if (num_entries < 0) {
++ buf_unlock(sb, sector);
++ return;
++ }
++ num_entries++;
++
++ buf_unlock(sb, sector);
++
++ /* (1) update the directory entry */
++ fs_func->delete_dir_entry(sb, p_dir, entry, 0, num_entries);
++}
++
++s32 rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry,
++ struct uni_name_t *p_uniname, struct file_id_t *fid)
++{
++ s32 ret, newentry = -1, num_old_entries, num_new_entries;
++ sector_t sector_old, sector_new;
++ struct dos_name_t dos_name;
++ struct dentry_t *epold, *epnew;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++
++ epold = get_entry_in_dir(sb, p_dir, oldentry, §or_old);
++ if (!epold)
++ return FFS_MEDIAERR;
++
++ buf_lock(sb, sector_old);
++
++ /* buf_lock() before call count_ext_entries() */
++ num_old_entries = fs_func->count_ext_entries(sb, p_dir, oldentry,
++ epold);
++ if (num_old_entries < 0) {
++ buf_unlock(sb, sector_old);
++ return FFS_MEDIAERR;
++ }
++ num_old_entries++;
++
++ ret = get_num_entries_and_dos_name(sb, p_dir, p_uniname,
++ &num_new_entries, &dos_name);
++ if (ret) {
++ buf_unlock(sb, sector_old);
++ return ret;
++ }
++
++ if (num_old_entries < num_new_entries) {
++ newentry = find_empty_entry(inode, p_dir, num_new_entries);
++ if (newentry < 0) {
++ buf_unlock(sb, sector_old);
++ return FFS_FULL;
++ }
++
++ epnew = get_entry_in_dir(sb, p_dir, newentry, §or_new);
++ if (!epnew) {
++ buf_unlock(sb, sector_old);
++ return FFS_MEDIAERR;
++ }
++
++ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
++ if (fs_func->get_entry_type(epnew) == TYPE_FILE) {
++ fs_func->set_entry_attr(epnew,
++ fs_func->get_entry_attr(epnew) |
++ ATTR_ARCHIVE);
++ fid->attr |= ATTR_ARCHIVE;
++ }
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_old);
++
++ if (p_fs->vol_type == EXFAT) {
++ epold = get_entry_in_dir(sb, p_dir, oldentry + 1,
++ §or_old);
++ buf_lock(sb, sector_old);
++ epnew = get_entry_in_dir(sb, p_dir, newentry + 1,
++ §or_new);
++
++ if (!epold || !epnew) {
++ buf_unlock(sb, sector_old);
++ return FFS_MEDIAERR;
++ }
++
++ memcpy((void *)epnew, (void *)epold, DENTRY_SIZE);
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_old);
++ }
++
++ ret = fs_func->init_ext_entry(sb, p_dir, newentry,
++ num_new_entries, p_uniname,
++ &dos_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ fs_func->delete_dir_entry(sb, p_dir, oldentry, 0,
++ num_old_entries);
++ fid->entry = newentry;
++ } else {
++ if (fs_func->get_entry_type(epold) == TYPE_FILE) {
++ fs_func->set_entry_attr(epold,
++ fs_func->get_entry_attr(epold) |
++ ATTR_ARCHIVE);
++ fid->attr |= ATTR_ARCHIVE;
++ }
++ buf_modify(sb, sector_old);
++ buf_unlock(sb, sector_old);
++
++ ret = fs_func->init_ext_entry(sb, p_dir, oldentry,
++ num_new_entries, p_uniname,
++ &dos_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ fs_func->delete_dir_entry(sb, p_dir, oldentry, num_new_entries,
++ num_old_entries);
++ }
++
++ return FFS_SUCCESS;
++}
++
++s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry,
++ struct chain_t *p_newdir, struct uni_name_t *p_uniname,
++ struct file_id_t *fid)
++{
++ s32 ret, newentry, num_new_entries, num_old_entries;
++ sector_t sector_mov, sector_new;
++ struct chain_t clu;
++ struct dos_name_t dos_name;
++ struct dentry_t *epmov, *epnew;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++
++ epmov = get_entry_in_dir(sb, p_olddir, oldentry, §or_mov);
++ if (!epmov)
++ return FFS_MEDIAERR;
++
++ /* check if the source and target directory is the same */
++ if (fs_func->get_entry_type(epmov) == TYPE_DIR &&
++ fs_func->get_entry_clu0(epmov) == p_newdir->dir)
++ return FFS_INVALIDPATH;
++
++ buf_lock(sb, sector_mov);
++
++ /* buf_lock() before call count_ext_entries() */
++ num_old_entries = fs_func->count_ext_entries(sb, p_olddir, oldentry,
++ epmov);
++ if (num_old_entries < 0) {
++ buf_unlock(sb, sector_mov);
++ return FFS_MEDIAERR;
++ }
++ num_old_entries++;
++
++ ret = get_num_entries_and_dos_name(sb, p_newdir, p_uniname,
++ &num_new_entries, &dos_name);
++ if (ret) {
++ buf_unlock(sb, sector_mov);
++ return ret;
++ }
++
++ newentry = find_empty_entry(inode, p_newdir, num_new_entries);
++ if (newentry < 0) {
++ buf_unlock(sb, sector_mov);
++ return FFS_FULL;
++ }
++
++ epnew = get_entry_in_dir(sb, p_newdir, newentry, §or_new);
++ if (!epnew) {
++ buf_unlock(sb, sector_mov);
++ return FFS_MEDIAERR;
++ }
++
++ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
++ if (fs_func->get_entry_type(epnew) == TYPE_FILE) {
++ fs_func->set_entry_attr(epnew, fs_func->get_entry_attr(epnew) |
++ ATTR_ARCHIVE);
++ fid->attr |= ATTR_ARCHIVE;
++ }
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_mov);
++
++ if (p_fs->vol_type == EXFAT) {
++ epmov = get_entry_in_dir(sb, p_olddir, oldentry + 1,
++ §or_mov);
++ buf_lock(sb, sector_mov);
++ epnew = get_entry_in_dir(sb, p_newdir, newentry + 1,
++ §or_new);
++ if (!epmov || !epnew) {
++ buf_unlock(sb, sector_mov);
++ return FFS_MEDIAERR;
++ }
++
++ memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE);
++ buf_modify(sb, sector_new);
++ buf_unlock(sb, sector_mov);
++ } else if (fs_func->get_entry_type(epnew) == TYPE_DIR) {
++ /* change ".." pointer to new parent dir */
++ clu.dir = fs_func->get_entry_clu0(epnew);
++ clu.flags = 0x01;
++
++ epnew = get_entry_in_dir(sb, &clu, 1, §or_new);
++ if (!epnew)
++ return FFS_MEDIAERR;
++
++ if (p_newdir->dir == p_fs->root_dir)
++ fs_func->set_entry_clu0(epnew, CLUSTER_32(0));
++ else
++ fs_func->set_entry_clu0(epnew, p_newdir->dir);
++ buf_modify(sb, sector_new);
++ }
++
++ ret = fs_func->init_ext_entry(sb, p_newdir, newentry, num_new_entries,
++ p_uniname, &dos_name);
++ if (ret != FFS_SUCCESS)
++ return ret;
++
++ fs_func->delete_dir_entry(sb, p_olddir, oldentry, 0, num_old_entries);
++
++ fid->dir.dir = p_newdir->dir;
++ fid->dir.size = p_newdir->size;
++ fid->dir.flags = p_newdir->flags;
++
++ fid->entry = newentry;
++
++ return FFS_SUCCESS;
++}
++
++/*
++ * Sector Read/Write Functions
++ */
++
++int sector_read(struct super_block *sb, sector_t sec, struct buffer_head **bh,
++ bool read)
++{
++ s32 ret = FFS_MEDIAERR;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if ((sec >= (p_fs->PBR_sector + p_fs->num_sectors)) &&
++ (p_fs->num_sectors > 0)) {
++ pr_err("[EXFAT] %s: out of range error! (sec = %llu)\n",
++ __func__, (unsigned long long)sec);
++ fs_error(sb);
++ return ret;
++ }
++
++ if (!p_fs->dev_ejected) {
++ ret = bdev_read(sb, sec, bh, 1, read);
++ if (ret != FFS_SUCCESS)
++ p_fs->dev_ejected = TRUE;
++ }
++
++ return ret;
++}
++
++int sector_write(struct super_block *sb, sector_t sec, struct buffer_head *bh,
++ bool sync)
++{
++ s32 ret = FFS_MEDIAERR;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (sec >= (p_fs->PBR_sector + p_fs->num_sectors) &&
++ (p_fs->num_sectors > 0)) {
++ pr_err("[EXFAT] %s: out of range error! (sec = %llu)\n",
++ __func__, (unsigned long long)sec);
++ fs_error(sb);
++ return ret;
++ }
++
++ if (!bh) {
++ pr_err("[EXFAT] %s: bh is NULL!\n", __func__);
++ fs_error(sb);
++ return ret;
++ }
++
++ if (!p_fs->dev_ejected) {
++ ret = bdev_write(sb, sec, bh, 1, sync);
++ if (ret != FFS_SUCCESS)
++ p_fs->dev_ejected = TRUE;
++ }
++
++ return ret;
++}
++
++int multi_sector_read(struct super_block *sb, sector_t sec,
++ struct buffer_head **bh, s32 num_secs, bool read)
++{
++ s32 ret = FFS_MEDIAERR;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (((sec + num_secs) > (p_fs->PBR_sector + p_fs->num_sectors)) &&
++ (p_fs->num_sectors > 0)) {
++ pr_err("[EXFAT] %s: out of range error! (sec = %llu, num_secs = %d)\n",
++ __func__, (unsigned long long)sec, num_secs);
++ fs_error(sb);
++ return ret;
++ }
++
++ if (!p_fs->dev_ejected) {
++ ret = bdev_read(sb, sec, bh, num_secs, read);
++ if (ret != FFS_SUCCESS)
++ p_fs->dev_ejected = TRUE;
++ }
++
++ return ret;
++}
++
++int multi_sector_write(struct super_block *sb, sector_t sec,
++ struct buffer_head *bh, s32 num_secs, bool sync)
++{
++ s32 ret = FFS_MEDIAERR;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if ((sec + num_secs) > (p_fs->PBR_sector + p_fs->num_sectors) &&
++ (p_fs->num_sectors > 0)) {
++ pr_err("[EXFAT] %s: out of range error! (sec = %llu, num_secs = %d)\n",
++ __func__, (unsigned long long)sec, num_secs);
++ fs_error(sb);
++ return ret;
++ }
++ if (!bh) {
++ pr_err("[EXFAT] %s: bh is NULL!\n", __func__);
++ fs_error(sb);
++ return ret;
++ }
++
++ if (!p_fs->dev_ejected) {
++ ret = bdev_write(sb, sec, bh, num_secs, sync);
++ if (ret != FFS_SUCCESS)
++ p_fs->dev_ejected = TRUE;
++ }
++
++ return ret;
++}
+diff --git a/drivers/staging/exfat/exfat_nls.c b/drivers/staging/exfat/exfat_nls.c
+new file mode 100644
+index 000000000000..2ca58616159b
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_nls.c
+@@ -0,0 +1,404 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/string.h>
++#include <linux/nls.h>
++#include "exfat.h"
++
++static u16 bad_dos_chars[] = {
++ /* + , ; = [ ] */
++ 0x002B, 0x002C, 0x003B, 0x003D, 0x005B, 0x005D,
++ 0xFF0B, 0xFF0C, 0xFF1B, 0xFF1D, 0xFF3B, 0xFF3D,
++ 0
++};
++
++static u16 bad_uni_chars[] = {
++ /* " * / : < > ? \ | */
++ 0x0022, 0x002A, 0x002F, 0x003A,
++ 0x003C, 0x003E, 0x003F, 0x005C, 0x007C,
++ 0
++};
++
++static int convert_ch_to_uni(struct nls_table *nls, u16 *uni, u8 *ch,
++ bool *lossy)
++{
++ int len;
++
++ *uni = 0x0;
++
++ if (ch[0] < 0x80) {
++ *uni = (u16)ch[0];
++ return 1;
++ }
++
++ len = nls->char2uni(ch, NLS_MAX_CHARSET_SIZE, uni);
++ if (len < 0) {
++ /* conversion failed */
++ pr_info("%s: fail to use nls\n", __func__);
++ if (lossy)
++ *lossy = true;
++ *uni = (u16)'_';
++ if (!strcmp(nls->charset, "utf8"))
++ return 1;
++ else
++ return 2;
++ }
++
++ return len;
++}
++
++static int convert_uni_to_ch(struct nls_table *nls, u8 *ch, u16 uni,
++ bool *lossy)
++{
++ int len;
++
++ ch[0] = 0x0;
++
++ if (uni < 0x0080) {
++ ch[0] = (u8)uni;
++ return 1;
++ }
++
++ len = nls->uni2char(uni, ch, NLS_MAX_CHARSET_SIZE);
++ if (len < 0) {
++ /* conversion failed */
++ pr_info("%s: fail to use nls\n", __func__);
++ if (lossy)
++ *lossy = true;
++ ch[0] = '_';
++ return 1;
++ }
++
++ return len;
++}
++
++u16 nls_upper(struct super_block *sb, u16 a)
++{
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ if (EXFAT_SB(sb)->options.casesensitive)
++ return a;
++ if (p_fs->vol_utbl && p_fs->vol_utbl[get_col_index(a)])
++ return p_fs->vol_utbl[get_col_index(a)][get_row_index(a)];
++ else
++ return a;
++}
++
++static u16 *nls_wstrchr(u16 *str, u16 wchar)
++{
++ while (*str) {
++ if (*(str++) == wchar)
++ return str;
++ }
++
++ return NULL;
++}
++
++int nls_dosname_cmp(struct super_block *sb, u8 *a, u8 *b)
++{
++ return strncmp(a, b, DOS_NAME_LENGTH);
++}
++
++int nls_uniname_cmp(struct super_block *sb, u16 *a, u16 *b)
++{
++ int i;
++
++ for (i = 0; i < MAX_NAME_LENGTH; i++, a++, b++) {
++ if (nls_upper(sb, *a) != nls_upper(sb, *b))
++ return 1;
++ if (*a == 0x0)
++ return 0;
++ }
++ return 0;
++}
++
++void nls_uniname_to_dosname(struct super_block *sb,
++ struct dos_name_t *p_dosname,
++ struct uni_name_t *p_uniname, bool *p_lossy)
++{
++ int i, j, len;
++ bool lossy = false;
++ u8 buf[MAX_CHARSET_SIZE];
++ u8 lower = 0, upper = 0;
++ u8 *dosname = p_dosname->name;
++ u16 *uniname = p_uniname->name;
++ u16 *p, *last_period;
++ struct nls_table *nls = EXFAT_SB(sb)->nls_disk;
++
++ for (i = 0; i < DOS_NAME_LENGTH; i++)
++ *(dosname + i) = ' ';
++
++ if (!nls_uniname_cmp(sb, uniname, (u16 *)UNI_CUR_DIR_NAME)) {
++ *(dosname) = '.';
++ p_dosname->name_case = 0x0;
++ if (p_lossy)
++ *p_lossy = false;
++ return;
++ }
++
++ if (!nls_uniname_cmp(sb, uniname, (u16 *)UNI_PAR_DIR_NAME)) {
++ *(dosname) = '.';
++ *(dosname + 1) = '.';
++ p_dosname->name_case = 0x0;
++ if (p_lossy)
++ *p_lossy = false;
++ return;
++ }
++
++ /* search for the last embedded period */
++ last_period = NULL;
++ for (p = uniname; *p; p++) {
++ if (*p == (u16)'.')
++ last_period = p;
++ }
++
++ i = 0;
++ while (i < DOS_NAME_LENGTH) {
++ if (i == 8) {
++ if (!last_period)
++ break;
++
++ if (uniname <= last_period) {
++ if (uniname < last_period)
++ lossy = true;
++ uniname = last_period + 1;
++ }
++ }
++
++ if (*uniname == (u16)'\0') {
++ break;
++ } else if (*uniname == (u16)' ') {
++ lossy = true;
++ } else if (*uniname == (u16)'.') {
++ if (uniname < last_period)
++ lossy = true;
++ else
++ i = 8;
++ } else if (nls_wstrchr(bad_dos_chars, *uniname)) {
++ lossy = true;
++ *(dosname + i) = '_';
++ i++;
++ } else {
++ len = convert_uni_to_ch(nls, buf, *uniname, &lossy);
++
++ if (len > 1) {
++ if ((i >= 8) && ((i + len) > DOS_NAME_LENGTH))
++ break;
++
++ if ((i < 8) && ((i + len) > 8)) {
++ i = 8;
++ continue;
++ }
++
++ lower = 0xFF;
++
++ for (j = 0; j < len; j++, i++)
++ *(dosname + i) = *(buf + j);
++ } else { /* len == 1 */
++ if ((*buf >= 'a') && (*buf <= 'z')) {
++ *(dosname + i) = *buf - ('a' - 'A');
++
++ if (i < 8)
++ lower |= 0x08;
++ else
++ lower |= 0x10;
++ } else if ((*buf >= 'A') && (*buf <= 'Z')) {
++ *(dosname + i) = *buf;
++
++ if (i < 8)
++ upper |= 0x08;
++ else
++ upper |= 0x10;
++ } else {
++ *(dosname + i) = *buf;
++ }
++ i++;
++ }
++ }
++
++ uniname++;
++ }
++
++ if (*dosname == 0xE5)
++ *dosname = 0x05;
++
++ if (*uniname != 0x0)
++ lossy = TRUE;
++
++ if (upper & lower)
++ p_dosname->name_case = 0xFF;
++ else
++ p_dosname->name_case = lower;
++
++ if (p_lossy)
++ *p_lossy = lossy;
++}
++
++void nls_dosname_to_uniname(struct super_block *sb,
++ struct uni_name_t *p_uniname,
++ struct dos_name_t *p_dosname)
++{
++ int i = 0, j, n = 0;
++ u8 buf[DOS_NAME_LENGTH + 2];
++ u8 *dosname = p_dosname->name;
++ u16 *uniname = p_uniname->name;
++ struct nls_table *nls = EXFAT_SB(sb)->nls_disk;
++
++ if (*dosname == 0x05) {
++ *buf = 0xE5;
++ i++;
++ n++;
++ }
++
++ for (; i < 8; i++, n++) {
++ if (*(dosname + i) == ' ')
++ break;
++
++ if ((*(dosname + i) >= 'A') && (*(dosname + i) <= 'Z') &&
++ (p_dosname->name_case & 0x08))
++ *(buf + n) = *(dosname + i) + ('a' - 'A');
++ else
++ *(buf + n) = *(dosname + i);
++ }
++ if (*(dosname + 8) != ' ') {
++ *(buf + n) = '.';
++ n++;
++ }
++
++ for (i = 8; i < DOS_NAME_LENGTH; i++, n++) {
++ if (*(dosname + i) == ' ')
++ break;
++
++ if ((*(dosname + i) >= 'A') && (*(dosname + i) <= 'Z') &&
++ (p_dosname->name_case & 0x10))
++ *(buf + n) = *(dosname + i) + ('a' - 'A');
++ else
++ *(buf + n) = *(dosname + i);
++ }
++ *(buf + n) = '\0';
++
++ i = 0;
++ j = 0;
++ while (j < (MAX_NAME_LENGTH - 1)) {
++ if (*(buf + i) == '\0')
++ break;
++
++ i += convert_ch_to_uni(nls, uniname, (buf + i), NULL);
++
++ uniname++;
++ j++;
++ }
++
++ *uniname = (u16)'\0';
++}
++
++void nls_uniname_to_cstring(struct super_block *sb, u8 *p_cstring,
++ struct uni_name_t *p_uniname)
++{
++ int i, j, len;
++ u8 buf[MAX_CHARSET_SIZE];
++ u16 *uniname = p_uniname->name;
++ struct nls_table *nls = EXFAT_SB(sb)->nls_io;
++
++ if (!nls) {
++ len = utf16s_to_utf8s(uniname, MAX_NAME_LENGTH,
++ UTF16_HOST_ENDIAN, p_cstring,
++ MAX_NAME_LENGTH);
++ p_cstring[len] = 0;
++ return;
++ }
++
++ i = 0;
++ while (i < (MAX_NAME_LENGTH - 1)) {
++ if (*uniname == (u16)'\0')
++ break;
++
++ len = convert_uni_to_ch(nls, buf, *uniname, NULL);
++
++ if (len > 1) {
++ for (j = 0; j < len; j++)
++ *p_cstring++ = (char)*(buf + j);
++ } else { /* len == 1 */
++ *p_cstring++ = (char)*buf;
++ }
++
++ uniname++;
++ i++;
++ }
++
++ *p_cstring = '\0';
++}
++
++void nls_cstring_to_uniname(struct super_block *sb,
++ struct uni_name_t *p_uniname, u8 *p_cstring,
++ bool *p_lossy)
++{
++ int i, j;
++ bool lossy = false;
++ u8 *end_of_name;
++ u8 upname[MAX_NAME_LENGTH * 2];
++ u16 *uniname = p_uniname->name;
++ struct nls_table *nls = EXFAT_SB(sb)->nls_io;
++
++ /* strip all trailing spaces */
++ end_of_name = p_cstring + strlen(p_cstring);
++
++ while (*(--end_of_name) == ' ') {
++ if (end_of_name < p_cstring)
++ break;
++ }
++ *(++end_of_name) = '\0';
++
++ if (strcmp(p_cstring, ".") && strcmp(p_cstring, "..")) {
++ /* strip all trailing periods */
++ while (*(--end_of_name) == '.') {
++ if (end_of_name < p_cstring)
++ break;
++ }
++ *(++end_of_name) = '\0';
++ }
++
++ if (*p_cstring == '\0')
++ lossy = true;
++
++ if (!nls) {
++ i = utf8s_to_utf16s(p_cstring, MAX_NAME_LENGTH,
++ UTF16_HOST_ENDIAN, uniname,
++ MAX_NAME_LENGTH);
++ for (j = 0; j < i; j++)
++ SET16_A(upname + j * 2, nls_upper(sb, uniname[j]));
++ uniname[i] = '\0';
++ } else {
++ i = 0;
++ j = 0;
++ while (j < (MAX_NAME_LENGTH - 1)) {
++ if (*(p_cstring + i) == '\0')
++ break;
++
++ i += convert_ch_to_uni(nls, uniname,
++ (u8 *)(p_cstring + i), &lossy);
++
++ if ((*uniname < 0x0020) ||
++ nls_wstrchr(bad_uni_chars, *uniname))
++ lossy = true;
++
++ SET16_A(upname + j * 2, nls_upper(sb, *uniname));
++
++ uniname++;
++ j++;
++ }
++
++ if (*(p_cstring + i) != '\0')
++ lossy = true;
++ *uniname = (u16)'\0';
++ }
++
++ p_uniname->name_len = j;
++ p_uniname->name_hash = calc_checksum_2byte(upname, j << 1, 0,
++ CS_DEFAULT);
++
++ if (p_lossy)
++ *p_lossy = lossy;
++}
+diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
+new file mode 100644
+index 000000000000..5b5c2ca8c9aa
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_super.c
+@@ -0,0 +1,4137 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/version.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/time.h>
++#include <linux/slab.h>
++#include <linux/seq_file.h>
++#include <linux/pagemap.h>
++#include <linux/mpage.h>
++#include <linux/buffer_head.h>
++#include <linux/exportfs.h>
++#include <linux/mount.h>
++#include <linux/vfs.h>
++#include <linux/aio.h>
++#include <linux/iversion.h>
++#include <linux/parser.h>
++#include <linux/uio.h>
++#include <linux/writeback.h>
++#include <linux/log2.h>
++#include <linux/hash.h>
++#include <linux/backing-dev.h>
++#include <linux/sched.h>
++#include <linux/fs_struct.h>
++#include <linux/namei.h>
++#include <linux/time.h>
++
++#include <linux/string.h>
++#include <linux/nls.h>
++#include <linux/mutex.h>
++#include <linux/swap.h>
++
++#define EXFAT_VERSION "1.3.0"
++
++#include "exfat.h"
++
++static struct kmem_cache *exfat_inode_cachep;
++
++// FIXME use commented lines
++// static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE;
++// static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;
++static int exfat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE;
++static char exfat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;
++
++#define INC_IVERSION(x) (inode_inc_iversion(x))
++#define GET_IVERSION(x) (inode_peek_iversion_raw(x))
++#define SET_IVERSION(x, y) (inode_set_iversion(x, y))
++
++static struct inode *exfat_iget(struct super_block *sb, loff_t i_pos);
++static int exfat_sync_inode(struct inode *inode);
++static struct inode *exfat_build_inode(struct super_block *sb,
++ struct file_id_t *fid, loff_t i_pos);
++static int exfat_write_inode(struct inode *inode,
++ struct writeback_control *wbc);
++static void exfat_write_super(struct super_block *sb);
++
++#define UNIX_SECS_1980 315532800L
++
++#if BITS_PER_LONG == 64
++#define UNIX_SECS_2108 4354819200L
++#endif
++
++/* days between 1.1.70 and 1.1.80 (2 leap days) */
++#define DAYS_DELTA_DECADE (365 * 10 + 2)
++/* 120 (2100 - 1980) isn't leap year */
++#define NO_LEAP_YEAR_2100 (120)
++#define IS_LEAP_YEAR(y) (!((y) & 0x3) && (y) != NO_LEAP_YEAR_2100)
++
++#define SECS_PER_MIN (60)
++#define SECS_PER_HOUR (60 * SECS_PER_MIN)
++#define SECS_PER_DAY (24 * SECS_PER_HOUR)
++
++#define MAKE_LEAP_YEAR(leap_year, year) \
++ do { \
++ if (unlikely(year > NO_LEAP_YEAR_2100)) \
++ leap_year = ((year + 3) / 4) - 1; \
++ else \
++ leap_year = ((year + 3) / 4); \
++ } while (0)
++
++/* Linear day numbers of the respective 1sts in non-leap years. */
++static time_t accum_days_in_year[] = {
++ /* Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec */
++ 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 0, 0, 0,
++};
++
++/* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */
++static void exfat_time_fat2unix(struct exfat_sb_info *sbi,
++ struct timespec64 *ts, struct date_time_t *tp)
++{
++ time_t year = tp->Year;
++ time_t ld;
++
++ MAKE_LEAP_YEAR(ld, year);
++
++ if (IS_LEAP_YEAR(year) && (tp->Month) > 2)
++ ld++;
++
++ ts->tv_sec = tp->Second +
++ tp->Minute * SECS_PER_MIN +
++ tp->Hour * SECS_PER_HOUR +
++ (ld + accum_days_in_year[(tp->Month)] +
++ (tp->Day - 1)) * SECS_PER_DAY +
++ (year * 365 + DAYS_DELTA_DECADE) * SECS_PER_DAY +
++ sys_tz.tz_minuteswest * SECS_PER_MIN;
++
++ ts->tv_nsec = 0;
++}
++
++/* Convert linear UNIX date to a FAT time/date pair. */
++static void exfat_time_unix2fat(struct exfat_sb_info *sbi,
++ struct timespec64 *ts, struct date_time_t *tp)
++{
++ time_t second = ts->tv_sec;
++ time_t day, month, year;
++ time_t ld;
++
++ second -= sys_tz.tz_minuteswest * SECS_PER_MIN;
++
++ /* Jan 1 GMT 00:00:00 1980. But what about another time zone? */
++ if (second < UNIX_SECS_1980) {
++ tp->Second = 0;
++ tp->Minute = 0;
++ tp->Hour = 0;
++ tp->Day = 1;
++ tp->Month = 1;
++ tp->Year = 0;
++ return;
++ }
++#if (BITS_PER_LONG == 64)
++ if (second >= UNIX_SECS_2108) {
++ tp->Second = 59;
++ tp->Minute = 59;
++ tp->Hour = 23;
++ tp->Day = 31;
++ tp->Month = 12;
++ tp->Year = 127;
++ return;
++ }
++#endif
++ day = second / SECS_PER_DAY - DAYS_DELTA_DECADE;
++ year = day / 365;
++ MAKE_LEAP_YEAR(ld, year);
++ if (year * 365 + ld > day)
++ year--;
++
++ MAKE_LEAP_YEAR(ld, year);
++ day -= year * 365 + ld;
++
++ if (IS_LEAP_YEAR(year) && day == accum_days_in_year[3]) {
++ month = 2;
++ } else {
++ if (IS_LEAP_YEAR(year) && day > accum_days_in_year[3])
++ day--;
++ for (month = 1; month < 12; month++) {
++ if (accum_days_in_year[month + 1] > day)
++ break;
++ }
++ }
++ day -= accum_days_in_year[month];
++
++ tp->Second = second % SECS_PER_MIN;
++ tp->Minute = (second / SECS_PER_MIN) % 60;
++ tp->Hour = (second / SECS_PER_HOUR) % 24;
++ tp->Day = day + 1;
++ tp->Month = month;
++ tp->Year = year;
++}
++
++struct timestamp_t *tm_current(struct timestamp_t *tp)
++{
++ struct timespec64 ts;
++ time_t second, day, leap_day, month, year;
++
++ ktime_get_real_ts64(&ts);
++
++ second = ts.tv_sec;
++ second -= sys_tz.tz_minuteswest * SECS_PER_MIN;
++
++ /* Jan 1 GMT 00:00:00 1980. But what about another time zone? */
++ if (second < UNIX_SECS_1980) {
++ tp->sec = 0;
++ tp->min = 0;
++ tp->hour = 0;
++ tp->day = 1;
++ tp->mon = 1;
++ tp->year = 0;
++ return tp;
++ }
++#if BITS_PER_LONG == 64
++ if (second >= UNIX_SECS_2108) {
++ tp->sec = 59;
++ tp->min = 59;
++ tp->hour = 23;
++ tp->day = 31;
++ tp->mon = 12;
++ tp->year = 127;
++ return tp;
++ }
++#endif
++
++ day = second / SECS_PER_DAY - DAYS_DELTA_DECADE;
++ year = day / 365;
++
++ MAKE_LEAP_YEAR(leap_day, year);
++ if (year * 365 + leap_day > day)
++ year--;
++
++ MAKE_LEAP_YEAR(leap_day, year);
++
++ day -= year * 365 + leap_day;
++
++ if (IS_LEAP_YEAR(year) && day == accum_days_in_year[3]) {
++ month = 2;
++ } else {
++ if (IS_LEAP_YEAR(year) && day > accum_days_in_year[3])
++ day--;
++ for (month = 1; month < 12; month++) {
++ if (accum_days_in_year[month + 1] > day)
++ break;
++ }
++ }
++ day -= accum_days_in_year[month];
++
++ tp->sec = second % SECS_PER_MIN;
++ tp->min = (second / SECS_PER_MIN) % 60;
++ tp->hour = (second / SECS_PER_HOUR) % 24;
++ tp->day = day + 1;
++ tp->mon = month;
++ tp->year = year;
++
++ return tp;
++}
++
++static void __lock_super(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ mutex_lock(&sbi->s_lock);
++}
++
++static void __unlock_super(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ mutex_unlock(&sbi->s_lock);
++}
++
++static int __is_sb_dirty(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ return sbi->s_dirt;
++}
++
++static void __set_sb_clean(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ sbi->s_dirt = 0;
++}
++
++static int __exfat_revalidate(struct dentry *dentry)
++{
++ return 0;
++}
++
++static int exfat_revalidate(struct dentry *dentry, unsigned int flags)
++{
++ if (flags & LOOKUP_RCU)
++ return -ECHILD;
++
++ if (dentry->d_inode)
++ return 1;
++ return __exfat_revalidate(dentry);
++}
++
++static int exfat_revalidate_ci(struct dentry *dentry, unsigned int flags)
++{
++ if (flags & LOOKUP_RCU)
++ return -ECHILD;
++
++ if (dentry->d_inode)
++ return 1;
++
++ if (!flags)
++ return 0;
++
++ if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
++ return 0;
++
++ return __exfat_revalidate(dentry);
++}
++
++static unsigned int __exfat_striptail_len(unsigned int len, const char *name)
++{
++ while (len && name[len - 1] == '.')
++ len--;
++ return len;
++}
++
++static unsigned int exfat_striptail_len(const struct qstr *qstr)
++{
++ return __exfat_striptail_len(qstr->len, qstr->name);
++}
++
++static int exfat_d_hash(const struct dentry *dentry, struct qstr *qstr)
++{
++ qstr->hash = full_name_hash(dentry, qstr->name,
++ exfat_striptail_len(qstr));
++ return 0;
++}
++
++static int exfat_d_hashi(const struct dentry *dentry, struct qstr *qstr)
++{
++ struct super_block *sb = dentry->d_sb;
++ const unsigned char *name;
++ unsigned int len;
++ unsigned long hash;
++
++ name = qstr->name;
++ len = exfat_striptail_len(qstr);
++
++ hash = init_name_hash(dentry);
++ while (len--)
++ hash = partial_name_hash(nls_upper(sb, *name++), hash);
++ qstr->hash = end_name_hash(hash);
++
++ return 0;
++}
++
++static int exfat_cmpi(const struct dentry *dentry, unsigned int len,
++ const char *str, const struct qstr *name)
++{
++ struct nls_table *t = EXFAT_SB(dentry->d_sb)->nls_io;
++ unsigned int alen, blen;
++
++ alen = exfat_striptail_len(name);
++ blen = __exfat_striptail_len(len, str);
++ if (alen == blen) {
++ if (t == NULL) {
++ if (strncasecmp(name->name, str, alen) == 0)
++ return 0;
++ } else if (nls_strnicmp(t, name->name, str, alen) == 0)
++ return 0;
++ }
++ return 1;
++}
++
++static int exfat_cmp(const struct dentry *dentry, unsigned int len,
++ const char *str, const struct qstr *name)
++{
++ unsigned int alen, blen;
++
++ alen = exfat_striptail_len(name);
++ blen = __exfat_striptail_len(len, str);
++ if (alen == blen) {
++ if (strncmp(name->name, str, alen) == 0)
++ return 0;
++ }
++ return 1;
++}
++
++static const struct dentry_operations exfat_ci_dentry_ops = {
++ .d_revalidate = exfat_revalidate_ci,
++ .d_hash = exfat_d_hashi,
++ .d_compare = exfat_cmpi,
++};
++
++static const struct dentry_operations exfat_dentry_ops = {
++ .d_revalidate = exfat_revalidate,
++ .d_hash = exfat_d_hash,
++ .d_compare = exfat_cmp,
++};
++
++static DEFINE_SEMAPHORE(z_sem);
++
++static inline void fs_sync(struct super_block *sb, bool do_sync)
++{
++ if (do_sync)
++ bdev_sync(sb);
++}
++
++/*
++ * If ->i_mode can't hold S_IWUGO (i.e. ATTR_RO), we use ->i_attrs to
++ * save ATTR_RO instead of ->i_mode.
++ *
++ * If it's directory and !sbi->options.rodir, ATTR_RO isn't read-only
++ * bit, it's just used as flag for app.
++ */
++static inline int exfat_mode_can_hold_ro(struct inode *inode)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(inode->i_sb);
++
++ if (S_ISDIR(inode->i_mode))
++ return 0;
++
++ if ((~sbi->options.fs_fmask) & 0222)
++ return 1;
++ return 0;
++}
++
++/* Convert attribute bits and a mask to the UNIX mode. */
++static inline mode_t exfat_make_mode(struct exfat_sb_info *sbi, u32 attr,
++ mode_t mode)
++{
++ if ((attr & ATTR_READONLY) && !(attr & ATTR_SUBDIR))
++ mode &= ~0222;
++
++ if (attr & ATTR_SUBDIR)
++ return (mode & ~sbi->options.fs_dmask) | S_IFDIR;
++ else if (attr & ATTR_SYMLINK)
++ return (mode & ~sbi->options.fs_dmask) | S_IFLNK;
++ else
++ return (mode & ~sbi->options.fs_fmask) | S_IFREG;
++}
++
++/* Return the FAT attribute byte for this inode */
++static inline u32 exfat_make_attr(struct inode *inode)
++{
++ if (exfat_mode_can_hold_ro(inode) && !(inode->i_mode & 0222))
++ return (EXFAT_I(inode)->fid.attr) | ATTR_READONLY;
++ else
++ return EXFAT_I(inode)->fid.attr;
++}
++
++static inline void exfat_save_attr(struct inode *inode, u32 attr)
++{
++ if (exfat_mode_can_hold_ro(inode))
++ EXFAT_I(inode)->fid.attr = attr & ATTR_RWMASK;
++ else
++ EXFAT_I(inode)->fid.attr = attr & (ATTR_RWMASK | ATTR_READONLY);
++}
++
++static int ffsMountVol(struct super_block *sb)
++{
++ int i, ret;
++ struct pbr_sector_t *p_pbr;
++ struct buffer_head *tmp_bh = NULL;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ pr_info("[EXFAT] trying to mount...\n");
++
++ down(&z_sem);
++
++ buf_init(sb);
++
++ sema_init(&p_fs->v_sem, 1);
++ p_fs->dev_ejected = FALSE;
++
++ /* open the block device */
++ bdev_open(sb);
++
++ if (p_bd->sector_size < sb->s_blocksize) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ if (p_bd->sector_size > sb->s_blocksize)
++ sb_set_blocksize(sb, p_bd->sector_size);
++
++ /* read Sector 0 */
++ if (sector_read(sb, 0, &tmp_bh, 1) != FFS_SUCCESS) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++
++ p_fs->PBR_sector = 0;
++
++ p_pbr = (struct pbr_sector_t *) tmp_bh->b_data;
++
++ /* check the validity of PBR */
++ if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
++ brelse(tmp_bh);
++ bdev_close(sb);
++ ret = FFS_FORMATERR;
++ goto out;
++ }
++
++ /* fill fs_stuct */
++ for (i = 0; i < 53; i++)
++ if (p_pbr->bpb[i])
++ break;
++
++ if (i < 53) {
++ if (GET16(p_pbr->bpb + 11)) /* num_fat_sectors */
++ ret = fat16_mount(sb, p_pbr);
++ else
++ ret = fat32_mount(sb, p_pbr);
++ } else {
++ ret = exfat_mount(sb, p_pbr);
++ }
++
++ brelse(tmp_bh);
++
++ if (ret) {
++ bdev_close(sb);
++ goto out;
++ }
++
++ if (p_fs->vol_type == EXFAT) {
++ ret = load_alloc_bitmap(sb);
++ if (ret) {
++ bdev_close(sb);
++ goto out;
++ }
++ ret = load_upcase_table(sb);
++ if (ret) {
++ free_alloc_bitmap(sb);
++ bdev_close(sb);
++ goto out;
++ }
++ }
++
++ if (p_fs->dev_ejected) {
++ if (p_fs->vol_type == EXFAT) {
++ free_upcase_table(sb);
++ free_alloc_bitmap(sb);
++ }
++ bdev_close(sb);
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++
++ pr_info("[EXFAT] mounted successfully\n");
++
++out:
++ up(&z_sem);
++
++ return ret;
++}
++
++static int ffsUmountVol(struct super_block *sb)
++{
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ int err = FFS_SUCCESS;
++
++ pr_info("[EXFAT] trying to unmount...\n");
++
++ down(&z_sem);
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++
++ if (p_fs->vol_type == EXFAT) {
++ free_upcase_table(sb);
++ free_alloc_bitmap(sb);
++ }
++
++ FAT_release_all(sb);
++ buf_release_all(sb);
++
++ /* close the block device */
++ bdev_close(sb);
++
++ if (p_fs->dev_ejected) {
++ pr_info("[EXFAT] unmounted with media errors. Device is already ejected.\n");
++ err = FFS_MEDIAERR;
++ }
++
++ buf_shutdown(sb);
++
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++ up(&z_sem);
++
++ pr_info("[EXFAT] unmounted successfully\n");
++
++ return err;
++}
++
++static int ffsGetVolInfo(struct super_block *sb, struct vol_info_t *info)
++{
++ int err = FFS_SUCCESS;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ /* check the validity of pointer parameters */
++ if (info == NULL)
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ if (p_fs->used_clusters == (u32) ~0)
++ p_fs->used_clusters = p_fs->fs_func->count_used_clusters(sb);
++
++ info->FatType = p_fs->vol_type;
++ info->ClusterSize = p_fs->cluster_size;
++ info->NumClusters = p_fs->num_clusters - 2; /* clu 0 & 1 */
++ info->UsedClusters = p_fs->used_clusters;
++ info->FreeClusters = info->NumClusters - info->UsedClusters;
++
++ if (p_fs->dev_ejected)
++ err = FFS_MEDIAERR;
++
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return err;
++}
++
++static int ffsSyncVol(struct super_block *sb, bool do_sync)
++{
++ int err = FFS_SUCCESS;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* synchronize the file system */
++ fs_sync(sb, do_sync);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++
++ if (p_fs->dev_ejected)
++ err = FFS_MEDIAERR;
++
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return err;
++}
++
++/*----------------------------------------------------------------------*/
++/* File Operation Functions */
++/*----------------------------------------------------------------------*/
++
++static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
++{
++ int ret, dentry, num_entries;
++ struct chain_t dir;
++ struct uni_name_t uni_name;
++ struct dos_name_t dos_name;
++ struct dentry_t *ep, *ep2;
++ struct entry_set_cache_t *es = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ pr_debug("%s entered\n", __func__);
++
++ /* check the validity of pointer parameters */
++ if ((fid == NULL) || (path == NULL) || (*path == '\0'))
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check the validity of directory name in the given pathname */
++ ret = resolve_path(inode, path, &dir, &uni_name);
++ if (ret)
++ goto out;
++
++ ret = get_num_entries_and_dos_name(sb, &dir, &uni_name, &num_entries,
++ &dos_name);
++ if (ret)
++ goto out;
++
++ /* search the file name for directories */
++ dentry = p_fs->fs_func->find_dir_entry(sb, &dir, &uni_name, num_entries,
++ &dos_name, TYPE_ALL);
++ if (dentry < -1) {
++ return FFS_NOTFOUND;
++ goto out;
++ }
++
++ fid->dir.dir = dir.dir;
++ fid->dir.size = dir.size;
++ fid->dir.flags = dir.flags;
++ fid->entry = dentry;
++
++ if (dentry == -1) {
++ fid->type = TYPE_DIR;
++ fid->rwoffset = 0;
++ fid->hint_last_off = -1;
++
++ fid->attr = ATTR_SUBDIR;
++ fid->flags = 0x01;
++ fid->size = 0;
++ fid->start_clu = p_fs->root_dir;
++ } else {
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &dir, dentry,
++ ES_2_ENTRIES, &ep);
++ if (!es) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep+1;
++ } else {
++ ep = get_entry_in_dir(sb, &dir, dentry, NULL);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep;
++ }
++
++ fid->type = p_fs->fs_func->get_entry_type(ep);
++ fid->rwoffset = 0;
++ fid->hint_last_off = -1;
++ fid->attr = p_fs->fs_func->get_entry_attr(ep);
++
++ fid->size = p_fs->fs_func->get_entry_size(ep2);
++ if ((fid->type == TYPE_FILE) && (fid->size == 0)) {
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++ fid->start_clu = CLUSTER_32(~0);
++ } else {
++ fid->flags = p_fs->fs_func->get_entry_flag(ep2);
++ fid->start_clu = p_fs->fs_func->get_entry_clu0(ep2);
++ }
++
++ if (p_fs->vol_type == EXFAT)
++ release_entry_set(es);
++ }
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsCreateFile(struct inode *inode, char *path, u8 mode,
++ struct file_id_t *fid)
++{
++ struct chain_t dir;
++ struct uni_name_t uni_name;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ int ret;
++
++ /* check the validity of pointer parameters */
++ if ((fid == NULL) || (path == NULL) || (*path == '\0'))
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check the validity of directory name in the given pathname */
++ ret = resolve_path(inode, path, &dir, &uni_name);
++ if (ret)
++ goto out;
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ /* create a new file */
++ ret = create_file(inode, &dir, &uni_name, mode, fid);
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
++ u64 count, u64 *rcount)
++{
++ s32 offset, sec_offset, clu_offset;
++ u32 clu;
++ int ret;
++ sector_t LogSector;
++ u64 oneblkread, read_bytes;
++ struct buffer_head *tmp_bh = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ /* check the validity of the given file id */
++ if (fid == NULL)
++ return FFS_INVALIDFID;
++
++ /* check the validity of pointer parameters */
++ if (buffer == NULL)
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check if the given file ID is opened */
++ if (fid->type != TYPE_FILE) {
++ ret = FFS_PERMISSIONERR;
++ goto out;
++ }
++
++ if (fid->rwoffset > fid->size)
++ fid->rwoffset = fid->size;
++
++ if (count > (fid->size - fid->rwoffset))
++ count = fid->size - fid->rwoffset;
++
++ if (count == 0) {
++ if (rcount != NULL)
++ *rcount = 0;
++ ret = FFS_EOF;
++ goto out;
++ }
++
++ read_bytes = 0;
++
++ while (count > 0) {
++ clu_offset = (s32)(fid->rwoffset >> p_fs->cluster_size_bits);
++ clu = fid->start_clu;
++
++ if (fid->flags == 0x03) {
++ clu += clu_offset;
++ } else {
++ /* hint information */
++ if ((clu_offset > 0) && (fid->hint_last_off > 0) &&
++ (clu_offset >= fid->hint_last_off)) {
++ clu_offset -= fid->hint_last_off;
++ clu = fid->hint_last_clu;
++ }
++
++ while (clu_offset > 0) {
++ /* clu = FAT_read(sb, clu); */
++ if (FAT_read(sb, clu, &clu) == -1)
++ return FFS_MEDIAERR;
++
++ clu_offset--;
++ }
++ }
++
++ /* hint information */
++ fid->hint_last_off = (s32)(fid->rwoffset >>
++ p_fs->cluster_size_bits);
++ fid->hint_last_clu = clu;
++
++ /* byte offset in cluster */
++ offset = (s32)(fid->rwoffset & (p_fs->cluster_size-1));
++
++ /* sector offset in cluster */
++ sec_offset = offset >> p_bd->sector_size_bits;
++
++ /* byte offset in sector */
++ offset &= p_bd->sector_size_mask;
++
++ LogSector = START_SECTOR(clu) + sec_offset;
++
++ oneblkread = (u64)(p_bd->sector_size - offset);
++ if (oneblkread > count)
++ oneblkread = count;
++
++ if ((offset == 0) && (oneblkread == p_bd->sector_size)) {
++ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
++ FFS_SUCCESS)
++ goto err_out;
++ memcpy((char *)buffer + read_bytes,
++ (char *)tmp_bh->b_data, (s32)oneblkread);
++ } else {
++ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
++ FFS_SUCCESS)
++ goto err_out;
++ memcpy((char *)buffer + read_bytes,
++ (char *)tmp_bh->b_data + offset,
++ (s32)oneblkread);
++ }
++ count -= oneblkread;
++ read_bytes += oneblkread;
++ fid->rwoffset += oneblkread;
++ }
++ brelse(tmp_bh);
++
++/* How did this ever work and not leak a brlse()?? */
++err_out:
++ /* set the size of read bytes */
++ if (rcount != NULL)
++ *rcount = read_bytes;
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
++ void *buffer, u64 count, u64 *wcount)
++{
++ s32 modified = FALSE, offset, sec_offset, clu_offset;
++ s32 num_clusters, num_alloc, num_alloced = (s32) ~0;
++ int ret = 0;
++ u32 clu, last_clu;
++ sector_t LogSector, sector = 0;
++ u64 oneblkwrite, write_bytes;
++ struct chain_t new_clu;
++ struct timestamp_t tm;
++ struct dentry_t *ep, *ep2;
++ struct entry_set_cache_t *es = NULL;
++ struct buffer_head *tmp_bh = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++
++ /* check the validity of the given file id */
++ if (fid == NULL)
++ return FFS_INVALIDFID;
++
++ /* check the validity of pointer parameters */
++ if (buffer == NULL)
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check if the given file ID is opened */
++ if (fid->type != TYPE_FILE) {
++ ret = FFS_PERMISSIONERR;
++ goto out;
++ }
++
++ if (fid->rwoffset > fid->size)
++ fid->rwoffset = fid->size;
++
++ if (count == 0) {
++ if (wcount != NULL)
++ *wcount = 0;
++ ret = FFS_SUCCESS;
++ goto out;
++ }
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ if (fid->size == 0)
++ num_clusters = 0;
++ else
++ num_clusters = (s32)((fid->size-1) >>
++ p_fs->cluster_size_bits) + 1;
++
++ write_bytes = 0;
++
++ while (count > 0) {
++ clu_offset = (s32)(fid->rwoffset >> p_fs->cluster_size_bits);
++ clu = last_clu = fid->start_clu;
++
++ if (fid->flags == 0x03) {
++ if ((clu_offset > 0) && (clu != CLUSTER_32(~0))) {
++ last_clu += clu_offset - 1;
++
++ if (clu_offset == num_clusters)
++ clu = CLUSTER_32(~0);
++ else
++ clu += clu_offset;
++ }
++ } else {
++ /* hint information */
++ if ((clu_offset > 0) && (fid->hint_last_off > 0) &&
++ (clu_offset >= fid->hint_last_off)) {
++ clu_offset -= fid->hint_last_off;
++ clu = fid->hint_last_clu;
++ }
++
++ while ((clu_offset > 0) && (clu != CLUSTER_32(~0))) {
++ last_clu = clu;
++ /* clu = FAT_read(sb, clu); */
++ if (FAT_read(sb, clu, &clu) == -1) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ clu_offset--;
++ }
++ }
++
++ if (clu == CLUSTER_32(~0)) {
++ num_alloc = (s32)((count - 1) >>
++ p_fs->cluster_size_bits) + 1;
++ new_clu.dir = (last_clu == CLUSTER_32(~0)) ?
++ CLUSTER_32(~0) : last_clu+1;
++ new_clu.size = 0;
++ new_clu.flags = fid->flags;
++
++ /* (1) allocate a chain of clusters */
++ num_alloced = p_fs->fs_func->alloc_cluster(sb,
++ num_alloc,
++ &new_clu);
++ if (num_alloced == 0)
++ break;
++ else if (num_alloced < 0) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++
++ /* (2) append to the FAT chain */
++ if (last_clu == CLUSTER_32(~0)) {
++ if (new_clu.flags == 0x01)
++ fid->flags = 0x01;
++ fid->start_clu = new_clu.dir;
++ modified = TRUE;
++ } else {
++ if (new_clu.flags != fid->flags) {
++ exfat_chain_cont_cluster(sb,
++ fid->start_clu,
++ num_clusters);
++ fid->flags = 0x01;
++ modified = TRUE;
++ }
++ if (new_clu.flags == 0x01)
++ FAT_write(sb, last_clu, new_clu.dir);
++ }
++
++ num_clusters += num_alloced;
++ clu = new_clu.dir;
++ }
++
++ /* hint information */
++ fid->hint_last_off = (s32)(fid->rwoffset >>
++ p_fs->cluster_size_bits);
++ fid->hint_last_clu = clu;
++
++ /* byte offset in cluster */
++ offset = (s32)(fid->rwoffset & (p_fs->cluster_size - 1));
++
++ /* sector offset in cluster */
++ sec_offset = offset >> p_bd->sector_size_bits;
++
++ /* byte offset in sector */
++ offset &= p_bd->sector_size_mask;
++
++ LogSector = START_SECTOR(clu) + sec_offset;
++
++ oneblkwrite = (u64)(p_bd->sector_size - offset);
++ if (oneblkwrite > count)
++ oneblkwrite = count;
++
++ if ((offset == 0) && (oneblkwrite == p_bd->sector_size)) {
++ if (sector_read(sb, LogSector, &tmp_bh, 0) !=
++ FFS_SUCCESS)
++ goto err_out;
++ memcpy((char *)tmp_bh->b_data,
++ (char *)buffer + write_bytes, (s32)oneblkwrite);
++ if (sector_write(sb, LogSector, tmp_bh, 0) !=
++ FFS_SUCCESS) {
++ brelse(tmp_bh);
++ goto err_out;
++ }
++ } else {
++ if ((offset > 0) ||
++ ((fid->rwoffset+oneblkwrite) < fid->size)) {
++ if (sector_read(sb, LogSector, &tmp_bh, 1) !=
++ FFS_SUCCESS)
++ goto err_out;
++ } else {
++ if (sector_read(sb, LogSector, &tmp_bh, 0) !=
++ FFS_SUCCESS)
++ goto err_out;
++ }
++
++ memcpy((char *)tmp_bh->b_data + offset,
++ (char *)buffer + write_bytes, (s32)oneblkwrite);
++ if (sector_write(sb, LogSector, tmp_bh, 0) !=
++ FFS_SUCCESS) {
++ brelse(tmp_bh);
++ goto err_out;
++ }
++ }
++
++ count -= oneblkwrite;
++ write_bytes += oneblkwrite;
++ fid->rwoffset += oneblkwrite;
++
++ fid->attr |= ATTR_ARCHIVE;
++
++ if (fid->size < fid->rwoffset) {
++ fid->size = fid->rwoffset;
++ modified = TRUE;
++ }
++ }
++
++ brelse(tmp_bh);
++
++ /* (3) update the direcoty entry */
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &(fid->dir), fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (es == NULL)
++ goto err_out;
++ ep2 = ep+1;
++ } else {
++ ep = get_entry_in_dir(sb, &(fid->dir), fid->entry, §or);
++ if (!ep)
++ goto err_out;
++ ep2 = ep;
++ }
++
++ p_fs->fs_func->set_entry_time(ep, tm_current(&tm), TM_MODIFY);
++ p_fs->fs_func->set_entry_attr(ep, fid->attr);
++
++ if (p_fs->vol_type != EXFAT)
++ buf_modify(sb, sector);
++
++ if (modified) {
++ if (p_fs->fs_func->get_entry_flag(ep2) != fid->flags)
++ p_fs->fs_func->set_entry_flag(ep2, fid->flags);
++
++ if (p_fs->fs_func->get_entry_size(ep2) != fid->size)
++ p_fs->fs_func->set_entry_size(ep2, fid->size);
++
++ if (p_fs->fs_func->get_entry_clu0(ep2) != fid->start_clu)
++ p_fs->fs_func->set_entry_clu0(ep2, fid->start_clu);
++
++ if (p_fs->vol_type != EXFAT)
++ buf_modify(sb, sector);
++ }
++
++ if (p_fs->vol_type == EXFAT) {
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
++ }
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++err_out:
++ /* set the size of written bytes */
++ if (wcount != NULL)
++ *wcount = write_bytes;
++
++ if (num_alloced == 0)
++ ret = FFS_FULL;
++
++ else if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
++{
++ s32 num_clusters;
++ u32 last_clu = CLUSTER_32(0);
++ int ret = 0;
++ sector_t sector = 0;
++ struct chain_t clu;
++ struct timestamp_t tm;
++ struct dentry_t *ep, *ep2;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++ struct entry_set_cache_t *es = NULL;
++
++ pr_debug("%s entered (inode %p size %llu)\n", __func__, inode,
++ new_size);
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check if the given file ID is opened */
++ if (fid->type != TYPE_FILE) {
++ ret = FFS_PERMISSIONERR;
++ goto out;
++ }
++
++ if (fid->size != old_size) {
++ pr_err("[EXFAT] truncate : can't skip it because of size-mismatch(old:%lld->fid:%lld).\n",
++ old_size, fid->size);
++ }
++
++ if (old_size <= new_size) {
++ ret = FFS_SUCCESS;
++ goto out;
++ }
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ clu.dir = fid->start_clu;
++ clu.size = (s32)((old_size-1) >> p_fs->cluster_size_bits) + 1;
++ clu.flags = fid->flags;
++
++ if (new_size > 0) {
++ num_clusters = (s32)((new_size-1) >>
++ p_fs->cluster_size_bits) + 1;
++
++ if (clu.flags == 0x03) {
++ clu.dir += num_clusters;
++ } else {
++ while (num_clusters > 0) {
++ last_clu = clu.dir;
++ if (FAT_read(sb, clu.dir, &clu.dir) == -1)
++ return FFS_MEDIAERR;
++ num_clusters--;
++ }
++ }
++
++ clu.size -= num_clusters;
++ }
++
++ fid->size = new_size;
++ fid->attr |= ATTR_ARCHIVE;
++ if (new_size == 0) {
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++ fid->start_clu = CLUSTER_32(~0);
++ }
++
++ /* (1) update the directory entry */
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (es == NULL) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep+1;
++ } else {
++ ep = get_entry_in_dir(sb, &(fid->dir), fid->entry, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep;
++ }
++
++ p_fs->fs_func->set_entry_time(ep, tm_current(&tm), TM_MODIFY);
++ p_fs->fs_func->set_entry_attr(ep, fid->attr);
++
++ p_fs->fs_func->set_entry_size(ep2, new_size);
++ if (new_size == 0) {
++ p_fs->fs_func->set_entry_flag(ep2, 0x01);
++ p_fs->fs_func->set_entry_clu0(ep2, CLUSTER_32(0));
++ }
++
++ if (p_fs->vol_type != EXFAT)
++ buf_modify(sb, sector);
++ else {
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
++ }
++
++ /* (2) cut off from the FAT chain */
++ if (last_clu != CLUSTER_32(0)) {
++ if (fid->flags == 0x01)
++ FAT_write(sb, last_clu, CLUSTER_32(~0));
++ }
++
++ /* (3) free the clusters */
++ p_fs->fs_func->free_cluster(sb, &clu, 0);
++
++ /* hint information */
++ fid->hint_last_off = -1;
++ if (fid->rwoffset > fid->size)
++ fid->rwoffset = fid->size;
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ pr_debug("%s exited (%d)\n", __func__, ret);
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static void update_parent_info(struct file_id_t *fid,
++ struct inode *parent_inode)
++{
++ struct fs_info_t *p_fs = &(EXFAT_SB(parent_inode->i_sb)->fs_info);
++ struct file_id_t *parent_fid = &(EXFAT_I(parent_inode)->fid);
++
++ if (unlikely((parent_fid->flags != fid->dir.flags) ||
++ (parent_fid->size !=
++ (fid->dir.size << p_fs->cluster_size_bits)) ||
++ (parent_fid->start_clu != fid->dir.dir))) {
++ fid->dir.dir = parent_fid->start_clu;
++ fid->dir.flags = parent_fid->flags;
++ fid->dir.size = ((parent_fid->size + (p_fs->cluster_size-1))
++ >> p_fs->cluster_size_bits);
++ }
++}
++
++static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
++ struct inode *new_parent_inode, struct dentry *new_dentry)
++{
++ s32 ret;
++ s32 dentry;
++ struct chain_t olddir, newdir;
++ struct chain_t *p_dir = NULL;
++ struct uni_name_t uni_name;
++ struct dentry_t *ep;
++ struct super_block *sb = old_parent_inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ u8 *new_path = (u8 *) new_dentry->d_name.name;
++ struct inode *new_inode = new_dentry->d_inode;
++ int num_entries;
++ struct file_id_t *new_fid = NULL;
++ s32 new_entry = 0;
++
++ /* check the validity of the given file id */
++ if (fid == NULL)
++ return FFS_INVALIDFID;
++
++ /* check the validity of pointer parameters */
++ if ((new_path == NULL) || (*new_path == '\0'))
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ update_parent_info(fid, old_parent_inode);
++
++ olddir.dir = fid->dir.dir;
++ olddir.size = fid->dir.size;
++ olddir.flags = fid->dir.flags;
++
++ dentry = fid->entry;
++
++ /* check if the old file is "." or ".." */
++ if (p_fs->vol_type != EXFAT) {
++ if ((olddir.dir != p_fs->root_dir) && (dentry < 2)) {
++ ret = FFS_PERMISSIONERR;
++ goto out2;
++ }
++ }
++
++ ep = get_entry_in_dir(sb, &olddir, dentry, NULL);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out2;
++ }
++
++ if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
++ ret = FFS_PERMISSIONERR;
++ goto out2;
++ }
++
++ /* check whether new dir is existing directory and empty */
++ if (new_inode) {
++ u32 entry_type;
++
++ ret = FFS_MEDIAERR;
++ new_fid = &EXFAT_I(new_inode)->fid;
++
++ update_parent_info(new_fid, new_parent_inode);
++
++ p_dir = &(new_fid->dir);
++ new_entry = new_fid->entry;
++ ep = get_entry_in_dir(sb, p_dir, new_entry, NULL);
++ if (!ep)
++ goto out;
++
++ entry_type = p_fs->fs_func->get_entry_type(ep);
++
++ if (entry_type == TYPE_DIR) {
++ struct chain_t new_clu;
++
++ new_clu.dir = new_fid->start_clu;
++ new_clu.size = (s32)((new_fid->size - 1) >>
++ p_fs->cluster_size_bits) + 1;
++ new_clu.flags = new_fid->flags;
++
++ if (!is_dir_empty(sb, &new_clu)) {
++ ret = FFS_FILEEXIST;
++ goto out;
++ }
++ }
++ }
++
++ /* check the validity of directory name in the given new pathname */
++ ret = resolve_path(new_parent_inode, new_path, &newdir, &uni_name);
++ if (ret)
++ goto out2;
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ if (olddir.dir == newdir.dir)
++ ret = rename_file(new_parent_inode, &olddir, dentry, &uni_name,
++ fid);
++ else
++ ret = move_file(new_parent_inode, &olddir, dentry, &newdir,
++ &uni_name, fid);
++
++ if ((ret == FFS_SUCCESS) && new_inode) {
++ /* delete entries of new_dir */
++ ep = get_entry_in_dir(sb, p_dir, new_entry, NULL);
++ if (!ep)
++ goto out;
++
++ num_entries = p_fs->fs_func->count_ext_entries(sb, p_dir,
++ new_entry, ep);
++ if (num_entries < 0)
++ goto out;
++ p_fs->fs_func->delete_dir_entry(sb, p_dir, new_entry, 0,
++ num_entries+1);
++ }
++out:
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++out2:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
++{
++ s32 dentry;
++ int ret = FFS_SUCCESS;
++ struct chain_t dir, clu_to_free;
++ struct dentry_t *ep;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ /* check the validity of the given file id */
++ if (fid == NULL)
++ return FFS_INVALIDFID;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ dir.dir = fid->dir.dir;
++ dir.size = fid->dir.size;
++ dir.flags = fid->dir.flags;
++
++ dentry = fid->entry;
++
++ ep = get_entry_in_dir(sb, &dir, dentry, NULL);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++
++ if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
++ ret = FFS_PERMISSIONERR;
++ goto out;
++ }
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ /* (1) update the directory entry */
++ remove_file(inode, &dir, dentry);
++
++ clu_to_free.dir = fid->start_clu;
++ clu_to_free.size = (s32)((fid->size-1) >> p_fs->cluster_size_bits) + 1;
++ clu_to_free.flags = fid->flags;
++
++ /* (2) free the clusters */
++ p_fs->fs_func->free_cluster(sb, &clu_to_free, 0);
++
++ fid->size = 0;
++ fid->start_clu = CLUSTER_32(~0);
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++#if 0
++/* Not currently wired up */
++static int ffsSetAttr(struct inode *inode, u32 attr)
++{
++ u32 type;
++ int ret = FFS_SUCCESS;
++ sector_t sector = 0;
++ struct dentry_t *ep;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++ u8 is_dir = (fid->type == TYPE_DIR) ? 1 : 0;
++ struct entry_set_cache_t *es = NULL;
++
++ if (fid->attr == attr) {
++ if (p_fs->dev_ejected)
++ return FFS_MEDIAERR;
++ return FFS_SUCCESS;
++ }
++
++ if (is_dir) {
++ if ((fid->dir.dir == p_fs->root_dir) &&
++ (fid->entry == -1)) {
++ if (p_fs->dev_ejected)
++ return FFS_MEDIAERR;
++ return FFS_SUCCESS;
++ }
++ }
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* get the directory entry of given file */
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &(fid->dir), fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (es == NULL) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ } else {
++ ep = get_entry_in_dir(sb, &(fid->dir), fid->entry, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ }
++
++ type = p_fs->fs_func->get_entry_type(ep);
++
++ if (((type == TYPE_FILE) && (attr & ATTR_SUBDIR)) ||
++ ((type == TYPE_DIR) && (!(attr & ATTR_SUBDIR)))) {
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++ else
++ ret = FFS_ERROR;
++
++ if (p_fs->vol_type == EXFAT)
++ release_entry_set(es);
++ goto out;
++ }
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ /* set the file attribute */
++ fid->attr = attr;
++ p_fs->fs_func->set_entry_attr(ep, attr);
++
++ if (p_fs->vol_type != EXFAT)
++ buf_modify(sb, sector);
++ else {
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
++ }
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++#endif
++
++static int ffsReadStat(struct inode *inode, struct dir_entry_t *info)
++{
++ sector_t sector = 0;
++ s32 count;
++ int ret = FFS_SUCCESS;
++ struct chain_t dir;
++ struct uni_name_t uni_name;
++ struct timestamp_t tm;
++ struct dentry_t *ep, *ep2;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++ struct entry_set_cache_t *es = NULL;
++ u8 is_dir = (fid->type == TYPE_DIR) ? 1 : 0;
++
++ pr_debug("%s entered\n", __func__);
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ if (is_dir) {
++ if ((fid->dir.dir == p_fs->root_dir) &&
++ (fid->entry == -1)) {
++ info->Attr = ATTR_SUBDIR;
++ memset((char *)&info->CreateTimestamp, 0,
++ sizeof(struct date_time_t));
++ memset((char *)&info->ModifyTimestamp, 0,
++ sizeof(struct date_time_t));
++ memset((char *)&info->AccessTimestamp, 0,
++ sizeof(struct date_time_t));
++ strcpy(info->ShortName, ".");
++ strcpy(info->Name, ".");
++
++ dir.dir = p_fs->root_dir;
++ dir.flags = 0x01;
++
++ if (p_fs->root_dir == CLUSTER_32(0)) {
++ /* FAT16 root_dir */
++ info->Size = p_fs->dentries_in_root <<
++ DENTRY_SIZE_BITS;
++ } else {
++ info->Size = count_num_clusters(sb, &dir) <<
++ p_fs->cluster_size_bits;
++ }
++
++ count = count_dos_name_entries(sb, &dir, TYPE_DIR);
++ if (count < 0) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ info->NumSubdirs = count;
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ }
++
++ /* get the directory entry of given file or directory */
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &(fid->dir), fid->entry,
++ ES_2_ENTRIES, &ep);
++ if (es == NULL) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep+1;
++ } else {
++ ep = get_entry_in_dir(sb, &(fid->dir), fid->entry, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep;
++ buf_lock(sb, sector);
++ }
++
++ /* set FILE_INFO structure using the acquired struct dentry_t */
++ info->Attr = p_fs->fs_func->get_entry_attr(ep);
++
++ p_fs->fs_func->get_entry_time(ep, &tm, TM_CREATE);
++ info->CreateTimestamp.Year = tm.year;
++ info->CreateTimestamp.Month = tm.mon;
++ info->CreateTimestamp.Day = tm.day;
++ info->CreateTimestamp.Hour = tm.hour;
++ info->CreateTimestamp.Minute = tm.min;
++ info->CreateTimestamp.Second = tm.sec;
++ info->CreateTimestamp.MilliSecond = 0;
++
++ p_fs->fs_func->get_entry_time(ep, &tm, TM_MODIFY);
++ info->ModifyTimestamp.Year = tm.year;
++ info->ModifyTimestamp.Month = tm.mon;
++ info->ModifyTimestamp.Day = tm.day;
++ info->ModifyTimestamp.Hour = tm.hour;
++ info->ModifyTimestamp.Minute = tm.min;
++ info->ModifyTimestamp.Second = tm.sec;
++ info->ModifyTimestamp.MilliSecond = 0;
++
++ memset((char *) &info->AccessTimestamp, 0, sizeof(struct date_time_t));
++
++ *(uni_name.name) = 0x0;
++ /* XXX this is very bad for exfat cuz name is already included in es.
++ * API should be revised
++ */
++ p_fs->fs_func->get_uni_name_from_ext_entry(sb, &(fid->dir), fid->entry,
++ uni_name.name);
++ if (*uni_name.name == 0x0 && p_fs->vol_type != EXFAT)
++ get_uni_name_from_dos_entry(sb, (struct dos_dentry_t *)ep,
++ &uni_name, 0x1);
++ nls_uniname_to_cstring(sb, info->Name, &uni_name);
++
++ if (p_fs->vol_type == EXFAT) {
++ info->NumSubdirs = 2;
++ } else {
++ buf_unlock(sb, sector);
++ get_uni_name_from_dos_entry(sb, (struct dos_dentry_t *)ep,
++ &uni_name, 0x0);
++ nls_uniname_to_cstring(sb, info->ShortName, &uni_name);
++ info->NumSubdirs = 0;
++ }
++
++ info->Size = p_fs->fs_func->get_entry_size(ep2);
++
++ if (p_fs->vol_type == EXFAT)
++ release_entry_set(es);
++
++ if (is_dir) {
++ dir.dir = fid->start_clu;
++ dir.flags = 0x01;
++
++ if (info->Size == 0)
++ info->Size = (u64)count_num_clusters(sb, &dir) <<
++ p_fs->cluster_size_bits;
++
++ count = count_dos_name_entries(sb, &dir, TYPE_DIR);
++ if (count < 0) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ info->NumSubdirs += count;
++ }
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ pr_debug("%s exited successfully\n", __func__);
++ return ret;
++}
++
++static int ffsWriteStat(struct inode *inode, struct dir_entry_t *info)
++{
++ sector_t sector = 0;
++ int ret = FFS_SUCCESS;
++ struct timestamp_t tm;
++ struct dentry_t *ep, *ep2;
++ struct entry_set_cache_t *es = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++ u8 is_dir = (fid->type == TYPE_DIR) ? 1 : 0;
++
++ pr_debug("%s entered (inode %p info %p\n", __func__, inode, info);
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ if (is_dir) {
++ if ((fid->dir.dir == p_fs->root_dir) &&
++ (fid->entry == -1)) {
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++ ret = FFS_SUCCESS;
++ goto out;
++ }
++ }
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ /* get the directory entry of given file or directory */
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &(fid->dir), fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (es == NULL) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep+1;
++ } else {
++ /* for other than exfat */
++ ep = get_entry_in_dir(sb, &(fid->dir), fid->entry, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ ep2 = ep;
++ }
++
++ p_fs->fs_func->set_entry_attr(ep, info->Attr);
++
++ /* set FILE_INFO structure using the acquired struct dentry_t */
++ tm.sec = info->CreateTimestamp.Second;
++ tm.min = info->CreateTimestamp.Minute;
++ tm.hour = info->CreateTimestamp.Hour;
++ tm.day = info->CreateTimestamp.Day;
++ tm.mon = info->CreateTimestamp.Month;
++ tm.year = info->CreateTimestamp.Year;
++ p_fs->fs_func->set_entry_time(ep, &tm, TM_CREATE);
++
++ tm.sec = info->ModifyTimestamp.Second;
++ tm.min = info->ModifyTimestamp.Minute;
++ tm.hour = info->ModifyTimestamp.Hour;
++ tm.day = info->ModifyTimestamp.Day;
++ tm.mon = info->ModifyTimestamp.Month;
++ tm.year = info->ModifyTimestamp.Year;
++ p_fs->fs_func->set_entry_time(ep, &tm, TM_MODIFY);
++
++ p_fs->fs_func->set_entry_size(ep2, info->Size);
++
++ if (p_fs->vol_type != EXFAT) {
++ buf_modify(sb, sector);
++ } else {
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
++ }
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ pr_debug("%s exited (%d)\n", __func__, ret);
++
++ return ret;
++}
++
++static int ffsMapCluster(struct inode *inode, s32 clu_offset, u32 *clu)
++{
++ s32 num_clusters, num_alloced, modified = FALSE;
++ u32 last_clu;
++ int ret = FFS_SUCCESS;
++ sector_t sector = 0;
++ struct chain_t new_clu;
++ struct dentry_t *ep;
++ struct entry_set_cache_t *es = NULL;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++
++ /* check the validity of pointer parameters */
++ if (clu == NULL)
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ fid->rwoffset = (s64)(clu_offset) << p_fs->cluster_size_bits;
++
++ if (EXFAT_I(inode)->mmu_private == 0)
++ num_clusters = 0;
++ else
++ num_clusters = (s32)((EXFAT_I(inode)->mmu_private - 1) >>
++ p_fs->cluster_size_bits) + 1;
++
++ *clu = last_clu = fid->start_clu;
++
++ if (fid->flags == 0x03) {
++ if ((clu_offset > 0) && (*clu != CLUSTER_32(~0))) {
++ last_clu += clu_offset - 1;
++
++ if (clu_offset == num_clusters)
++ *clu = CLUSTER_32(~0);
++ else
++ *clu += clu_offset;
++ }
++ } else {
++ /* hint information */
++ if ((clu_offset > 0) && (fid->hint_last_off > 0) &&
++ (clu_offset >= fid->hint_last_off)) {
++ clu_offset -= fid->hint_last_off;
++ *clu = fid->hint_last_clu;
++ }
++
++ while ((clu_offset > 0) && (*clu != CLUSTER_32(~0))) {
++ last_clu = *clu;
++ if (FAT_read(sb, *clu, clu) == -1) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ clu_offset--;
++ }
++ }
++
++ if (*clu == CLUSTER_32(~0)) {
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ new_clu.dir = (last_clu == CLUSTER_32(~0)) ? CLUSTER_32(~0) :
++ last_clu + 1;
++ new_clu.size = 0;
++ new_clu.flags = fid->flags;
++
++ /* (1) allocate a cluster */
++ num_alloced = p_fs->fs_func->alloc_cluster(sb, 1, &new_clu);
++ if (num_alloced < 0) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ } else if (num_alloced == 0) {
++ ret = FFS_FULL;
++ goto out;
++ }
++
++ /* (2) append to the FAT chain */
++ if (last_clu == CLUSTER_32(~0)) {
++ if (new_clu.flags == 0x01)
++ fid->flags = 0x01;
++ fid->start_clu = new_clu.dir;
++ modified = TRUE;
++ } else {
++ if (new_clu.flags != fid->flags) {
++ exfat_chain_cont_cluster(sb, fid->start_clu,
++ num_clusters);
++ fid->flags = 0x01;
++ modified = TRUE;
++ }
++ if (new_clu.flags == 0x01)
++ FAT_write(sb, last_clu, new_clu.dir);
++ }
++
++ num_clusters += num_alloced;
++ *clu = new_clu.dir;
++
++ if (p_fs->vol_type == EXFAT) {
++ es = get_entry_set_in_dir(sb, &fid->dir, fid->entry,
++ ES_ALL_ENTRIES, &ep);
++ if (es == NULL) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ /* get stream entry */
++ ep++;
++ }
++
++ /* (3) update directory entry */
++ if (modified) {
++ if (p_fs->vol_type != EXFAT) {
++ ep = get_entry_in_dir(sb, &(fid->dir),
++ fid->entry, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ }
++
++ if (p_fs->fs_func->get_entry_flag(ep) != fid->flags)
++ p_fs->fs_func->set_entry_flag(ep, fid->flags);
++
++ if (p_fs->fs_func->get_entry_clu0(ep) != fid->start_clu)
++ p_fs->fs_func->set_entry_clu0(ep,
++ fid->start_clu);
++
++ if (p_fs->vol_type != EXFAT)
++ buf_modify(sb, sector);
++ }
++
++ if (p_fs->vol_type == EXFAT) {
++ update_dir_checksum_with_entry_set(sb, es);
++ release_entry_set(es);
++ }
++
++ /* add number of new blocks to inode */
++ inode->i_blocks += num_alloced << (p_fs->cluster_size_bits - 9);
++ }
++
++ /* hint information */
++ fid->hint_last_off = (s32)(fid->rwoffset >> p_fs->cluster_size_bits);
++ fid->hint_last_clu = *clu;
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++/*----------------------------------------------------------------------*/
++/* Directory Operation Functions */
++/*----------------------------------------------------------------------*/
++
++static int ffsCreateDir(struct inode *inode, char *path, struct file_id_t *fid)
++{
++ int ret = FFS_SUCCESS;
++ struct chain_t dir;
++ struct uni_name_t uni_name;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ pr_debug("%s entered\n", __func__);
++
++ /* check the validity of pointer parameters */
++ if ((fid == NULL) || (path == NULL) || (*path == '\0'))
++ return FFS_ERROR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ /* check the validity of directory name in the given old pathname */
++ ret = resolve_path(inode, path, &dir, &uni_name);
++ if (ret)
++ goto out;
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ ret = create_dir(inode, &dir, &uni_name, fid);
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
++{
++ int i, dentry, clu_offset;
++ int ret = FFS_SUCCESS;
++ s32 dentries_per_clu, dentries_per_clu_bits = 0;
++ u32 type;
++ sector_t sector;
++ struct chain_t dir, clu;
++ struct uni_name_t uni_name;
++ struct timestamp_t tm;
++ struct dentry_t *ep;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct fs_func *fs_func = p_fs->fs_func;
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++
++ /* check the validity of pointer parameters */
++ if (dir_entry == NULL)
++ return FFS_ERROR;
++
++ /* check if the given file ID is opened */
++ if (fid->type != TYPE_DIR)
++ return FFS_PERMISSIONERR;
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ if (fid->entry == -1) {
++ dir.dir = p_fs->root_dir;
++ dir.flags = 0x01;
++ } else {
++ dir.dir = fid->start_clu;
++ dir.size = (s32)(fid->size >> p_fs->cluster_size_bits);
++ dir.flags = fid->flags;
++ }
++
++ dentry = (s32)fid->rwoffset;
++
++ if (dir.dir == CLUSTER_32(0)) {
++ /* FAT16 root_dir */
++ dentries_per_clu = p_fs->dentries_in_root;
++
++ if (dentry == dentries_per_clu) {
++ clu.dir = CLUSTER_32(~0);
++ } else {
++ clu.dir = dir.dir;
++ clu.size = dir.size;
++ clu.flags = dir.flags;
++ }
++ } else {
++ dentries_per_clu = p_fs->dentries_per_clu;
++ dentries_per_clu_bits = ilog2(dentries_per_clu);
++
++ clu_offset = dentry >> dentries_per_clu_bits;
++ clu.dir = dir.dir;
++ clu.size = dir.size;
++ clu.flags = dir.flags;
++
++ if (clu.flags == 0x03) {
++ clu.dir += clu_offset;
++ clu.size -= clu_offset;
++ } else {
++ /* hint_information */
++ if ((clu_offset > 0) && (fid->hint_last_off > 0) &&
++ (clu_offset >= fid->hint_last_off)) {
++ clu_offset -= fid->hint_last_off;
++ clu.dir = fid->hint_last_clu;
++ }
++
++ while (clu_offset > 0) {
++ /* clu.dir = FAT_read(sb, clu.dir); */
++ if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ clu_offset--;
++ }
++ }
++ }
++
++ while (clu.dir != CLUSTER_32(~0)) {
++ if (p_fs->dev_ejected)
++ break;
++
++ if (dir.dir == CLUSTER_32(0)) /* FAT16 root_dir */
++ i = dentry % dentries_per_clu;
++ else
++ i = dentry & (dentries_per_clu-1);
++
++ for ( ; i < dentries_per_clu; i++, dentry++) {
++ ep = get_entry_in_dir(sb, &clu, i, §or);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ type = fs_func->get_entry_type(ep);
++
++ if (type == TYPE_UNUSED)
++ break;
++
++ if ((type != TYPE_FILE) && (type != TYPE_DIR))
++ continue;
++
++ buf_lock(sb, sector);
++ dir_entry->Attr = fs_func->get_entry_attr(ep);
++
++ fs_func->get_entry_time(ep, &tm, TM_CREATE);
++ dir_entry->CreateTimestamp.Year = tm.year;
++ dir_entry->CreateTimestamp.Month = tm.mon;
++ dir_entry->CreateTimestamp.Day = tm.day;
++ dir_entry->CreateTimestamp.Hour = tm.hour;
++ dir_entry->CreateTimestamp.Minute = tm.min;
++ dir_entry->CreateTimestamp.Second = tm.sec;
++ dir_entry->CreateTimestamp.MilliSecond = 0;
++
++ fs_func->get_entry_time(ep, &tm, TM_MODIFY);
++ dir_entry->ModifyTimestamp.Year = tm.year;
++ dir_entry->ModifyTimestamp.Month = tm.mon;
++ dir_entry->ModifyTimestamp.Day = tm.day;
++ dir_entry->ModifyTimestamp.Hour = tm.hour;
++ dir_entry->ModifyTimestamp.Minute = tm.min;
++ dir_entry->ModifyTimestamp.Second = tm.sec;
++ dir_entry->ModifyTimestamp.MilliSecond = 0;
++
++ memset((char *)&dir_entry->AccessTimestamp, 0,
++ sizeof(struct date_time_t));
++
++ *(uni_name.name) = 0x0;
++ fs_func->get_uni_name_from_ext_entry(sb, &dir, dentry,
++ uni_name.name);
++ if (*uni_name.name == 0x0 && p_fs->vol_type != EXFAT)
++ get_uni_name_from_dos_entry(sb,
++ (struct dos_dentry_t *)ep,
++ &uni_name, 0x1);
++ nls_uniname_to_cstring(sb, dir_entry->Name, &uni_name);
++ buf_unlock(sb, sector);
++
++ if (p_fs->vol_type == EXFAT) {
++ ep = get_entry_in_dir(sb, &clu, i+1, NULL);
++ if (!ep) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ } else {
++ get_uni_name_from_dos_entry(sb,
++ (struct dos_dentry_t *)ep,
++ &uni_name, 0x0);
++ nls_uniname_to_cstring(sb, dir_entry->ShortName,
++ &uni_name);
++ }
++
++ dir_entry->Size = fs_func->get_entry_size(ep);
++
++ /* hint information */
++ if (dir.dir == CLUSTER_32(0)) { /* FAT16 root_dir */
++ } else {
++ fid->hint_last_off = dentry >>
++ dentries_per_clu_bits;
++ fid->hint_last_clu = clu.dir;
++ }
++
++ fid->rwoffset = (s64) ++dentry;
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++
++ if (dir.dir == CLUSTER_32(0))
++ break; /* FAT16 root_dir */
++
++ if (clu.flags == 0x03) {
++ if ((--clu.size) > 0)
++ clu.dir++;
++ else
++ clu.dir = CLUSTER_32(~0);
++ } else {
++ /* clu.dir = FAT_read(sb, clu.dir); */
++ if (FAT_read(sb, clu.dir, &clu.dir) == -1) {
++ ret = FFS_MEDIAERR;
++ goto out;
++ }
++ }
++ }
++
++ *(dir_entry->Name) = '\0';
++
++ fid->rwoffset = (s64) ++dentry;
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
++{
++ s32 dentry;
++ int ret = FFS_SUCCESS;
++ struct chain_t dir, clu_to_free;
++ struct super_block *sb = inode->i_sb;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ /* check the validity of the given file id */
++ if (fid == NULL)
++ return FFS_INVALIDFID;
++
++ dir.dir = fid->dir.dir;
++ dir.size = fid->dir.size;
++ dir.flags = fid->dir.flags;
++
++ dentry = fid->entry;
++
++ /* check if the file is "." or ".." */
++ if (p_fs->vol_type != EXFAT) {
++ if ((dir.dir != p_fs->root_dir) && (dentry < 2))
++ return FFS_PERMISSIONERR;
++ }
++
++ /* acquire the lock for file system critical section */
++ down(&p_fs->v_sem);
++
++ clu_to_free.dir = fid->start_clu;
++ clu_to_free.size = (s32)((fid->size-1) >> p_fs->cluster_size_bits) + 1;
++ clu_to_free.flags = fid->flags;
++
++ if (!is_dir_empty(sb, &clu_to_free)) {
++ ret = FFS_FILEEXIST;
++ goto out;
++ }
++
++ fs_set_vol_flags(sb, VOL_DIRTY);
++
++ /* (1) update the directory entry */
++ remove_file(inode, &dir, dentry);
++
++ /* (2) free the clusters */
++ p_fs->fs_func->free_cluster(sb, &clu_to_free, 1);
++
++ fid->size = 0;
++ fid->start_clu = CLUSTER_32(~0);
++ fid->flags = (p_fs->vol_type == EXFAT) ? 0x03 : 0x01;
++
++#ifdef CONFIG_EXFAT_DELAYED_SYNC
++ fs_sync(sb, false);
++ fs_set_vol_flags(sb, VOL_CLEAN);
++#endif
++
++ if (p_fs->dev_ejected)
++ ret = FFS_MEDIAERR;
++
++out:
++ /* release the lock for file system critical section */
++ up(&p_fs->v_sem);
++
++ return ret;
++}
++
++/*======================================================================*/
++/* Directory Entry Operations */
++/*======================================================================*/
++
++static int exfat_readdir(struct file *filp, struct dir_context *ctx)
++{
++ struct inode *inode = file_inode(filp);
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++ struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
++ struct dir_entry_t de;
++ unsigned long inum;
++ loff_t cpos;
++ int err = 0;
++
++ __lock_super(sb);
++
++ cpos = ctx->pos;
++ /* Fake . and .. for the root directory. */
++ if ((p_fs->vol_type == EXFAT) || (inode->i_ino == EXFAT_ROOT_INO)) {
++ while (cpos < 2) {
++ if (inode->i_ino == EXFAT_ROOT_INO)
++ inum = EXFAT_ROOT_INO;
++ else if (cpos == 0)
++ inum = inode->i_ino;
++ else /* (cpos == 1) */
++ inum = parent_ino(filp->f_path.dentry);
++
++ if (!dir_emit_dots(filp, ctx))
++ goto out;
++ cpos++;
++ ctx->pos++;
++ }
++ if (cpos == 2)
++ cpos = 0;
++ }
++ if (cpos & (DENTRY_SIZE - 1)) {
++ err = -ENOENT;
++ goto out;
++ }
++
++get_new:
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++ EXFAT_I(inode)->fid.rwoffset = cpos >> DENTRY_SIZE_BITS;
++
++ err = ffsReadDir(inode, &de);
++ if (err) {
++ /* at least we tried to read a sector
++ * move cpos to next sector position (should be aligned)
++ */
++ if (err == FFS_MEDIAERR) {
++ cpos += 1 << p_bd->sector_size_bits;
++ cpos &= ~((1 << p_bd->sector_size_bits)-1);
++ }
++
++ err = -EIO;
++ goto end_of_dir;
++ }
++
++ cpos = EXFAT_I(inode)->fid.rwoffset << DENTRY_SIZE_BITS;
++
++ if (!de.Name[0])
++ goto end_of_dir;
++
++ if (!memcmp(de.ShortName, DOS_CUR_DIR_NAME, DOS_NAME_LENGTH)) {
++ inum = inode->i_ino;
++ } else if (!memcmp(de.ShortName, DOS_PAR_DIR_NAME, DOS_NAME_LENGTH)) {
++ inum = parent_ino(filp->f_path.dentry);
++ } else {
++ loff_t i_pos = ((loff_t) EXFAT_I(inode)->fid.start_clu << 32) |
++ ((EXFAT_I(inode)->fid.rwoffset-1) & 0xffffffff);
++ struct inode *tmp = exfat_iget(sb, i_pos);
++
++ if (tmp) {
++ inum = tmp->i_ino;
++ iput(tmp);
++ } else {
++ inum = iunique(sb, EXFAT_ROOT_INO);
++ }
++ }
++
++ if (!dir_emit(ctx, de.Name, strlen(de.Name), inum,
++ (de.Attr & ATTR_SUBDIR) ? DT_DIR : DT_REG))
++ goto out;
++
++ ctx->pos = cpos;
++ goto get_new;
++
++end_of_dir:
++ ctx->pos = cpos;
++out:
++ __unlock_super(sb);
++ return err;
++}
++
++static int exfat_ioctl_volume_id(struct inode *dir)
++{
++ struct super_block *sb = dir->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++
++ return p_fs->vol_id;
++}
++
++static long exfat_generic_ioctl(struct file *filp, unsigned int cmd,
++ unsigned long arg)
++{
++struct inode *inode = filp->f_path.dentry->d_inode;
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ unsigned int flags;
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++ switch (cmd) {
++ case EXFAT_IOCTL_GET_VOLUME_ID:
++ return exfat_ioctl_volume_id(inode);
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ case EXFAT_IOC_GET_DEBUGFLAGS: {
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ flags = sbi->debug_flags;
++ return put_user(flags, (int __user *)arg);
++ }
++ case EXFAT_IOC_SET_DEBUGFLAGS: {
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ if (!capable(CAP_SYS_ADMIN))
++ return -EPERM;
++
++ if (get_user(flags, (int __user *) arg))
++ return -EFAULT;
++
++ __lock_super(sb);
++ sbi->debug_flags = flags;
++ __unlock_super(sb);
++
++ return 0;
++ }
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++ default:
++ return -ENOTTY; /* Inappropriate ioctl for device */
++ }
++}
++
++static const struct file_operations exfat_dir_operations = {
++ .llseek = generic_file_llseek,
++ .read = generic_read_dir,
++ .iterate = exfat_readdir,
++ .unlocked_ioctl = exfat_generic_ioctl,
++ .fsync = generic_file_fsync,
++};
++
++static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
++ bool excl)
++{
++ struct super_block *sb = dir->i_sb;
++ struct inode *inode;
++ struct file_id_t fid;
++ loff_t i_pos;
++ int err;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ err = ffsCreateFile(dir, (u8 *) dentry->d_name.name, FM_REGULAR, &fid);
++ if (err) {
++ if (err == FFS_INVALIDPATH)
++ err = -EINVAL;
++ else if (err == FFS_FILEEXIST)
++ err = -EEXIST;
++ else if (err == FFS_FULL)
++ err = -ENOSPC;
++ else if (err == FFS_NAMETOOLONG)
++ err = -ENAMETOOLONG;
++ else
++ err = -EIO;
++ goto out;
++ }
++ INC_IVERSION(dir);
++ dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
++ if (IS_DIRSYNC(dir))
++ (void) exfat_sync_inode(dir);
++ else
++ mark_inode_dirty(dir);
++
++ i_pos = ((loff_t) fid.dir.dir << 32) | (fid.entry & 0xffffffff);
++
++ inode = exfat_build_inode(sb, &fid, i_pos);
++ if (IS_ERR(inode)) {
++ err = PTR_ERR(inode);
++ goto out;
++ }
++ INC_IVERSION(inode);
++ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
++ /*
++ * timestamp is already written, so mark_inode_dirty() is unnecessary.
++ */
++
++ dentry->d_time = GET_IVERSION(dentry->d_parent->d_inode);
++ d_instantiate(dentry, inode);
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_find(struct inode *dir, struct qstr *qname,
++ struct file_id_t *fid)
++{
++ int err;
++
++ if (qname->len == 0)
++ return -ENOENT;
++
++ err = ffsLookupFile(dir, (u8 *) qname->name, fid);
++ if (err)
++ return -ENOENT;
++
++ return 0;
++}
++
++static int exfat_d_anon_disconn(struct dentry *dentry)
++{
++ return IS_ROOT(dentry) && (dentry->d_flags & DCACHE_DISCONNECTED);
++}
++
++static struct dentry *exfat_lookup(struct inode *dir, struct dentry *dentry,
++ unsigned int flags)
++{
++ struct super_block *sb = dir->i_sb;
++ struct inode *inode;
++ struct dentry *alias;
++ int err;
++ struct file_id_t fid;
++ loff_t i_pos;
++ u64 ret;
++ mode_t i_mode;
++
++ __lock_super(sb);
++ pr_debug("%s entered\n", __func__);
++ err = exfat_find(dir, &dentry->d_name, &fid);
++ if (err) {
++ if (err == -ENOENT) {
++ inode = NULL;
++ goto out;
++ }
++ goto error;
++ }
++
++ i_pos = ((loff_t) fid.dir.dir << 32) | (fid.entry & 0xffffffff);
++ inode = exfat_build_inode(sb, &fid, i_pos);
++ if (IS_ERR(inode)) {
++ err = PTR_ERR(inode);
++ goto error;
++ }
++
++ i_mode = inode->i_mode;
++ if (S_ISLNK(i_mode) && !EXFAT_I(inode)->target) {
++ EXFAT_I(inode)->target = kmalloc(i_size_read(inode) + 1,
++ GFP_KERNEL);
++ if (!EXFAT_I(inode)->target) {
++ err = -ENOMEM;
++ goto error;
++ }
++ ffsReadFile(dir, &fid, EXFAT_I(inode)->target,
++ i_size_read(inode), &ret);
++ *(EXFAT_I(inode)->target + i_size_read(inode)) = '\0';
++ }
++
++ alias = d_find_alias(inode);
++ if (alias && !exfat_d_anon_disconn(alias)) {
++ BUG_ON(d_unhashed(alias));
++ if (!S_ISDIR(i_mode))
++ d_move(alias, dentry);
++ iput(inode);
++ __unlock_super(sb);
++ pr_debug("%s exited 1\n", __func__);
++ return alias;
++ }
++ dput(alias);
++out:
++ __unlock_super(sb);
++ dentry->d_time = GET_IVERSION(dentry->d_parent->d_inode);
++ dentry = d_splice_alias(inode, dentry);
++ if (dentry)
++ dentry->d_time = GET_IVERSION(dentry->d_parent->d_inode);
++ pr_debug("%s exited 2\n", __func__);
++ return dentry;
++
++error:
++ __unlock_super(sb);
++ pr_debug("%s exited 3\n", __func__);
++ return ERR_PTR(err);
++}
++
++static inline unsigned long exfat_hash(loff_t i_pos)
++{
++ return hash_32(i_pos, EXFAT_HASH_BITS);
++}
++
++static void exfat_attach(struct inode *inode, loff_t i_pos)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(inode->i_sb);
++ struct hlist_head *head = sbi->inode_hashtable + exfat_hash(i_pos);
++
++ spin_lock(&sbi->inode_hash_lock);
++ EXFAT_I(inode)->i_pos = i_pos;
++ hlist_add_head(&EXFAT_I(inode)->i_hash_fat, head);
++ spin_unlock(&sbi->inode_hash_lock);
++}
++
++static void exfat_detach(struct inode *inode)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(inode->i_sb);
++
++ spin_lock(&sbi->inode_hash_lock);
++ hlist_del_init(&EXFAT_I(inode)->i_hash_fat);
++ EXFAT_I(inode)->i_pos = 0;
++ spin_unlock(&sbi->inode_hash_lock);
++}
++
++static int exfat_unlink(struct inode *dir, struct dentry *dentry)
++{
++ struct inode *inode = dentry->d_inode;
++ struct super_block *sb = dir->i_sb;
++ int err;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++
++ err = ffsRemoveFile(dir, &(EXFAT_I(inode)->fid));
++ if (err) {
++ if (err == FFS_PERMISSIONERR)
++ err = -EPERM;
++ else
++ err = -EIO;
++ goto out;
++ }
++ INC_IVERSION(dir);
++ dir->i_mtime = dir->i_atime = current_time(dir);
++ if (IS_DIRSYNC(dir))
++ (void) exfat_sync_inode(dir);
++ else
++ mark_inode_dirty(dir);
++
++ clear_nlink(inode);
++ inode->i_mtime = inode->i_atime = current_time(inode);
++ exfat_detach(inode);
++ remove_inode_hash(inode);
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_symlink(struct inode *dir, struct dentry *dentry,
++ const char *target)
++{
++ struct super_block *sb = dir->i_sb;
++ struct inode *inode;
++ struct file_id_t fid;
++ loff_t i_pos;
++ int err;
++ u64 len = (u64) strlen(target);
++ u64 ret;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ err = ffsCreateFile(dir, (u8 *) dentry->d_name.name, FM_SYMLINK, &fid);
++ if (err) {
++ if (err == FFS_INVALIDPATH)
++ err = -EINVAL;
++ else if (err == FFS_FILEEXIST)
++ err = -EEXIST;
++ else if (err == FFS_FULL)
++ err = -ENOSPC;
++ else
++ err = -EIO;
++ goto out;
++ }
++
++ err = ffsWriteFile(dir, &fid, (char *) target, len, &ret);
++
++ if (err) {
++ ffsRemoveFile(dir, &fid);
++
++ if (err == FFS_FULL)
++ err = -ENOSPC;
++ else
++ err = -EIO;
++ goto out;
++ }
++
++ INC_IVERSION(dir);
++ dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
++ if (IS_DIRSYNC(dir))
++ (void) exfat_sync_inode(dir);
++ else
++ mark_inode_dirty(dir);
++
++ i_pos = ((loff_t) fid.dir.dir << 32) | (fid.entry & 0xffffffff);
++
++ inode = exfat_build_inode(sb, &fid, i_pos);
++ if (IS_ERR(inode)) {
++ err = PTR_ERR(inode);
++ goto out;
++ }
++ INC_IVERSION(inode);
++ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
++ /* timestamp is already written, so mark_inode_dirty() is unneeded. */
++
++ EXFAT_I(inode)->target = kmalloc(len+1, GFP_KERNEL);
++ if (!EXFAT_I(inode)->target) {
++ err = -ENOMEM;
++ goto out;
++ }
++ memcpy(EXFAT_I(inode)->target, target, len+1);
++
++ dentry->d_time = GET_IVERSION(dentry->d_parent->d_inode);
++ d_instantiate(dentry, inode);
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
++{
++ struct super_block *sb = dir->i_sb;
++ struct inode *inode;
++ struct file_id_t fid;
++ loff_t i_pos;
++ int err;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ err = ffsCreateDir(dir, (u8 *) dentry->d_name.name, &fid);
++ if (err) {
++ if (err == FFS_INVALIDPATH)
++ err = -EINVAL;
++ else if (err == FFS_FILEEXIST)
++ err = -EEXIST;
++ else if (err == FFS_FULL)
++ err = -ENOSPC;
++ else if (err == FFS_NAMETOOLONG)
++ err = -ENAMETOOLONG;
++ else
++ err = -EIO;
++ goto out;
++ }
++ INC_IVERSION(dir);
++ dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
++ if (IS_DIRSYNC(dir))
++ (void) exfat_sync_inode(dir);
++ else
++ mark_inode_dirty(dir);
++ inc_nlink(dir);
++
++ i_pos = ((loff_t) fid.dir.dir << 32) | (fid.entry & 0xffffffff);
++
++ inode = exfat_build_inode(sb, &fid, i_pos);
++ if (IS_ERR(inode)) {
++ err = PTR_ERR(inode);
++ goto out;
++ }
++ INC_IVERSION(inode);
++ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
++ /* timestamp is already written, so mark_inode_dirty() is unneeded. */
++
++ dentry->d_time = GET_IVERSION(dentry->d_parent->d_inode);
++ d_instantiate(dentry, inode);
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
++{
++ struct inode *inode = dentry->d_inode;
++ struct super_block *sb = dir->i_sb;
++ int err;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++
++ err = ffsRemoveDir(dir, &(EXFAT_I(inode)->fid));
++ if (err) {
++ if (err == FFS_INVALIDPATH)
++ err = -EINVAL;
++ else if (err == FFS_FILEEXIST)
++ err = -ENOTEMPTY;
++ else if (err == FFS_NOTFOUND)
++ err = -ENOENT;
++ else if (err == FFS_DIRBUSY)
++ err = -EBUSY;
++ else
++ err = -EIO;
++ goto out;
++ }
++ INC_IVERSION(dir);
++ dir->i_mtime = dir->i_atime = current_time(dir);
++ if (IS_DIRSYNC(dir))
++ (void) exfat_sync_inode(dir);
++ else
++ mark_inode_dirty(dir);
++ drop_nlink(dir);
++
++ clear_nlink(inode);
++ inode->i_mtime = inode->i_atime = current_time(inode);
++ exfat_detach(inode);
++ remove_inode_hash(inode);
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
++ struct inode *new_dir, struct dentry *new_dentry,
++ unsigned int flags)
++{
++ struct inode *old_inode, *new_inode;
++ struct super_block *sb = old_dir->i_sb;
++ loff_t i_pos;
++ int err;
++
++ if (flags)
++ return -EINVAL;
++
++ __lock_super(sb);
++
++ pr_debug("%s entered\n", __func__);
++
++ old_inode = old_dentry->d_inode;
++ new_inode = new_dentry->d_inode;
++
++ EXFAT_I(old_inode)->fid.size = i_size_read(old_inode);
++
++ err = ffsMoveFile(old_dir, &(EXFAT_I(old_inode)->fid), new_dir,
++ new_dentry);
++ if (err) {
++ if (err == FFS_PERMISSIONERR)
++ err = -EPERM;
++ else if (err == FFS_INVALIDPATH)
++ err = -EINVAL;
++ else if (err == FFS_FILEEXIST)
++ err = -EEXIST;
++ else if (err == FFS_NOTFOUND)
++ err = -ENOENT;
++ else if (err == FFS_FULL)
++ err = -ENOSPC;
++ else
++ err = -EIO;
++ goto out;
++ }
++ INC_IVERSION(new_dir);
++ new_dir->i_ctime = new_dir->i_mtime = new_dir->i_atime =
++ current_time(new_dir);
++ if (IS_DIRSYNC(new_dir))
++ (void) exfat_sync_inode(new_dir);
++ else
++ mark_inode_dirty(new_dir);
++
++ i_pos = ((loff_t) EXFAT_I(old_inode)->fid.dir.dir << 32) |
++ (EXFAT_I(old_inode)->fid.entry & 0xffffffff);
++
++ exfat_detach(old_inode);
++ exfat_attach(old_inode, i_pos);
++ if (IS_DIRSYNC(new_dir))
++ (void) exfat_sync_inode(old_inode);
++ else
++ mark_inode_dirty(old_inode);
++
++ if ((S_ISDIR(old_inode->i_mode)) && (old_dir != new_dir)) {
++ drop_nlink(old_dir);
++ if (!new_inode)
++ inc_nlink(new_dir);
++ }
++ INC_IVERSION(old_dir);
++ old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
++ if (IS_DIRSYNC(old_dir))
++ (void) exfat_sync_inode(old_dir);
++ else
++ mark_inode_dirty(old_dir);
++
++ if (new_inode) {
++ exfat_detach(new_inode);
++ drop_nlink(new_inode);
++ if (S_ISDIR(new_inode->i_mode))
++ drop_nlink(new_inode);
++ new_inode->i_ctime = current_time(new_inode);
++ }
++
++out:
++ __unlock_super(sb);
++ pr_debug("%s exited\n", __func__);
++ return err;
++}
++
++static int exfat_cont_expand(struct inode *inode, loff_t size)
++{
++ struct address_space *mapping = inode->i_mapping;
++ loff_t start = i_size_read(inode), count = size - i_size_read(inode);
++ int err, err2;
++
++ err = generic_cont_expand_simple(inode, size);
++ if (err != 0)
++ return err;
++
++ inode->i_ctime = inode->i_mtime = current_time(inode);
++ mark_inode_dirty(inode);
++
++ if (IS_SYNC(inode)) {
++ err = filemap_fdatawrite_range(mapping, start,
++ start + count - 1);
++ err2 = sync_mapping_buffers(mapping);
++ err = (err) ? (err) : (err2);
++ err2 = write_inode_now(inode, 1);
++ err = (err) ? (err) : (err2);
++ if (!err)
++ err = filemap_fdatawait_range(mapping, start,
++ start + count - 1);
++ }
++ return err;
++}
++
++static int exfat_allow_set_time(struct exfat_sb_info *sbi, struct inode *inode)
++{
++ mode_t allow_utime = sbi->options.allow_utime;
++
++ if (!uid_eq(current_fsuid(), inode->i_uid)) {
++ if (in_group_p(inode->i_gid))
++ allow_utime >>= 3;
++ if (allow_utime & MAY_WRITE)
++ return 1;
++ }
++
++ /* use a default check */
++ return 0;
++}
++
++static int exfat_sanitize_mode(const struct exfat_sb_info *sbi,
++ struct inode *inode, umode_t *mode_ptr)
++{
++ mode_t i_mode, mask, perm;
++
++ i_mode = inode->i_mode;
++
++ if (S_ISREG(i_mode) || S_ISLNK(i_mode))
++ mask = sbi->options.fs_fmask;
++ else
++ mask = sbi->options.fs_dmask;
++
++ perm = *mode_ptr & ~(S_IFMT | mask);
++
++ /* Of the r and x bits, all (subject to umask) must be present.*/
++ if ((perm & 0555) != (i_mode & 0555))
++ return -EPERM;
++
++ if (exfat_mode_can_hold_ro(inode)) {
++ /*
++ * Of the w bits, either all (subject to umask) or none must be
++ * present.
++ */
++ if ((perm & 0222) && ((perm & 0222) != (0222 & ~mask)))
++ return -EPERM;
++ } else {
++ /*
++ * If exfat_mode_can_hold_ro(inode) is false, can't change w
++ * bits.
++ */
++ if ((perm & 0222) != (0222 & ~mask))
++ return -EPERM;
++ }
++
++ *mode_ptr &= S_IFMT | perm;
++
++ return 0;
++}
++
++static void exfat_truncate(struct inode *inode, loff_t old_size)
++{
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++ int err;
++
++ __lock_super(sb);
++
++ /*
++ * This protects against truncating a file bigger than it was then
++ * trying to write into the hole.
++ */
++ if (EXFAT_I(inode)->mmu_private > i_size_read(inode))
++ EXFAT_I(inode)->mmu_private = i_size_read(inode);
++
++ if (EXFAT_I(inode)->fid.start_clu == 0)
++ goto out;
++
++ err = ffsTruncateFile(inode, old_size, i_size_read(inode));
++ if (err)
++ goto out;
++
++ inode->i_ctime = inode->i_mtime = current_time(inode);
++ if (IS_DIRSYNC(inode))
++ (void) exfat_sync_inode(inode);
++ else
++ mark_inode_dirty(inode);
++
++ inode->i_blocks = ((i_size_read(inode) + (p_fs->cluster_size - 1)) &
++ ~((loff_t)p_fs->cluster_size - 1)) >> 9;
++out:
++ __unlock_super(sb);
++}
++
++static int exfat_setattr(struct dentry *dentry, struct iattr *attr)
++{
++
++ struct exfat_sb_info *sbi = EXFAT_SB(dentry->d_sb);
++ struct inode *inode = dentry->d_inode;
++ unsigned int ia_valid;
++ int error;
++ loff_t old_size;
++
++ pr_debug("%s entered\n", __func__);
++
++ if ((attr->ia_valid & ATTR_SIZE)
++ && (attr->ia_size > i_size_read(inode))) {
++ error = exfat_cont_expand(inode, attr->ia_size);
++ if (error || attr->ia_valid == ATTR_SIZE)
++ return error;
++ attr->ia_valid &= ~ATTR_SIZE;
++ }
++
++ ia_valid = attr->ia_valid;
++
++ if ((ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET))
++ && exfat_allow_set_time(sbi, inode)) {
++ attr->ia_valid &= ~(ATTR_MTIME_SET |
++ ATTR_ATIME_SET |
++ ATTR_TIMES_SET);
++ }
++
++ error = setattr_prepare(dentry, attr);
++ attr->ia_valid = ia_valid;
++ if (error)
++ return error;
++
++ if (((attr->ia_valid & ATTR_UID) &&
++ (!uid_eq(attr->ia_uid, sbi->options.fs_uid))) ||
++ ((attr->ia_valid & ATTR_GID) &&
++ (!gid_eq(attr->ia_gid, sbi->options.fs_gid))) ||
++ ((attr->ia_valid & ATTR_MODE) &&
++ (attr->ia_mode & ~(S_IFREG | S_IFLNK | S_IFDIR | 0777)))) {
++ return -EPERM;
++ }
++
++ /*
++ * We don't return -EPERM here. Yes, strange, but this is too
++ * old behavior.
++ */
++ if (attr->ia_valid & ATTR_MODE) {
++ if (exfat_sanitize_mode(sbi, inode, &attr->ia_mode) < 0)
++ attr->ia_valid &= ~ATTR_MODE;
++ }
++
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++
++ if (attr->ia_valid & ATTR_SIZE) {
++ old_size = i_size_read(inode);
++ down_write(&EXFAT_I(inode)->truncate_lock);
++ truncate_setsize(inode, attr->ia_size);
++ exfat_truncate(inode, old_size);
++ up_write(&EXFAT_I(inode)->truncate_lock);
++ }
++ setattr_copy(inode, attr);
++ mark_inode_dirty(inode);
++
++ pr_debug("%s exited\n", __func__);
++ return error;
++}
++
++static int exfat_getattr(const struct path *path, struct kstat *stat,
++ u32 request_mask, unsigned int flags)
++{
++ struct inode *inode = path->dentry->d_inode;
++
++ pr_debug("%s entered\n", __func__);
++
++ generic_fillattr(inode, stat);
++ stat->blksize = EXFAT_SB(inode->i_sb)->fs_info.cluster_size;
++
++ pr_debug("%s exited\n", __func__);
++ return 0;
++}
++
++static const struct inode_operations exfat_dir_inode_operations = {
++ .create = exfat_create,
++ .lookup = exfat_lookup,
++ .unlink = exfat_unlink,
++ .symlink = exfat_symlink,
++ .mkdir = exfat_mkdir,
++ .rmdir = exfat_rmdir,
++ .rename = exfat_rename,
++ .setattr = exfat_setattr,
++ .getattr = exfat_getattr,
++};
++
++/*======================================================================*/
++/* File Operations */
++/*======================================================================*/
++static const char *exfat_get_link(struct dentry *dentry, struct inode *inode,
++ struct delayed_call *done)
++{
++ struct exfat_inode_info *ei = EXFAT_I(inode);
++
++ if (ei->target != NULL) {
++ char *cookie = ei->target;
++
++ if (cookie != NULL)
++ return (char *)(ei->target);
++ }
++ return NULL;
++}
++
++static const struct inode_operations exfat_symlink_inode_operations = {
++ .get_link = exfat_get_link,
++};
++
++static int exfat_file_release(struct inode *inode, struct file *filp)
++{
++ struct super_block *sb = inode->i_sb;
++
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++ ffsSyncVol(sb, false);
++ return 0;
++}
++
++static const struct file_operations exfat_file_operations = {
++ .llseek = generic_file_llseek,
++ .read_iter = generic_file_read_iter,
++ .write_iter = generic_file_write_iter,
++ .mmap = generic_file_mmap,
++ .release = exfat_file_release,
++ .unlocked_ioctl = exfat_generic_ioctl,
++ .fsync = generic_file_fsync,
++ .splice_read = generic_file_splice_read,
++};
++
++static const struct inode_operations exfat_file_inode_operations = {
++ .setattr = exfat_setattr,
++ .getattr = exfat_getattr,
++};
++
++/*======================================================================*/
++/* Address Space Operations */
++/*======================================================================*/
++
++static int exfat_bmap(struct inode *inode, sector_t sector, sector_t *phys,
++ unsigned long *mapped_blocks, int *create)
++{
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++ struct bd_info_t *p_bd = &(sbi->bd_info);
++ const unsigned long blocksize = sb->s_blocksize;
++ const unsigned char blocksize_bits = sb->s_blocksize_bits;
++ sector_t last_block;
++ int err, clu_offset, sec_offset;
++ unsigned int cluster;
++
++ *phys = 0;
++ *mapped_blocks = 0;
++
++ if ((p_fs->vol_type == FAT12) || (p_fs->vol_type == FAT16)) {
++ if (inode->i_ino == EXFAT_ROOT_INO) {
++ if (sector <
++ (p_fs->dentries_in_root >>
++ (p_bd->sector_size_bits-DENTRY_SIZE_BITS))) {
++ *phys = sector + p_fs->root_start_sector;
++ *mapped_blocks = 1;
++ }
++ return 0;
++ }
++ }
++
++ last_block = (i_size_read(inode) + (blocksize - 1)) >> blocksize_bits;
++ if (sector >= last_block) {
++ if (*create == 0)
++ return 0;
++ } else {
++ *create = 0;
++ }
++
++ /* cluster offset */
++ clu_offset = sector >> p_fs->sectors_per_clu_bits;
++
++ /* sector offset in cluster */
++ sec_offset = sector & (p_fs->sectors_per_clu - 1);
++
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++
++ err = ffsMapCluster(inode, clu_offset, &cluster);
++
++ if (err) {
++ if (err == FFS_FULL)
++ return -ENOSPC;
++ else
++ return -EIO;
++ } else if (cluster != CLUSTER_32(~0)) {
++ *phys = START_SECTOR(cluster) + sec_offset;
++ *mapped_blocks = p_fs->sectors_per_clu - sec_offset;
++ }
++
++ return 0;
++}
++
++static int exfat_get_block(struct inode *inode, sector_t iblock,
++ struct buffer_head *bh_result, int create)
++{
++ struct super_block *sb = inode->i_sb;
++ unsigned long max_blocks = bh_result->b_size >> inode->i_blkbits;
++ int err;
++ unsigned long mapped_blocks;
++ sector_t phys;
++
++ __lock_super(sb);
++
++ err = exfat_bmap(inode, iblock, &phys, &mapped_blocks, &create);
++ if (err) {
++ __unlock_super(sb);
++ return err;
++ }
++
++ if (phys) {
++ max_blocks = min(mapped_blocks, max_blocks);
++ if (create) {
++ EXFAT_I(inode)->mmu_private += max_blocks <<
++ sb->s_blocksize_bits;
++ set_buffer_new(bh_result);
++ }
++ map_bh(bh_result, sb, phys);
++ }
++
++ bh_result->b_size = max_blocks << sb->s_blocksize_bits;
++ __unlock_super(sb);
++
++ return 0;
++}
++
++static int exfat_readpage(struct file *file, struct page *page)
++{
++ return mpage_readpage(page, exfat_get_block);
++}
++
++static int exfat_readpages(struct file *file, struct address_space *mapping,
++ struct list_head *pages, unsigned int nr_pages)
++{
++ return mpage_readpages(mapping, pages, nr_pages, exfat_get_block);
++}
++
++static int exfat_writepage(struct page *page, struct writeback_control *wbc)
++{
++ return block_write_full_page(page, exfat_get_block, wbc);
++}
++
++static int exfat_writepages(struct address_space *mapping,
++ struct writeback_control *wbc)
++{
++ return mpage_writepages(mapping, wbc, exfat_get_block);
++}
++
++static void exfat_write_failed(struct address_space *mapping, loff_t to)
++{
++ struct inode *inode = mapping->host;
++
++ if (to > i_size_read(inode)) {
++ truncate_pagecache(inode, i_size_read(inode));
++ EXFAT_I(inode)->fid.size = i_size_read(inode);
++ exfat_truncate(inode, i_size_read(inode));
++ }
++}
++
++static int exfat_write_begin(struct file *file, struct address_space *mapping,
++ loff_t pos, unsigned int len, unsigned int flags,
++ struct page **pagep, void **fsdata)
++{
++ int ret;
++
++ *pagep = NULL;
++ ret = cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
++ exfat_get_block,
++ &EXFAT_I(mapping->host)->mmu_private);
++
++ if (ret < 0)
++ exfat_write_failed(mapping, pos+len);
++ return ret;
++}
++
++static int exfat_write_end(struct file *file, struct address_space *mapping,
++ loff_t pos, unsigned int len, unsigned int copied,
++ struct page *pagep, void *fsdata)
++{
++ struct inode *inode = mapping->host;
++ struct file_id_t *fid = &(EXFAT_I(inode)->fid);
++ int err;
++
++ err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);
++
++ if (err < len)
++ exfat_write_failed(mapping, pos+len);
++
++ if (!(err < 0) && !(fid->attr & ATTR_ARCHIVE)) {
++ inode->i_mtime = inode->i_ctime = current_time(inode);
++ fid->attr |= ATTR_ARCHIVE;
++ mark_inode_dirty(inode);
++ }
++ return err;
++}
++
++static ssize_t exfat_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
++{
++ struct inode *inode = iocb->ki_filp->f_mapping->host;
++ struct address_space *mapping = iocb->ki_filp->f_mapping;
++ ssize_t ret;
++ int rw;
++
++ rw = iov_iter_rw(iter);
++
++ if (rw == WRITE) {
++ if (EXFAT_I(inode)->mmu_private < iov_iter_count(iter))
++ return 0;
++ }
++ ret = blockdev_direct_IO(iocb, inode, iter, exfat_get_block);
++
++ if ((ret < 0) && (rw & WRITE))
++ exfat_write_failed(mapping, iov_iter_count(iter));
++ return ret;
++}
++
++static sector_t _exfat_bmap(struct address_space *mapping, sector_t block)
++{
++ sector_t blocknr;
++
++ /* exfat_get_cluster() assumes the requested blocknr isn't truncated. */
++ down_read(&EXFAT_I(mapping->host)->truncate_lock);
++ blocknr = generic_block_bmap(mapping, block, exfat_get_block);
++ up_read(&EXFAT_I(mapping->host)->truncate_lock);
++
++ return blocknr;
++}
++
++static const struct address_space_operations exfat_aops = {
++ .readpage = exfat_readpage,
++ .readpages = exfat_readpages,
++ .writepage = exfat_writepage,
++ .writepages = exfat_writepages,
++ .write_begin = exfat_write_begin,
++ .write_end = exfat_write_end,
++ .direct_IO = exfat_direct_IO,
++ .bmap = _exfat_bmap
++};
++
++/*======================================================================*/
++/* Super Operations */
++/*======================================================================*/
++
++static struct inode *exfat_iget(struct super_block *sb, loff_t i_pos)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct exfat_inode_info *info;
++ struct hlist_head *head = sbi->inode_hashtable + exfat_hash(i_pos);
++ struct inode *inode = NULL;
++
++ spin_lock(&sbi->inode_hash_lock);
++ hlist_for_each_entry(info, head, i_hash_fat) {
++ BUG_ON(info->vfs_inode.i_sb != sb);
++
++ if (i_pos != info->i_pos)
++ continue;
++ inode = igrab(&info->vfs_inode);
++ if (inode)
++ break;
++ }
++ spin_unlock(&sbi->inode_hash_lock);
++ return inode;
++}
++
++/* doesn't deal with root inode */
++static int exfat_fill_inode(struct inode *inode, struct file_id_t *fid)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(inode->i_sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++ struct dir_entry_t info;
++
++ memcpy(&(EXFAT_I(inode)->fid), fid, sizeof(struct file_id_t));
++
++ ffsReadStat(inode, &info);
++
++ EXFAT_I(inode)->i_pos = 0;
++ EXFAT_I(inode)->target = NULL;
++ inode->i_uid = sbi->options.fs_uid;
++ inode->i_gid = sbi->options.fs_gid;
++ INC_IVERSION(inode);
++ inode->i_generation = get_seconds();
++
++ if (info.Attr & ATTR_SUBDIR) { /* directory */
++ inode->i_generation &= ~1;
++ inode->i_mode = exfat_make_mode(sbi, info.Attr, 0777);
++ inode->i_op = &exfat_dir_inode_operations;
++ inode->i_fop = &exfat_dir_operations;
++
++ i_size_write(inode, info.Size);
++ EXFAT_I(inode)->mmu_private = i_size_read(inode);
++ set_nlink(inode, info.NumSubdirs);
++ } else if (info.Attr & ATTR_SYMLINK) { /* symbolic link */
++ inode->i_generation |= 1;
++ inode->i_mode = exfat_make_mode(sbi, info.Attr, 0777);
++ inode->i_op = &exfat_symlink_inode_operations;
++
++ i_size_write(inode, info.Size);
++ EXFAT_I(inode)->mmu_private = i_size_read(inode);
++ } else { /* regular file */
++ inode->i_generation |= 1;
++ inode->i_mode = exfat_make_mode(sbi, info.Attr, 0777);
++ inode->i_op = &exfat_file_inode_operations;
++ inode->i_fop = &exfat_file_operations;
++ inode->i_mapping->a_ops = &exfat_aops;
++ inode->i_mapping->nrpages = 0;
++
++ i_size_write(inode, info.Size);
++ EXFAT_I(inode)->mmu_private = i_size_read(inode);
++ }
++ exfat_save_attr(inode, info.Attr);
++
++ inode->i_blocks = ((i_size_read(inode) + (p_fs->cluster_size - 1))
++ & ~((loff_t)p_fs->cluster_size - 1)) >> 9;
++
++ exfat_time_fat2unix(sbi, &inode->i_mtime, &info.ModifyTimestamp);
++ exfat_time_fat2unix(sbi, &inode->i_ctime, &info.CreateTimestamp);
++ exfat_time_fat2unix(sbi, &inode->i_atime, &info.AccessTimestamp);
++
++ return 0;
++}
++
++static struct inode *exfat_build_inode(struct super_block *sb,
++ struct file_id_t *fid, loff_t i_pos)
++{
++ struct inode *inode;
++ int err;
++
++ inode = exfat_iget(sb, i_pos);
++ if (inode)
++ goto out;
++ inode = new_inode(sb);
++ if (!inode) {
++ inode = ERR_PTR(-ENOMEM);
++ goto out;
++ }
++ inode->i_ino = iunique(sb, EXFAT_ROOT_INO);
++ SET_IVERSION(inode, 1);
++ err = exfat_fill_inode(inode, fid);
++ if (err) {
++ iput(inode);
++ inode = ERR_PTR(err);
++ goto out;
++ }
++ exfat_attach(inode, i_pos);
++ insert_inode_hash(inode);
++out:
++ return inode;
++}
++
++static int exfat_sync_inode(struct inode *inode)
++{
++ return exfat_write_inode(inode, NULL);
++}
++
++static struct inode *exfat_alloc_inode(struct super_block *sb)
++{
++ struct exfat_inode_info *ei;
++
++ ei = kmem_cache_alloc(exfat_inode_cachep, GFP_NOFS);
++ if (!ei)
++ return NULL;
++
++ init_rwsem(&ei->truncate_lock);
++
++ return &ei->vfs_inode;
++}
++
++static void exfat_destroy_inode(struct inode *inode)
++{
++ if (EXFAT_I(inode)->target)
++ kfree(EXFAT_I(inode)->target);
++ EXFAT_I(inode)->target = NULL;
++
++ kmem_cache_free(exfat_inode_cachep, EXFAT_I(inode));
++}
++
++static int exfat_write_inode(struct inode *inode, struct writeback_control *wbc)
++{
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct dir_entry_t info;
++
++ if (inode->i_ino == EXFAT_ROOT_INO)
++ return 0;
++
++ info.Attr = exfat_make_attr(inode);
++ info.Size = i_size_read(inode);
++
++ exfat_time_unix2fat(sbi, &inode->i_mtime, &info.ModifyTimestamp);
++ exfat_time_unix2fat(sbi, &inode->i_ctime, &info.CreateTimestamp);
++ exfat_time_unix2fat(sbi, &inode->i_atime, &info.AccessTimestamp);
++
++ ffsWriteStat(inode, &info);
++
++ return 0;
++}
++
++static void exfat_evict_inode(struct inode *inode)
++{
++ truncate_inode_pages(&inode->i_data, 0);
++
++ if (!inode->i_nlink)
++ i_size_write(inode, 0);
++ invalidate_inode_buffers(inode);
++ clear_inode(inode);
++ exfat_detach(inode);
++
++ remove_inode_hash(inode);
++}
++
++static void exfat_free_super(struct exfat_sb_info *sbi)
++{
++ if (sbi->nls_disk)
++ unload_nls(sbi->nls_disk);
++ if (sbi->nls_io)
++ unload_nls(sbi->nls_io);
++ if (sbi->options.iocharset != exfat_default_iocharset)
++ kfree(sbi->options.iocharset);
++ /* mutex_init is in exfat_fill_super function. only for 3.7+ */
++ mutex_destroy(&sbi->s_lock);
++ kfree(sbi);
++}
++
++static void exfat_put_super(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++
++ if (__is_sb_dirty(sb))
++ exfat_write_super(sb);
++
++ ffsUmountVol(sb);
++
++ sb->s_fs_info = NULL;
++ exfat_free_super(sbi);
++}
++
++static void exfat_write_super(struct super_block *sb)
++{
++ __lock_super(sb);
++
++ __set_sb_clean(sb);
++
++ if (!sb_rdonly(sb))
++ ffsSyncVol(sb, true);
++
++ __unlock_super(sb);
++}
++
++static int exfat_sync_fs(struct super_block *sb, int wait)
++{
++ int err = 0;
++
++ if (__is_sb_dirty(sb)) {
++ __lock_super(sb);
++ __set_sb_clean(sb);
++ err = ffsSyncVol(sb, true);
++ __unlock_super(sb);
++ }
++
++ return err;
++}
++
++static int exfat_statfs(struct dentry *dentry, struct kstatfs *buf)
++{
++ struct super_block *sb = dentry->d_sb;
++ u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++ struct vol_info_t info;
++
++ if (p_fs->used_clusters == (u32) ~0) {
++ if (ffsGetVolInfo(sb, &info) == FFS_MEDIAERR)
++ return -EIO;
++
++ } else {
++ info.FatType = p_fs->vol_type;
++ info.ClusterSize = p_fs->cluster_size;
++ info.NumClusters = p_fs->num_clusters - 2;
++ info.UsedClusters = p_fs->used_clusters;
++ info.FreeClusters = info.NumClusters - info.UsedClusters;
++
++ if (p_fs->dev_ejected)
++ pr_info("[EXFAT] statfs on device that is ejected\n");
++ }
++
++ buf->f_type = sb->s_magic;
++ buf->f_bsize = info.ClusterSize;
++ buf->f_blocks = info.NumClusters;
++ buf->f_bfree = info.FreeClusters;
++ buf->f_bavail = info.FreeClusters;
++ buf->f_fsid.val[0] = (u32)id;
++ buf->f_fsid.val[1] = (u32)(id >> 32);
++ buf->f_namelen = 260;
++
++ return 0;
++}
++
++static int exfat_remount(struct super_block *sb, int *flags, char *data)
++{
++ *flags |= SB_NODIRATIME;
++ return 0;
++}
++
++static int exfat_show_options(struct seq_file *m, struct dentry *root)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(root->d_sb);
++ struct exfat_mount_options *opts = &sbi->options;
++
++ if (__kuid_val(opts->fs_uid))
++ seq_printf(m, ",uid=%u", __kuid_val(opts->fs_uid));
++ if (__kgid_val(opts->fs_gid))
++ seq_printf(m, ",gid=%u", __kgid_val(opts->fs_gid));
++ seq_printf(m, ",fmask=%04o", opts->fs_fmask);
++ seq_printf(m, ",dmask=%04o", opts->fs_dmask);
++ if (opts->allow_utime)
++ seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
++ if (sbi->nls_disk)
++ seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
++ if (sbi->nls_io)
++ seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
++ seq_printf(m, ",namecase=%u", opts->casesensitive);
++ if (opts->errors == EXFAT_ERRORS_CONT)
++ seq_puts(m, ",errors=continue");
++ else if (opts->errors == EXFAT_ERRORS_PANIC)
++ seq_puts(m, ",errors=panic");
++ else
++ seq_puts(m, ",errors=remount-ro");
++#ifdef CONFIG_EXFAT_DISCARD
++ if (opts->discard)
++ seq_puts(m, ",discard");
++#endif
++ return 0;
++}
++
++static const struct super_operations exfat_sops = {
++ .alloc_inode = exfat_alloc_inode,
++ .destroy_inode = exfat_destroy_inode,
++ .write_inode = exfat_write_inode,
++ .evict_inode = exfat_evict_inode,
++ .put_super = exfat_put_super,
++ .sync_fs = exfat_sync_fs,
++ .statfs = exfat_statfs,
++ .remount_fs = exfat_remount,
++ .show_options = exfat_show_options,
++};
++
++/*======================================================================*/
++/* Export Operations */
++/*======================================================================*/
++
++static struct inode *exfat_nfs_get_inode(struct super_block *sb, u64 ino,
++ u32 generation)
++{
++ struct inode *inode = NULL;
++
++ if (ino < EXFAT_ROOT_INO)
++ return inode;
++ inode = ilookup(sb, ino);
++
++ if (inode && generation && (inode->i_generation != generation)) {
++ iput(inode);
++ inode = NULL;
++ }
++
++ return inode;
++}
++
++static struct dentry *exfat_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,
++ exfat_nfs_get_inode);
++}
++
++static struct dentry *exfat_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,
++ exfat_nfs_get_inode);
++}
++
++static const struct export_operations exfat_export_ops = {
++ .fh_to_dentry = exfat_fh_to_dentry,
++ .fh_to_parent = exfat_fh_to_parent,
++};
++
++/*======================================================================*/
++/* Super Block Read Operations */
++/*======================================================================*/
++
++enum {
++ Opt_uid,
++ Opt_gid,
++ Opt_umask,
++ Opt_dmask,
++ Opt_fmask,
++ Opt_allow_utime,
++ Opt_codepage,
++ Opt_charset,
++ Opt_namecase,
++ Opt_debug,
++ Opt_err_cont,
++ Opt_err_panic,
++ Opt_err_ro,
++ Opt_utf8_hack,
++ Opt_err,
++#ifdef CONFIG_EXFAT_DISCARD
++ Opt_discard,
++#endif /* EXFAT_CONFIG_DISCARD */
++};
++
++static const match_table_t exfat_tokens = {
++ {Opt_uid, "uid=%u"},
++ {Opt_gid, "gid=%u"},
++ {Opt_umask, "umask=%o"},
++ {Opt_dmask, "dmask=%o"},
++ {Opt_fmask, "fmask=%o"},
++ {Opt_allow_utime, "allow_utime=%o"},
++ {Opt_codepage, "codepage=%u"},
++ {Opt_charset, "iocharset=%s"},
++ {Opt_namecase, "namecase=%u"},
++ {Opt_debug, "debug"},
++ {Opt_err_cont, "errors=continue"},
++ {Opt_err_panic, "errors=panic"},
++ {Opt_err_ro, "errors=remount-ro"},
++ {Opt_utf8_hack, "utf8"},
++#ifdef CONFIG_EXFAT_DISCARD
++ {Opt_discard, "discard"},
++#endif /* CONFIG_EXFAT_DISCARD */
++ {Opt_err, NULL}
++};
++
++static int parse_options(char *options, int silent, int *debug,
++ struct exfat_mount_options *opts)
++{
++ char *p;
++ substring_t args[MAX_OPT_ARGS];
++ int option;
++ char *iocharset;
++
++ opts->fs_uid = current_uid();
++ opts->fs_gid = current_gid();
++ opts->fs_fmask = opts->fs_dmask = current->fs->umask;
++ opts->allow_utime = (unsigned short) -1;
++ opts->codepage = exfat_default_codepage;
++ opts->iocharset = exfat_default_iocharset;
++ opts->casesensitive = 0;
++ opts->errors = EXFAT_ERRORS_RO;
++#ifdef CONFIG_EXFAT_DISCARD
++ opts->discard = 0;
++#endif
++ *debug = 0;
++
++ if (!options)
++ goto out;
++
++ while ((p = strsep(&options, ",")) != NULL) {
++ int token;
++
++ if (!*p)
++ continue;
++
++ token = match_token(p, exfat_tokens, args);
++ switch (token) {
++ case Opt_uid:
++ if (match_int(&args[0], &option))
++ return 0;
++ opts->fs_uid = KUIDT_INIT(option);
++ break;
++ case Opt_gid:
++ if (match_int(&args[0], &option))
++ return 0;
++ opts->fs_gid = KGIDT_INIT(option);
++ break;
++ case Opt_umask:
++ case Opt_dmask:
++ case Opt_fmask:
++ if (match_octal(&args[0], &option))
++ return 0;
++ if (token != Opt_dmask)
++ opts->fs_fmask = option;
++ if (token != Opt_fmask)
++ opts->fs_dmask = option;
++ break;
++ case Opt_allow_utime:
++ if (match_octal(&args[0], &option))
++ return 0;
++ opts->allow_utime = option & 0022;
++ break;
++ case Opt_codepage:
++ if (match_int(&args[0], &option))
++ return 0;
++ opts->codepage = option;
++ break;
++ case Opt_charset:
++ if (opts->iocharset != exfat_default_iocharset)
++ kfree(opts->iocharset);
++ iocharset = match_strdup(&args[0]);
++ if (!iocharset)
++ return -ENOMEM;
++ opts->iocharset = iocharset;
++ break;
++ case Opt_namecase:
++ if (match_int(&args[0], &option))
++ return 0;
++ opts->casesensitive = option;
++ break;
++ case Opt_err_cont:
++ opts->errors = EXFAT_ERRORS_CONT;
++ break;
++ case Opt_err_panic:
++ opts->errors = EXFAT_ERRORS_PANIC;
++ break;
++ case Opt_err_ro:
++ opts->errors = EXFAT_ERRORS_RO;
++ break;
++ case Opt_debug:
++ *debug = 1;
++ break;
++#ifdef CONFIG_EXFAT_DISCARD
++ case Opt_discard:
++ opts->discard = 1;
++ break;
++#endif /* CONFIG_EXFAT_DISCARD */
++ case Opt_utf8_hack:
++ break;
++ default:
++ if (!silent)
++ pr_err("[EXFAT] Unrecognized mount option %s or missing value\n",
++ p);
++ return -EINVAL;
++ }
++ }
++
++out:
++ if (opts->allow_utime == (unsigned short) -1)
++ opts->allow_utime = ~opts->fs_dmask & 0022;
++
++ return 0;
++}
++
++static void exfat_hash_init(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ int i;
++
++ spin_lock_init(&sbi->inode_hash_lock);
++ for (i = 0; i < EXFAT_HASH_SIZE; i++)
++ INIT_HLIST_HEAD(&sbi->inode_hashtable[i]);
++}
++
++static int exfat_read_root(struct inode *inode)
++{
++ struct super_block *sb = inode->i_sb;
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct fs_info_t *p_fs = &(sbi->fs_info);
++ struct dir_entry_t info;
++
++ EXFAT_I(inode)->fid.dir.dir = p_fs->root_dir;
++ EXFAT_I(inode)->fid.dir.flags = 0x01;
++ EXFAT_I(inode)->fid.entry = -1;
++ EXFAT_I(inode)->fid.start_clu = p_fs->root_dir;
++ EXFAT_I(inode)->fid.flags = 0x01;
++ EXFAT_I(inode)->fid.type = TYPE_DIR;
++ EXFAT_I(inode)->fid.rwoffset = 0;
++ EXFAT_I(inode)->fid.hint_last_off = -1;
++
++ EXFAT_I(inode)->target = NULL;
++
++ ffsReadStat(inode, &info);
++
++ inode->i_uid = sbi->options.fs_uid;
++ inode->i_gid = sbi->options.fs_gid;
++ INC_IVERSION(inode);
++ inode->i_generation = 0;
++ inode->i_mode = exfat_make_mode(sbi, ATTR_SUBDIR, 0777);
++ inode->i_op = &exfat_dir_inode_operations;
++ inode->i_fop = &exfat_dir_operations;
++
++ i_size_write(inode, info.Size);
++ inode->i_blocks = ((i_size_read(inode) + (p_fs->cluster_size - 1))
++ & ~((loff_t)p_fs->cluster_size - 1)) >> 9;
++ EXFAT_I(inode)->i_pos = ((loff_t) p_fs->root_dir << 32) | 0xffffffff;
++ EXFAT_I(inode)->mmu_private = i_size_read(inode);
++
++ exfat_save_attr(inode, ATTR_SUBDIR);
++ inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
++ set_nlink(inode, info.NumSubdirs + 2);
++
++ return 0;
++}
++
++static void setup_dops(struct super_block *sb)
++{
++ if (EXFAT_SB(sb)->options.casesensitive == 0)
++ sb->s_d_op = &exfat_ci_dentry_ops;
++ else
++ sb->s_d_op = &exfat_dentry_ops;
++}
++
++static int exfat_fill_super(struct super_block *sb, void *data, int silent)
++{
++ struct inode *root_inode = NULL;
++ struct exfat_sb_info *sbi;
++ int debug, ret;
++ long error;
++ char buf[50];
++
++ /*
++ * GFP_KERNEL is ok here, because while we do hold the
++ * supeblock lock, memory pressure can't call back into
++ * the filesystem, since we're only just about to mount
++ * it and have no inodes etc active!
++ */
++ sbi = kzalloc(sizeof(struct exfat_sb_info), GFP_KERNEL);
++ if (!sbi)
++ return -ENOMEM;
++ mutex_init(&sbi->s_lock);
++ sb->s_fs_info = sbi;
++ sb->s_flags |= SB_NODIRATIME;
++ sb->s_magic = EXFAT_SUPER_MAGIC;
++ sb->s_op = &exfat_sops;
++ sb->s_export_op = &exfat_export_ops;
++
++ error = parse_options(data, silent, &debug, &sbi->options);
++ if (error)
++ goto out_fail;
++
++ setup_dops(sb);
++
++ error = -EIO;
++ sb_min_blocksize(sb, 512);
++ sb->s_maxbytes = 0x7fffffffffffffffLL; /* maximum file size */
++
++ ret = ffsMountVol(sb);
++ if (ret) {
++ if (!silent)
++ pr_err("[EXFAT] ffsMountVol failed\n");
++
++ goto out_fail;
++ }
++
++ /* set up enough so that it can read an inode */
++ exfat_hash_init(sb);
++
++ /*
++ * The low byte of FAT's first entry must have same value with
++ * media-field. But in real world, too many devices is
++ * writing wrong value. So, removed that validity check.
++ *
++ * if (FAT_FIRST_ENT(sb, media) != first)
++ */
++
++ /* codepage is not meaningful in exfat */
++ if (sbi->fs_info.vol_type != EXFAT) {
++ error = -EINVAL;
++ sprintf(buf, "cp%d", sbi->options.codepage);
++ sbi->nls_disk = load_nls(buf);
++ if (!sbi->nls_disk) {
++ pr_err("[EXFAT] Codepage %s not found\n", buf);
++ goto out_fail2;
++ }
++ }
++
++ sbi->nls_io = load_nls(sbi->options.iocharset);
++
++ error = -ENOMEM;
++ root_inode = new_inode(sb);
++ if (!root_inode)
++ goto out_fail2;
++ root_inode->i_ino = EXFAT_ROOT_INO;
++ SET_IVERSION(root_inode, 1);
++
++ error = exfat_read_root(root_inode);
++ if (error < 0)
++ goto out_fail2;
++ error = -ENOMEM;
++ exfat_attach(root_inode, EXFAT_I(root_inode)->i_pos);
++ insert_inode_hash(root_inode);
++ sb->s_root = d_make_root(root_inode);
++ if (!sb->s_root) {
++ pr_err("[EXFAT] Getting the root inode failed\n");
++ goto out_fail2;
++ }
++
++ return 0;
++
++out_fail2:
++ ffsUmountVol(sb);
++out_fail:
++ if (root_inode)
++ iput(root_inode);
++ sb->s_fs_info = NULL;
++ exfat_free_super(sbi);
++ return error;
++}
++
++static struct dentry *exfat_fs_mount(struct file_system_type *fs_type,
++ int flags, const char *dev_name,
++ void *data)
++{
++ return mount_bdev(fs_type, flags, dev_name, data, exfat_fill_super);
++}
++
++static void init_once(void *foo)
++{
++ struct exfat_inode_info *ei = (struct exfat_inode_info *)foo;
++
++ INIT_HLIST_NODE(&ei->i_hash_fat);
++ inode_init_once(&ei->vfs_inode);
++}
++
++static int __init exfat_init_inodecache(void)
++{
++ exfat_inode_cachep = kmem_cache_create("exfat_inode_cache",
++ sizeof(struct exfat_inode_info),
++ 0,
++ (SLAB_RECLAIM_ACCOUNT |
++ SLAB_MEM_SPREAD),
++ init_once);
++ if (exfat_inode_cachep == NULL)
++ return -ENOMEM;
++ return 0;
++}
++
++static void __exit exfat_destroy_inodecache(void)
++{
++ /*
++ * Make sure all delayed rcu free inodes are flushed before we
++ * destroy cache.
++ */
++ rcu_barrier();
++ kmem_cache_destroy(exfat_inode_cachep);
++}
++
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++static void exfat_debug_kill_sb(struct super_block *sb)
++{
++ struct exfat_sb_info *sbi = EXFAT_SB(sb);
++ struct block_device *bdev = sb->s_bdev;
++ struct fs_info_t *p_fs = &(EXFAT_SB(sb)->fs_info);
++
++ long flags;
++
++ if (sbi) {
++ flags = sbi->debug_flags;
++
++ if (flags & EXFAT_DEBUGFLAGS_INVALID_UMOUNT) {
++ /*
++ * invalidate_bdev drops all device cache include
++ * dirty. We use this to simulate device removal.
++ */
++ down(&p_fs->v_sem);
++ FAT_release_all(sb);
++ buf_release_all(sb);
++ up(&p_fs->v_sem);
++
++ invalidate_bdev(bdev);
++ }
++ }
++
++ kill_block_super(sb);
++}
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++
++static struct file_system_type exfat_fs_type = {
++ .owner = THIS_MODULE,
++ .name = "exfat",
++ .mount = exfat_fs_mount,
++#ifdef CONFIG_EXFAT_KERNEL_DEBUG
++ .kill_sb = exfat_debug_kill_sb,
++#else
++ .kill_sb = kill_block_super,
++#endif /* CONFIG_EXFAT_KERNEL_DEBUG */
++ .fs_flags = FS_REQUIRES_DEV,
++};
++
++static int __init init_exfat(void)
++{
++ int err;
++
++ BUILD_BUG_ON(sizeof(struct dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct dos_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct ext_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct file_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct strm_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct name_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct bmap_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct case_dentry_t) != DENTRY_SIZE);
++ BUILD_BUG_ON(sizeof(struct volm_dentry_t) != DENTRY_SIZE);
++
++ pr_info("exFAT: Version %s\n", EXFAT_VERSION);
++
++ err = exfat_init_inodecache();
++ if (err)
++ return err;
++
++ err = register_filesystem(&exfat_fs_type);
++ if (err)
++ return err;
++
++ return 0;
++}
++
++static void __exit exit_exfat(void)
++{
++ exfat_destroy_inodecache();
++ unregister_filesystem(&exfat_fs_type);
++}
++
++module_init(init_exfat);
++module_exit(exit_exfat);
++
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("exFAT Filesystem Driver");
++MODULE_ALIAS_FS("exfat");
+diff --git a/drivers/staging/exfat/exfat_upcase.c b/drivers/staging/exfat/exfat_upcase.c
+new file mode 100644
+index 000000000000..366082fb3dab
+--- /dev/null
++++ b/drivers/staging/exfat/exfat_upcase.c
+@@ -0,0 +1,740 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
++ */
++
++#include <linux/types.h>
++#include "exfat.h"
++
++const u8 uni_upcase[NUM_UPCASE << 1] = {
++ 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00,
++ 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00,
++ 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, 0x00,
++ 0x0C, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x0F, 0x00,
++ 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00,
++ 0x14, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00,
++ 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00,
++ 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00,
++ 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00,
++ 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00,
++ 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x00,
++ 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, 0x00,
++ 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00,
++ 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00,
++ 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, 0x00,
++ 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, 0x00,
++ 0x40, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00,
++ 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00,
++ 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, 0x00,
++ 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00,
++ 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00,
++ 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00,
++ 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00,
++ 0x5C, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, 0x00,
++ 0x60, 0x00, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00,
++ 0x44, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00,
++ 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00, 0x4B, 0x00,
++ 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00,
++ 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00,
++ 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00,
++ 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x7B, 0x00,
++ 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00,
++ 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00,
++ 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00,
++ 0x88, 0x00, 0x89, 0x00, 0x8A, 0x00, 0x8B, 0x00,
++ 0x8C, 0x00, 0x8D, 0x00, 0x8E, 0x00, 0x8F, 0x00,
++ 0x90, 0x00, 0x91, 0x00, 0x92, 0x00, 0x93, 0x00,
++ 0x94, 0x00, 0x95, 0x00, 0x96, 0x00, 0x97, 0x00,
++ 0x98, 0x00, 0x99, 0x00, 0x9A, 0x00, 0x9B, 0x00,
++ 0x9C, 0x00, 0x9D, 0x00, 0x9E, 0x00, 0x9F, 0x00,
++ 0xA0, 0x00, 0xA1, 0x00, 0xA2, 0x00, 0xA3, 0x00,
++ 0xA4, 0x00, 0xA5, 0x00, 0xA6, 0x00, 0xA7, 0x00,
++ 0xA8, 0x00, 0xA9, 0x00, 0xAA, 0x00, 0xAB, 0x00,
++ 0xAC, 0x00, 0xAD, 0x00, 0xAE, 0x00, 0xAF, 0x00,
++ 0xB0, 0x00, 0xB1, 0x00, 0xB2, 0x00, 0xB3, 0x00,
++ 0xB4, 0x00, 0xB5, 0x00, 0xB6, 0x00, 0xB7, 0x00,
++ 0xB8, 0x00, 0xB9, 0x00, 0xBA, 0x00, 0xBB, 0x00,
++ 0xBC, 0x00, 0xBD, 0x00, 0xBE, 0x00, 0xBF, 0x00,
++ 0xC0, 0x00, 0xC1, 0x00, 0xC2, 0x00, 0xC3, 0x00,
++ 0xC4, 0x00, 0xC5, 0x00, 0xC6, 0x00, 0xC7, 0x00,
++ 0xC8, 0x00, 0xC9, 0x00, 0xCA, 0x00, 0xCB, 0x00,
++ 0xCC, 0x00, 0xCD, 0x00, 0xCE, 0x00, 0xCF, 0x00,
++ 0xD0, 0x00, 0xD1, 0x00, 0xD2, 0x00, 0xD3, 0x00,
++ 0xD4, 0x00, 0xD5, 0x00, 0xD6, 0x00, 0xD7, 0x00,
++ 0xD8, 0x00, 0xD9, 0x00, 0xDA, 0x00, 0xDB, 0x00,
++ 0xDC, 0x00, 0xDD, 0x00, 0xDE, 0x00, 0xDF, 0x00,
++ 0xC0, 0x00, 0xC1, 0x00, 0xC2, 0x00, 0xC3, 0x00,
++ 0xC4, 0x00, 0xC5, 0x00, 0xC6, 0x00, 0xC7, 0x00,
++ 0xC8, 0x00, 0xC9, 0x00, 0xCA, 0x00, 0xCB, 0x00,
++ 0xCC, 0x00, 0xCD, 0x00, 0xCE, 0x00, 0xCF, 0x00,
++ 0xD0, 0x00, 0xD1, 0x00, 0xD2, 0x00, 0xD3, 0x00,
++ 0xD4, 0x00, 0xD5, 0x00, 0xD6, 0x00, 0xF7, 0x00,
++ 0xD8, 0x00, 0xD9, 0x00, 0xDA, 0x00, 0xDB, 0x00,
++ 0xDC, 0x00, 0xDD, 0x00, 0xDE, 0x00, 0x78, 0x01,
++ 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01,
++ 0x04, 0x01, 0x04, 0x01, 0x06, 0x01, 0x06, 0x01,
++ 0x08, 0x01, 0x08, 0x01, 0x0A, 0x01, 0x0A, 0x01,
++ 0x0C, 0x01, 0x0C, 0x01, 0x0E, 0x01, 0x0E, 0x01,
++ 0x10, 0x01, 0x10, 0x01, 0x12, 0x01, 0x12, 0x01,
++ 0x14, 0x01, 0x14, 0x01, 0x16, 0x01, 0x16, 0x01,
++ 0x18, 0x01, 0x18, 0x01, 0x1A, 0x01, 0x1A, 0x01,
++ 0x1C, 0x01, 0x1C, 0x01, 0x1E, 0x01, 0x1E, 0x01,
++ 0x20, 0x01, 0x20, 0x01, 0x22, 0x01, 0x22, 0x01,
++ 0x24, 0x01, 0x24, 0x01, 0x26, 0x01, 0x26, 0x01,
++ 0x28, 0x01, 0x28, 0x01, 0x2A, 0x01, 0x2A, 0x01,
++ 0x2C, 0x01, 0x2C, 0x01, 0x2E, 0x01, 0x2E, 0x01,
++ 0x30, 0x01, 0x31, 0x01, 0x32, 0x01, 0x32, 0x01,
++ 0x34, 0x01, 0x34, 0x01, 0x36, 0x01, 0x36, 0x01,
++ 0x38, 0x01, 0x39, 0x01, 0x39, 0x01, 0x3B, 0x01,
++ 0x3B, 0x01, 0x3D, 0x01, 0x3D, 0x01, 0x3F, 0x01,
++ 0x3F, 0x01, 0x41, 0x01, 0x41, 0x01, 0x43, 0x01,
++ 0x43, 0x01, 0x45, 0x01, 0x45, 0x01, 0x47, 0x01,
++ 0x47, 0x01, 0x49, 0x01, 0x4A, 0x01, 0x4A, 0x01,
++ 0x4C, 0x01, 0x4C, 0x01, 0x4E, 0x01, 0x4E, 0x01,
++ 0x50, 0x01, 0x50, 0x01, 0x52, 0x01, 0x52, 0x01,
++ 0x54, 0x01, 0x54, 0x01, 0x56, 0x01, 0x56, 0x01,
++ 0x58, 0x01, 0x58, 0x01, 0x5A, 0x01, 0x5A, 0x01,
++ 0x5C, 0x01, 0x5C, 0x01, 0x5E, 0x01, 0x5E, 0x01,
++ 0x60, 0x01, 0x60, 0x01, 0x62, 0x01, 0x62, 0x01,
++ 0x64, 0x01, 0x64, 0x01, 0x66, 0x01, 0x66, 0x01,
++ 0x68, 0x01, 0x68, 0x01, 0x6A, 0x01, 0x6A, 0x01,
++ 0x6C, 0x01, 0x6C, 0x01, 0x6E, 0x01, 0x6E, 0x01,
++ 0x70, 0x01, 0x70, 0x01, 0x72, 0x01, 0x72, 0x01,
++ 0x74, 0x01, 0x74, 0x01, 0x76, 0x01, 0x76, 0x01,
++ 0x78, 0x01, 0x79, 0x01, 0x79, 0x01, 0x7B, 0x01,
++ 0x7B, 0x01, 0x7D, 0x01, 0x7D, 0x01, 0x7F, 0x01,
++ 0x43, 0x02, 0x81, 0x01, 0x82, 0x01, 0x82, 0x01,
++ 0x84, 0x01, 0x84, 0x01, 0x86, 0x01, 0x87, 0x01,
++ 0x87, 0x01, 0x89, 0x01, 0x8A, 0x01, 0x8B, 0x01,
++ 0x8B, 0x01, 0x8D, 0x01, 0x8E, 0x01, 0x8F, 0x01,
++ 0x90, 0x01, 0x91, 0x01, 0x91, 0x01, 0x93, 0x01,
++ 0x94, 0x01, 0xF6, 0x01, 0x96, 0x01, 0x97, 0x01,
++ 0x98, 0x01, 0x98, 0x01, 0x3D, 0x02, 0x9B, 0x01,
++ 0x9C, 0x01, 0x9D, 0x01, 0x20, 0x02, 0x9F, 0x01,
++ 0xA0, 0x01, 0xA0, 0x01, 0xA2, 0x01, 0xA2, 0x01,
++ 0xA4, 0x01, 0xA4, 0x01, 0xA6, 0x01, 0xA7, 0x01,
++ 0xA7, 0x01, 0xA9, 0x01, 0xAA, 0x01, 0xAB, 0x01,
++ 0xAC, 0x01, 0xAC, 0x01, 0xAE, 0x01, 0xAF, 0x01,
++ 0xAF, 0x01, 0xB1, 0x01, 0xB2, 0x01, 0xB3, 0x01,
++ 0xB3, 0x01, 0xB5, 0x01, 0xB5, 0x01, 0xB7, 0x01,
++ 0xB8, 0x01, 0xB8, 0x01, 0xBA, 0x01, 0xBB, 0x01,
++ 0xBC, 0x01, 0xBC, 0x01, 0xBE, 0x01, 0xF7, 0x01,
++ 0xC0, 0x01, 0xC1, 0x01, 0xC2, 0x01, 0xC3, 0x01,
++ 0xC4, 0x01, 0xC5, 0x01, 0xC4, 0x01, 0xC7, 0x01,
++ 0xC8, 0x01, 0xC7, 0x01, 0xCA, 0x01, 0xCB, 0x01,
++ 0xCA, 0x01, 0xCD, 0x01, 0xCD, 0x01, 0xCF, 0x01,
++ 0xCF, 0x01, 0xD1, 0x01, 0xD1, 0x01, 0xD3, 0x01,
++ 0xD3, 0x01, 0xD5, 0x01, 0xD5, 0x01, 0xD7, 0x01,
++ 0xD7, 0x01, 0xD9, 0x01, 0xD9, 0x01, 0xDB, 0x01,
++ 0xDB, 0x01, 0x8E, 0x01, 0xDE, 0x01, 0xDE, 0x01,
++ 0xE0, 0x01, 0xE0, 0x01, 0xE2, 0x01, 0xE2, 0x01,
++ 0xE4, 0x01, 0xE4, 0x01, 0xE6, 0x01, 0xE6, 0x01,
++ 0xE8, 0x01, 0xE8, 0x01, 0xEA, 0x01, 0xEA, 0x01,
++ 0xEC, 0x01, 0xEC, 0x01, 0xEE, 0x01, 0xEE, 0x01,
++ 0xF0, 0x01, 0xF1, 0x01, 0xF2, 0x01, 0xF1, 0x01,
++ 0xF4, 0x01, 0xF4, 0x01, 0xF6, 0x01, 0xF7, 0x01,
++ 0xF8, 0x01, 0xF8, 0x01, 0xFA, 0x01, 0xFA, 0x01,
++ 0xFC, 0x01, 0xFC, 0x01, 0xFE, 0x01, 0xFE, 0x01,
++ 0x00, 0x02, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
++ 0x04, 0x02, 0x04, 0x02, 0x06, 0x02, 0x06, 0x02,
++ 0x08, 0x02, 0x08, 0x02, 0x0A, 0x02, 0x0A, 0x02,
++ 0x0C, 0x02, 0x0C, 0x02, 0x0E, 0x02, 0x0E, 0x02,
++ 0x10, 0x02, 0x10, 0x02, 0x12, 0x02, 0x12, 0x02,
++ 0x14, 0x02, 0x14, 0x02, 0x16, 0x02, 0x16, 0x02,
++ 0x18, 0x02, 0x18, 0x02, 0x1A, 0x02, 0x1A, 0x02,
++ 0x1C, 0x02, 0x1C, 0x02, 0x1E, 0x02, 0x1E, 0x02,
++ 0x20, 0x02, 0x21, 0x02, 0x22, 0x02, 0x22, 0x02,
++ 0x24, 0x02, 0x24, 0x02, 0x26, 0x02, 0x26, 0x02,
++ 0x28, 0x02, 0x28, 0x02, 0x2A, 0x02, 0x2A, 0x02,
++ 0x2C, 0x02, 0x2C, 0x02, 0x2E, 0x02, 0x2E, 0x02,
++ 0x30, 0x02, 0x30, 0x02, 0x32, 0x02, 0x32, 0x02,
++ 0x34, 0x02, 0x35, 0x02, 0x36, 0x02, 0x37, 0x02,
++ 0x38, 0x02, 0x39, 0x02, 0x65, 0x2C, 0x3B, 0x02,
++ 0x3B, 0x02, 0x3D, 0x02, 0x66, 0x2C, 0x3F, 0x02,
++ 0x40, 0x02, 0x41, 0x02, 0x41, 0x02, 0x43, 0x02,
++ 0x44, 0x02, 0x45, 0x02, 0x46, 0x02, 0x46, 0x02,
++ 0x48, 0x02, 0x48, 0x02, 0x4A, 0x02, 0x4A, 0x02,
++ 0x4C, 0x02, 0x4C, 0x02, 0x4E, 0x02, 0x4E, 0x02,
++ 0x50, 0x02, 0x51, 0x02, 0x52, 0x02, 0x81, 0x01,
++ 0x86, 0x01, 0x55, 0x02, 0x89, 0x01, 0x8A, 0x01,
++ 0x58, 0x02, 0x8F, 0x01, 0x5A, 0x02, 0x90, 0x01,
++ 0x5C, 0x02, 0x5D, 0x02, 0x5E, 0x02, 0x5F, 0x02,
++ 0x93, 0x01, 0x61, 0x02, 0x62, 0x02, 0x94, 0x01,
++ 0x64, 0x02, 0x65, 0x02, 0x66, 0x02, 0x67, 0x02,
++ 0x97, 0x01, 0x96, 0x01, 0x6A, 0x02, 0x62, 0x2C,
++ 0x6C, 0x02, 0x6D, 0x02, 0x6E, 0x02, 0x9C, 0x01,
++ 0x70, 0x02, 0x71, 0x02, 0x9D, 0x01, 0x73, 0x02,
++ 0x74, 0x02, 0x9F, 0x01, 0x76, 0x02, 0x77, 0x02,
++ 0x78, 0x02, 0x79, 0x02, 0x7A, 0x02, 0x7B, 0x02,
++ 0x7C, 0x02, 0x64, 0x2C, 0x7E, 0x02, 0x7F, 0x02,
++ 0xA6, 0x01, 0x81, 0x02, 0x82, 0x02, 0xA9, 0x01,
++ 0x84, 0x02, 0x85, 0x02, 0x86, 0x02, 0x87, 0x02,
++ 0xAE, 0x01, 0x44, 0x02, 0xB1, 0x01, 0xB2, 0x01,
++ 0x45, 0x02, 0x8D, 0x02, 0x8E, 0x02, 0x8F, 0x02,
++ 0x90, 0x02, 0x91, 0x02, 0xB7, 0x01, 0x93, 0x02,
++ 0x94, 0x02, 0x95, 0x02, 0x96, 0x02, 0x97, 0x02,
++ 0x98, 0x02, 0x99, 0x02, 0x9A, 0x02, 0x9B, 0x02,
++ 0x9C, 0x02, 0x9D, 0x02, 0x9E, 0x02, 0x9F, 0x02,
++ 0xA0, 0x02, 0xA1, 0x02, 0xA2, 0x02, 0xA3, 0x02,
++ 0xA4, 0x02, 0xA5, 0x02, 0xA6, 0x02, 0xA7, 0x02,
++ 0xA8, 0x02, 0xA9, 0x02, 0xAA, 0x02, 0xAB, 0x02,
++ 0xAC, 0x02, 0xAD, 0x02, 0xAE, 0x02, 0xAF, 0x02,
++ 0xB0, 0x02, 0xB1, 0x02, 0xB2, 0x02, 0xB3, 0x02,
++ 0xB4, 0x02, 0xB5, 0x02, 0xB6, 0x02, 0xB7, 0x02,
++ 0xB8, 0x02, 0xB9, 0x02, 0xBA, 0x02, 0xBB, 0x02,
++ 0xBC, 0x02, 0xBD, 0x02, 0xBE, 0x02, 0xBF, 0x02,
++ 0xC0, 0x02, 0xC1, 0x02, 0xC2, 0x02, 0xC3, 0x02,
++ 0xC4, 0x02, 0xC5, 0x02, 0xC6, 0x02, 0xC7, 0x02,
++ 0xC8, 0x02, 0xC9, 0x02, 0xCA, 0x02, 0xCB, 0x02,
++ 0xCC, 0x02, 0xCD, 0x02, 0xCE, 0x02, 0xCF, 0x02,
++ 0xD0, 0x02, 0xD1, 0x02, 0xD2, 0x02, 0xD3, 0x02,
++ 0xD4, 0x02, 0xD5, 0x02, 0xD6, 0x02, 0xD7, 0x02,
++ 0xD8, 0x02, 0xD9, 0x02, 0xDA, 0x02, 0xDB, 0x02,
++ 0xDC, 0x02, 0xDD, 0x02, 0xDE, 0x02, 0xDF, 0x02,
++ 0xE0, 0x02, 0xE1, 0x02, 0xE2, 0x02, 0xE3, 0x02,
++ 0xE4, 0x02, 0xE5, 0x02, 0xE6, 0x02, 0xE7, 0x02,
++ 0xE8, 0x02, 0xE9, 0x02, 0xEA, 0x02, 0xEB, 0x02,
++ 0xEC, 0x02, 0xED, 0x02, 0xEE, 0x02, 0xEF, 0x02,
++ 0xF0, 0x02, 0xF1, 0x02, 0xF2, 0x02, 0xF3, 0x02,
++ 0xF4, 0x02, 0xF5, 0x02, 0xF6, 0x02, 0xF7, 0x02,
++ 0xF8, 0x02, 0xF9, 0x02, 0xFA, 0x02, 0xFB, 0x02,
++ 0xFC, 0x02, 0xFD, 0x02, 0xFE, 0x02, 0xFF, 0x02,
++ 0x00, 0x03, 0x01, 0x03, 0x02, 0x03, 0x03, 0x03,
++ 0x04, 0x03, 0x05, 0x03, 0x06, 0x03, 0x07, 0x03,
++ 0x08, 0x03, 0x09, 0x03, 0x0A, 0x03, 0x0B, 0x03,
++ 0x0C, 0x03, 0x0D, 0x03, 0x0E, 0x03, 0x0F, 0x03,
++ 0x10, 0x03, 0x11, 0x03, 0x12, 0x03, 0x13, 0x03,
++ 0x14, 0x03, 0x15, 0x03, 0x16, 0x03, 0x17, 0x03,
++ 0x18, 0x03, 0x19, 0x03, 0x1A, 0x03, 0x1B, 0x03,
++ 0x1C, 0x03, 0x1D, 0x03, 0x1E, 0x03, 0x1F, 0x03,
++ 0x20, 0x03, 0x21, 0x03, 0x22, 0x03, 0x23, 0x03,
++ 0x24, 0x03, 0x25, 0x03, 0x26, 0x03, 0x27, 0x03,
++ 0x28, 0x03, 0x29, 0x03, 0x2A, 0x03, 0x2B, 0x03,
++ 0x2C, 0x03, 0x2D, 0x03, 0x2E, 0x03, 0x2F, 0x03,
++ 0x30, 0x03, 0x31, 0x03, 0x32, 0x03, 0x33, 0x03,
++ 0x34, 0x03, 0x35, 0x03, 0x36, 0x03, 0x37, 0x03,
++ 0x38, 0x03, 0x39, 0x03, 0x3A, 0x03, 0x3B, 0x03,
++ 0x3C, 0x03, 0x3D, 0x03, 0x3E, 0x03, 0x3F, 0x03,
++ 0x40, 0x03, 0x41, 0x03, 0x42, 0x03, 0x43, 0x03,
++ 0x44, 0x03, 0x45, 0x03, 0x46, 0x03, 0x47, 0x03,
++ 0x48, 0x03, 0x49, 0x03, 0x4A, 0x03, 0x4B, 0x03,
++ 0x4C, 0x03, 0x4D, 0x03, 0x4E, 0x03, 0x4F, 0x03,
++ 0x50, 0x03, 0x51, 0x03, 0x52, 0x03, 0x53, 0x03,
++ 0x54, 0x03, 0x55, 0x03, 0x56, 0x03, 0x57, 0x03,
++ 0x58, 0x03, 0x59, 0x03, 0x5A, 0x03, 0x5B, 0x03,
++ 0x5C, 0x03, 0x5D, 0x03, 0x5E, 0x03, 0x5F, 0x03,
++ 0x60, 0x03, 0x61, 0x03, 0x62, 0x03, 0x63, 0x03,
++ 0x64, 0x03, 0x65, 0x03, 0x66, 0x03, 0x67, 0x03,
++ 0x68, 0x03, 0x69, 0x03, 0x6A, 0x03, 0x6B, 0x03,
++ 0x6C, 0x03, 0x6D, 0x03, 0x6E, 0x03, 0x6F, 0x03,
++ 0x70, 0x03, 0x71, 0x03, 0x72, 0x03, 0x73, 0x03,
++ 0x74, 0x03, 0x75, 0x03, 0x76, 0x03, 0x77, 0x03,
++ 0x78, 0x03, 0x79, 0x03, 0x7A, 0x03, 0xFD, 0x03,
++ 0xFE, 0x03, 0xFF, 0x03, 0x7E, 0x03, 0x7F, 0x03,
++ 0x80, 0x03, 0x81, 0x03, 0x82, 0x03, 0x83, 0x03,
++ 0x84, 0x03, 0x85, 0x03, 0x86, 0x03, 0x87, 0x03,
++ 0x88, 0x03, 0x89, 0x03, 0x8A, 0x03, 0x8B, 0x03,
++ 0x8C, 0x03, 0x8D, 0x03, 0x8E, 0x03, 0x8F, 0x03,
++ 0x90, 0x03, 0x91, 0x03, 0x92, 0x03, 0x93, 0x03,
++ 0x94, 0x03, 0x95, 0x03, 0x96, 0x03, 0x97, 0x03,
++ 0x98, 0x03, 0x99, 0x03, 0x9A, 0x03, 0x9B, 0x03,
++ 0x9C, 0x03, 0x9D, 0x03, 0x9E, 0x03, 0x9F, 0x03,
++ 0xA0, 0x03, 0xA1, 0x03, 0xA2, 0x03, 0xA3, 0x03,
++ 0xA4, 0x03, 0xA5, 0x03, 0xA6, 0x03, 0xA7, 0x03,
++ 0xA8, 0x03, 0xA9, 0x03, 0xAA, 0x03, 0xAB, 0x03,
++ 0x86, 0x03, 0x88, 0x03, 0x89, 0x03, 0x8A, 0x03,
++ 0xB0, 0x03, 0x91, 0x03, 0x92, 0x03, 0x93, 0x03,
++ 0x94, 0x03, 0x95, 0x03, 0x96, 0x03, 0x97, 0x03,
++ 0x98, 0x03, 0x99, 0x03, 0x9A, 0x03, 0x9B, 0x03,
++ 0x9C, 0x03, 0x9D, 0x03, 0x9E, 0x03, 0x9F, 0x03,
++ 0xA0, 0x03, 0xA1, 0x03, 0xA3, 0x03, 0xA3, 0x03,
++ 0xA4, 0x03, 0xA5, 0x03, 0xA6, 0x03, 0xA7, 0x03,
++ 0xA8, 0x03, 0xA9, 0x03, 0xAA, 0x03, 0xAB, 0x03,
++ 0x8C, 0x03, 0x8E, 0x03, 0x8F, 0x03, 0xCF, 0x03,
++ 0xD0, 0x03, 0xD1, 0x03, 0xD2, 0x03, 0xD3, 0x03,
++ 0xD4, 0x03, 0xD5, 0x03, 0xD6, 0x03, 0xD7, 0x03,
++ 0xD8, 0x03, 0xD8, 0x03, 0xDA, 0x03, 0xDA, 0x03,
++ 0xDC, 0x03, 0xDC, 0x03, 0xDE, 0x03, 0xDE, 0x03,
++ 0xE0, 0x03, 0xE0, 0x03, 0xE2, 0x03, 0xE2, 0x03,
++ 0xE4, 0x03, 0xE4, 0x03, 0xE6, 0x03, 0xE6, 0x03,
++ 0xE8, 0x03, 0xE8, 0x03, 0xEA, 0x03, 0xEA, 0x03,
++ 0xEC, 0x03, 0xEC, 0x03, 0xEE, 0x03, 0xEE, 0x03,
++ 0xF0, 0x03, 0xF1, 0x03, 0xF9, 0x03, 0xF3, 0x03,
++ 0xF4, 0x03, 0xF5, 0x03, 0xF6, 0x03, 0xF7, 0x03,
++ 0xF7, 0x03, 0xF9, 0x03, 0xFA, 0x03, 0xFA, 0x03,
++ 0xFC, 0x03, 0xFD, 0x03, 0xFE, 0x03, 0xFF, 0x03,
++ 0x00, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0x04,
++ 0x04, 0x04, 0x05, 0x04, 0x06, 0x04, 0x07, 0x04,
++ 0x08, 0x04, 0x09, 0x04, 0x0A, 0x04, 0x0B, 0x04,
++ 0x0C, 0x04, 0x0D, 0x04, 0x0E, 0x04, 0x0F, 0x04,
++ 0x10, 0x04, 0x11, 0x04, 0x12, 0x04, 0x13, 0x04,
++ 0x14, 0x04, 0x15, 0x04, 0x16, 0x04, 0x17, 0x04,
++ 0x18, 0x04, 0x19, 0x04, 0x1A, 0x04, 0x1B, 0x04,
++ 0x1C, 0x04, 0x1D, 0x04, 0x1E, 0x04, 0x1F, 0x04,
++ 0x20, 0x04, 0x21, 0x04, 0x22, 0x04, 0x23, 0x04,
++ 0x24, 0x04, 0x25, 0x04, 0x26, 0x04, 0x27, 0x04,
++ 0x28, 0x04, 0x29, 0x04, 0x2A, 0x04, 0x2B, 0x04,
++ 0x2C, 0x04, 0x2D, 0x04, 0x2E, 0x04, 0x2F, 0x04,
++ 0x10, 0x04, 0x11, 0x04, 0x12, 0x04, 0x13, 0x04,
++ 0x14, 0x04, 0x15, 0x04, 0x16, 0x04, 0x17, 0x04,
++ 0x18, 0x04, 0x19, 0x04, 0x1A, 0x04, 0x1B, 0x04,
++ 0x1C, 0x04, 0x1D, 0x04, 0x1E, 0x04, 0x1F, 0x04,
++ 0x20, 0x04, 0x21, 0x04, 0x22, 0x04, 0x23, 0x04,
++ 0x24, 0x04, 0x25, 0x04, 0x26, 0x04, 0x27, 0x04,
++ 0x28, 0x04, 0x29, 0x04, 0x2A, 0x04, 0x2B, 0x04,
++ 0x2C, 0x04, 0x2D, 0x04, 0x2E, 0x04, 0x2F, 0x04,
++ 0x00, 0x04, 0x01, 0x04, 0x02, 0x04, 0x03, 0x04,
++ 0x04, 0x04, 0x05, 0x04, 0x06, 0x04, 0x07, 0x04,
++ 0x08, 0x04, 0x09, 0x04, 0x0A, 0x04, 0x0B, 0x04,
++ 0x0C, 0x04, 0x0D, 0x04, 0x0E, 0x04, 0x0F, 0x04,
++ 0x60, 0x04, 0x60, 0x04, 0x62, 0x04, 0x62, 0x04,
++ 0x64, 0x04, 0x64, 0x04, 0x66, 0x04, 0x66, 0x04,
++ 0x68, 0x04, 0x68, 0x04, 0x6A, 0x04, 0x6A, 0x04,
++ 0x6C, 0x04, 0x6C, 0x04, 0x6E, 0x04, 0x6E, 0x04,
++ 0x70, 0x04, 0x70, 0x04, 0x72, 0x04, 0x72, 0x04,
++ 0x74, 0x04, 0x74, 0x04, 0x76, 0x04, 0x76, 0x04,
++ 0x78, 0x04, 0x78, 0x04, 0x7A, 0x04, 0x7A, 0x04,
++ 0x7C, 0x04, 0x7C, 0x04, 0x7E, 0x04, 0x7E, 0x04,
++ 0x80, 0x04, 0x80, 0x04, 0x82, 0x04, 0x83, 0x04,
++ 0x84, 0x04, 0x85, 0x04, 0x86, 0x04, 0x87, 0x04,
++ 0x88, 0x04, 0x89, 0x04, 0x8A, 0x04, 0x8A, 0x04,
++ 0x8C, 0x04, 0x8C, 0x04, 0x8E, 0x04, 0x8E, 0x04,
++ 0x90, 0x04, 0x90, 0x04, 0x92, 0x04, 0x92, 0x04,
++ 0x94, 0x04, 0x94, 0x04, 0x96, 0x04, 0x96, 0x04,
++ 0x98, 0x04, 0x98, 0x04, 0x9A, 0x04, 0x9A, 0x04,
++ 0x9C, 0x04, 0x9C, 0x04, 0x9E, 0x04, 0x9E, 0x04,
++ 0xA0, 0x04, 0xA0, 0x04, 0xA2, 0x04, 0xA2, 0x04,
++ 0xA4, 0x04, 0xA4, 0x04, 0xA6, 0x04, 0xA6, 0x04,
++ 0xA8, 0x04, 0xA8, 0x04, 0xAA, 0x04, 0xAA, 0x04,
++ 0xAC, 0x04, 0xAC, 0x04, 0xAE, 0x04, 0xAE, 0x04,
++ 0xB0, 0x04, 0xB0, 0x04, 0xB2, 0x04, 0xB2, 0x04,
++ 0xB4, 0x04, 0xB4, 0x04, 0xB6, 0x04, 0xB6, 0x04,
++ 0xB8, 0x04, 0xB8, 0x04, 0xBA, 0x04, 0xBA, 0x04,
++ 0xBC, 0x04, 0xBC, 0x04, 0xBE, 0x04, 0xBE, 0x04,
++ 0xC0, 0x04, 0xC1, 0x04, 0xC1, 0x04, 0xC3, 0x04,
++ 0xC3, 0x04, 0xC5, 0x04, 0xC5, 0x04, 0xC7, 0x04,
++ 0xC7, 0x04, 0xC9, 0x04, 0xC9, 0x04, 0xCB, 0x04,
++ 0xCB, 0x04, 0xCD, 0x04, 0xCD, 0x04, 0xC0, 0x04,
++ 0xD0, 0x04, 0xD0, 0x04, 0xD2, 0x04, 0xD2, 0x04,
++ 0xD4, 0x04, 0xD4, 0x04, 0xD6, 0x04, 0xD6, 0x04,
++ 0xD8, 0x04, 0xD8, 0x04, 0xDA, 0x04, 0xDA, 0x04,
++ 0xDC, 0x04, 0xDC, 0x04, 0xDE, 0x04, 0xDE, 0x04,
++ 0xE0, 0x04, 0xE0, 0x04, 0xE2, 0x04, 0xE2, 0x04,
++ 0xE4, 0x04, 0xE4, 0x04, 0xE6, 0x04, 0xE6, 0x04,
++ 0xE8, 0x04, 0xE8, 0x04, 0xEA, 0x04, 0xEA, 0x04,
++ 0xEC, 0x04, 0xEC, 0x04, 0xEE, 0x04, 0xEE, 0x04,
++ 0xF0, 0x04, 0xF0, 0x04, 0xF2, 0x04, 0xF2, 0x04,
++ 0xF4, 0x04, 0xF4, 0x04, 0xF6, 0x04, 0xF6, 0x04,
++ 0xF8, 0x04, 0xF8, 0x04, 0xFA, 0x04, 0xFA, 0x04,
++ 0xFC, 0x04, 0xFC, 0x04, 0xFE, 0x04, 0xFE, 0x04,
++ 0x00, 0x05, 0x00, 0x05, 0x02, 0x05, 0x02, 0x05,
++ 0x04, 0x05, 0x04, 0x05, 0x06, 0x05, 0x06, 0x05,
++ 0x08, 0x05, 0x08, 0x05, 0x0A, 0x05, 0x0A, 0x05,
++ 0x0C, 0x05, 0x0C, 0x05, 0x0E, 0x05, 0x0E, 0x05,
++ 0x10, 0x05, 0x10, 0x05, 0x12, 0x05, 0x12, 0x05,
++ 0x14, 0x05, 0x15, 0x05, 0x16, 0x05, 0x17, 0x05,
++ 0x18, 0x05, 0x19, 0x05, 0x1A, 0x05, 0x1B, 0x05,
++ 0x1C, 0x05, 0x1D, 0x05, 0x1E, 0x05, 0x1F, 0x05,
++ 0x20, 0x05, 0x21, 0x05, 0x22, 0x05, 0x23, 0x05,
++ 0x24, 0x05, 0x25, 0x05, 0x26, 0x05, 0x27, 0x05,
++ 0x28, 0x05, 0x29, 0x05, 0x2A, 0x05, 0x2B, 0x05,
++ 0x2C, 0x05, 0x2D, 0x05, 0x2E, 0x05, 0x2F, 0x05,
++ 0x30, 0x05, 0x31, 0x05, 0x32, 0x05, 0x33, 0x05,
++ 0x34, 0x05, 0x35, 0x05, 0x36, 0x05, 0x37, 0x05,
++ 0x38, 0x05, 0x39, 0x05, 0x3A, 0x05, 0x3B, 0x05,
++ 0x3C, 0x05, 0x3D, 0x05, 0x3E, 0x05, 0x3F, 0x05,
++ 0x40, 0x05, 0x41, 0x05, 0x42, 0x05, 0x43, 0x05,
++ 0x44, 0x05, 0x45, 0x05, 0x46, 0x05, 0x47, 0x05,
++ 0x48, 0x05, 0x49, 0x05, 0x4A, 0x05, 0x4B, 0x05,
++ 0x4C, 0x05, 0x4D, 0x05, 0x4E, 0x05, 0x4F, 0x05,
++ 0x50, 0x05, 0x51, 0x05, 0x52, 0x05, 0x53, 0x05,
++ 0x54, 0x05, 0x55, 0x05, 0x56, 0x05, 0x57, 0x05,
++ 0x58, 0x05, 0x59, 0x05, 0x5A, 0x05, 0x5B, 0x05,
++ 0x5C, 0x05, 0x5D, 0x05, 0x5E, 0x05, 0x5F, 0x05,
++ 0x60, 0x05, 0x31, 0x05, 0x32, 0x05, 0x33, 0x05,
++ 0x34, 0x05, 0x35, 0x05, 0x36, 0x05, 0x37, 0x05,
++ 0x38, 0x05, 0x39, 0x05, 0x3A, 0x05, 0x3B, 0x05,
++ 0x3C, 0x05, 0x3D, 0x05, 0x3E, 0x05, 0x3F, 0x05,
++ 0x40, 0x05, 0x41, 0x05, 0x42, 0x05, 0x43, 0x05,
++ 0x44, 0x05, 0x45, 0x05, 0x46, 0x05, 0x47, 0x05,
++ 0x48, 0x05, 0x49, 0x05, 0x4A, 0x05, 0x4B, 0x05,
++ 0x4C, 0x05, 0x4D, 0x05, 0x4E, 0x05, 0x4F, 0x05,
++ 0x50, 0x05, 0x51, 0x05, 0x52, 0x05, 0x53, 0x05,
++ 0x54, 0x05, 0x55, 0x05, 0x56, 0x05, 0xFF, 0xFF,
++ 0xF6, 0x17, 0x63, 0x2C, 0x7E, 0x1D, 0x7F, 0x1D,
++ 0x80, 0x1D, 0x81, 0x1D, 0x82, 0x1D, 0x83, 0x1D,
++ 0x84, 0x1D, 0x85, 0x1D, 0x86, 0x1D, 0x87, 0x1D,
++ 0x88, 0x1D, 0x89, 0x1D, 0x8A, 0x1D, 0x8B, 0x1D,
++ 0x8C, 0x1D, 0x8D, 0x1D, 0x8E, 0x1D, 0x8F, 0x1D,
++ 0x90, 0x1D, 0x91, 0x1D, 0x92, 0x1D, 0x93, 0x1D,
++ 0x94, 0x1D, 0x95, 0x1D, 0x96, 0x1D, 0x97, 0x1D,
++ 0x98, 0x1D, 0x99, 0x1D, 0x9A, 0x1D, 0x9B, 0x1D,
++ 0x9C, 0x1D, 0x9D, 0x1D, 0x9E, 0x1D, 0x9F, 0x1D,
++ 0xA0, 0x1D, 0xA1, 0x1D, 0xA2, 0x1D, 0xA3, 0x1D,
++ 0xA4, 0x1D, 0xA5, 0x1D, 0xA6, 0x1D, 0xA7, 0x1D,
++ 0xA8, 0x1D, 0xA9, 0x1D, 0xAA, 0x1D, 0xAB, 0x1D,
++ 0xAC, 0x1D, 0xAD, 0x1D, 0xAE, 0x1D, 0xAF, 0x1D,
++ 0xB0, 0x1D, 0xB1, 0x1D, 0xB2, 0x1D, 0xB3, 0x1D,
++ 0xB4, 0x1D, 0xB5, 0x1D, 0xB6, 0x1D, 0xB7, 0x1D,
++ 0xB8, 0x1D, 0xB9, 0x1D, 0xBA, 0x1D, 0xBB, 0x1D,
++ 0xBC, 0x1D, 0xBD, 0x1D, 0xBE, 0x1D, 0xBF, 0x1D,
++ 0xC0, 0x1D, 0xC1, 0x1D, 0xC2, 0x1D, 0xC3, 0x1D,
++ 0xC4, 0x1D, 0xC5, 0x1D, 0xC6, 0x1D, 0xC7, 0x1D,
++ 0xC8, 0x1D, 0xC9, 0x1D, 0xCA, 0x1D, 0xCB, 0x1D,
++ 0xCC, 0x1D, 0xCD, 0x1D, 0xCE, 0x1D, 0xCF, 0x1D,
++ 0xD0, 0x1D, 0xD1, 0x1D, 0xD2, 0x1D, 0xD3, 0x1D,
++ 0xD4, 0x1D, 0xD5, 0x1D, 0xD6, 0x1D, 0xD7, 0x1D,
++ 0xD8, 0x1D, 0xD9, 0x1D, 0xDA, 0x1D, 0xDB, 0x1D,
++ 0xDC, 0x1D, 0xDD, 0x1D, 0xDE, 0x1D, 0xDF, 0x1D,
++ 0xE0, 0x1D, 0xE1, 0x1D, 0xE2, 0x1D, 0xE3, 0x1D,
++ 0xE4, 0x1D, 0xE5, 0x1D, 0xE6, 0x1D, 0xE7, 0x1D,
++ 0xE8, 0x1D, 0xE9, 0x1D, 0xEA, 0x1D, 0xEB, 0x1D,
++ 0xEC, 0x1D, 0xED, 0x1D, 0xEE, 0x1D, 0xEF, 0x1D,
++ 0xF0, 0x1D, 0xF1, 0x1D, 0xF2, 0x1D, 0xF3, 0x1D,
++ 0xF4, 0x1D, 0xF5, 0x1D, 0xF6, 0x1D, 0xF7, 0x1D,
++ 0xF8, 0x1D, 0xF9, 0x1D, 0xFA, 0x1D, 0xFB, 0x1D,
++ 0xFC, 0x1D, 0xFD, 0x1D, 0xFE, 0x1D, 0xFF, 0x1D,
++ 0x00, 0x1E, 0x00, 0x1E, 0x02, 0x1E, 0x02, 0x1E,
++ 0x04, 0x1E, 0x04, 0x1E, 0x06, 0x1E, 0x06, 0x1E,
++ 0x08, 0x1E, 0x08, 0x1E, 0x0A, 0x1E, 0x0A, 0x1E,
++ 0x0C, 0x1E, 0x0C, 0x1E, 0x0E, 0x1E, 0x0E, 0x1E,
++ 0x10, 0x1E, 0x10, 0x1E, 0x12, 0x1E, 0x12, 0x1E,
++ 0x14, 0x1E, 0x14, 0x1E, 0x16, 0x1E, 0x16, 0x1E,
++ 0x18, 0x1E, 0x18, 0x1E, 0x1A, 0x1E, 0x1A, 0x1E,
++ 0x1C, 0x1E, 0x1C, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E,
++ 0x20, 0x1E, 0x20, 0x1E, 0x22, 0x1E, 0x22, 0x1E,
++ 0x24, 0x1E, 0x24, 0x1E, 0x26, 0x1E, 0x26, 0x1E,
++ 0x28, 0x1E, 0x28, 0x1E, 0x2A, 0x1E, 0x2A, 0x1E,
++ 0x2C, 0x1E, 0x2C, 0x1E, 0x2E, 0x1E, 0x2E, 0x1E,
++ 0x30, 0x1E, 0x30, 0x1E, 0x32, 0x1E, 0x32, 0x1E,
++ 0x34, 0x1E, 0x34, 0x1E, 0x36, 0x1E, 0x36, 0x1E,
++ 0x38, 0x1E, 0x38, 0x1E, 0x3A, 0x1E, 0x3A, 0x1E,
++ 0x3C, 0x1E, 0x3C, 0x1E, 0x3E, 0x1E, 0x3E, 0x1E,
++ 0x40, 0x1E, 0x40, 0x1E, 0x42, 0x1E, 0x42, 0x1E,
++ 0x44, 0x1E, 0x44, 0x1E, 0x46, 0x1E, 0x46, 0x1E,
++ 0x48, 0x1E, 0x48, 0x1E, 0x4A, 0x1E, 0x4A, 0x1E,
++ 0x4C, 0x1E, 0x4C, 0x1E, 0x4E, 0x1E, 0x4E, 0x1E,
++ 0x50, 0x1E, 0x50, 0x1E, 0x52, 0x1E, 0x52, 0x1E,
++ 0x54, 0x1E, 0x54, 0x1E, 0x56, 0x1E, 0x56, 0x1E,
++ 0x58, 0x1E, 0x58, 0x1E, 0x5A, 0x1E, 0x5A, 0x1E,
++ 0x5C, 0x1E, 0x5C, 0x1E, 0x5E, 0x1E, 0x5E, 0x1E,
++ 0x60, 0x1E, 0x60, 0x1E, 0x62, 0x1E, 0x62, 0x1E,
++ 0x64, 0x1E, 0x64, 0x1E, 0x66, 0x1E, 0x66, 0x1E,
++ 0x68, 0x1E, 0x68, 0x1E, 0x6A, 0x1E, 0x6A, 0x1E,
++ 0x6C, 0x1E, 0x6C, 0x1E, 0x6E, 0x1E, 0x6E, 0x1E,
++ 0x70, 0x1E, 0x70, 0x1E, 0x72, 0x1E, 0x72, 0x1E,
++ 0x74, 0x1E, 0x74, 0x1E, 0x76, 0x1E, 0x76, 0x1E,
++ 0x78, 0x1E, 0x78, 0x1E, 0x7A, 0x1E, 0x7A, 0x1E,
++ 0x7C, 0x1E, 0x7C, 0x1E, 0x7E, 0x1E, 0x7E, 0x1E,
++ 0x80, 0x1E, 0x80, 0x1E, 0x82, 0x1E, 0x82, 0x1E,
++ 0x84, 0x1E, 0x84, 0x1E, 0x86, 0x1E, 0x86, 0x1E,
++ 0x88, 0x1E, 0x88, 0x1E, 0x8A, 0x1E, 0x8A, 0x1E,
++ 0x8C, 0x1E, 0x8C, 0x1E, 0x8E, 0x1E, 0x8E, 0x1E,
++ 0x90, 0x1E, 0x90, 0x1E, 0x92, 0x1E, 0x92, 0x1E,
++ 0x94, 0x1E, 0x94, 0x1E, 0x96, 0x1E, 0x97, 0x1E,
++ 0x98, 0x1E, 0x99, 0x1E, 0x9A, 0x1E, 0x9B, 0x1E,
++ 0x9C, 0x1E, 0x9D, 0x1E, 0x9E, 0x1E, 0x9F, 0x1E,
++ 0xA0, 0x1E, 0xA0, 0x1E, 0xA2, 0x1E, 0xA2, 0x1E,
++ 0xA4, 0x1E, 0xA4, 0x1E, 0xA6, 0x1E, 0xA6, 0x1E,
++ 0xA8, 0x1E, 0xA8, 0x1E, 0xAA, 0x1E, 0xAA, 0x1E,
++ 0xAC, 0x1E, 0xAC, 0x1E, 0xAE, 0x1E, 0xAE, 0x1E,
++ 0xB0, 0x1E, 0xB0, 0x1E, 0xB2, 0x1E, 0xB2, 0x1E,
++ 0xB4, 0x1E, 0xB4, 0x1E, 0xB6, 0x1E, 0xB6, 0x1E,
++ 0xB8, 0x1E, 0xB8, 0x1E, 0xBA, 0x1E, 0xBA, 0x1E,
++ 0xBC, 0x1E, 0xBC, 0x1E, 0xBE, 0x1E, 0xBE, 0x1E,
++ 0xC0, 0x1E, 0xC0, 0x1E, 0xC2, 0x1E, 0xC2, 0x1E,
++ 0xC4, 0x1E, 0xC4, 0x1E, 0xC6, 0x1E, 0xC6, 0x1E,
++ 0xC8, 0x1E, 0xC8, 0x1E, 0xCA, 0x1E, 0xCA, 0x1E,
++ 0xCC, 0x1E, 0xCC, 0x1E, 0xCE, 0x1E, 0xCE, 0x1E,
++ 0xD0, 0x1E, 0xD0, 0x1E, 0xD2, 0x1E, 0xD2, 0x1E,
++ 0xD4, 0x1E, 0xD4, 0x1E, 0xD6, 0x1E, 0xD6, 0x1E,
++ 0xD8, 0x1E, 0xD8, 0x1E, 0xDA, 0x1E, 0xDA, 0x1E,
++ 0xDC, 0x1E, 0xDC, 0x1E, 0xDE, 0x1E, 0xDE, 0x1E,
++ 0xE0, 0x1E, 0xE0, 0x1E, 0xE2, 0x1E, 0xE2, 0x1E,
++ 0xE4, 0x1E, 0xE4, 0x1E, 0xE6, 0x1E, 0xE6, 0x1E,
++ 0xE8, 0x1E, 0xE8, 0x1E, 0xEA, 0x1E, 0xEA, 0x1E,
++ 0xEC, 0x1E, 0xEC, 0x1E, 0xEE, 0x1E, 0xEE, 0x1E,
++ 0xF0, 0x1E, 0xF0, 0x1E, 0xF2, 0x1E, 0xF2, 0x1E,
++ 0xF4, 0x1E, 0xF4, 0x1E, 0xF6, 0x1E, 0xF6, 0x1E,
++ 0xF8, 0x1E, 0xF8, 0x1E, 0xFA, 0x1E, 0xFB, 0x1E,
++ 0xFC, 0x1E, 0xFD, 0x1E, 0xFE, 0x1E, 0xFF, 0x1E,
++ 0x08, 0x1F, 0x09, 0x1F, 0x0A, 0x1F, 0x0B, 0x1F,
++ 0x0C, 0x1F, 0x0D, 0x1F, 0x0E, 0x1F, 0x0F, 0x1F,
++ 0x08, 0x1F, 0x09, 0x1F, 0x0A, 0x1F, 0x0B, 0x1F,
++ 0x0C, 0x1F, 0x0D, 0x1F, 0x0E, 0x1F, 0x0F, 0x1F,
++ 0x18, 0x1F, 0x19, 0x1F, 0x1A, 0x1F, 0x1B, 0x1F,
++ 0x1C, 0x1F, 0x1D, 0x1F, 0x16, 0x1F, 0x17, 0x1F,
++ 0x18, 0x1F, 0x19, 0x1F, 0x1A, 0x1F, 0x1B, 0x1F,
++ 0x1C, 0x1F, 0x1D, 0x1F, 0x1E, 0x1F, 0x1F, 0x1F,
++ 0x28, 0x1F, 0x29, 0x1F, 0x2A, 0x1F, 0x2B, 0x1F,
++ 0x2C, 0x1F, 0x2D, 0x1F, 0x2E, 0x1F, 0x2F, 0x1F,
++ 0x28, 0x1F, 0x29, 0x1F, 0x2A, 0x1F, 0x2B, 0x1F,
++ 0x2C, 0x1F, 0x2D, 0x1F, 0x2E, 0x1F, 0x2F, 0x1F,
++ 0x38, 0x1F, 0x39, 0x1F, 0x3A, 0x1F, 0x3B, 0x1F,
++ 0x3C, 0x1F, 0x3D, 0x1F, 0x3E, 0x1F, 0x3F, 0x1F,
++ 0x38, 0x1F, 0x39, 0x1F, 0x3A, 0x1F, 0x3B, 0x1F,
++ 0x3C, 0x1F, 0x3D, 0x1F, 0x3E, 0x1F, 0x3F, 0x1F,
++ 0x48, 0x1F, 0x49, 0x1F, 0x4A, 0x1F, 0x4B, 0x1F,
++ 0x4C, 0x1F, 0x4D, 0x1F, 0x46, 0x1F, 0x47, 0x1F,
++ 0x48, 0x1F, 0x49, 0x1F, 0x4A, 0x1F, 0x4B, 0x1F,
++ 0x4C, 0x1F, 0x4D, 0x1F, 0x4E, 0x1F, 0x4F, 0x1F,
++ 0x50, 0x1F, 0x59, 0x1F, 0x52, 0x1F, 0x5B, 0x1F,
++ 0x54, 0x1F, 0x5D, 0x1F, 0x56, 0x1F, 0x5F, 0x1F,
++ 0x58, 0x1F, 0x59, 0x1F, 0x5A, 0x1F, 0x5B, 0x1F,
++ 0x5C, 0x1F, 0x5D, 0x1F, 0x5E, 0x1F, 0x5F, 0x1F,
++ 0x68, 0x1F, 0x69, 0x1F, 0x6A, 0x1F, 0x6B, 0x1F,
++ 0x6C, 0x1F, 0x6D, 0x1F, 0x6E, 0x1F, 0x6F, 0x1F,
++ 0x68, 0x1F, 0x69, 0x1F, 0x6A, 0x1F, 0x6B, 0x1F,
++ 0x6C, 0x1F, 0x6D, 0x1F, 0x6E, 0x1F, 0x6F, 0x1F,
++ 0xBA, 0x1F, 0xBB, 0x1F, 0xC8, 0x1F, 0xC9, 0x1F,
++ 0xCA, 0x1F, 0xCB, 0x1F, 0xDA, 0x1F, 0xDB, 0x1F,
++ 0xF8, 0x1F, 0xF9, 0x1F, 0xEA, 0x1F, 0xEB, 0x1F,
++ 0xFA, 0x1F, 0xFB, 0x1F, 0x7E, 0x1F, 0x7F, 0x1F,
++ 0x88, 0x1F, 0x89, 0x1F, 0x8A, 0x1F, 0x8B, 0x1F,
++ 0x8C, 0x1F, 0x8D, 0x1F, 0x8E, 0x1F, 0x8F, 0x1F,
++ 0x88, 0x1F, 0x89, 0x1F, 0x8A, 0x1F, 0x8B, 0x1F,
++ 0x8C, 0x1F, 0x8D, 0x1F, 0x8E, 0x1F, 0x8F, 0x1F,
++ 0x98, 0x1F, 0x99, 0x1F, 0x9A, 0x1F, 0x9B, 0x1F,
++ 0x9C, 0x1F, 0x9D, 0x1F, 0x9E, 0x1F, 0x9F, 0x1F,
++ 0x98, 0x1F, 0x99, 0x1F, 0x9A, 0x1F, 0x9B, 0x1F,
++ 0x9C, 0x1F, 0x9D, 0x1F, 0x9E, 0x1F, 0x9F, 0x1F,
++ 0xA8, 0x1F, 0xA9, 0x1F, 0xAA, 0x1F, 0xAB, 0x1F,
++ 0xAC, 0x1F, 0xAD, 0x1F, 0xAE, 0x1F, 0xAF, 0x1F,
++ 0xA8, 0x1F, 0xA9, 0x1F, 0xAA, 0x1F, 0xAB, 0x1F,
++ 0xAC, 0x1F, 0xAD, 0x1F, 0xAE, 0x1F, 0xAF, 0x1F,
++ 0xB8, 0x1F, 0xB9, 0x1F, 0xB2, 0x1F, 0xBC, 0x1F,
++ 0xB4, 0x1F, 0xB5, 0x1F, 0xB6, 0x1F, 0xB7, 0x1F,
++ 0xB8, 0x1F, 0xB9, 0x1F, 0xBA, 0x1F, 0xBB, 0x1F,
++ 0xBC, 0x1F, 0xBD, 0x1F, 0xBE, 0x1F, 0xBF, 0x1F,
++ 0xC0, 0x1F, 0xC1, 0x1F, 0xC2, 0x1F, 0xC3, 0x1F,
++ 0xC4, 0x1F, 0xC5, 0x1F, 0xC6, 0x1F, 0xC7, 0x1F,
++ 0xC8, 0x1F, 0xC9, 0x1F, 0xCA, 0x1F, 0xCB, 0x1F,
++ 0xC3, 0x1F, 0xCD, 0x1F, 0xCE, 0x1F, 0xCF, 0x1F,
++ 0xD8, 0x1F, 0xD9, 0x1F, 0xD2, 0x1F, 0xD3, 0x1F,
++ 0xD4, 0x1F, 0xD5, 0x1F, 0xD6, 0x1F, 0xD7, 0x1F,
++ 0xD8, 0x1F, 0xD9, 0x1F, 0xDA, 0x1F, 0xDB, 0x1F,
++ 0xDC, 0x1F, 0xDD, 0x1F, 0xDE, 0x1F, 0xDF, 0x1F,
++ 0xE8, 0x1F, 0xE9, 0x1F, 0xE2, 0x1F, 0xE3, 0x1F,
++ 0xE4, 0x1F, 0xEC, 0x1F, 0xE6, 0x1F, 0xE7, 0x1F,
++ 0xE8, 0x1F, 0xE9, 0x1F, 0xEA, 0x1F, 0xEB, 0x1F,
++ 0xEC, 0x1F, 0xED, 0x1F, 0xEE, 0x1F, 0xEF, 0x1F,
++ 0xF0, 0x1F, 0xF1, 0x1F, 0xF2, 0x1F, 0xF3, 0x1F,
++ 0xF4, 0x1F, 0xF5, 0x1F, 0xF6, 0x1F, 0xF7, 0x1F,
++ 0xF8, 0x1F, 0xF9, 0x1F, 0xFA, 0x1F, 0xFB, 0x1F,
++ 0xF3, 0x1F, 0xFD, 0x1F, 0xFE, 0x1F, 0xFF, 0x1F,
++ 0x00, 0x20, 0x01, 0x20, 0x02, 0x20, 0x03, 0x20,
++ 0x04, 0x20, 0x05, 0x20, 0x06, 0x20, 0x07, 0x20,
++ 0x08, 0x20, 0x09, 0x20, 0x0A, 0x20, 0x0B, 0x20,
++ 0x0C, 0x20, 0x0D, 0x20, 0x0E, 0x20, 0x0F, 0x20,
++ 0x10, 0x20, 0x11, 0x20, 0x12, 0x20, 0x13, 0x20,
++ 0x14, 0x20, 0x15, 0x20, 0x16, 0x20, 0x17, 0x20,
++ 0x18, 0x20, 0x19, 0x20, 0x1A, 0x20, 0x1B, 0x20,
++ 0x1C, 0x20, 0x1D, 0x20, 0x1E, 0x20, 0x1F, 0x20,
++ 0x20, 0x20, 0x21, 0x20, 0x22, 0x20, 0x23, 0x20,
++ 0x24, 0x20, 0x25, 0x20, 0x26, 0x20, 0x27, 0x20,
++ 0x28, 0x20, 0x29, 0x20, 0x2A, 0x20, 0x2B, 0x20,
++ 0x2C, 0x20, 0x2D, 0x20, 0x2E, 0x20, 0x2F, 0x20,
++ 0x30, 0x20, 0x31, 0x20, 0x32, 0x20, 0x33, 0x20,
++ 0x34, 0x20, 0x35, 0x20, 0x36, 0x20, 0x37, 0x20,
++ 0x38, 0x20, 0x39, 0x20, 0x3A, 0x20, 0x3B, 0x20,
++ 0x3C, 0x20, 0x3D, 0x20, 0x3E, 0x20, 0x3F, 0x20,
++ 0x40, 0x20, 0x41, 0x20, 0x42, 0x20, 0x43, 0x20,
++ 0x44, 0x20, 0x45, 0x20, 0x46, 0x20, 0x47, 0x20,
++ 0x48, 0x20, 0x49, 0x20, 0x4A, 0x20, 0x4B, 0x20,
++ 0x4C, 0x20, 0x4D, 0x20, 0x4E, 0x20, 0x4F, 0x20,
++ 0x50, 0x20, 0x51, 0x20, 0x52, 0x20, 0x53, 0x20,
++ 0x54, 0x20, 0x55, 0x20, 0x56, 0x20, 0x57, 0x20,
++ 0x58, 0x20, 0x59, 0x20, 0x5A, 0x20, 0x5B, 0x20,
++ 0x5C, 0x20, 0x5D, 0x20, 0x5E, 0x20, 0x5F, 0x20,
++ 0x60, 0x20, 0x61, 0x20, 0x62, 0x20, 0x63, 0x20,
++ 0x64, 0x20, 0x65, 0x20, 0x66, 0x20, 0x67, 0x20,
++ 0x68, 0x20, 0x69, 0x20, 0x6A, 0x20, 0x6B, 0x20,
++ 0x6C, 0x20, 0x6D, 0x20, 0x6E, 0x20, 0x6F, 0x20,
++ 0x70, 0x20, 0x71, 0x20, 0x72, 0x20, 0x73, 0x20,
++ 0x74, 0x20, 0x75, 0x20, 0x76, 0x20, 0x77, 0x20,
++ 0x78, 0x20, 0x79, 0x20, 0x7A, 0x20, 0x7B, 0x20,
++ 0x7C, 0x20, 0x7D, 0x20, 0x7E, 0x20, 0x7F, 0x20,
++ 0x80, 0x20, 0x81, 0x20, 0x82, 0x20, 0x83, 0x20,
++ 0x84, 0x20, 0x85, 0x20, 0x86, 0x20, 0x87, 0x20,
++ 0x88, 0x20, 0x89, 0x20, 0x8A, 0x20, 0x8B, 0x20,
++ 0x8C, 0x20, 0x8D, 0x20, 0x8E, 0x20, 0x8F, 0x20,
++ 0x90, 0x20, 0x91, 0x20, 0x92, 0x20, 0x93, 0x20,
++ 0x94, 0x20, 0x95, 0x20, 0x96, 0x20, 0x97, 0x20,
++ 0x98, 0x20, 0x99, 0x20, 0x9A, 0x20, 0x9B, 0x20,
++ 0x9C, 0x20, 0x9D, 0x20, 0x9E, 0x20, 0x9F, 0x20,
++ 0xA0, 0x20, 0xA1, 0x20, 0xA2, 0x20, 0xA3, 0x20,
++ 0xA4, 0x20, 0xA5, 0x20, 0xA6, 0x20, 0xA7, 0x20,
++ 0xA8, 0x20, 0xA9, 0x20, 0xAA, 0x20, 0xAB, 0x20,
++ 0xAC, 0x20, 0xAD, 0x20, 0xAE, 0x20, 0xAF, 0x20,
++ 0xB0, 0x20, 0xB1, 0x20, 0xB2, 0x20, 0xB3, 0x20,
++ 0xB4, 0x20, 0xB5, 0x20, 0xB6, 0x20, 0xB7, 0x20,
++ 0xB8, 0x20, 0xB9, 0x20, 0xBA, 0x20, 0xBB, 0x20,
++ 0xBC, 0x20, 0xBD, 0x20, 0xBE, 0x20, 0xBF, 0x20,
++ 0xC0, 0x20, 0xC1, 0x20, 0xC2, 0x20, 0xC3, 0x20,
++ 0xC4, 0x20, 0xC5, 0x20, 0xC6, 0x20, 0xC7, 0x20,
++ 0xC8, 0x20, 0xC9, 0x20, 0xCA, 0x20, 0xCB, 0x20,
++ 0xCC, 0x20, 0xCD, 0x20, 0xCE, 0x20, 0xCF, 0x20,
++ 0xD0, 0x20, 0xD1, 0x20, 0xD2, 0x20, 0xD3, 0x20,
++ 0xD4, 0x20, 0xD5, 0x20, 0xD6, 0x20, 0xD7, 0x20,
++ 0xD8, 0x20, 0xD9, 0x20, 0xDA, 0x20, 0xDB, 0x20,
++ 0xDC, 0x20, 0xDD, 0x20, 0xDE, 0x20, 0xDF, 0x20,
++ 0xE0, 0x20, 0xE1, 0x20, 0xE2, 0x20, 0xE3, 0x20,
++ 0xE4, 0x20, 0xE5, 0x20, 0xE6, 0x20, 0xE7, 0x20,
++ 0xE8, 0x20, 0xE9, 0x20, 0xEA, 0x20, 0xEB, 0x20,
++ 0xEC, 0x20, 0xED, 0x20, 0xEE, 0x20, 0xEF, 0x20,
++ 0xF0, 0x20, 0xF1, 0x20, 0xF2, 0x20, 0xF3, 0x20,
++ 0xF4, 0x20, 0xF5, 0x20, 0xF6, 0x20, 0xF7, 0x20,
++ 0xF8, 0x20, 0xF9, 0x20, 0xFA, 0x20, 0xFB, 0x20,
++ 0xFC, 0x20, 0xFD, 0x20, 0xFE, 0x20, 0xFF, 0x20,
++ 0x00, 0x21, 0x01, 0x21, 0x02, 0x21, 0x03, 0x21,
++ 0x04, 0x21, 0x05, 0x21, 0x06, 0x21, 0x07, 0x21,
++ 0x08, 0x21, 0x09, 0x21, 0x0A, 0x21, 0x0B, 0x21,
++ 0x0C, 0x21, 0x0D, 0x21, 0x0E, 0x21, 0x0F, 0x21,
++ 0x10, 0x21, 0x11, 0x21, 0x12, 0x21, 0x13, 0x21,
++ 0x14, 0x21, 0x15, 0x21, 0x16, 0x21, 0x17, 0x21,
++ 0x18, 0x21, 0x19, 0x21, 0x1A, 0x21, 0x1B, 0x21,
++ 0x1C, 0x21, 0x1D, 0x21, 0x1E, 0x21, 0x1F, 0x21,
++ 0x20, 0x21, 0x21, 0x21, 0x22, 0x21, 0x23, 0x21,
++ 0x24, 0x21, 0x25, 0x21, 0x26, 0x21, 0x27, 0x21,
++ 0x28, 0x21, 0x29, 0x21, 0x2A, 0x21, 0x2B, 0x21,
++ 0x2C, 0x21, 0x2D, 0x21, 0x2E, 0x21, 0x2F, 0x21,
++ 0x30, 0x21, 0x31, 0x21, 0x32, 0x21, 0x33, 0x21,
++ 0x34, 0x21, 0x35, 0x21, 0x36, 0x21, 0x37, 0x21,
++ 0x38, 0x21, 0x39, 0x21, 0x3A, 0x21, 0x3B, 0x21,
++ 0x3C, 0x21, 0x3D, 0x21, 0x3E, 0x21, 0x3F, 0x21,
++ 0x40, 0x21, 0x41, 0x21, 0x42, 0x21, 0x43, 0x21,
++ 0x44, 0x21, 0x45, 0x21, 0x46, 0x21, 0x47, 0x21,
++ 0x48, 0x21, 0x49, 0x21, 0x4A, 0x21, 0x4B, 0x21,
++ 0x4C, 0x21, 0x4D, 0x21, 0x32, 0x21, 0x4F, 0x21,
++ 0x50, 0x21, 0x51, 0x21, 0x52, 0x21, 0x53, 0x21,
++ 0x54, 0x21, 0x55, 0x21, 0x56, 0x21, 0x57, 0x21,
++ 0x58, 0x21, 0x59, 0x21, 0x5A, 0x21, 0x5B, 0x21,
++ 0x5C, 0x21, 0x5D, 0x21, 0x5E, 0x21, 0x5F, 0x21,
++ 0x60, 0x21, 0x61, 0x21, 0x62, 0x21, 0x63, 0x21,
++ 0x64, 0x21, 0x65, 0x21, 0x66, 0x21, 0x67, 0x21,
++ 0x68, 0x21, 0x69, 0x21, 0x6A, 0x21, 0x6B, 0x21,
++ 0x6C, 0x21, 0x6D, 0x21, 0x6E, 0x21, 0x6F, 0x21,
++ 0x60, 0x21, 0x61, 0x21, 0x62, 0x21, 0x63, 0x21,
++ 0x64, 0x21, 0x65, 0x21, 0x66, 0x21, 0x67, 0x21,
++ 0x68, 0x21, 0x69, 0x21, 0x6A, 0x21, 0x6B, 0x21,
++ 0x6C, 0x21, 0x6D, 0x21, 0x6E, 0x21, 0x6F, 0x21,
++ 0x80, 0x21, 0x81, 0x21, 0x82, 0x21, 0x83, 0x21,
++ 0x83, 0x21, 0xFF, 0xFF, 0x4B, 0x03, 0xB6, 0x24,
++ 0xB7, 0x24, 0xB8, 0x24, 0xB9, 0x24, 0xBA, 0x24,
++ 0xBB, 0x24, 0xBC, 0x24, 0xBD, 0x24, 0xBE, 0x24,
++ 0xBF, 0x24, 0xC0, 0x24, 0xC1, 0x24, 0xC2, 0x24,
++ 0xC3, 0x24, 0xC4, 0x24, 0xC5, 0x24, 0xC6, 0x24,
++ 0xC7, 0x24, 0xC8, 0x24, 0xC9, 0x24, 0xCA, 0x24,
++ 0xCB, 0x24, 0xCC, 0x24, 0xCD, 0x24, 0xCE, 0x24,
++ 0xCF, 0x24, 0xFF, 0xFF, 0x46, 0x07, 0x00, 0x2C,
++ 0x01, 0x2C, 0x02, 0x2C, 0x03, 0x2C, 0x04, 0x2C,
++ 0x05, 0x2C, 0x06, 0x2C, 0x07, 0x2C, 0x08, 0x2C,
++ 0x09, 0x2C, 0x0A, 0x2C, 0x0B, 0x2C, 0x0C, 0x2C,
++ 0x0D, 0x2C, 0x0E, 0x2C, 0x0F, 0x2C, 0x10, 0x2C,
++ 0x11, 0x2C, 0x12, 0x2C, 0x13, 0x2C, 0x14, 0x2C,
++ 0x15, 0x2C, 0x16, 0x2C, 0x17, 0x2C, 0x18, 0x2C,
++ 0x19, 0x2C, 0x1A, 0x2C, 0x1B, 0x2C, 0x1C, 0x2C,
++ 0x1D, 0x2C, 0x1E, 0x2C, 0x1F, 0x2C, 0x20, 0x2C,
++ 0x21, 0x2C, 0x22, 0x2C, 0x23, 0x2C, 0x24, 0x2C,
++ 0x25, 0x2C, 0x26, 0x2C, 0x27, 0x2C, 0x28, 0x2C,
++ 0x29, 0x2C, 0x2A, 0x2C, 0x2B, 0x2C, 0x2C, 0x2C,
++ 0x2D, 0x2C, 0x2E, 0x2C, 0x5F, 0x2C, 0x60, 0x2C,
++ 0x60, 0x2C, 0x62, 0x2C, 0x63, 0x2C, 0x64, 0x2C,
++ 0x65, 0x2C, 0x66, 0x2C, 0x67, 0x2C, 0x67, 0x2C,
++ 0x69, 0x2C, 0x69, 0x2C, 0x6B, 0x2C, 0x6B, 0x2C,
++ 0x6D, 0x2C, 0x6E, 0x2C, 0x6F, 0x2C, 0x70, 0x2C,
++ 0x71, 0x2C, 0x72, 0x2C, 0x73, 0x2C, 0x74, 0x2C,
++ 0x75, 0x2C, 0x75, 0x2C, 0x77, 0x2C, 0x78, 0x2C,
++ 0x79, 0x2C, 0x7A, 0x2C, 0x7B, 0x2C, 0x7C, 0x2C,
++ 0x7D, 0x2C, 0x7E, 0x2C, 0x7F, 0x2C, 0x80, 0x2C,
++ 0x80, 0x2C, 0x82, 0x2C, 0x82, 0x2C, 0x84, 0x2C,
++ 0x84, 0x2C, 0x86, 0x2C, 0x86, 0x2C, 0x88, 0x2C,
++ 0x88, 0x2C, 0x8A, 0x2C, 0x8A, 0x2C, 0x8C, 0x2C,
++ 0x8C, 0x2C, 0x8E, 0x2C, 0x8E, 0x2C, 0x90, 0x2C,
++ 0x90, 0x2C, 0x92, 0x2C, 0x92, 0x2C, 0x94, 0x2C,
++ 0x94, 0x2C, 0x96, 0x2C, 0x96, 0x2C, 0x98, 0x2C,
++ 0x98, 0x2C, 0x9A, 0x2C, 0x9A, 0x2C, 0x9C, 0x2C,
++ 0x9C, 0x2C, 0x9E, 0x2C, 0x9E, 0x2C, 0xA0, 0x2C,
++ 0xA0, 0x2C, 0xA2, 0x2C, 0xA2, 0x2C, 0xA4, 0x2C,
++ 0xA4, 0x2C, 0xA6, 0x2C, 0xA6, 0x2C, 0xA8, 0x2C,
++ 0xA8, 0x2C, 0xAA, 0x2C, 0xAA, 0x2C, 0xAC, 0x2C,
++ 0xAC, 0x2C, 0xAE, 0x2C, 0xAE, 0x2C, 0xB0, 0x2C,
++ 0xB0, 0x2C, 0xB2, 0x2C, 0xB2, 0x2C, 0xB4, 0x2C,
++ 0xB4, 0x2C, 0xB6, 0x2C, 0xB6, 0x2C, 0xB8, 0x2C,
++ 0xB8, 0x2C, 0xBA, 0x2C, 0xBA, 0x2C, 0xBC, 0x2C,
++ 0xBC, 0x2C, 0xBE, 0x2C, 0xBE, 0x2C, 0xC0, 0x2C,
++ 0xC0, 0x2C, 0xC2, 0x2C, 0xC2, 0x2C, 0xC4, 0x2C,
++ 0xC4, 0x2C, 0xC6, 0x2C, 0xC6, 0x2C, 0xC8, 0x2C,
++ 0xC8, 0x2C, 0xCA, 0x2C, 0xCA, 0x2C, 0xCC, 0x2C,
++ 0xCC, 0x2C, 0xCE, 0x2C, 0xCE, 0x2C, 0xD0, 0x2C,
++ 0xD0, 0x2C, 0xD2, 0x2C, 0xD2, 0x2C, 0xD4, 0x2C,
++ 0xD4, 0x2C, 0xD6, 0x2C, 0xD6, 0x2C, 0xD8, 0x2C,
++ 0xD8, 0x2C, 0xDA, 0x2C, 0xDA, 0x2C, 0xDC, 0x2C,
++ 0xDC, 0x2C, 0xDE, 0x2C, 0xDE, 0x2C, 0xE0, 0x2C,
++ 0xE0, 0x2C, 0xE2, 0x2C, 0xE2, 0x2C, 0xE4, 0x2C,
++ 0xE5, 0x2C, 0xE6, 0x2C, 0xE7, 0x2C, 0xE8, 0x2C,
++ 0xE9, 0x2C, 0xEA, 0x2C, 0xEB, 0x2C, 0xEC, 0x2C,
++ 0xED, 0x2C, 0xEE, 0x2C, 0xEF, 0x2C, 0xF0, 0x2C,
++ 0xF1, 0x2C, 0xF2, 0x2C, 0xF3, 0x2C, 0xF4, 0x2C,
++ 0xF5, 0x2C, 0xF6, 0x2C, 0xF7, 0x2C, 0xF8, 0x2C,
++ 0xF9, 0x2C, 0xFA, 0x2C, 0xFB, 0x2C, 0xFC, 0x2C,
++ 0xFD, 0x2C, 0xFE, 0x2C, 0xFF, 0x2C, 0xA0, 0x10,
++ 0xA1, 0x10, 0xA2, 0x10, 0xA3, 0x10, 0xA4, 0x10,
++ 0xA5, 0x10, 0xA6, 0x10, 0xA7, 0x10, 0xA8, 0x10,
++ 0xA9, 0x10, 0xAA, 0x10, 0xAB, 0x10, 0xAC, 0x10,
++ 0xAD, 0x10, 0xAE, 0x10, 0xAF, 0x10, 0xB0, 0x10,
++ 0xB1, 0x10, 0xB2, 0x10, 0xB3, 0x10, 0xB4, 0x10,
++ 0xB5, 0x10, 0xB6, 0x10, 0xB7, 0x10, 0xB8, 0x10,
++ 0xB9, 0x10, 0xBA, 0x10, 0xBB, 0x10, 0xBC, 0x10,
++ 0xBD, 0x10, 0xBE, 0x10, 0xBF, 0x10, 0xC0, 0x10,
++ 0xC1, 0x10, 0xC2, 0x10, 0xC3, 0x10, 0xC4, 0x10,
++ 0xC5, 0x10, 0xFF, 0xFF, 0x1B, 0xD2, 0x21, 0xFF,
++ 0x22, 0xFF, 0x23, 0xFF, 0x24, 0xFF, 0x25, 0xFF,
++ 0x26, 0xFF, 0x27, 0xFF, 0x28, 0xFF, 0x29, 0xFF,
++ 0x2A, 0xFF, 0x2B, 0xFF, 0x2C, 0xFF, 0x2D, 0xFF,
++ 0x2E, 0xFF, 0x2F, 0xFF, 0x30, 0xFF, 0x31, 0xFF,
++ 0x32, 0xFF, 0x33, 0xFF, 0x34, 0xFF, 0x35, 0xFF,
++ 0x36, 0xFF, 0x37, 0xFF, 0x38, 0xFF, 0x39, 0xFF,
++ 0x3A, 0xFF, 0x5B, 0xFF, 0x5C, 0xFF, 0x5D, 0xFF,
++ 0x5E, 0xFF, 0x5F, 0xFF, 0x60, 0xFF, 0x61, 0xFF,
++ 0x62, 0xFF, 0x63, 0xFF, 0x64, 0xFF, 0x65, 0xFF,
++ 0x66, 0xFF, 0x67, 0xFF, 0x68, 0xFF, 0x69, 0xFF,
++ 0x6A, 0xFF, 0x6B, 0xFF, 0x6C, 0xFF, 0x6D, 0xFF,
++ 0x6E, 0xFF, 0x6F, 0xFF, 0x70, 0xFF, 0x71, 0xFF,
++ 0x72, 0xFF, 0x73, 0xFF, 0x74, 0xFF, 0x75, 0xFF,
++ 0x76, 0xFF, 0x77, 0xFF, 0x78, 0xFF, 0x79, 0xFF,
++ 0x7A, 0xFF, 0x7B, 0xFF, 0x7C, 0xFF, 0x7D, 0xFF,
++ 0x7E, 0xFF, 0x7F, 0xFF, 0x80, 0xFF, 0x81, 0xFF,
++ 0x82, 0xFF, 0x83, 0xFF, 0x84, 0xFF, 0x85, 0xFF,
++ 0x86, 0xFF, 0x87, 0xFF, 0x88, 0xFF, 0x89, 0xFF,
++ 0x8A, 0xFF, 0x8B, 0xFF, 0x8C, 0xFF, 0x8D, 0xFF,
++ 0x8E, 0xFF, 0x8F, 0xFF, 0x90, 0xFF, 0x91, 0xFF,
++ 0x92, 0xFF, 0x93, 0xFF, 0x94, 0xFF, 0x95, 0xFF,
++ 0x96, 0xFF, 0x97, 0xFF, 0x98, 0xFF, 0x99, 0xFF,
++ 0x9A, 0xFF, 0x9B, 0xFF, 0x9C, 0xFF, 0x9D, 0xFF,
++ 0x9E, 0xFF, 0x9F, 0xFF, 0xA0, 0xFF, 0xA1, 0xFF,
++ 0xA2, 0xFF, 0xA3, 0xFF, 0xA4, 0xFF, 0xA5, 0xFF,
++ 0xA6, 0xFF, 0xA7, 0xFF, 0xA8, 0xFF, 0xA9, 0xFF,
++ 0xAA, 0xFF, 0xAB, 0xFF, 0xAC, 0xFF, 0xAD, 0xFF,
++ 0xAE, 0xFF, 0xAF, 0xFF, 0xB0, 0xFF, 0xB1, 0xFF,
++ 0xB2, 0xFF, 0xB3, 0xFF, 0xB4, 0xFF, 0xB5, 0xFF,
++ 0xB6, 0xFF, 0xB7, 0xFF, 0xB8, 0xFF, 0xB9, 0xFF,
++ 0xBA, 0xFF, 0xBB, 0xFF, 0xBC, 0xFF, 0xBD, 0xFF,
++ 0xBE, 0xFF, 0xBF, 0xFF, 0xC0, 0xFF, 0xC1, 0xFF,
++ 0xC2, 0xFF, 0xC3, 0xFF, 0xC4, 0xFF, 0xC5, 0xFF,
++ 0xC6, 0xFF, 0xC7, 0xFF, 0xC8, 0xFF, 0xC9, 0xFF,
++ 0xCA, 0xFF, 0xCB, 0xFF, 0xCC, 0xFF, 0xCD, 0xFF,
++ 0xCE, 0xFF, 0xCF, 0xFF, 0xD0, 0xFF, 0xD1, 0xFF,
++ 0xD2, 0xFF, 0xD3, 0xFF, 0xD4, 0xFF, 0xD5, 0xFF,
++ 0xD6, 0xFF, 0xD7, 0xFF, 0xD8, 0xFF, 0xD9, 0xFF,
++ 0xDA, 0xFF, 0xDB, 0xFF, 0xDC, 0xFF, 0xDD, 0xFF,
++ 0xDE, 0xFF, 0xDF, 0xFF, 0xE0, 0xFF, 0xE1, 0xFF,
++ 0xE2, 0xFF, 0xE3, 0xFF, 0xE4, 0xFF, 0xE5, 0xFF,
++ 0xE6, 0xFF, 0xE7, 0xFF, 0xE8, 0xFF, 0xE9, 0xFF,
++ 0xEA, 0xFF, 0xEB, 0xFF, 0xEC, 0xFF, 0xED, 0xFF,
++ 0xEE, 0xFF, 0xEF, 0xFF, 0xF0, 0xFF, 0xF1, 0xFF,
++ 0xF2, 0xFF, 0xF3, 0xFF, 0xF4, 0xFF, 0xF5, 0xFF,
++ 0xF6, 0xFF, 0xF7, 0xFF, 0xF8, 0xFF, 0xF9, 0xFF,
++ 0xFA, 0xFF, 0xFB, 0xFF, 0xFC, 0xFF, 0xFD, 0xFF,
++ 0xFE, 0xFF, 0xFF, 0xFF
++};commit 0a30ba509fdeea740bedb81ce3bee4f74a759654
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Aug 8 01:43:22 2019 -0400
+
+ netfilter: nf_nat_proto: make tables static
+
+ Sparse warns about two tables not being declared.
+
+ CHECK net/netfilter/nf_nat_proto.c
+ net/netfilter/nf_nat_proto.c:725:26: warning: symbol 'nf_nat_ipv4_ops' was not declared. Should it be static?
+ net/netfilter/nf_nat_proto.c:964:26: warning: symbol 'nf_nat_ipv6_ops' was not declared. Should it be static?
+
+ And in fact they can indeed be static.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Acked-by: Florian Westphal <fw@strlen.de>
+ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+
+diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c
+index 7ac733ebd060..0a59c14b5177 100644
+--- a/net/netfilter/nf_nat_proto.c
++++ b/net/netfilter/nf_nat_proto.c
+@@ -722,7 +722,7 @@ nf_nat_ipv4_local_fn(void *priv, struct sk_buff *skb,
+ return ret;
+ }
+
+-const struct nf_hook_ops nf_nat_ipv4_ops[] = {
++static const struct nf_hook_ops nf_nat_ipv4_ops[] = {
+ /* Before packet filtering, change destination */
+ {
+ .hook = nf_nat_ipv4_in,
+@@ -961,7 +961,7 @@ nf_nat_ipv6_local_fn(void *priv, struct sk_buff *skb,
+ return ret;
+ }
+
+-const struct nf_hook_ops nf_nat_ipv6_ops[] = {
++static const struct nf_hook_ops nf_nat_ipv6_ops[] = {
+ /* Before packet filtering, change destination */
+ {
+ .hook = nf_nat_ipv6_in,commit 5785cf15fd74ec3b1a076fd39bc67382a8455fe7
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Aug 8 01:28:08 2019 -0400
+
+ netfilter: nf_tables: add missing prototypes.
+
+ Sparse rightly complains about undeclared symbols.
+
+ CHECK net/netfilter/nft_set_hash.c
+ net/netfilter/nft_set_hash.c:647:21: warning: symbol 'nft_set_rhash_type' was not declared. Should it be static?
+ net/netfilter/nft_set_hash.c:670:21: warning: symbol 'nft_set_hash_type' was not declared. Should it be static?
+ net/netfilter/nft_set_hash.c:690:21: warning: symbol 'nft_set_hash_fast_type' was not declared. Should it be static?
+ CHECK net/netfilter/nft_set_bitmap.c
+ net/netfilter/nft_set_bitmap.c:296:21: warning: symbol 'nft_set_bitmap_type' was not declared. Should it be static?
+ CHECK net/netfilter/nft_set_rbtree.c
+ net/netfilter/nft_set_rbtree.c:470:21: warning: symbol 'nft_set_rbtree_type' was not declared. Should it be static?
+
+ Include nf_tables_core.h rather than nf_tables.h to pick up the additional definitions.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+
+diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
+index b5aeccdddb22..087a056e34d1 100644
+--- a/net/netfilter/nft_set_bitmap.c
++++ b/net/netfilter/nft_set_bitmap.c
+@@ -10,7 +10,7 @@
+ #include <linux/netlink.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter/nf_tables.h>
+-#include <net/netfilter/nf_tables.h>
++#include <net/netfilter/nf_tables_core.h>
+
+ struct nft_bitmap_elem {
+ struct list_head head;
+diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
+index 6e8d20c03e3d..c490451fcebf 100644
+--- a/net/netfilter/nft_set_hash.c
++++ b/net/netfilter/nft_set_hash.c
+@@ -16,7 +16,7 @@
+ #include <linux/rhashtable.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter/nf_tables.h>
+-#include <net/netfilter/nf_tables.h>
++#include <net/netfilter/nf_tables_core.h>
+
+ /* We target a hash table size of 4, element hint is 75% of final size */
+ #define NFT_RHASH_ELEMENT_HINT 3
+diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
+index 419d58ef802b..57123259452f 100644
+--- a/net/netfilter/nft_set_rbtree.c
++++ b/net/netfilter/nft_set_rbtree.c
+@@ -13,7 +13,7 @@
+ #include <linux/netlink.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter/nf_tables.h>
+-#include <net/netfilter/nf_tables.h>
++#include <net/netfilter/nf_tables_core.h>
+
+ struct nft_rbtree {
+ struct rb_root root;commit b6ff24f7b5101101ff897dfdde3f37924e676bc2
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Thu Aug 8 16:32:27 2019 +0200
+
+ RAS: Build debugfs.o only when enabled in Kconfig
+
+ In addition, the 0day bot reported this build error:
+
+ >> drivers/ras/debugfs.c:10:5: error: redefinition of 'ras_userspace_consumers'
+ int ras_userspace_consumers(void)
+ ^~~~~~~~~~~~~~~~~~~~~~~
+ In file included from drivers/ras/debugfs.c:3:0:
+ include/linux/ras.h:14:19: note: previous definition of 'ras_userspace_consumers' was here
+ static inline int ras_userspace_consumers(void) { return 0; }
+ ^~~~~~~~~~~~~~~~~~~~~~~
+
+ for a riscv-specific .config where CONFIG_DEBUG_FS is not set. Fix all
+ that by making debugfs.o depend on that define.
+
+ [ bp: Rewrite commit message. ]
+
+ Reported-by: kbuild test robot <lkp@intel.com>
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Borislav Petkov <bp@suse.de>
+ Cc: Tony Luck <tony.luck@intel.com>
+ Cc: linux-edac@vger.kernel.org
+ Cc: x86@kernel.org
+ Link: http://lkml.kernel.org/r/7053.1565218556@turing-police
+
+diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile
+index ef6777e14d3d..6f0404f50107 100644
+--- a/drivers/ras/Makefile
++++ b/drivers/ras/Makefile
+@@ -1,3 +1,4 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+-obj-$(CONFIG_RAS) += ras.o debugfs.o
++obj-$(CONFIG_RAS) += ras.o
++obj-$(CONFIG_DEBUG_FS) += debugfs.o
+ obj-$(CONFIG_RAS_CEC) += cec.ocommit 0a54b809a3a2c31e1055b45b03708eb730222be1 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Aug 7 18:59:29 2019 -0400 + + RAS: Fix prototype warnings + + When building with C=2 and/or W=1, legitimate warnings are issued about + missing prototypes: + + CHECK drivers/ras/debugfs.c + drivers/ras/debugfs.c:4:15: warning: symbol 'ras_debugfs_dir' was not declared. Should it be static? + drivers/ras/debugfs.c:8:5: warning: symbol 'ras_userspace_consumers' was not declared. Should it be static? + drivers/ras/debugfs.c:38:12: warning: symbol 'ras_add_daemon_trace' was not declared. Should it be static? + drivers/ras/debugfs.c:54:13: warning: symbol 'ras_debugfs_init' was not declared. Should it be static? + CC drivers/ras/debugfs.o + drivers/ras/debugfs.c:8:5: warning: no previous prototype for 'ras_userspace_consumers' [-Wmissing-prototypes] + 8 | int ras_userspace_consumers(void) + | ^~~~~~~~~~~~~~~~~~~~~~~ + drivers/ras/debugfs.c:38:12: warning: no previous prototype for 'ras_add_daemon_trace' [-Wmissing-prototypes] + 38 | int __init ras_add_daemon_trace(void) + | ^~~~~~~~~~~~~~~~~~~~ + drivers/ras/debugfs.c:54:13: warning: no previous prototype for 'ras_debugfs_init' [-Wmissing-prototypes] + 54 | void __init ras_debugfs_init(void) + | ^~~~~~~~~~~~~~~~ + + Provide the proper includes. + + [ bp: Take care of the same warnings for cec.c too. ] + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Borislav Petkov <bp@suse.de> + Cc: Tony Luck <tony.luck@intel.com> + Cc: linux-edac@vger.kernel.org + Cc: x86@kernel.org + Link: http://lkml.kernel.org/r/7168.1565218769@turing-police + +diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c +index 5d545806d930..c09cf55e2d20 100644 +--- a/drivers/ras/cec.c ++++ b/drivers/ras/cec.c +@@ -4,6 +4,7 @@ + */ + #include <linux/mm.h> + #include <linux/gfp.h> ++#include <linux/ras.h> + #include <linux/kernel.h> + #include <linux/workqueue.h> + +diff --git a/drivers/ras/debugfs.c b/drivers/ras/debugfs.c +index 9c1b717efad8..0d4f985afbf3 100644 +--- a/drivers/ras/debugfs.c ++++ b/drivers/ras/debugfs.c +@@ -1,5 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-only + #include <linux/debugfs.h> ++#include <linux/ras.h> ++#include "debugfs.h" + + struct dentry *ras_debugfs_dir; +
commit 04f5bda84b0712d6f172556a7e8dca9ded5e73b9
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Aug 7 23:27:17 2019 -0400
+
+ x86/lib/cpu: Address missing prototypes warning
+
+ When building with W=1, warnings about missing prototypes are emitted:
+
+ CC arch/x86/lib/cpu.o
+ arch/x86/lib/cpu.c:5:14: warning: no previous prototype for 'x86_family' [-Wmissing-prototypes]
+ 5 | unsigned int x86_family(unsigned int sig)
+ | ^~~~~~~~~~
+ arch/x86/lib/cpu.c:18:14: warning: no previous prototype for 'x86_model' [-Wmissing-prototypes]
+ 18 | unsigned int x86_model(unsigned int sig)
+ | ^~~~~~~~~
+ arch/x86/lib/cpu.c:33:14: warning: no previous prototype for 'x86_stepping' [-Wmissing-prototypes]
+ 33 | unsigned int x86_stepping(unsigned int sig)
+ | ^~~~~~~~~~~~
+
+ Add the proper include file so the prototypes are there.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+ Link: https://lkml.kernel.org/r/42513.1565234837@turing-police
+
+diff --git a/arch/x86/lib/cpu.c b/arch/x86/lib/cpu.c
+index 04967cdce5d1..7ad68917a51e 100644
+--- a/arch/x86/lib/cpu.c
++++ b/arch/x86/lib/cpu.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0-only
+ #include <linux/types.h>
+ #include <linux/export.h>
++#include <asm/cpu.h>
+
+ unsigned int x86_family(unsigned int sig)
+ {commit a92c7ba982e3950a82fd63b3fd289248bd99e8f4 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Aug 7 19:22:34 2019 -0400 + + fs/handle.c - fix up kerneldoc + + When building with W=1, we get some kerneldoc warnings: + + CC fs/fhandle.o + fs/fhandle.c:259: warning: Function parameter or member 'flags' not described in 'sys_open_by_handle_at' + fs/fhandle.c:259: warning: Excess function parameter 'flag' description in 'sys_open_by_handle_at' + + Fix the typo that caused it. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> + +diff --git a/fs/fhandle.c b/fs/fhandle.c +index 0ee727485615..01263ffbc4c0 100644 +--- a/fs/fhandle.c ++++ b/fs/fhandle.c +@@ -246,7 +246,7 @@ static long do_handle_open(int mountdirfd, struct file_handle __user *ufh, + * sys_open_by_handle_at: Open the file handle + * @mountdirfd: directory file descriptor + * @handle: file handle to be opened +- * @flag: open flags. ++ * @flags: open flags. + * + * @mountdirfd indicate the directory file descriptor + * of the mount point. file handle is decoded relative+
commit aee450cbe482a8c2f6fa5b05b178ef8b8ff107ca +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Jun 6 22:39:27 2019 -0400 + + bpf: silence warning messages in core + + Compiling kernel/bpf/core.c with W=1 causes a flood of warnings: + + kernel/bpf/core.c:1198:65: warning: initialized field overwritten [-Woverride-init] + 1198 | #define BPF_INSN_3_TBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = true + | ^~~~ + kernel/bpf/core.c:1087:2: note: in expansion of macro 'BPF_INSN_3_TBL' + 1087 | INSN_3(ALU, ADD, X), \ + | ^~~~~~ + kernel/bpf/core.c:1202:3: note: in expansion of macro 'BPF_INSN_MAP' + 1202 | BPF_INSN_MAP(BPF_INSN_2_TBL, BPF_INSN_3_TBL), + | ^~~~~~~~~~~~ + kernel/bpf/core.c:1198:65: note: (near initialization for 'public_insntable[12]') + 1198 | #define BPF_INSN_3_TBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = true + | ^~~~ + kernel/bpf/core.c:1087:2: note: in expansion of macro 'BPF_INSN_3_TBL' + 1087 | INSN_3(ALU, ADD, X), \ + | ^~~~~~ + kernel/bpf/core.c:1202:3: note: in expansion of macro 'BPF_INSN_MAP' + 1202 | BPF_INSN_MAP(BPF_INSN_2_TBL, BPF_INSN_3_TBL), + | ^~~~~~~~~~~~ + + 98 copies of the above. + + The attached patch silences the warnings, because we *know* we're overwriting + the default initializer. That leaves bpf/core.c with only 6 other warnings, + which become more visible in comparison. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Andrii Nakryiko <andriin@fb.com> + Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> + +diff --git a/kernel/bpf/Makefile b/kernel/bpf/Makefile +index 4c2fa3ac56f6..29d781061cd5 100644 +--- a/kernel/bpf/Makefile ++++ b/kernel/bpf/Makefile +@@ -1,5 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 + obj-y := core.o ++CFLAGS_core.o += $(call cc-disable-warning, override-init) + + obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o + obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o
commit e28f296ea155da36f710eb1f1173d8780fbac49d
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 07:26:06 2019 -0400
+
+ platform/x86: dell-rbtn: Add missing #include
+
+ Building with W=1 complains:
+ CC [M] drivers/platform/x86/dell-rbtn.o
+ drivers/platform/x86/dell-rbtn.c:345:5: warning: no previous prototype for 'dell_rbtn_notifier_register' [-Wmissing-prototypes]
+ 345 | int dell_rbtn_notifier_register(struct notifier_block *nb)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+ drivers/platform/x86/dell-rbtn.c:371:5: warning: no previous prototype for 'dell_rbtn_notifier_unregister' [-Wmissing-prototypes]
+ 371 | int dell_rbtn_notifier_unregister(struct notifier_block *nb)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ The real problem is a missing include. Add it to keep dell-rbtn.c and .h in sync.
+
+ Fixes: b05ffc95f9ed ("dell-rbtn: Export notifier for other kernel modules")
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ [andy: massaged commit message, added Fixes tag]
+ Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+diff --git a/drivers/platform/x86/dell-rbtn.c b/drivers/platform/x86/dell-rbtn.c
+index f3afe778001e..56535d7222dd 100644
+--- a/drivers/platform/x86/dell-rbtn.c
++++ b/drivers/platform/x86/dell-rbtn.c
+@@ -18,6 +18,8 @@
+ #include <linux/rfkill.h>
+ #include <linux/input.h>
+
++#include "dell-rbtn.h"
++
+ enum rbtn_type {
+ RBTN_UNKNOWN,
+ RBTN_TOGGLE,commit db8b4aefd17b1ccf108d81a4fbb181c8e50abf0e +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Mar 12 06:42:31 2019 -0400 + + extcon: Fix build warning for extcon_unregister_notifier comment + + Give the line the asterisk it wanted to fix the build warning. + + [Build warning message] + Building with W=1 reports: + + CC drivers/extcon/devres.o + drivers/extcon/devres.c:208: warning: bad line: + - Resource-managed extcon_unregister_notifier() + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + [cw00.choi: Edit the patch subject and description] + Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> + +diff --git a/drivers/extcon/devres.c b/drivers/extcon/devres.c +index f599aeddf8e5..f487d877ab5d 100644 +--- a/drivers/extcon/devres.c ++++ b/drivers/extcon/devres.c +@@ -205,7 +205,7 @@ EXPORT_SYMBOL(devm_extcon_register_notifier); + + /** + * devm_extcon_unregister_notifier() +- - Resource-managed extcon_unregister_notifier() ++ * - Resource-managed extcon_unregister_notifier() + * @dev: the device owning the extcon device being created + * @edev: the extcon device + * @id: the unique id among the extcon enumeration
commit d18bf4229b1772e91c0c36772737c01cf9726720
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 04:06:37 2019 -0400
+
+ perf/core: Make perf_swevent_init_cpu() static
+
+ 'make W=1' causes GCC to complain:
+
+ kernel/events/core.c:11877:6: warning: no previous prototype for 'perf_swevent_init_cpu' [-Wmissing-prototypes]
+
+ It's not referenced anywhere else, make it static.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+ Cc: Linus Torvalds <torvalds@linux-foundation.org>
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Cc: Thomas Gleixner <tglx@linutronix.de>
+ Link: https://lkml.kernel.org/r/28974.1552377997@turing-police
+ Signed-off-by: Ingo Molnar <mingo@kernel.org>
+
+diff --git a/kernel/events/core.c b/kernel/events/core.c
+index 72d06e302e99..dfc4bab0b02b 100644
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -11878,7 +11878,7 @@ static void __init perf_event_init_all_cpus(void)
+ }
+ }
+
+-void perf_swevent_init_cpu(unsigned int cpu)
++static void perf_swevent_init_cpu(unsigned int cpu)
+ {
+ struct swevent_htable *swhash = &per_cpu(swevent_htable, cpu);
+ commit 3adf2aa8af2d5122917b78988de9cdeb828cdd9d +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Mar 12 07:49:03 2019 -0400 + + drivers/tty/tty_jobctrl.c - fix non-kerneldoc comment + + Building with W=1 reports (among other things): + CC drivers/tty/tty_jobctrl.o + drivers/tty/tty_jobctrl.c:317: warning: Cannot understand * + on line 317 - I thought it was a doc line + + Fix up the non-kerneldoc comment. (other warnings to be cleaned up in separate patch) + + Signed-off-by Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/tty/tty_jobctrl.c b/drivers/tty/tty_jobctrl.c +index c4ecd66fafef..1393f71bb170 100644 +--- a/drivers/tty/tty_jobctrl.c ++++ b/drivers/tty/tty_jobctrl.c +@@ -313,7 +313,7 @@ void disassociate_ctty(int on_exit) + read_unlock(&tasklist_lock); + } + +-/** ++/* + * + * no_tty - Ensure the current process does not have a controlling tty + */
commit 48084abf212052ca1d39fae064c581b1ce5b1fdf +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Mar 12 05:33:48 2019 -0400 + + watchdog/core: Make variables static + + sparse complains: + CHECK kernel/watchdog.c + kernel/watchdog.c:45:19: warning: symbol 'nmi_watchdog_available' + was not declared. Should it be static? + kernel/watchdog.c:47:16: warning: symbol 'watchdog_allowed_mask' + was not declared. Should it be static? + + They're not referenced by name from anyplace else, make them static. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Thomas Gleixner <tglx@linutronix.de> + Link: https://lkml.kernel.org/r/7855.1552383228@turing-police + +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 8fbfda94a67b..403c9bd90413 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -42,9 +42,9 @@ int __read_mostly watchdog_user_enabled = 1; + int __read_mostly nmi_watchdog_user_enabled = NMI_WATCHDOG_DEFAULT; + int __read_mostly soft_watchdog_user_enabled = 1; + int __read_mostly watchdog_thresh = 10; +-int __read_mostly nmi_watchdog_available; ++static int __read_mostly nmi_watchdog_available; + +-struct cpumask watchdog_allowed_mask __read_mostly; ++static struct cpumask watchdog_allowed_mask __read_mostly; + + struct cpumask watchdog_cpumask __read_mostly; + unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
commit e8750053d64a3317cbc15f8341f0f11ca751bfeb
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 04:38:35 2019 -0400
+
+ time/jiffies: Make refined_jiffies static
+
+ sparse complains:
+
+ CHECK kernel/time/jiffies.c
+ kernel/time/jiffies.c:92:20: warning: symbol 'refined_jiffies' was not
+ declared. Should it be static?
+
+ Its only used in file scope. Make it static.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+ Link: https://lkml.kernel.org/r/32342.1552379915@turing-police
+
+diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
+index dc1b6f1929f9..ac9c03dd6c7d 100644
+--- a/kernel/time/jiffies.c
++++ b/kernel/time/jiffies.c
+@@ -89,7 +89,7 @@ struct clocksource * __init __weak clocksource_default_clock(void)
+ return &clocksource_jiffies;
+ }
+
+-struct clocksource refined_jiffies;
++static struct clocksource refined_jiffies;
+
+ int register_refined_jiffies(long cycles_per_second)
+ {commit bb2e320565f997273fe04035bb6c17f643da6f8a +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Mar 12 04:17:56 2019 -0400 + + genirq/devres: Remove excess parameter from kernel doc + + Building with 'make W=1' complains: + + CC kernel/irq/devres.o + kernel/irq/devres.c:104: warning: Excess function parameter 'thread_fn' + description in 'devm_request_any_context_irq' + + Remove it. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Thomas Gleixner <tglx@linutronix.de> + Link: https://lkml.kernel.org/r/31207.1552378676@turing-police + +diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c +index 5d5378ea0afe..f808c6a97dcc 100644 +--- a/kernel/irq/devres.c ++++ b/kernel/irq/devres.c +@@ -84,8 +84,6 @@ EXPORT_SYMBOL(devm_request_threaded_irq); + * @dev: device to request interrupt for + * @irq: Interrupt line to allocate + * @handler: Function to be called when the IRQ occurs +- * @thread_fn: function to be called in a threaded interrupt context. NULL +- * for devices which handle everything in @handler + * @irqflags: Interrupt type flags + * @devname: An ascii name for the claiming device, dev_name(dev) if NULL + * @dev_id: A cookie passed back to the handler function
commit 4fe64a62e04cfb2dc1daab0d8f05d212aa014161
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 03:47:53 2019 -0400
+
+ x86/mm/pti: Make local symbols static
+
+ With 'make C=2 W=1', sparse and gcc both complain:
+
+ CHECK arch/x86/mm/pti.c
+ arch/x86/mm/pti.c:84:3: warning: symbol 'pti_mode' was not declared. Should it be static?
+ arch/x86/mm/pti.c:605:6: warning: symbol 'pti_set_kernel_image_nonglobal' was not declared. Should it be static?
+ CC arch/x86/mm/pti.o
+ arch/x86/mm/pti.c:605:6: warning: no previous prototype for 'pti_set_kernel_image_nonglobal' [-Wmissing-prototypes]
+ 605 | void pti_set_kernel_image_nonglobal(void)
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ pti_set_kernel_image_nonglobal() is only used locally. 'pti_mode' exists in
+ drivers/hwtracing/intel_th/pti.c as well, but it's a completely unrelated
+ local (static) symbol.
+
+ Make both static.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+ Cc: Dave Hansen <dave.hansen@linux.intel.com>
+ Cc: Andy Lutomirski <luto@kernel.org>
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Link: https://lkml.kernel.org/r/27680.1552376873@turing-police
+
+diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
+index 4fee5c3003ed..139b28a01ce4 100644
+--- a/arch/x86/mm/pti.c
++++ b/arch/x86/mm/pti.c
+@@ -77,7 +77,7 @@ static void __init pti_print_if_secure(const char *reason)
+ pr_info("%s\n", reason);
+ }
+
+-enum pti_mode {
++static enum pti_mode {
+ PTI_AUTO = 0,
+ PTI_FORCE_OFF,
+ PTI_FORCE_ON
+@@ -602,7 +602,7 @@ static void pti_clone_kernel_text(void)
+ set_memory_global(start, (end_global - start) >> PAGE_SHIFT);
+ }
+
+-void pti_set_kernel_image_nonglobal(void)
++static void pti_set_kernel_image_nonglobal(void)
+ {
+ /*
+ * The identity map is created with PMDs, regardless of thecommit 50505e578f5395a4405008997814ae7f41ff5300 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Mar 12 08:09:20 2019 -0400 + + staging: rtl8712 - fix up non-kerneldoc comments + + Building with W=1 reports (among other things) + + CC [M] drivers/staging/rtl8712/rtl871x_ioctl_linux.o + drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1106: warning: Cannot understand * + on line 1106 - I thought it was a doc line + + CC [M] drivers/staging/rtl8712/os_intfs.o + drivers/staging/rtl8712/os_intfs.c:366: warning: Cannot understand * + on line 366 - I thought it was a doc line + drivers/staging/rtl8712/os_intfs.c:434: warning: Cannot understand * + on line 434 - I thought it was a doc line + + Fix up the non-kerneldoc comments + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c +index 41ba1eeea2f2..c962696c9822 100644 +--- a/drivers/staging/rtl8712/os_intfs.c ++++ b/drivers/staging/rtl8712/os_intfs.c +@@ -362,7 +362,7 @@ static void enable_video_mode(struct _adapter *padapter, int cbw40_value) + r8712_fw_cmd(padapter, intcmd); + } + +-/** ++/* + * + * This function intends to handle the activation of an interface + * i.e. when it is brought Up/Active from a Down state. +@@ -430,7 +430,7 @@ static int netdev_open(struct net_device *pnetdev) + return -1; + } + +-/** ++/* + * + * This function intends to handle the shutdown of an interface + * i.e. when it is brought Down from an Up/Active state. +diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +index ad9b2f76d04a..a7230c0c7b23 100644 +--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c ++++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +@@ -1102,7 +1102,7 @@ static int r871x_wx_set_mlme(struct net_device *dev, + return ret; + } + +-/** ++/* + * + * This function intends to handle the Set Scan command. + * Currently, the request comes via Wireless Extensions' SIOCSIWSCAN ioctl.+
commit cede666e2eb28dc8a680d1622fded533769f07a4
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 04:58:32 2019 -0400
+
+ trace/probes: Remove kernel doc style from non kernel doc comment
+
+ CC kernel/trace/trace_kprobe.o
+ kernel/trace/trace_kprobe.c:41: warning: cannot understand function prototype: 'struct trace_kprobe '
+
+ The real problem is that a comment looked like kerneldoc when it shouldn't be...
+
+ Link: http://lkml.kernel.org/r/2812.1552381112@turing-police
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+
+diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
+index d5fb09ebba8b..ceafa0a2b1d1 100644
+--- a/kernel/trace/trace_kprobe.c
++++ b/kernel/trace/trace_kprobe.c
+@@ -35,7 +35,7 @@ static struct dyn_event_operations trace_kprobe_ops = {
+ .match = trace_kprobe_match,
+ };
+
+-/**
++/*
+ * Kprobe event core functions
+ */
+ struct trace_kprobe {commit 0841625201b649c0b1bf0f0e25cf4401e68fb8fd
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Mar 12 04:52:58 2019 -0400
+
+ tracing/probes: Make reserved_field_names static
+
+ sparse complains:
+ CHECK kernel/trace/trace_probe.c
+ kernel/trace/trace_probe.c:16:12: warning: symbol 'reserved_field_names' was not declared. Should it be static?
+
+ Yes, it should be static.
+
+ Link: http://lkml.kernel.org/r/2478.1552380778@turing-police
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+
+diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
+index 89da34b326e3..cfcf77e6fb19 100644
+--- a/kernel/trace/trace_probe.c
++++ b/kernel/trace/trace_probe.c
+@@ -13,7 +13,7 @@
+
+ #include "trace_probe.h"
+
+-const char *reserved_field_names[] = {
++static const char *reserved_field_names[] = {
+ "common_type",
+ "common_flags",
+ "common_preempt_count",commit 8496ecd0bed4c70b43f39cecf0872b84360f0d14 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Mar 7 16:29:06 2019 -0800 + + init/calibrate.c: provide proper prototype + + Sparse issues a warning: + + CHECK init/calibrate.c + init/calibrate.c:271:28: warning: symbol 'calibration_delay_done' was not declared. Should it be static? + + The actual issue is that it's a __weak symbol that archs can override + (in fact, ARM does so), but no prototype is provided. Let's provide one + to prevent surprises. + + Link: http://lkml.kernel.org/r/18827.1548750938@turing-police.cc.vt.edu + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Reviewed-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/include/linux/delay.h b/include/linux/delay.h +index b78bab4395d8..8e6828094c1e 100644 +--- a/include/linux/delay.h ++++ b/include/linux/delay.h +@@ -55,6 +55,7 @@ static inline void ndelay(unsigned long x) + + extern unsigned long lpj_fine; + void calibrate_delay(void); ++void __attribute__((weak)) calibration_delay_done(void); + void msleep(unsigned int msecs); + unsigned long msleep_interruptible(unsigned int msecs); + void usleep_range(unsigned long min, unsigned long max);
commit a98eb6f19952f18a7e5ac55d6bd7bbbb2bdc8b88 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Thu Mar 7 16:26:46 2019 -0800 + + kernel/hung_task.c - fix sparse warnings + + sparse complains: + + CHECK kernel/hung_task.c + kernel/hung_task.c:28:19: warning: symbol 'sysctl_hung_task_check_count' was not declared. Should it be static? + kernel/hung_task.c:42:29: warning: symbol 'sysctl_hung_task_timeout_secs' was not declared. Should it be static? + kernel/hung_task.c:47:29: warning: symbol 'sysctl_hung_task_check_interval_secs' was not declared. Should it be static? + kernel/hung_task.c:49:19: warning: symbol 'sysctl_hung_task_warnings' was not declared. Should it be static? + kernel/hung_task.c:61:28: warning: symbol 'sysctl_hung_task_panic' was not declared. Should it be static? + kernel/hung_task.c:219:5: warning: symbol 'proc_dohung_task_timeout_secs' was not declared. Should it be static? + + Add the appropriate header file to provide declarations. + + Link: http://lkml.kernel.org/r/467.1548649525@turing-police.cc.vt.edu + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Cc: "Paul E. McKenney" <paulmck@linux.ibm.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/kernel/hung_task.c b/kernel/hung_task.c +index 4a9191617076..0c11216171c9 100644 +--- a/kernel/hung_task.c ++++ b/kernel/hung_task.c +@@ -19,6 +19,7 @@ + #include <linux/utsname.h> + #include <linux/sched/signal.h> + #include <linux/sched/debug.h> ++#include <linux/sched/sysctl.h> + + #include <trace/events/sched.h> +
commit 1832f4ef5867fd3898d8a6c6c1978b75d76fc246
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Jan 29 01:47:06 2019 -0500
+
+ bpf, cgroups: clean up kerneldoc warnings
+
+ Building with W=1 reveals some bitrot:
+
+ CC kernel/bpf/cgroup.o
+ kernel/bpf/cgroup.c:238: warning: Function parameter or member 'flags' not described in '__cgroup_bpf_attach'
+ kernel/bpf/cgroup.c:367: warning: Function parameter or member 'unused_flags' not described in '__cgroup_bpf_detach'
+
+ Add a kerneldoc line for 'flags'.
+
+ Fixing the warning for 'unused_flags' is best approached by
+ removing the unused parameter on the function call.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Acked-by: Song Liu <songliubraving@fb.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+
+diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
+index 588dd5f0bd85..695b2a880d9a 100644
+--- a/include/linux/bpf-cgroup.h
++++ b/include/linux/bpf-cgroup.h
+@@ -78,7 +78,7 @@ int cgroup_bpf_inherit(struct cgroup *cgrp);
+ int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog,
+ enum bpf_attach_type type, u32 flags);
+ int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog,
+- enum bpf_attach_type type, u32 flags);
++ enum bpf_attach_type type);
+ int __cgroup_bpf_query(struct cgroup *cgrp, const union bpf_attr *attr,
+ union bpf_attr __user *uattr);
+
+diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
+index ab612fe9862f..d78cfec5807d 100644
+--- a/kernel/bpf/cgroup.c
++++ b/kernel/bpf/cgroup.c
+@@ -230,6 +230,7 @@ static int update_effective_progs(struct cgroup *cgrp,
+ * @cgrp: The cgroup which descendants to traverse
+ * @prog: A program to attach
+ * @type: Type of attach operation
++ * @flags: Option flags
+ *
+ * Must be called with cgroup_mutex held.
+ */
+@@ -363,7 +364,7 @@ int __cgroup_bpf_attach(struct cgroup *cgrp, struct bpf_prog *prog,
+ * Must be called with cgroup_mutex held.
+ */
+ int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog,
+- enum bpf_attach_type type, u32 unused_flags)
++ enum bpf_attach_type type)
+ {
+ struct list_head *progs = &cgrp->bpf.progs[type];
+ enum bpf_cgroup_storage_type stype;
+diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
+index f31bd61c9466..9f617605dacb 100644
+--- a/kernel/cgroup/cgroup.c
++++ b/kernel/cgroup/cgroup.c
+@@ -5996,7 +5996,7 @@ int cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog,
+ int ret;
+
+ mutex_lock(&cgroup_mutex);
+- ret = __cgroup_bpf_detach(cgrp, prog, type, flags);
++ ret = __cgroup_bpf_detach(cgrp, prog, type);
+ mutex_unlock(&cgroup_mutex);
+ return ret;
+ }commit 116bfa96a255123ed209da6544f74a4f2eaca5da +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Tue Jan 29 01:04:25 2019 -0500 + + bpf: fix missing prototype warnings + + Compiling with W=1 generates warnings: + + CC kernel/bpf/core.o + kernel/bpf/core.c:721:12: warning: no previous prototype for ?bpf_jit_alloc_exec_limit? [-Wmissing-prototypes] + 721 | u64 __weak bpf_jit_alloc_exec_limit(void) + | ^~~~~~~~~~~~~~~~~~~~~~~~ + kernel/bpf/core.c:757:14: warning: no previous prototype for ?bpf_jit_alloc_exec? [-Wmissing-prototypes] + 757 | void *__weak bpf_jit_alloc_exec(unsigned long size) + | ^~~~~~~~~~~~~~~~~~ + kernel/bpf/core.c:762:13: warning: no previous prototype for ?bpf_jit_free_exec? [-Wmissing-prototypes] + 762 | void __weak bpf_jit_free_exec(void *addr) + | ^~~~~~~~~~~~~~~~~ + + All three are weak functions that archs can override, provide + proper prototypes for when a new arch provides their own. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Song Liu <songliubraving@fb.com> + Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> + +diff --git a/include/linux/filter.h b/include/linux/filter.h +index e4b473f85b46..7317376734f7 100644 +--- a/include/linux/filter.h ++++ b/include/linux/filter.h +@@ -880,7 +880,9 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, + unsigned int alignment, + bpf_jit_fill_hole_t bpf_fill_ill_insns); + void bpf_jit_binary_free(struct bpf_binary_header *hdr); +- ++u64 bpf_jit_alloc_exec_limit(void); ++void *bpf_jit_alloc_exec(unsigned long size); ++void bpf_jit_free_exec(void *addr); + void bpf_jit_free(struct bpf_prog *fp); + + int bpf_jit_get_func_addr(const struct bpf_prog *prog,
commit de1da68d9c9d230e448b9fa0abff139a0468fb96 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Mon Jan 28 23:04:46 2019 -0500 + + bpf: fix bitrotted kerneldoc + + Over the years, the function signature has changed, but the + kerneldoc block hasn't. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Acked-by: Song Liu <songliubraving@fb.com> + Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> + +diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c +index a7bcb23bee84..f13c543b7b36 100644 +--- a/kernel/bpf/core.c ++++ b/kernel/bpf/core.c +@@ -1263,8 +1263,9 @@ bool bpf_opcode_in_insntable(u8 code) + #ifndef CONFIG_BPF_JIT_ALWAYS_ON + /** + * __bpf_prog_run - run eBPF program on a given context +- * @ctx: is the data we are operating on ++ * @regs: is the array of MAX_BPF_EXT_REG eBPF pseudo-registers + * @insn: is the array of eBPF instructions ++ * @stack: is the eBPF storage stack + * + * Decode and execute eBPF instructions. + */
commit 90a8c78b8b5e2c8537a170ee675127f02ca94532
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Wed Sep 26 18:49:38 2018 -0400
+
+ crypto/morus(640,1280) - make crypto_...-algs static
+
+ sparse complains thusly:
+
+ CHECK arch/x86/crypto/morus640-sse2-glue.c
+ arch/x86/crypto/morus640-sse2-glue.c:38:1: warning: symbol 'crypto_morus640_sse2_algs' was not declared. Should it be static?
+ CHECK arch/x86/crypto/morus1280-sse2-glue.c
+ arch/x86/crypto/morus1280-sse2-glue.c:38:1: warning: symbol 'crypto_morus1280_sse2_algs' was not declared. Should it be static?
+ CHECK arch/x86/crypto/morus1280-avx2-glue.c
+ arch/x86/crypto/morus1280-avx2-glue.c:38:1: warning: symbol 'crypto_morus1280_avx2_algs' was not declared. Should it be static?
+
+ and sparse is correct - these don't need to be global and polluting the namespace.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/include/crypto/morus1280_glue.h b/include/crypto/morus1280_glue.h
+index b26dd70efd9a..ba782e10065e 100644
+--- a/include/crypto/morus1280_glue.h
++++ b/include/crypto/morus1280_glue.h
+@@ -82,7 +82,7 @@ void cryptd_morus1280_glue_exit_tfm(struct crypto_aead *aead);
+ { \
+ } \
+ \
+- struct aead_alg crypto_morus1280_##id##_algs[] = {\
++ static struct aead_alg crypto_morus1280_##id##_algs[] = {\
+ { \
+ .setkey = crypto_morus1280_glue_setkey, \
+ .setauthsize = crypto_morus1280_glue_setauthsize, \
+diff --git a/include/crypto/morus640_glue.h b/include/crypto/morus640_glue.h
+index 90c8db07e740..27fa790a2362 100644
+--- a/include/crypto/morus640_glue.h
++++ b/include/crypto/morus640_glue.h
+@@ -82,7 +82,7 @@ void cryptd_morus640_glue_exit_tfm(struct crypto_aead *aead);
+ { \
+ } \
+ \
+- struct aead_alg crypto_morus640_##id##_algs[] = {\
++ static struct aead_alg crypto_morus640_##id##_algs[] = {\
+ { \
+ .setkey = crypto_morus640_glue_setkey, \
+ .setauthsize = crypto_morus640_glue_setauthsize, \commit 1ec49a236565060566be547b6e050bb414d0da96 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Wed Aug 8 16:16:54 2018 -0400 + + mt76: fix build for MediaTek MT7610U USB wireless dongle + + The mt76x0 driver requires the mt76 core driver to actually function. + So add a 'select' to avoid embarrassing 'symbol unknown' errors + when attempting to modprobe it in a module tree that doesn't + include mt76.ko + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Kalle Valo <kvalo@codeaurora.org> + +diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig +index 850611ad347a..b6c5f17dca30 100644 +--- a/drivers/net/wireless/mediatek/mt76/Kconfig ++++ b/drivers/net/wireless/mediatek/mt76/Kconfig +@@ -11,6 +11,7 @@ config MT76x2_COMMON + + config MT76x0U + tristate "MediaTek MT76x0U (USB) support" ++ select MT76_CORE + depends on MAC80211 + depends on USB + help
commit 701b3a3c0ac42630f74a5efba8545d61ac0e3293
+Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+Date: Tue Jul 17 12:57:29 2018 -0400
+
+ PATCH scripts/kernel-doc
+
+ Fix a warning whinge from Perl introduced by "scripts: kernel-doc: parse next structs/unions"
+
+ Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32), passed through in regex; marked by <-- HERE in m/({ <-- HERE [^\{\}]*})/ at ./scripts/kernel-doc line 1155.
+ Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32), passed through in regex; marked by <-- HERE in m/({ <-- HERE )/ at ./scripts/kernel-doc line 1179.
+
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+ Signed-off-by: Jonathan Corbet <corbet@lwn.net>
+
+diff --git a/scripts/kernel-doc b/scripts/kernel-doc
+index 0057d8eafcc1..31a34ced55a3 100755
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -1152,7 +1152,7 @@ sub dump_struct($$) {
+ }
+
+ # Ignore other nested elements, like enums
+- $members =~ s/({[^\{\}]*})//g;
++ $members =~ s/(\{[^\{\}]*})//g;
+
+ create_parameterlist($members, ';', $file, $declaration_name);
+ check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual);
+@@ -1176,7 +1176,7 @@ sub dump_struct($$) {
+ $declaration .= "\t" x $level;
+ }
+ $declaration .= "\t" . $clause . "\n";
+- $level++ if ($clause =~ m/({)/ && !($clause =~m/}/));
++ $level++ if ($clause =~ m/(\{)/ && !($clause =~m/}/));
+ }
+ output_declaration($declaration_name,
+ 'struct',
+ commit 80d172431696482d9acd8d2c4ea78fed8956e2a1 +Author: Valdis Kletnieks <valdis.kletnieks@vt.edu> +Date: Sun Feb 4 12:01:43 2018 -0500 + + gcc-plugins: Add include required by GCC release 8 + + GCC requires another #include to get the gcc-plugins to build cleanly. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Kees Cook <keescook@chromium.org> + +diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h +index ffd1dfaa1cc1..f46750053377 100644 +--- a/scripts/gcc-plugins/gcc-common.h ++++ b/scripts/gcc-plugins/gcc-common.h +@@ -97,6 +97,10 @@ + #include "predict.h" + #include "ipa-utils.h" + ++#if BUILDING_GCC_VERSION >= 8000 ++#include "stringpool.h" ++#endif ++ + #if BUILDING_GCC_VERSION >= 4009 + #include "attribs.h" + #include "varasm.h"
commit 0da325afbdb80098e014b83937372e3eef6872d5
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Sep 20 18:14:53 2016 -0400
+
+ ALSA: line6: snd-usb-line6 depends on CONFIG_SND_HWDEP
+
+ ERROR: "snd_hwdep_new" [sound/usb/line6/snd-usb-line6.ko] undefined!
+ scripts/Makefile.modpost:91: recipe for target '__modpost' failed
+ make[1]: *** [__modpost] Error 1
+
+ Fixes: a16039cbf1a1 ('ALSA: line6: Add hwdep interface to access the POD control messages')
+ Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+ Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/usb/line6/Kconfig b/sound/usb/line6/Kconfig
+index 8ffcf48097d9..39b400392d71 100644
+--- a/sound/usb/line6/Kconfig
++++ b/sound/usb/line6/Kconfig
+@@ -2,6 +2,7 @@ config SND_USB_LINE6
+ tristate
+ select SND_RAWMIDI
+ select SND_PCM
++ select SND_HWDEP
+
+ config SND_USB_POD
+ tristate "Line 6 POD USB support"commit 5e44258d168b2bdee51d9e2e1f1f4726ff9775cd +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Sun Jul 31 23:24:50 2016 -0400 + + x86/build: Reduce the W=1 warnings noise when compiling x86 syscall tables + + Building an X86_64 kernel with W=1 throws a total of 9,948 lines of warnings of + this form for both 32-bit and 64-bit syscall tables. Given that the entire rest + of the build for my config only generates 8,375 lines of output, this is a big + reduction in the warnings generated. + + The warnings follow this pattern: + + ./arch/x86/include/generated/asm/syscalls_32.h:885:21: warning: initialized field overwritten [-Woverride-init] + __SYSCALL_I386(379, compat_sys_pwritev2, ) + ^ + arch/x86/entry/syscall_32.c:13:46: note: in definition of macro '__SYSCALL_I386' + #define __SYSCALL_I386(nr, sym, qual) [nr] = sym, + ^~~ + ./arch/x86/include/generated/asm/syscalls_32.h:885:21: note: (near initialization for 'ia32_sys_call_table[379]') + __SYSCALL_I386(379, compat_sys_pwritev2, ) + ^ + arch/x86/entry/syscall_32.c:13:46: note: in definition of macro '__SYSCALL_I386' + #define __SYSCALL_I386(nr, sym, qual) [nr] = sym, + + Since we intentionally build the syscall tables this way, ignore that one + warning in the two files. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Cc: Andy Lutomirski <luto@kernel.org> + Cc: Borislav Petkov <bp@alien8.de> + Cc: Brian Gerst <brgerst@gmail.com> + Cc: Denys Vlasenko <dvlasenk@redhat.com> + Cc: H. Peter Anvin <hpa@zytor.com> + Cc: Josh Poimboeuf <jpoimboe@redhat.com> + Cc: Linus Torvalds <torvalds@linux-foundation.org> + Cc: Peter Zijlstra <peterz@infradead.org> + Cc: Thomas Gleixner <tglx@linutronix.de> + Link: http://lkml.kernel.org/r/7464.1470021890@turing-police.cc.vt.edu + Signed-off-by: Ingo Molnar <mingo@kernel.org> + +diff --git a/arch/x86/entry/Makefile b/arch/x86/entry/Makefile +index fe91c25092da..77f28ce9c646 100644 +--- a/arch/x86/entry/Makefile ++++ b/arch/x86/entry/Makefile +@@ -5,6 +5,8 @@ + OBJECT_FILES_NON_STANDARD_entry_$(BITS).o := y + OBJECT_FILES_NON_STANDARD_entry_64_compat.o := y + ++CFLAGS_syscall_64.o += -Wno-override-init ++CFLAGS_syscall_32.o += -Wno-override-init + obj-y := entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o + obj-y += common.o +
commit f1cb637e75b59a07450cf81ad68b04f3f46b03d7 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Tue Aug 2 14:07:27 2016 -0700 + + init/Kconfig: add clarification for out-of-tree modules + + It doesn't trim just symbols that are totally unused in-tree - it trims + the symbols unused by any in-tree modules actually built. If you've + done a 'make localmodconfig' and only build a hundred or so modules, + it's pretty likely that your out-of-tree module will come up lacking + something... + + Hopefully this will save the next guy from a Homer Simpson "D'oh!" + moment. + + Link: http://lkml.kernel.org/r/10177.1469787292@turing-police.cc.vt.edu + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Cc: Michal Marek <mmarek@suse.cz> + Cc: Rusty Russell <rusty@rustcorp.com.au> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/init/Kconfig b/init/Kconfig +index 380798f86aae..69886493ff1e 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -2080,7 +2080,7 @@ config TRIM_UNUSED_KSYMS + (especially when using LTO) for optimizing the code and reducing + binary size. This might have some security advantages as well. + +- If unsure say N. ++ If unsure, or if you need to build out-of-tree modules, say N. + + endif # MODULES +
commit ca52953f5f24aff0aa8fa8de750b76ba0302142d +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Tue Aug 2 14:03:25 2016 -0700 + + fs/proc/task_mmu.c: suppress compilation warnings with W=1 + + Suppress a bunch of warnings of the form: + + fs/proc/task_mmu.c: In function 'show_smap_vma_flags': + fs/proc/task_mmu.c:635:22: warning: initialized field overwritten [-Wt override-init] + [ilog2(VM_READ)] = "rd", + ^~~~ + fs/proc/task_mmu.c:635:22: note: (near initialization for 'mnemonics[0]') + + They happen because of the way we intentionally build the table, so + silence the warning when building with 'make W=1'. + + Link: http://lkml.kernel.org/r/8727.1470022083@turing-police.cc.vt.edu + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/fs/proc/Makefile b/fs/proc/Makefile +index 7151ea428041..a8c13605b434 100644 +--- a/fs/proc/Makefile ++++ b/fs/proc/Makefile +@@ -4,6 +4,7 @@ + + obj-y += proc.o + ++CFLAGS_task_mmu.o += -Wno-override-init + proc-y := nommu.o task_nommu.o + proc-$(CONFIG_MMU) := task_mmu.o +
commit 117dec978cf64e8e96f13d0cf4891ff77c9acf55 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Tue Aug 2 14:02:28 2016 -0700 + + tools/testing/radix-tree/linux/gfp.h: fix bitrotted value + + Apparently, the tools/testing version dates to a few flags ago, and + we've sprouted 4 new ones since. Keep in sync with the value in the + main tree... + + Link: http://lkml.kernel.org/r/23400.1469702675@turing-police.cc.vt.edu + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/tools/testing/radix-tree/linux/gfp.h b/tools/testing/radix-tree/linux/gfp.h +index 0e37f7a760eb..5201b915f631 100644 +--- a/tools/testing/radix-tree/linux/gfp.h ++++ b/tools/testing/radix-tree/linux/gfp.h +@@ -1,7 +1,7 @@ + #ifndef _GFP_H + #define _GFP_H + +-#define __GFP_BITS_SHIFT 22 ++#define __GFP_BITS_SHIFT 26 + #define __GFP_BITS_MASK ((gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) + #define __GFP_WAIT 1 + #define __GFP_ACCOUNT 0
commit c67f69576bba438e69f3d0657e08bdecb4cc2097 +Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> +Date: Mon May 30 02:26:38 2016 -0400 + + Fix annoyingly awkward typo in drm_edid_load.c + + Fix egregious typo in comment. + + Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> + Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> + Link: http://patchwork.freedesktop.org/patch/msgid/10576.1464589598@turing-police.cc.vt.edu + +diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c +index 9a401aed98e0..622f788bff46 100644 +--- a/drivers/gpu/drm/drm_edid_load.c ++++ b/drivers/gpu/drm/drm_edid_load.c +@@ -271,7 +271,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) + * by commas, search through the list looking for one that + * matches the connector. + * +- * If there's one or more that don't't specify a connector, keep ++ * If there's one or more that doesn't specify a connector, keep + * the last one found one as a fallback. + */ + fwstr = kstrdup(edid_firmware, GFP_KERNEL);
commit ad0d7799382b37e6afa910f27fa342af62d80ded
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Dec 22 19:36:54 2015 -0500
+
+ drivers/staging/lustre: Nuke another unsigned >= 0 assert
+
+ Clean up another case of the compiler remininding the programmer they
+ are an idiot:
+
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c:308:34: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
+ LASSERT(page_pools.epp_waitqlen >= 0);
+
+ Just lose the assert, and save a page of compiler spew.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+index 6152c1b766c3..22621c74a66a 100644
+--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
++++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+@@ -304,7 +304,6 @@ static unsigned long enc_pools_cleanup(struct page ***pools, int npools)
+ static inline void enc_pools_wakeup(void)
+ {
+ assert_spin_locked(&page_pools.epp_lock);
+- LASSERT(page_pools.epp_waitqlen >= 0);
+
+ if (unlikely(page_pools.epp_waitqlen)) {
+ LASSERT(waitqueue_active(&page_pools.epp_waitq));commit bd6455de1a1af6b382b9ee93311397284c165c92
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Dec 22 19:36:53 2015 -0500
+
+ drivers/staging/lustre: Nuke an unsigned >= 0 assert
+
+ Writing asserts for almost-never-can-happen things can be valuable.
+ Writing an assert that tests that an "unsigned int" hasn't gone negative
+ isn't.
+
+ And it generates an *ugly* message:
+
+ drivers/staging/lustre/lustre/llite/rw.c:763:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+ include/linux/compiler.h:137:45: note: in definition of macro 'unlikely'
+ # define unlikely(x) (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 0))
+ ^
+ drivers/staging/lustre/lustre/llite/rw.c:763:2: note: in expansion of macro 'LASSERTF'
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+ drivers/staging/lustre/lustre/llite/rw.c:763:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+ include/linux/compiler.h:137:53: note: in definition of macro 'unlikely'
+ # define unlikely(x) (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 0))
+ ^
+ drivers/staging/lustre/lustre/llite/rw.c:763:2: note: in expansion of macro 'LASSERTF'
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+ drivers/staging/lustre/lustre/llite/rw.c:763:20: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+ include/linux/compiler.h:110:47: note: in definition of macro 'likely_notrace'
+ #define likely_notrace(x) __builtin_expect(!!(x), 1)
+ ^
+ include/linux/compiler.h:137:58: note: in expansion of macro '__branch_check__'
+ # define unlikely(x) (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 0))
+ ^
+ drivers/staging/lustre/lustre/llite/../include/linux/../../../include/linux/libcfs/libcfs_private.h:58:6: note: in expansion of macro 'unlikely'
+ if (unlikely(!(cond))) { \
+ ^
+ drivers/staging/lustre/lustre/llite/rw.c:763:2: note: in expansion of macro 'LASSERTF'
+ LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ ^
+
+ Umm, thank you, GCC. We'll delete the problem line so we never see that spew again.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
+index f355474967d6..6b587d66d1b3 100644
+--- a/drivers/staging/lustre/lustre/llite/rw.c
++++ b/drivers/staging/lustre/lustre/llite/rw.c
+@@ -764,7 +764,6 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,
+ ret = ll_read_ahead_pages(env, io, queue,
+ ria, &reserved, mapping, &ra_end);
+
+- LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
+ if (reserved != 0)
+ ll_ra_count_put(ll_i2sbi(inode), reserved);
+ commit 5aec2e0791a5a76bec020b088a8b8a10afcfd522
+Author: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+Date: Tue Dec 22 19:36:52 2015 -0500
+
+ drivers/staging/lustre: Fix another C compiler whine: set but not used
+
+ CC [M] drivers/staging/lustre/lustre/libcfs/module.o
+ drivers/staging/lustre/lustre/libcfs/module.c: In function 'lustre_insert_debugfs':
+ drivers/staging/lustre/lustre/libcfs/module.c:670:17: warning: variable 'entry' set but not used [-Wunused-but-set-variable]
+ struct dentry *entry;
+ ^
+
+ Just ignore the dentry returned, and add a comment that we *know*
+ we're not really leaking the dentry because something else will be able
+ to reap it via recursion.
+
+ Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
+index 0067e5347884..af516a29c20e 100644
+--- a/drivers/staging/lustre/lustre/libcfs/module.c
++++ b/drivers/staging/lustre/lustre/libcfs/module.c
+@@ -511,8 +511,6 @@ static const struct file_operations lnet_debugfs_file_operations = {
+ void lustre_insert_debugfs(struct ctl_table *table,
+ const struct lnet_debugfs_symlink_def *symlinks)
+ {
+- struct dentry *entry;
+-
+ if (lnet_debugfs_root == NULL)
+ lnet_debugfs_root = debugfs_create_dir("lnet", NULL);
+
+@@ -520,15 +518,17 @@ void lustre_insert_debugfs(struct ctl_table *table,
+ if (IS_ERR_OR_NULL(lnet_debugfs_root))
+ return;
+
++ /* We don't save the dentry returned in next two calls, because
++ * we don't call debugfs_remove() but rather remove_recursive()
++ */
+ for (; table->procname; table++)
+- entry = debugfs_create_file(table->procname, table->mode,
+- lnet_debugfs_root, table,
+- &lnet_debugfs_file_operations);
++ debugfs_create_file(table->procname, table->mode,
++ lnet_debugfs_root, table,
++ &lnet_debugfs_file_operations);
+
+ for (; symlinks && symlinks->name; symlinks++)
+- entry = debugfs_create_symlink(symlinks->name,
+- lnet_debugfs_root,
+- symlinks->target);
++ debugfs_create_symlink(symlinks->name, lnet_debugfs_root,
++ symlinks->target);
+
+ }
+ EXPORT_SYMBOL_GPL(lustre_insert_debugfs);
+ commit 44d0fb387b53e56c8a050bac5c7d460e21eb226f
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Mon May 15 21:09:58 2023 +0800
+
+ mm: page_table_check: Ensure user pages are not slab pages
+
+ The current uses of PageAnon in page table check functions can lead to
+ type confusion bugs between struct page and slab [1], if slab pages are
+ accidentally mapped into the user space. This is because slab reuses the
+ bits in struct page to store its internal states, which renders PageAnon
+ ineffective on slab pages.
+
+ Since slab pages are not expected to be mapped into the user space, this
+ patch adds BUG_ON(PageSlab(page)) checks to make sure that slab pages
+ are not inadvertently mapped. Otherwise, there must be some bugs in the
+ kernel.
+
+ Reported-by: syzbot+fcf1a817ceb50935ce99@syzkaller.appspotmail.com
+ Closes: https://lore.kernel.org/lkml/000000000000258e5e05fae79fc1@google.com/ [1]
+ Fixes: df4e817b7108 ("mm: page table check")
+ Cc: <stable@vger.kernel.org> # 5.17
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Acked-by: Pasha Tatashin <pasha.tatashin@soleen.com>
+ Link: https://lore.kernel.org/r/20230515130958.32471-5-lrh2000@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
+index 1c68d67b832f..92a2063a0a23 100644
+--- a/include/linux/page-flags.h
++++ b/include/linux/page-flags.h
+@@ -617,6 +617,12 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemmap_self_hosted)
+ * Please note that, confusingly, "page_mapping" refers to the inode
+ * address_space which maps the page from disk; whereas "page_mapped"
+ * refers to user virtual address space into which the page is mapped.
++ *
++ * For slab pages, since slab reuses the bits in struct page to store its
++ * internal states, the page->mapping does not exist as such, nor do these
++ * flags below. So in order to avoid testing non-existent bits, please
++ * make sure that PageSlab(page) actually evaluates to false before calling
++ * the following functions (e.g., PageAnon). See mm/slab.h.
+ */
+ #define PAGE_MAPPING_ANON 0x1
+ #define PAGE_MAPPING_MOVABLE 0x2
+diff --git a/mm/page_table_check.c b/mm/page_table_check.c
+index 25d8610c0042..f2baf97d5f38 100644
+--- a/mm/page_table_check.c
++++ b/mm/page_table_check.c
+@@ -71,6 +71,8 @@ static void page_table_check_clear(struct mm_struct *mm, unsigned long addr,
+
+ page = pfn_to_page(pfn);
+ page_ext = page_ext_get(page);
++
++ BUG_ON(PageSlab(page));
+ anon = PageAnon(page);
+
+ for (i = 0; i < pgcnt; i++) {
+@@ -107,6 +109,8 @@ static void page_table_check_set(struct mm_struct *mm, unsigned long addr,
+
+ page = pfn_to_page(pfn);
+ page_ext = page_ext_get(page);
++
++ BUG_ON(PageSlab(page));
+ anon = PageAnon(page);
+
+ for (i = 0; i < pgcnt; i++) {
+@@ -133,6 +137,8 @@ void __page_table_check_zero(struct page *page, unsigned int order)
+ struct page_ext *page_ext;
+ unsigned long i;
+
++ BUG_ON(PageSlab(page));
++
+ page_ext = page_ext_get(page);
+ BUG_ON(!page_ext);
+ for (i = 0; i < (1ul << order); i++) {commit 81a31a860bb61d54eb688af2568d9332ed9b8942 +Author: Ruihan Li <lrh2000@pku.edu.cn> +Date: Mon May 15 21:09:57 2023 +0800 + + mm: page_table_check: Make it dependent on EXCLUSIVE_SYSTEM_RAM + + Without EXCLUSIVE_SYSTEM_RAM, users are allowed to map arbitrary + physical memory regions into the userspace via /dev/mem. At the same + time, pages may change their properties (e.g., from anonymous pages to + named pages) while they are still being mapped in the userspace, leading + to "corruption" detected by the page table check. + + To avoid these false positives, this patch makes PAGE_TABLE_CHECK + depends on EXCLUSIVE_SYSTEM_RAM. This dependency is understandable + because PAGE_TABLE_CHECK is a hardening technique but /dev/mem without + STRICT_DEVMEM (i.e., !EXCLUSIVE_SYSTEM_RAM) is itself a security + problem. + + Even with EXCLUSIVE_SYSTEM_RAM, I/O pages may be still allowed to be + mapped via /dev/mem. However, these pages are always considered as named + pages, so they won't break the logic used in the page table check. + + Cc: <stable@vger.kernel.org> # 5.17 + Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn> + Acked-by: David Hildenbrand <david@redhat.com> + Acked-by: Pasha Tatashin <pasha.tatashin@soleen.com> + Link: https://lore.kernel.org/r/20230515130958.32471-4-lrh2000@pku.edu.cn + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/Documentation/mm/page_table_check.rst b/Documentation/mm/page_table_check.rst +index cfd8f4117cf3..c12838ce6b8d 100644 +--- a/Documentation/mm/page_table_check.rst ++++ b/Documentation/mm/page_table_check.rst +@@ -52,3 +52,22 @@ Build kernel with: + + Optionally, build kernel with PAGE_TABLE_CHECK_ENFORCED in order to have page + table support without extra kernel parameter. ++ ++Implementation notes ++==================== ++ ++We specifically decided not to use VMA information in order to avoid relying on ++MM states (except for limited "struct page" info). The page table check is a ++separate from Linux-MM state machine that verifies that the user accessible ++pages are not falsely shared. ++ ++PAGE_TABLE_CHECK depends on EXCLUSIVE_SYSTEM_RAM. The reason is that without ++EXCLUSIVE_SYSTEM_RAM, users are allowed to map arbitrary physical memory ++regions into the userspace via /dev/mem. At the same time, pages may change ++their properties (e.g., from anonymous pages to named pages) while they are ++still being mapped in the userspace, leading to "corruption" detected by the ++page table check. ++ ++Even with EXCLUSIVE_SYSTEM_RAM, I/O pages may be still allowed to be mapped via ++/dev/mem. However, these pages are always considered as named pages, so they ++won't break the logic used in the page table check. +diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug +index a925415b4d10..018a5bd2f576 100644 +--- a/mm/Kconfig.debug ++++ b/mm/Kconfig.debug +@@ -98,6 +98,7 @@ config PAGE_OWNER + config PAGE_TABLE_CHECK + bool "Check for invalid mappings in user page tables" + depends on ARCH_SUPPORTS_PAGE_TABLE_CHECK ++ depends on EXCLUSIVE_SYSTEM_RAM + select PAGE_EXTENSION + help + Check that anonymous page is not being mapped twice with read write
commit d0b861653f8c16839c3035875b556afc4472f941
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Mon May 15 21:09:56 2023 +0800
+
+ usb: usbfs: Use consistent mmap functions
+
+ When hcd->localmem_pool is non-null, localmem_pool is used to allocate
+ DMA memory. In this case, the dma address will be properly returned (in
+ dma_handle), and dma_mmap_coherent should be used to map this memory
+ into the user space. However, the current implementation uses
+ pfn_remap_range, which is supposed to map normal pages.
+
+ Instead of repeating the logic in the memory allocation function, this
+ patch introduces a more robust solution. Here, the type of allocated
+ memory is checked by testing whether dma_handle is properly set. If
+ dma_handle is properly returned, it means some DMA pages are allocated
+ and dma_mmap_coherent should be used to map them. Otherwise, normal
+ pages are allocated and pfn_remap_range should be called. This ensures
+ that the correct mmap functions are used consistently, independently
+ with logic details that determine which type of memory gets allocated.
+
+ Fixes: a0e710a7def4 ("USB: usbfs: fix mmap dma mismatch")
+ Cc: stable@vger.kernel.org
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Link: https://lore.kernel.org/r/20230515130958.32471-3-lrh2000@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
+index 3936ca7f7d2f..fcf68818e999 100644
+--- a/drivers/usb/core/devio.c
++++ b/drivers/usb/core/devio.c
+@@ -235,7 +235,7 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
+ size_t size = vma->vm_end - vma->vm_start;
+ void *mem;
+ unsigned long flags;
+- dma_addr_t dma_handle;
++ dma_addr_t dma_handle = DMA_MAPPING_ERROR;
+ int ret;
+
+ ret = usbfs_increase_memory_usage(size + sizeof(struct usb_memory));
+@@ -265,7 +265,14 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
+ usbm->vma_use_count = 1;
+ INIT_LIST_HEAD(&usbm->memlist);
+
+- if (hcd->localmem_pool || !hcd_uses_dma(hcd)) {
++ /*
++ * In DMA-unavailable cases, hcd_buffer_alloc_pages allocates
++ * normal pages and assigns DMA_MAPPING_ERROR to dma_handle. Check
++ * whether we are in such cases, and then use remap_pfn_range (or
++ * dma_mmap_coherent) to map normal (or DMA) pages into the user
++ * space, respectively.
++ */
++ if (dma_handle == DMA_MAPPING_ERROR) {
+ if (remap_pfn_range(vma, vma->vm_start,
+ virt_to_phys(usbm->mem) >> PAGE_SHIFT,
+ size, vma->vm_page_prot) < 0) {commit 0143d148d1e882fb1538dc9974c94d63961719b9
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Mon May 15 21:09:55 2023 +0800
+
+ usb: usbfs: Enforce page requirements for mmap
+
+ The current implementation of usbdev_mmap uses usb_alloc_coherent to
+ allocate memory pages that will later be mapped into the user space.
+ Meanwhile, usb_alloc_coherent employs three different methods to
+ allocate memory, as outlined below:
+ * If hcd->localmem_pool is non-null, it uses gen_pool_dma_alloc to
+ allocate memory;
+ * If DMA is not available, it uses kmalloc to allocate memory;
+ * Otherwise, it uses dma_alloc_coherent.
+
+ However, it should be noted that gen_pool_dma_alloc does not guarantee
+ that the resulting memory will be page-aligned. Furthermore, trying to
+ map slab pages (i.e., memory allocated by kmalloc) into the user space
+ is not resonable and can lead to problems, such as a type confusion bug
+ when PAGE_TABLE_CHECK=y [1].
+
+ To address these issues, this patch introduces hcd_alloc_coherent_pages,
+ which addresses the above two problems. Specifically,
+ hcd_alloc_coherent_pages uses gen_pool_dma_alloc_align instead of
+ gen_pool_dma_alloc to ensure that the memory is page-aligned. To replace
+ kmalloc, hcd_alloc_coherent_pages directly allocates pages by calling
+ __get_free_pages.
+
+ Reported-by: syzbot+fcf1a817ceb50935ce99@syzkaller.appspotmail.comm
+ Closes: https://lore.kernel.org/lkml/000000000000258e5e05fae79fc1@google.com/ [1]
+ Fixes: f7d34b445abc ("USB: Add support for usbfs zerocopy.")
+ Fixes: ff2437befd8f ("usb: host: Fix excessive alignment restriction for local memory allocations")
+ Cc: stable@vger.kernel.org
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Acked-by: Alan Stern <stern@rowland.harvard.edu>
+ Link: https://lore.kernel.org/r/20230515130958.32471-2-lrh2000@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
+index fbb087b728dc..268ccbec88f9 100644
+--- a/drivers/usb/core/buffer.c
++++ b/drivers/usb/core/buffer.c
+@@ -172,3 +172,44 @@ void hcd_buffer_free(
+ }
+ dma_free_coherent(hcd->self.sysdev, size, addr, dma);
+ }
++
++void *hcd_buffer_alloc_pages(struct usb_hcd *hcd,
++ size_t size, gfp_t mem_flags, dma_addr_t *dma)
++{
++ if (size == 0)
++ return NULL;
++
++ if (hcd->localmem_pool)
++ return gen_pool_dma_alloc_align(hcd->localmem_pool,
++ size, dma, PAGE_SIZE);
++
++ /* some USB hosts just use PIO */
++ if (!hcd_uses_dma(hcd)) {
++ *dma = DMA_MAPPING_ERROR;
++ return (void *)__get_free_pages(mem_flags,
++ get_order(size));
++ }
++
++ return dma_alloc_coherent(hcd->self.sysdev,
++ size, dma, mem_flags);
++}
++
++void hcd_buffer_free_pages(struct usb_hcd *hcd,
++ size_t size, void *addr, dma_addr_t dma)
++{
++ if (!addr)
++ return;
++
++ if (hcd->localmem_pool) {
++ gen_pool_free(hcd->localmem_pool,
++ (unsigned long)addr, size);
++ return;
++ }
++
++ if (!hcd_uses_dma(hcd)) {
++ free_pages((unsigned long)addr, get_order(size));
++ return;
++ }
++
++ dma_free_coherent(hcd->self.sysdev, size, addr, dma);
++}
+diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
+index e501a03d6c70..3936ca7f7d2f 100644
+--- a/drivers/usb/core/devio.c
++++ b/drivers/usb/core/devio.c
+@@ -186,6 +186,7 @@ static int connected(struct usb_dev_state *ps)
+ static void dec_usb_memory_use_count(struct usb_memory *usbm, int *count)
+ {
+ struct usb_dev_state *ps = usbm->ps;
++ struct usb_hcd *hcd = bus_to_hcd(ps->dev->bus);
+ unsigned long flags;
+
+ spin_lock_irqsave(&ps->lock, flags);
+@@ -194,8 +195,8 @@ static void dec_usb_memory_use_count(struct usb_memory *usbm, int *count)
+ list_del(&usbm->memlist);
+ spin_unlock_irqrestore(&ps->lock, flags);
+
+- usb_free_coherent(ps->dev, usbm->size, usbm->mem,
+- usbm->dma_handle);
++ hcd_buffer_free_pages(hcd, usbm->size,
++ usbm->mem, usbm->dma_handle);
+ usbfs_decrease_memory_usage(
+ usbm->size + sizeof(struct usb_memory));
+ kfree(usbm);
+@@ -247,8 +248,8 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
+ goto error_decrease_mem;
+ }
+
+- mem = usb_alloc_coherent(ps->dev, size, GFP_USER | __GFP_NOWARN,
+- &dma_handle);
++ mem = hcd_buffer_alloc_pages(hcd,
++ size, GFP_USER | __GFP_NOWARN, &dma_handle);
+ if (!mem) {
+ ret = -ENOMEM;
+ goto error_free_usbm;
+diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
+index 094c77eaf455..0c7eff91adf4 100644
+--- a/include/linux/usb/hcd.h
++++ b/include/linux/usb/hcd.h
+@@ -501,6 +501,11 @@ void *hcd_buffer_alloc(struct usb_bus *bus, size_t size,
+ void hcd_buffer_free(struct usb_bus *bus, size_t size,
+ void *addr, dma_addr_t dma);
+
++void *hcd_buffer_alloc_pages(struct usb_hcd *hcd,
++ size_t size, gfp_t mem_flags, dma_addr_t *dma);
++void hcd_buffer_free_pages(struct usb_hcd *hcd,
++ size_t size, void *addr, dma_addr_t dma);
++
+ /* generic bus glue, needed for host controllers that don't use PCI */
+ extern irqreturn_t usb_hcd_irq(int irq, void *__hcd);
+ commit a2904d2825536aa896a149a9174d11b0958e7095
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Wed May 3 21:39:37 2023 +0800
+
+ Bluetooth: Unlink CISes when LE disconnects in hci_conn_del
+
+ Currently, hci_conn_del calls hci_conn_unlink for BR/EDR, (e)SCO, and
+ CIS connections, i.e., everything except LE connections. However, if
+ (e)SCO connections are unlinked when BR/EDR disconnects, CIS connections
+ should also be unlinked when LE disconnects.
+
+ In terms of disconnection behavior, CIS and (e)SCO connections are not
+ too different. One peculiarity of CIS is that when CIS connections are
+ disconnected, the CIS handle isn't deleted, as per [BLUETOOTH CORE
+ SPECIFICATION Version 5.4 | Vol 4, Part E] 7.1.6 Disconnect command:
+
+ All SCO, eSCO, and CIS connections on a physical link should be
+ disconnected before the ACL connection on the same physical
+ connection is disconnected. If it does not, they will be
+ implicitly disconnected as part of the ACL disconnection.
+ ...
+ Note: As specified in Section 7.7.5, on the Central, the handle
+ for a CIS remains valid even after disconnection and, therefore,
+ the Host can recreate a disconnected CIS at a later point in
+ time using the same connection handle.
+
+ Since hci_conn_link invokes both hci_conn_get and hci_conn_hold,
+ hci_conn_unlink should perform both hci_conn_put and hci_conn_drop as
+ well. However, currently it performs only hci_conn_put.
+
+ This patch makes hci_conn_unlink call hci_conn_drop as well, which
+ simplifies the logic in hci_conn_del a bit and may benefit future users
+ of hci_conn_unlink. But it is noted that this change additionally
+ implies that hci_conn_unlink can queue disc_work on conn itself, with
+ the following call stack:
+
+ hci_conn_unlink(conn) [conn->parent == NULL]
+ -> hci_conn_unlink(child) [child->parent == conn]
+ -> hci_conn_drop(child->parent)
+ -> queue_delayed_work(&conn->disc_work)
+
+ Queued disc_work after hci_conn_del can be spurious, so during the
+ process of hci_conn_del, it is necessary to make the call to
+ cancel_delayed_work(&conn->disc_work) after invoking hci_conn_unlink.
+
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Co-developed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index ce588359b290..f75ef12f18f7 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -1100,7 +1100,9 @@ static void hci_conn_unlink(struct hci_conn *conn)
+ * yet at this point. Delete it now, otherwise it is
+ * possible for it to be stuck and can't be deleted.
+ */
+- if (child->handle == HCI_CONN_HANDLE_UNSET)
++ if ((child->type == SCO_LINK ||
++ child->type == ESCO_LINK) &&
++ child->handle == HCI_CONN_HANDLE_UNSET)
+ hci_conn_del(child);
+ }
+
+@@ -1113,6 +1115,7 @@ static void hci_conn_unlink(struct hci_conn *conn)
+ list_del_rcu(&conn->link->list);
+ synchronize_rcu();
+
++ hci_conn_drop(conn->parent);
+ hci_conn_put(conn->parent);
+ conn->parent = NULL;
+
+@@ -1126,12 +1129,13 @@ void hci_conn_del(struct hci_conn *conn)
+
+ BT_DBG("%s hcon %p handle %d", hdev->name, conn, conn->handle);
+
++ hci_conn_unlink(conn);
++
+ cancel_delayed_work_sync(&conn->disc_work);
+ cancel_delayed_work_sync(&conn->auto_accept_work);
+ cancel_delayed_work_sync(&conn->idle_work);
+
+ if (conn->type == ACL_LINK) {
+- hci_conn_unlink(conn);
+ /* Unacked frames */
+ hdev->acl_cnt += conn->sent;
+ } else if (conn->type == LE_LINK) {
+@@ -1142,13 +1146,6 @@ void hci_conn_del(struct hci_conn *conn)
+ else
+ hdev->acl_cnt += conn->sent;
+ } else {
+- struct hci_conn *acl = conn->parent;
+-
+- if (acl) {
+- hci_conn_unlink(conn);
+- hci_conn_drop(acl);
+- }
+-
+ /* Unacked ISO frames */
+ if (conn->type == ISO_LINK) {
+ if (hdev->iso_pkts)
+@@ -2485,12 +2482,6 @@ void hci_conn_hash_flush(struct hci_dev *hdev)
+ list)) != NULL) {
+ conn->state = BT_CLOSED;
+ hci_disconn_cfm(conn, HCI_ERROR_LOCAL_HOST_TERM);
+-
+- /* Unlink before deleting otherwise it is possible that
+- * hci_conn_del removes the link which may cause the list to
+- * contain items already freed.
+- */
+- hci_conn_unlink(conn);
+ hci_conn_del(conn);
+ }
+ }commit a2ac591cb4d83e1f2d4b4adb3c14b2c79764650a
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Wed May 3 21:39:36 2023 +0800
+
+ Bluetooth: Fix UAF in hci_conn_hash_flush again
+
+ Commit 06149746e720 ("Bluetooth: hci_conn: Add support for linking
+ multiple hcon") reintroduced a previously fixed bug [1] ("KASAN:
+ slab-use-after-free Read in hci_conn_hash_flush"). This bug was
+ originally fixed by commit 5dc7d23e167e ("Bluetooth: hci_conn: Fix
+ possible UAF").
+
+ The hci_conn_unlink function was added to avoid invalidating the link
+ traversal caused by successive hci_conn_del operations releasing extra
+ connections. However, currently hci_conn_unlink itself also releases
+ extra connections, resulted in the reintroduced bug.
+
+ This patch follows a more robust solution for cleaning up all
+ connections, by repeatedly removing the first connection until there are
+ none left. This approach does not rely on the inner workings of
+ hci_conn_del and ensures proper cleanup of all connections.
+
+ Meanwhile, we need to make sure that hci_conn_del never fails. Indeed it
+ doesn't, as it now always returns zero. To make this a bit clearer, this
+ patch also changes its return type to void.
+
+ Reported-by: syzbot+8bb72f86fc823817bc5d@syzkaller.appspotmail.com
+ Closes: https://lore.kernel.org/linux-bluetooth/000000000000aa920505f60d25ad@google.com/
+ Fixes: 06149746e720 ("Bluetooth: hci_conn: Add support for linking multiple hcon")
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Co-developed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+
+diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
+index a6c8aee2f256..8baf34639939 100644
+--- a/include/net/bluetooth/hci_core.h
++++ b/include/net/bluetooth/hci_core.h
+@@ -1327,7 +1327,7 @@ int hci_le_create_cis(struct hci_conn *conn);
+
+ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
+ u8 role);
+-int hci_conn_del(struct hci_conn *conn);
++void hci_conn_del(struct hci_conn *conn);
+ void hci_conn_hash_flush(struct hci_dev *hdev);
+ void hci_conn_check_pending(struct hci_dev *hdev);
+
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index 44d0643fc681..ce588359b290 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -1088,6 +1088,14 @@ static void hci_conn_unlink(struct hci_conn *conn)
+
+ hci_conn_unlink(child);
+
++ /* If hdev is down it means
++ * hci_dev_close_sync/hci_conn_hash_flush is in progress
++ * and links don't need to be cleanup as all connections
++ * would be cleanup.
++ */
++ if (!test_bit(HCI_UP, &hdev->flags))
++ continue;
++
+ /* Due to race, SCO connection might be not established
+ * yet at this point. Delete it now, otherwise it is
+ * possible for it to be stuck and can't be deleted.
+@@ -1112,7 +1120,7 @@ static void hci_conn_unlink(struct hci_conn *conn)
+ conn->link = NULL;
+ }
+
+-int hci_conn_del(struct hci_conn *conn)
++void hci_conn_del(struct hci_conn *conn)
+ {
+ struct hci_dev *hdev = conn->hdev;
+
+@@ -1163,8 +1171,6 @@ int hci_conn_del(struct hci_conn *conn)
+ * rest of hci_conn_del.
+ */
+ hci_conn_cleanup(conn);
+-
+- return 0;
+ }
+
+ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)
+@@ -2465,22 +2471,27 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
+ /* Drop all connection on the device */
+ void hci_conn_hash_flush(struct hci_dev *hdev)
+ {
+- struct hci_conn_hash *h = &hdev->conn_hash;
+- struct hci_conn *c, *n;
++ struct list_head *head = &hdev->conn_hash.list;
++ struct hci_conn *conn;
+
+ BT_DBG("hdev %s", hdev->name);
+
+- list_for_each_entry_safe(c, n, &h->list, list) {
+- c->state = BT_CLOSED;
+-
+- hci_disconn_cfm(c, HCI_ERROR_LOCAL_HOST_TERM);
++ /* We should not traverse the list here, because hci_conn_del
++ * can remove extra links, which may cause the list traversal
++ * to hit items that have already been released.
++ */
++ while ((conn = list_first_entry_or_null(head,
++ struct hci_conn,
++ list)) != NULL) {
++ conn->state = BT_CLOSED;
++ hci_disconn_cfm(conn, HCI_ERROR_LOCAL_HOST_TERM);
+
+ /* Unlink before deleting otherwise it is possible that
+ * hci_conn_del removes the link which may cause the list to
+ * contain items already freed.
+ */
+- hci_conn_unlink(c);
+- hci_conn_del(c);
++ hci_conn_unlink(conn);
++ hci_conn_del(conn);
+ }
+ }
+ commit 2910431ab0e500dfc5df12299bb15eef0f30b43e
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Wed May 3 21:39:35 2023 +0800
+
+ Bluetooth: Refcnt drop must be placed last in hci_conn_unlink
+
+ If hci_conn_put(conn->parent) reduces conn->parent's reference count to
+ zero, it can immediately deallocate conn->parent. At the same time,
+ conn->link->list has its head in conn->parent, causing use-after-free
+ problems in the latter list_del_rcu(&conn->link->list).
+
+ This problem can be easily solved by reordering the two operations,
+ i.e., first performing the list removal with list_del_rcu and then
+ decreasing the refcnt with hci_conn_put.
+
+ Reported-by: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
+ Closes: https://lore.kernel.org/linux-bluetooth/CABBYNZ+1kce8_RJrLNOXd_8=Mdpb=2bx4Nto-hFORk=qiOkoCg@mail.gmail.com/
+ Fixes: 06149746e720 ("Bluetooth: hci_conn: Add support for linking multiple hcon")
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index 70e1655a9df6..44d0643fc681 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -1102,12 +1102,12 @@ static void hci_conn_unlink(struct hci_conn *conn)
+ if (!conn->link)
+ return;
+
+- hci_conn_put(conn->parent);
+- conn->parent = NULL;
+-
+ list_del_rcu(&conn->link->list);
+ synchronize_rcu();
+
++ hci_conn_put(conn->parent);
++ conn->parent = NULL;
++
+ kfree(conn->link);
+ conn->link = NULL;
+ }commit ca1fd42e7dbfcb34890ffbf1f2f4b356776dab6f
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Wed May 3 21:39:34 2023 +0800
+
+ Bluetooth: Fix potential double free caused by hci_conn_unlink
+
+ The hci_conn_unlink function is being called by hci_conn_del, which
+ means it should not call hci_conn_del with the input parameter conn
+ again. If it does, conn may have already been released when
+ hci_conn_unlink returns, leading to potential UAF and double-free
+ issues.
+
+ This patch resolves the problem by modifying hci_conn_unlink to release
+ only conn's child links when necessary, but never release conn itself.
+
+ Reported-by: syzbot+690b90b14f14f43f4688@syzkaller.appspotmail.com
+ Closes: https://lore.kernel.org/linux-bluetooth/000000000000484a8205faafe216@google.com/
+ Fixes: 06149746e720 ("Bluetooth: hci_conn: Add support for linking multiple hcon")
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+ Reported-by: syzbot+690b90b14f14f43f4688@syzkaller.appspotmail.com
+ Reported-by: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
+ Reported-by: syzbot+8bb72f86fc823817bc5d@syzkaller.appspotmail.com
+
+diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
+index 640b951bf40a..70e1655a9df6 100644
+--- a/net/bluetooth/hci_conn.c
++++ b/net/bluetooth/hci_conn.c
+@@ -1083,8 +1083,18 @@ static void hci_conn_unlink(struct hci_conn *conn)
+ if (!conn->parent) {
+ struct hci_link *link, *t;
+
+- list_for_each_entry_safe(link, t, &conn->link_list, list)
+- hci_conn_unlink(link->conn);
++ list_for_each_entry_safe(link, t, &conn->link_list, list) {
++ struct hci_conn *child = link->conn;
++
++ hci_conn_unlink(child);
++
++ /* Due to race, SCO connection might be not established
++ * yet at this point. Delete it now, otherwise it is
++ * possible for it to be stuck and can't be deleted.
++ */
++ if (child->handle == HCI_CONN_HANDLE_UNSET)
++ hci_conn_del(child);
++ }
+
+ return;
+ }
+@@ -1100,13 +1110,6 @@ static void hci_conn_unlink(struct hci_conn *conn)
+
+ kfree(conn->link);
+ conn->link = NULL;
+-
+- /* Due to race, SCO connection might be not established
+- * yet at this point. Delete it now, otherwise it is
+- * possible for it to be stuck and can't be deleted.
+- */
+- if (conn->handle == HCI_CONN_HANDLE_UNSET)
+- hci_conn_del(conn);
+ }
+
+ int hci_conn_del(struct hci_conn *conn)commit 1a261a6e10e80cd7c69c3f5bdf47cd41f928fd08
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Tue Apr 25 00:21:10 2023 +0800
+
+ scripts: Remove ICC-related dead code
+
+ Intel compiler support has already been completely removed in commit
+ 95207db8166a ("Remove Intel compiler support"). However, it appears
+ that there is still some ICC-related code in scripts/cc-version.sh.
+ There is no harm in leaving the code as it is, but removing the dead
+ code makes the codebase a bit cleaner.
+
+ Hopefully all ICC-related stuff in the build scripts will be removed
+ after this commit, given the grep output as below:
+
+ (linux/scripts) $ grep -i -w -R 'icc'
+ cc-version.sh:ICC)
+ cc-version.sh: min_version=$($min_tool_version icc)
+ dtc/include-prefixes/arm64/qcom/sm6350.dtsi:#include <dt-bindings/interconnect/qcom,icc.h>
+
+ Fixes: 95207db8166a ("Remove Intel compiler support")
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
+ Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/scripts/cc-version.sh b/scripts/cc-version.sh
+index 0573c92e841d..a7e28b6a514e 100755
+--- a/scripts/cc-version.sh
++++ b/scripts/cc-version.sh
+@@ -45,10 +45,6 @@ Clang)
+ version=$2.$3.$4
+ min_version=$($min_tool_version llvm)
+ ;;
+-ICC)
+- version=$(($2 / 100)).$(($2 % 100)).$3
+- min_version=$($min_tool_version icc)
+- ;;
+ *)
+ echo "$orig_args: unknown C compiler" >&2
+ exit 1commit 25c150ac103a4ebeed0319994c742a90634ddf18
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Sun Apr 16 16:14:04 2023 +0800
+
+ bluetooth: Perform careful capability checks in hci_sock_ioctl()
+
+ Previously, capability was checked using capable(), which verified that the
+ caller of the ioctl system call had the required capability. In addition,
+ the result of the check would be stored in the HCI_SOCK_TRUSTED flag,
+ making it persistent for the socket.
+
+ However, malicious programs can abuse this approach by deliberately sharing
+ an HCI socket with a privileged task. The HCI socket will be marked as
+ trusted when the privileged task occasionally makes an ioctl call.
+
+ This problem can be solved by using sk_capable() to check capability, which
+ ensures that not only the current task but also the socket opener has the
+ specified capability, thus reducing the risk of privilege escalation
+ through the previously identified vulnerability.
+
+ Cc: stable@vger.kernel.org
+ Fixes: f81f5b2db869 ("Bluetooth: Send control open and close messages for HCI raw sockets")
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+
+diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
+index 8d8950101cee..1d249d839819 100644
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -1031,7 +1031,14 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,
+ if (hci_sock_gen_cookie(sk)) {
+ struct sk_buff *skb;
+
+- if (capable(CAP_NET_ADMIN))
++ /* Perform careful checks before setting the HCI_SOCK_TRUSTED
++ * flag. Make sure that not only the current task but also
++ * the socket opener has the required capability, since
++ * privileged programs can be tricked into making ioctl calls
++ * on HCI sockets, and the socket should not be marked as
++ * trusted simply because the ioctl caller is privileged.
++ */
++ if (sk_capable(sk, CAP_NET_ADMIN))
+ hci_sock_set_flag(sk, HCI_SOCK_TRUSTED);
+
+ /* Send event to monitor */
+ commit e8da368a1e42a8056d1a6b419e1b91b6cf11d77e
+Author: Yun-Ze Li <p76091292@gs.ncku.edu.tw>
+Date: Mon Jun 20 07:15:16 2022 +0000
+
+ mm, docs: fix comments that mention mem_hotplug_end()
+
+ Comments that mention mem_hotplug_end() are confusing as there is no
+ function called mem_hotplug_end(). Fix them by replacing all the
+ occurences of mem_hotplug_end() in the comments with mem_hotplug_done().
+
+ [akpm@linux-foundation.org: grammatical fixes]
+ Link: https://lkml.kernel.org/r/20220620071516.1286101-1-p76091292@gs.ncku.edu.tw
+ Signed-off-by: Yun-Ze Li <p76091292@gs.ncku.edu.tw>
+ Cc: Souptick Joarder <jrdr.linux@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+
+diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
+index 2b5757752333..735bf5b37949 100644
+--- a/include/linux/mmzone.h
++++ b/include/linux/mmzone.h
+@@ -591,8 +591,8 @@ struct zone {
+ * give them a chance of being in the same cacheline.
+ *
+ * Write access to present_pages at runtime should be protected by
+- * mem_hotplug_begin/end(). Any reader who can't tolerant drift of
+- * present_pages should get_online_mems() to get a stable value.
++ * mem_hotplug_begin/done(). Any reader who can't tolerant drift of
++ * present_pages should use get_online_mems() to get a stable value.
+ */
+ atomic_long_t managed_pages;
+ unsigned long spanned_pages;
+@@ -870,7 +870,7 @@ typedef struct pglist_data {
+ unsigned long nr_reclaim_start; /* nr pages written while throttled
+ * when throttling started. */
+ struct task_struct *kswapd; /* Protected by
+- mem_hotplug_begin/end() */
++ mem_hotplug_begin/done() */
+ int kswapd_order;
+ enum zone_type kswapd_highest_zoneidx;
+
+diff --git a/mm/compaction.c b/mm/compaction.c
+index 1f89b969c12b..cd029ab03d0e 100644
+--- a/mm/compaction.c
++++ b/mm/compaction.c
+@@ -3011,7 +3011,7 @@ void kcompactd_run(int nid)
+
+ /*
+ * Called by memory hotplug when all memory in a node is offlined. Caller must
+- * hold mem_hotplug_begin/end().
++ * be holding mem_hotplug_begin/done().
+ */
+ void kcompactd_stop(int nid)
+ {
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index 161096d9311a..f58761cea0a0 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -4645,7 +4645,7 @@ void kswapd_run(int nid)
+
+ /*
+ * Called by memory hotplug when all memory in a node is offlined. Caller must
+- * hold mem_hotplug_begin/end().
++ * be holding mem_hotplug_begin/done().
+ */
+ void kswapd_stop(int nid)
+ {
+ commit 1eafe075bf9cb4db575be4ddf1b1c8256758714a
+Author: Asif Rasheed <b00073877@aus.edu>
+Date: Sun Sep 20 17:31:54 2020 +0400
+
+ list.h: Update comment to explicitly note circular lists
+
+ The students in the Operating System Lecture Section at the
+ American University of Sharjah were confused by the header comment
+ in include/linux/list.h, which says "Simple doubly linked list
+ implementation". This comment means "simple" as in "not complex",
+ but "simple" is often used in this context to mean "not circular".
+ This commit therefore avoids this ambiguity by explicitly calling out
+ "circular".
+
+ Signed-off-by: Asif Rasheed <b00073877@aus.edu>
+ Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+
+diff --git a/include/linux/list.h b/include/linux/list.h
+index a18c87b63376..89bdc92e75c3 100644
+--- a/include/linux/list.h
++++ b/include/linux/list.h
+@@ -9,7 +9,7 @@
+ #include <linux/kernel.h>
+
+ /*
+- * Simple doubly linked list implementation.
++ * Circular doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ commit cca73e4946c4a8d2ce3395207d8a0b5c565b530b +Author: Billy Wilson <billy_wilson@byu.edu> +Date: Thu Aug 6 17:17:54 2020 -0600 + + docs: Correct the release date of 5.2 stable + + A table lists the 5.2 stable release date as September 15, but it was + released on July 7. This may confuse a reader who is trying to + understand the stable update release cycle. + + Signed-off-by: Billy Wilson <billy_wilson@byu.edu> + Link: https://lore.kernel.org/r/20200806231754.7735-1-billy_wilson@byu.edu + Signed-off-by: Jonathan Corbet <corbet@lwn.net> + +diff --git a/Documentation/process/2.Process.rst b/Documentation/process/2.Process.rst +index 3588f48841eb..4ae1e0f600c1 100644 +--- a/Documentation/process/2.Process.rst ++++ b/Documentation/process/2.Process.rst +@@ -113,7 +113,7 @@ than one development cycle past their initial release. So, for example, the + 5.2 kernel's history looked like this (all dates in 2019): + + ============== =============================== +- September 15 5.2 stable release ++ July 7 5.2 stable release + July 14 5.2.1 + July 21 5.2.2 + July 26 5.2.3+
commit dd1bf47a84fe64edf50f6a83fdc164d0da6fa021
+Author: Ryan M. Collins <rmc032@bucknell.edu>
+Date: Fri Aug 30 14:49:55 2019 -0400
+
+ net: bcmgenet: use ethtool_op_get_ts_info()
+
+ This change enables the use of SW timestamping on the Raspberry Pi 4.
+
+ bcmgenet's transmit function bcmgenet_xmit() implements software
+ timestamping. However the SOF_TIMESTAMPING_TX_SOFTWARE capability was
+ missing and only SOF_TIMESTAMPING_RX_SOFTWARE was announced. By using
+ ethtool_ops bcmgenet_ethtool_ops() as get_ts_info(), the
+ SOF_TIMESTAMPING_TX_SOFTWARE capability is announced.
+
+ Similar to commit a8f5cb9e7991 ("smsc95xx: use ethtool_op_get_ts_info()")
+
+ Signed-off-by: Ryan M. Collins <rmc032@bucknell.edu>
+ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+ Acked-by: Doug Berger <opendmb@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+index d3a0b614dbfa..b22196880d6d 100644
+--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
++++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+@@ -1124,6 +1124,7 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = {
+ .set_coalesce = bcmgenet_set_coalesce,
+ .get_link_ksettings = bcmgenet_get_link_ksettings,
+ .set_link_ksettings = bcmgenet_set_link_ksettings,
++ .get_ts_info = ethtool_op_get_ts_info,
+ };
+
+ /* Power down the unimac, based on mode. */
+ commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 +Author: Jeffrin Jose T <jeffrin@rajagiritech.edu.in> +Date: Wed May 15 12:14:04 2019 +0530 + + selftests: netfilter: missing error check when setting up veth interface + + A test for the basic NAT functionality uses ip command which needs veth + device. There is a condition where the kernel support for veth is not + compiled into the kernel and the test script breaks. This patch contains + code for reasonable error display and correct code exit. + + Signed-off-by: Jeffrin Jose T <jeffrin@rajagiritech.edu.in> + Acked-by: Florian Westphal <fw@strlen.de> + Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> + +diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh +index 21159f5f3362..f102a65aa8b7 100755 +--- a/tools/testing/selftests/netfilter/nft_nat.sh ++++ b/tools/testing/selftests/netfilter/nft_nat.sh +@@ -24,7 +24,11 @@ ip netns add ns0 + ip netns add ns1 + ip netns add ns2 + +-ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 ++ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 ++if [ $? -ne 0 ];then ++ echo "SKIP: No virtual ethernet pair device support in kernel" ++ exit $ksft_skip ++fi + ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 + + ip -net ns0 link set lo up+
commit 7fafcfdf6377b18b2a726ea554d6e593ba44349f
+Author: Yavuz, Tuba <tuba@ece.ufl.edu>
+Date: Fri Mar 23 17:00:38 2018 +0000
+
+ USB: gadget: f_midi: fixing a possible double-free in f_midi
+
+ It looks like there is a possibility of a double-free vulnerability on an
+ error path of the f_midi_set_alt function in the f_midi driver. If the
+ path is feasible then free_ep_req gets called twice:
+
+ req->complete = f_midi_complete;
+ err = usb_ep_queue(midi->out_ep, req, GFP_ATOMIC);
+ => ...
+ usb_gadget_giveback_request
+ =>
+ f_midi_complete (CALLBACK)
+ (inside f_midi_complete, for various cases of status)
+ free_ep_req(ep, req); // first kfree
+ if (err) {
+ ERROR(midi, "%s: couldn't enqueue request: %d\n",
+ midi->out_ep->name, err);
+ free_ep_req(midi->out_ep, req); // second kfree
+ return err;
+ }
+
+ The double-free possibility was introduced with commit ad0d1a058eac
+ ("usb: gadget: f_midi: fix leak on failed to enqueue out requests").
+
+ Found by MOXCAFE tool.
+
+ Signed-off-by: Tuba Yavuz <tuba@ece.ufl.edu>
+ Fixes: ad0d1a058eac ("usb: gadget: f_midi: fix leak on failed to enqueue out requests")
+ Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
+ Cc: stable <stable@vger.kernel.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
+index 4eb96b91cc40..e8f35db42394 100644
+--- a/drivers/usb/gadget/function/f_midi.c
++++ b/drivers/usb/gadget/function/f_midi.c
+@@ -404,7 +404,8 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
+ if (err) {
+ ERROR(midi, "%s: couldn't enqueue request: %d\n",
+ midi->out_ep->name, err);
+- free_ep_req(midi->out_ep, req);
++ if (req->buf != NULL)
++ free_ep_req(midi->out_ep, req);
+ return err;
+ }
+ }
+diff --git a/drivers/usb/gadget/u_f.h b/drivers/usb/gadget/u_f.h
+index c3fbef2bb5db..09f90447fed5 100644
+--- a/drivers/usb/gadget/u_f.h
++++ b/drivers/usb/gadget/u_f.h
+@@ -61,7 +61,9 @@ struct usb_request *alloc_ep_req(struct usb_ep *ep, size_t len);
+ /* Frees a usb_request previously allocated by alloc_ep_req() */
+ static inline void free_ep_req(struct usb_ep *ep, struct usb_request *req)
+ {
++ WARN_ON(req->buf == NULL);
+ kfree(req->buf);
++ req->buf = NULL;
+ usb_ep_free_request(ep, req);
+ }
+
+ commit 043e337f555e610ad8237fd23522d97c968d72b9 +Author: Md. Islam <mislam4@kent.edu> +Date: Tue Feb 6 23:14:18 2018 -0500 + + sch_netem: Bug fixing in calculating Netem interval + + In Kernel 4.15.0+, Netem does not work properly. + + Netem setup: + + tc qdisc add dev h1-eth0 root handle 1: netem delay 10ms 2ms + + Result: + + PING 172.16.101.2 (172.16.101.2) 56(84) bytes of data. + 64 bytes from 172.16.101.2: icmp_seq=1 ttl=64 time=22.8 ms + 64 bytes from 172.16.101.2: icmp_seq=2 ttl=64 time=10.9 ms + 64 bytes from 172.16.101.2: icmp_seq=3 ttl=64 time=10.9 ms + 64 bytes from 172.16.101.2: icmp_seq=5 ttl=64 time=11.4 ms + 64 bytes from 172.16.101.2: icmp_seq=6 ttl=64 time=11.8 ms + 64 bytes from 172.16.101.2: icmp_seq=4 ttl=64 time=4303 ms + 64 bytes from 172.16.101.2: icmp_seq=10 ttl=64 time=11.2 ms + 64 bytes from 172.16.101.2: icmp_seq=11 ttl=64 time=10.3 ms + 64 bytes from 172.16.101.2: icmp_seq=7 ttl=64 time=4304 ms + 64 bytes from 172.16.101.2: icmp_seq=8 ttl=64 time=4303 ms + + Patch: + + (rnd % (2 * sigma)) - sigma was overflowing s32. After applying the + patch, I found following output which is desirable. + + PING 172.16.101.2 (172.16.101.2) 56(84) bytes of data. + 64 bytes from 172.16.101.2: icmp_seq=1 ttl=64 time=21.1 ms + 64 bytes from 172.16.101.2: icmp_seq=2 ttl=64 time=8.46 ms + 64 bytes from 172.16.101.2: icmp_seq=3 ttl=64 time=9.00 ms + 64 bytes from 172.16.101.2: icmp_seq=4 ttl=64 time=11.8 ms + 64 bytes from 172.16.101.2: icmp_seq=5 ttl=64 time=8.36 ms + 64 bytes from 172.16.101.2: icmp_seq=6 ttl=64 time=11.8 ms + 64 bytes from 172.16.101.2: icmp_seq=7 ttl=64 time=8.11 ms + 64 bytes from 172.16.101.2: icmp_seq=8 ttl=64 time=10.0 ms + 64 bytes from 172.16.101.2: icmp_seq=9 ttl=64 time=11.3 ms + 64 bytes from 172.16.101.2: icmp_seq=10 ttl=64 time=11.5 ms + 64 bytes from 172.16.101.2: icmp_seq=11 ttl=64 time=10.2 ms + + Reviewed-by: Stephen Hemminger <stephen@networkplumber.org> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c +index 7bbc13b8ca47..7c179addebcd 100644 +--- a/net/sched/sch_netem.c ++++ b/net/sched/sch_netem.c +@@ -327,7 +327,7 @@ static s64 tabledist(s64 mu, s32 sigma, + + /* default uniform distribution */ + if (dist == NULL) +- return (rnd % (2 * sigma)) - sigma + mu; ++ return ((rnd % (2 * sigma)) + mu) - sigma; + + t = dist->table[rnd % dist->size]; + x = (sigma % NETEM_DIST_SCALE) * t;+
commit 68e34f4e89e2bb64d53e77a18e0cfddc3c7f24e9
+Author: Jonathan Haws <jhaws@sdl.usu.edu>
+Date: Tue Feb 6 15:40:52 2018 -0800
+
+ ipc/mqueue.c: have RT tasks queue in by priority in wq_add()
+
+ Previous behavior added tasks to the work queue using the static_prio
+ value instead of the dynamic priority value in prio. This caused RT tasks
+ to be added to the work queue in a FIFO manner rather than by priority.
+ Normal tasks were handled by priority.
+
+ This fix utilizes the dynamic priority of the task to ensure that both RT
+ and normal tasks are added to the work queue in priority order. Utilizing
+ the dynamic priority (prio) rather than the base priority (normal_prio)
+ was chosen to ensure that if a task had a boosted priority when it was
+ added to the work queue, it would be woken sooner to to ensure that it
+ releases any other locks it may be holding in a more timely manner. It is
+ understood that the task could have a lower priority when it wakes than
+ when it was added to the queue in this (unlikely) case.
+
+ Link: http://lkml.kernel.org/r/1513006652-7014-1-git-send-email-jhaws@sdl.usu.edu
+ Signed-off-by: Jonathan Haws <jhaws@sdl.usu.edu>
+ Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+ Reviewed-by: Davidlohr Bueso <dbueso@suse.de>
+ Cc: Ingo Molnar <mingo@kernel.org>
+ Cc: Al Viro <viro@zeniv.linux.org.uk>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Deepa Dinamani <deepa.kernel@gmail.com>
+ Cc: Thomas Gleixner <tglx@linutronix.de>
+ Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ Cc: Manfred Spraul <manfred@colorfullife.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/ipc/mqueue.c b/ipc/mqueue.c
+index 690ae6665500..360e564ae7d1 100644
+--- a/ipc/mqueue.c
++++ b/ipc/mqueue.c
+@@ -596,7 +596,7 @@ static void wq_add(struct mqueue_inode_info *info, int sr,
+ ewp->task = current;
+
+ list_for_each_entry(walk, &info->e_wait_q[sr].list, list) {
+- if (walk->task->static_prio <= current->static_prio) {
++ if (walk->task->prio <= current->prio) {
+ list_add_tail(&ewp->list, &walk->list);
+ return;
+ }
+ commit 0c2310217b40af190b4a8ff79320088856c2f25c
+Author: Lukasz Faber <faber@agh.edu.pl>
+Date: Wed Jul 5 11:45:09 2017 +0200
+
+ staging: rtl8192u: Fix braces placement and spacing
+
+ Fixes the following checkpatch errors:
+ - open brace '{' following enum go on the same line
+ - space required after that close brace '}'
+
+ Signed-off-by: Lukasz Faber <faber@agh.edu.pl>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/rtl8192u/r8192U_hw.h b/drivers/staging/rtl8192u/r8192U_hw.h
+index 174ccf618d3e..00a123d44207 100644
+--- a/drivers/staging/rtl8192u/r8192U_hw.h
++++ b/drivers/staging/rtl8192u/r8192U_hw.h
+@@ -20,25 +20,24 @@
+ #ifndef R8192_HW
+ #define R8192_HW
+
+-typedef enum _VERSION_819xU{
++typedef enum _VERSION_819xU {
+ VERSION_819xU_A, // A-cut
+ VERSION_819xU_B, // B-cut
+ VERSION_819xU_C,// C-cut
+ } VERSION_819xU, *PVERSION_819xU;
+ //added for different RF type
+-typedef enum _RT_RF_TYPE_DEF
+-{
++typedef enum _RT_RF_TYPE_DEF {
+ RF_1T2R = 0,
+ RF_2T4R,
+
+ RF_819X_MAX_TYPE
+-}RT_RF_TYPE_DEF;
++} RT_RF_TYPE_DEF;
+
+
+-typedef enum _BaseBand_Config_Type{
++typedef enum _BaseBand_Config_Type {
+ BaseBand_Config_PHY_REG = 0, //Radio Path A
+ BaseBand_Config_AGC_TAB = 1, //Radio Path B
+-}BaseBand_Config_Type, *PBaseBand_Config_Type;
++} BaseBand_Config_Type, *PBaseBand_Config_Type;
+ #define RTL8187_REQT_READ 0xc0
+ #define RTL8187_REQT_WRITE 0x40
+ #define RTL8187_REQ_GET_REGS 0x05
+ commit ae1d557d8f30cb097b4d1f2ab04fa294588ee1cf
+Author: Christian Sünkenberg <christian.suenkenberg@student.kit.edu>
+Date: Sun Jun 4 19:18:39 2017 +0200
+
+ x86/cpu/cyrix: Add alternative Device ID of Geode GX1 SoC
+
+ A SoC variant of Geode GX1, notably NSC branded SC1100, seems to
+ report an inverted Device ID in its DIR0 configuration register,
+ specifically 0xb instead of the expected 0x4.
+
+ Catch this presumably quirky version so it's properly recognized
+ as GX1 and has its cache switched to write-back mode, which provides
+ a significant performance boost in most workloads.
+
+ SC1100's datasheet "Geode™ SC1100 Information Appliance On a Chip",
+ states in section 1.1.7.1 "Device ID" that device identification
+ values are specified in SC1100's device errata. These, however,
+ seem to not have been publicly released.
+
+ Wading through a number of boot logs and /proc/cpuinfo dumps found on
+ pastebin and blogs, this patch should mostly be relevant for a number
+ of now admittedly aging Soekris NET4801 and PC Engines WRAP devices,
+ the latter being the platform this issue was discovered on.
+ Performance impact was verified using "openssl speed", with
+ write-back caching scaling throughput between -3% and +41%.
+
+ Signed-off-by: Christian Sünkenberg <christian.suenkenberg@student.kit.edu>
+ Cc: Linus Torvalds <torvalds@linux-foundation.org>
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Cc: Thomas Gleixner <tglx@linutronix.de>
+ Link: http://lkml.kernel.org/r/1496596719.26725.14.camel@student.kit.edu
+ Signed-off-by: Ingo Molnar <mingo@kernel.org>
+
+diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
+index a70fd61095f8..6f077445647a 100644
+--- a/arch/x86/kernel/cpu/cyrix.c
++++ b/arch/x86/kernel/cpu/cyrix.c
+@@ -255,6 +255,7 @@ static void init_cyrix(struct cpuinfo_x86 *c)
+ break;
+
+ case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
++ case 11: /* GX1 with inverted Device ID */
+ #ifdef CONFIG_PCI
+ {
+ u32 vendor, device;
+ commit d232b128e28f54cd8811dd4f6d8b72ffb12cc0a1 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sat Jan 15 18:06:44 2011 +0800 + + asm-generic headers: add sizes.h + + This patch adds sizes.h into asm-generic headers. + Only 32-bit version supported. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/include/asm-generic/sizes.h b/include/asm-generic/sizes.h +new file mode 100644 +index 000000000000..ea5d4ef81061 +--- /dev/null ++++ b/include/asm-generic/sizes.h +@@ -0,0 +1,47 @@ ++/* ++ * linux/include/asm-generic/sizes.h ++ * ++ * 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 __ASM_GENERIC_SIZES_H__ ++#define __ASM_GENERIC_SIZES_H__ ++ ++#define SZ_1 0x00000001 ++#define SZ_2 0x00000002 ++#define SZ_4 0x00000004 ++#define SZ_8 0x00000008 ++#define SZ_16 0x00000010 ++#define SZ_32 0x00000020 ++#define SZ_64 0x00000040 ++#define SZ_128 0x00000080 ++#define SZ_256 0x00000100 ++#define SZ_512 0x00000200 ++ ++#define SZ_1K 0x00000400 ++#define SZ_2K 0x00000800 ++#define SZ_4K 0x00001000 ++#define SZ_8K 0x00002000 ++#define SZ_16K 0x00004000 ++#define SZ_32K 0x00008000 ++#define SZ_64K 0x00010000 ++#define SZ_128K 0x00020000 ++#define SZ_256K 0x00040000 ++#define SZ_512K 0x00080000 ++ ++#define SZ_1M 0x00100000 ++#define SZ_2M 0x00200000 ++#define SZ_4M 0x00400000 ++#define SZ_8M 0x00800000 ++#define SZ_16M 0x01000000 ++#define SZ_32M 0x02000000 ++#define SZ_64M 0x04000000 ++#define SZ_128M 0x08000000 ++#define SZ_256M 0x10000000 ++#define SZ_512M 0x20000000 ++ ++#define SZ_1G 0x40000000 ++#define SZ_2G 0x80000000 ++ ++#endif /* __ASM_GENERIC_SIZES_H__ */
commit 7dc59bdde7063323b6a70c2f0fadb399ede8038d
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Tue Feb 22 19:06:43 2011 +0800
+
+ asm-generic: fix inX/outX functions for architectures that have PCI
+
+ The definitions for the PC-style PIO functions in asm-generic/io.h were
+ meant as dummies so you could compile code on architectures without
+ ISA and PCI buses. However, unicore32 actually wants to use them
+ with a real PCI bus, so they need to be defined to actually address
+ the register window holding the I/O ports.
+
+ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
+index 4644c9a7f724..e0ffa3ddb02a 100644
+--- a/include/asm-generic/io.h
++++ b/include/asm-generic/io.h
+@@ -94,6 +94,10 @@ static inline void __raw_writeq(u64 b, volatile void __iomem *addr)
+ #define writeq(b,addr) __raw_writeq(__cpu_to_le64(b),addr)
+ #endif
+
++#ifndef PCI_IOBASE
++#define PCI_IOBASE ((void __iomem *) 0)
++#endif
++
+ /*****************************************************************************/
+ /*
+ * traditional input/output functions
+@@ -101,32 +105,32 @@ static inline void __raw_writeq(u64 b, volatile void __iomem *addr)
+
+ static inline u8 inb(unsigned long addr)
+ {
+- return readb((volatile void __iomem *) addr);
++ return readb(addr + PCI_IOBASE);
+ }
+
+ static inline u16 inw(unsigned long addr)
+ {
+- return readw((volatile void __iomem *) addr);
++ return readw(addr + PCI_IOBASE);
+ }
+
+ static inline u32 inl(unsigned long addr)
+ {
+- return readl((volatile void __iomem *) addr);
++ return readl(addr + PCI_IOBASE);
+ }
+
+ static inline void outb(u8 b, unsigned long addr)
+ {
+- writeb(b, (volatile void __iomem *) addr);
++ writeb(b, addr + PCI_IOBASE);
+ }
+
+ static inline void outw(u16 b, unsigned long addr)
+ {
+- writew(b, (volatile void __iomem *) addr);
++ writew(b, addr + PCI_IOBASE);
+ }
+
+ static inline void outl(u32 b, unsigned long addr)
+ {
+- writel(b, (volatile void __iomem *) addr);
++ writel(b, addr + PCI_IOBASE);
+ }
+
+ #define inb_p(addr) inb(addr)
+@@ -213,32 +217,32 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
+
+ static inline void readsl(const void __iomem *addr, void *buf, int len)
+ {
+- insl((unsigned long)addr, buf, len);
++ insl(addr - PCI_IOBASE, buf, len);
+ }
+
+ static inline void readsw(const void __iomem *addr, void *buf, int len)
+ {
+- insw((unsigned long)addr, buf, len);
++ insw(addr - PCI_IOBASE, buf, len);
+ }
+
+ static inline void readsb(const void __iomem *addr, void *buf, int len)
+ {
+- insb((unsigned long)addr, buf, len);
++ insb(addr - PCI_IOBASE, buf, len);
+ }
+
+ static inline void writesl(const void __iomem *addr, const void *buf, int len)
+ {
+- outsl((unsigned long)addr, buf, len);
++ outsl(addr - PCI_IOBASE, buf, len);
+ }
+
+ static inline void writesw(const void __iomem *addr, const void *buf, int len)
+ {
+- outsw((unsigned long)addr, buf, len);
++ outsw(addr - PCI_IOBASE, buf, len);
+ }
+
+ static inline void writesb(const void __iomem *addr, const void *buf, int len)
+ {
+- outsb((unsigned long)addr, buf, len);
++ outsb(addr - PCI_IOBASE, buf, len);
+ }
+
+ #ifndef CONFIG_GENERIC_IOMAP
+@@ -269,8 +273,9 @@ static inline void writesb(const void __iomem *addr, const void *buf, int len)
+ outsl((unsigned long) (p), (src), (count))
+ #endif /* CONFIG_GENERIC_IOMAP */
+
+-
+-#define IO_SPACE_LIMIT 0xffffffff
++#ifndef IO_SPACE_LIMIT
++#define IO_SPACE_LIMIT 0xffff
++#endif
+
+ #ifdef __KERNEL__
+ commit 188c517a050ec5b123e72cab76ea213721e5bd9d
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Tue Sep 25 15:17:07 2012 +0000
+
+ ipv6: return errno pointers consistently for fib6_add_1()
+
+ fib6_add_1() should consistently return errno pointers,
+ rather than a mixture of NULL and errno pointers.
+
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
+index 286acfc21250..24995a93ef8c 100644
+--- a/net/ipv6/ip6_fib.c
++++ b/net/ipv6/ip6_fib.c
+@@ -514,7 +514,7 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
+ ln = node_alloc();
+
+ if (!ln)
+- return NULL;
++ return ERR_PTR(-ENOMEM);
+ ln->fn_bit = plen;
+
+ ln->parent = pn;
+@@ -561,7 +561,7 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
+ node_free(in);
+ if (ln)
+ node_free(ln);
+- return NULL;
++ return ERR_PTR(-ENOMEM);
+ }
+
+ /*
+@@ -611,7 +611,7 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
+ ln = node_alloc();
+
+ if (!ln)
+- return NULL;
++ return ERR_PTR(-ENOMEM);
+
+ ln->fn_bit = plen;
+
+@@ -777,11 +777,8 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
+
+ if (IS_ERR(fn)) {
+ err = PTR_ERR(fn);
+- fn = NULL;
+- }
+-
+- if (!fn)
+ goto out;
++ }
+
+ pn = fn;
+
+@@ -820,15 +817,12 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
+ allow_create, replace_required);
+
+ if (IS_ERR(sn)) {
+- err = PTR_ERR(sn);
+- sn = NULL;
+- }
+- if (!sn) {
+ /* If it is failed, discard just allocated
+ root, and then (in st_failure) stale node
+ in main tree.
+ */
+ node_free(sfn);
++ err = PTR_ERR(sn);
+ goto st_failure;
+ }
+
+@@ -843,10 +837,8 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
+
+ if (IS_ERR(sn)) {
+ err = PTR_ERR(sn);
+- sn = NULL;
+- }
+- if (!sn)
+ goto st_failure;
++ }
+ }
+
+ if (!fn->leaf) {commit 61648d91fc278fd1d500da8061d17e6920cd3500
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Sun Jul 29 02:00:03 2012 +0000
+
+ ipv4: clean up put_child
+
+ The first parameter struct trie *t is not used anymore.
+ Remove it.
+
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
+index 2a6fdc2708c6..f0cdb30921c0 100644
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -159,7 +159,6 @@ struct trie {
+ #endif
+ };
+
+-static void put_child(struct trie *t, struct tnode *tn, int i, struct rt_trie_node *n);
+ static void tnode_put_child_reorg(struct tnode *tn, int i, struct rt_trie_node *n,
+ int wasfull);
+ static struct rt_trie_node *resize(struct trie *t, struct tnode *tn);
+@@ -490,7 +489,7 @@ static inline int tnode_full(const struct tnode *tn, const struct rt_trie_node *
+ return ((struct tnode *) n)->pos == tn->pos + tn->bits;
+ }
+
+-static inline void put_child(struct trie *t, struct tnode *tn, int i,
++static inline void put_child(struct tnode *tn, int i,
+ struct rt_trie_node *n)
+ {
+ tnode_put_child_reorg(tn, i, n, -1);
+@@ -754,8 +753,8 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn)
+ goto nomem;
+ }
+
+- put_child(t, tn, 2*i, (struct rt_trie_node *) left);
+- put_child(t, tn, 2*i+1, (struct rt_trie_node *) right);
++ put_child(tn, 2*i, (struct rt_trie_node *) left);
++ put_child(tn, 2*i+1, (struct rt_trie_node *) right);
+ }
+ }
+
+@@ -776,9 +775,9 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn)
+ if (tkey_extract_bits(node->key,
+ oldtnode->pos + oldtnode->bits,
+ 1) == 0)
+- put_child(t, tn, 2*i, node);
++ put_child(tn, 2*i, node);
+ else
+- put_child(t, tn, 2*i+1, node);
++ put_child(tn, 2*i+1, node);
+ continue;
+ }
+
+@@ -786,8 +785,8 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn)
+ inode = (struct tnode *) node;
+
+ if (inode->bits == 1) {
+- put_child(t, tn, 2*i, rtnl_dereference(inode->child[0]));
+- put_child(t, tn, 2*i+1, rtnl_dereference(inode->child[1]));
++ put_child(tn, 2*i, rtnl_dereference(inode->child[0]));
++ put_child(tn, 2*i+1, rtnl_dereference(inode->child[1]));
+
+ tnode_free_safe(inode);
+ continue;
+@@ -817,22 +816,22 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn)
+ */
+
+ left = (struct tnode *) tnode_get_child(tn, 2*i);
+- put_child(t, tn, 2*i, NULL);
++ put_child(tn, 2*i, NULL);
+
+ BUG_ON(!left);
+
+ right = (struct tnode *) tnode_get_child(tn, 2*i+1);
+- put_child(t, tn, 2*i+1, NULL);
++ put_child(tn, 2*i+1, NULL);
+
+ BUG_ON(!right);
+
+ size = tnode_child_length(left);
+ for (j = 0; j < size; j++) {
+- put_child(t, left, j, rtnl_dereference(inode->child[j]));
+- put_child(t, right, j, rtnl_dereference(inode->child[j + size]));
++ put_child(left, j, rtnl_dereference(inode->child[j]));
++ put_child(right, j, rtnl_dereference(inode->child[j + size]));
+ }
+- put_child(t, tn, 2*i, resize(t, left));
+- put_child(t, tn, 2*i+1, resize(t, right));
++ put_child(tn, 2*i, resize(t, left));
++ put_child(tn, 2*i+1, resize(t, right));
+
+ tnode_free_safe(inode);
+ }
+@@ -877,7 +876,7 @@ static struct tnode *halve(struct trie *t, struct tnode *tn)
+ if (!newn)
+ goto nomem;
+
+- put_child(t, tn, i/2, (struct rt_trie_node *)newn);
++ put_child(tn, i/2, (struct rt_trie_node *)newn);
+ }
+
+ }
+@@ -892,21 +891,21 @@ static struct tnode *halve(struct trie *t, struct tnode *tn)
+ if (left == NULL) {
+ if (right == NULL) /* Both are empty */
+ continue;
+- put_child(t, tn, i/2, right);
++ put_child(tn, i/2, right);
+ continue;
+ }
+
+ if (right == NULL) {
+- put_child(t, tn, i/2, left);
++ put_child(tn, i/2, left);
+ continue;
+ }
+
+ /* Two nonempty children */
+ newBinNode = (struct tnode *) tnode_get_child(tn, i/2);
+- put_child(t, tn, i/2, NULL);
+- put_child(t, newBinNode, 0, left);
+- put_child(t, newBinNode, 1, right);
+- put_child(t, tn, i/2, resize(t, newBinNode));
++ put_child(tn, i/2, NULL);
++ put_child(newBinNode, 0, left);
++ put_child(newBinNode, 1, right);
++ put_child(tn, i/2, resize(t, newBinNode));
+ }
+ tnode_free_safe(oldtnode);
+ return tn;
+@@ -1125,7 +1124,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
+ node_set_parent((struct rt_trie_node *)l, tp);
+
+ cindex = tkey_extract_bits(key, tp->pos, tp->bits);
+- put_child(t, tp, cindex, (struct rt_trie_node *)l);
++ put_child(tp, cindex, (struct rt_trie_node *)l);
+ } else {
+ /* Case 3: n is a LEAF or a TNODE and the key doesn't match. */
+ /*
+@@ -1155,12 +1154,12 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
+ node_set_parent((struct rt_trie_node *)tn, tp);
+
+ missbit = tkey_extract_bits(key, newpos, 1);
+- put_child(t, tn, missbit, (struct rt_trie_node *)l);
+- put_child(t, tn, 1-missbit, n);
++ put_child(tn, missbit, (struct rt_trie_node *)l);
++ put_child(tn, 1-missbit, n);
+
+ if (tp) {
+ cindex = tkey_extract_bits(key, tp->pos, tp->bits);
+- put_child(t, tp, cindex, (struct rt_trie_node *)tn);
++ put_child(tp, cindex, (struct rt_trie_node *)tn);
+ } else {
+ rcu_assign_pointer(t->trie, (struct rt_trie_node *)tn);
+ tp = tn;
+@@ -1619,7 +1618,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l)
+
+ if (tp) {
+ t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits);
+- put_child(t, tp, cindex, NULL);
++ put_child(tp, cindex, NULL);
+ trie_rebalance(t, tp);
+ } else
+ RCU_INIT_POINTER(t->trie, NULL);commit 4ea4bf7ebcbacee2f4736d261efb0693e87a34c9
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Sun Jul 29 01:19:55 2012 +0000
+
+ ipv4: fix debug info in tnode_new
+
+ It should print size of struct rt_trie_node * allocated instead of size
+ of struct rt_trie_node.
+
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
+index 18cbc15b20d5..2a6fdc2708c6 100644
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -473,7 +473,7 @@ static struct tnode *tnode_new(t_key key, int pos, int bits)
+ }
+
+ pr_debug("AT %p s=%zu %zu\n", tn, sizeof(struct tnode),
+- sizeof(struct rt_trie_node) << bits);
++ sizeof(struct rt_trie_node *) << bits);
+ return tn;
+ }
+ commit 8fe5cb873b7ef7f4fa49477455e8f2e3d555230e +Author: Lin Ming <mlin@ss.pku.edu.cn> +Date: Mon Jul 23 04:11:21 2012 +0000 + + ipv4: Remove redundant assignment + + It is redundant to set no_addr and accept_local to 0 and then set them + with other values just after that. + + Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c +index f277cf0e6321..8732cc7920ed 100644 +--- a/net/ipv4/fib_frontend.c ++++ b/net/ipv4/fib_frontend.c +@@ -258,7 +258,6 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, + fl4.flowi4_tos = tos; + fl4.flowi4_scope = RT_SCOPE_UNIVERSE; + +- no_addr = accept_local = 0; + no_addr = idev->ifa_list == NULL; + + accept_local = IN_DEV_ACCEPT_LOCAL(idev);
commit 9e33ce453f8ac8452649802bee1f410319408f4b
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Sat Jul 7 18:26:10 2012 +0800
+
+ ipvs: fix oops on NAT reply in br_nf context
+
+ IPVS should not reset skb->nf_bridge in FORWARD hook
+ by calling nf_reset for NAT replies. It triggers oops in
+ br_nf_forward_finish.
+
+ [ 579.781508] BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
+ [ 579.781669] IP: [<ffffffff817b1ca5>] br_nf_forward_finish+0x58/0x112
+ [ 579.781792] PGD 218f9067 PUD 0
+ [ 579.781865] Oops: 0000 [#1] SMP
+ [ 579.781945] CPU 0
+ [ 579.781983] Modules linked in:
+ [ 579.782047]
+ [ 579.782080]
+ [ 579.782114] Pid: 4644, comm: qemu Tainted: G W 3.5.0-rc5-00006-g95e69f9 #282 Hewlett-Packard /30E8
+ [ 579.782300] RIP: 0010:[<ffffffff817b1ca5>] [<ffffffff817b1ca5>] br_nf_forward_finish+0x58/0x112
+ [ 579.782455] RSP: 0018:ffff88007b003a98 EFLAGS: 00010287
+ [ 579.782541] RAX: 0000000000000008 RBX: ffff8800762ead00 RCX: 000000000001670a
+ [ 579.782653] RDX: 0000000000000000 RSI: 000000000000000a RDI: ffff8800762ead00
+ [ 579.782845] RBP: ffff88007b003ac8 R08: 0000000000016630 R09: ffff88007b003a90
+ [ 579.782957] R10: ffff88007b0038e8 R11: ffff88002da37540 R12: ffff88002da01a02
+ [ 579.783066] R13: ffff88002da01a80 R14: ffff88002d83c000 R15: ffff88002d82a000
+ [ 579.783177] FS: 0000000000000000(0000) GS:ffff88007b000000(0063) knlGS:00000000f62d1b70
+ [ 579.783306] CS: 0010 DS: 002b ES: 002b CR0: 000000008005003b
+ [ 579.783395] CR2: 0000000000000004 CR3: 00000000218fe000 CR4: 00000000000027f0
+ [ 579.783505] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+ [ 579.783684] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
+ [ 579.783795] Process qemu (pid: 4644, threadinfo ffff880021b20000, task ffff880021aba760)
+ [ 579.783919] Stack:
+ [ 579.783959] ffff88007693cedc ffff8800762ead00 ffff88002da01a02 ffff8800762ead00
+ [ 579.784110] ffff88002da01a02 ffff88002da01a80 ffff88007b003b18 ffffffff817b26c7
+ [ 579.784260] ffff880080000000 ffffffff81ef59f0 ffff8800762ead00 ffffffff81ef58b0
+ [ 579.784477] Call Trace:
+ [ 579.784523] <IRQ>
+ [ 579.784562]
+ [ 579.784603] [<ffffffff817b26c7>] br_nf_forward_ip+0x275/0x2c8
+ [ 579.784707] [<ffffffff81704b58>] nf_iterate+0x47/0x7d
+ [ 579.784797] [<ffffffff817ac32e>] ? br_dev_queue_push_xmit+0xae/0xae
+ [ 579.784906] [<ffffffff81704bfb>] nf_hook_slow+0x6d/0x102
+ [ 579.784995] [<ffffffff817ac32e>] ? br_dev_queue_push_xmit+0xae/0xae
+ [ 579.785175] [<ffffffff8187fa95>] ? _raw_write_unlock_bh+0x19/0x1b
+ [ 579.785179] [<ffffffff817ac417>] __br_forward+0x97/0xa2
+ [ 579.785179] [<ffffffff817ad366>] br_handle_frame_finish+0x1a6/0x257
+ [ 579.785179] [<ffffffff817b2386>] br_nf_pre_routing_finish+0x26d/0x2cb
+ [ 579.785179] [<ffffffff817b2cf0>] br_nf_pre_routing+0x55d/0x5c1
+ [ 579.785179] [<ffffffff81704b58>] nf_iterate+0x47/0x7d
+ [ 579.785179] [<ffffffff817ad1c0>] ? br_handle_local_finish+0x44/0x44
+ [ 579.785179] [<ffffffff81704bfb>] nf_hook_slow+0x6d/0x102
+ [ 579.785179] [<ffffffff817ad1c0>] ? br_handle_local_finish+0x44/0x44
+ [ 579.785179] [<ffffffff81551525>] ? sky2_poll+0xb35/0xb54
+ [ 579.785179] [<ffffffff817ad62a>] br_handle_frame+0x213/0x229
+ [ 579.785179] [<ffffffff817ad417>] ? br_handle_frame_finish+0x257/0x257
+ [ 579.785179] [<ffffffff816e3b47>] __netif_receive_skb+0x2b4/0x3f1
+ [ 579.785179] [<ffffffff816e69fc>] process_backlog+0x99/0x1e2
+ [ 579.785179] [<ffffffff816e6800>] net_rx_action+0xdf/0x242
+ [ 579.785179] [<ffffffff8107e8a8>] __do_softirq+0xc1/0x1e0
+ [ 579.785179] [<ffffffff8135a5ba>] ? trace_hardirqs_off_thunk+0x3a/0x6c
+ [ 579.785179] [<ffffffff8188812c>] call_softirq+0x1c/0x30
+
+ The steps to reproduce as follow,
+
+ 1. On Host1, setup brige br0(192.168.1.106)
+ 2. Boot a kvm guest(192.168.1.105) on Host1 and start httpd
+ 3. Start IPVS service on Host1
+ ipvsadm -A -t 192.168.1.106:80 -s rr
+ ipvsadm -a -t 192.168.1.106:80 -r 192.168.1.105:80 -m
+ 4. Run apache benchmark on Host2(192.168.1.101)
+ ab -n 1000 http://192.168.1.106/
+
+ ip_vs_reply4
+ ip_vs_out
+ handle_response
+ ip_vs_notrack
+ nf_reset()
+ {
+ skb->nf_bridge = NULL;
+ }
+
+ Actually, IPVS wants in this case just to replace nfct
+ with untracked version. So replace the nf_reset(skb) call
+ in ip_vs_notrack() with a nf_conntrack_put(skb->nfct) call.
+
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: Julian Anastasov <ja@ssi.bg>
+ Signed-off-by: Simon Horman <horms@verge.net.au>
+ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+
+diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
+index d6146b4811c2..95374d1696a1 100644
+--- a/include/net/ip_vs.h
++++ b/include/net/ip_vs.h
+@@ -1425,7 +1425,7 @@ static inline void ip_vs_notrack(struct sk_buff *skb)
+ struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
+
+ if (!ct || !nf_ct_is_untracked(ct)) {
+- nf_reset(skb);
++ nf_conntrack_put(skb->nfct);
+ skb->nfct = &nf_ct_untracked_get()->ct_general;
+ skb->nfctinfo = IP_CT_NEW;
+ nf_conntrack_get(skb->nfct);commit 1ff2b0c303698e486f1e0886b4d9876200ef8ca5
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Sat Apr 21 00:11:05 2012 +0800
+
+ xen: implement IRQ_WORK_VECTOR handler
+
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+
+diff --git a/arch/x86/include/asm/xen/events.h b/arch/x86/include/asm/xen/events.h
+index 1df35417c412..cc146d51449e 100644
+--- a/arch/x86/include/asm/xen/events.h
++++ b/arch/x86/include/asm/xen/events.h
+@@ -6,6 +6,7 @@ enum ipi_vector {
+ XEN_CALL_FUNCTION_VECTOR,
+ XEN_CALL_FUNCTION_SINGLE_VECTOR,
+ XEN_SPIN_UNLOCK_VECTOR,
++ XEN_IRQ_WORK_VECTOR,
+
+ XEN_NR_IPIS,
+ };
+diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
+index 2dc6628c1520..3ec3f8eb19fc 100644
+--- a/arch/x86/xen/smp.c
++++ b/arch/x86/xen/smp.c
+@@ -16,6 +16,7 @@
+ #include <linux/err.h>
+ #include <linux/slab.h>
+ #include <linux/smp.h>
++#include <linux/irq_work.h>
+
+ #include <asm/paravirt.h>
+ #include <asm/desc.h>
+@@ -41,10 +42,12 @@ cpumask_var_t xen_cpu_initialized_map;
+ static DEFINE_PER_CPU(int, xen_resched_irq);
+ static DEFINE_PER_CPU(int, xen_callfunc_irq);
+ static DEFINE_PER_CPU(int, xen_callfuncsingle_irq);
++static DEFINE_PER_CPU(int, xen_irq_work);
+ static DEFINE_PER_CPU(int, xen_debug_irq) = -1;
+
+ static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id);
+ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id);
++static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id);
+
+ /*
+ * Reschedule call back.
+@@ -143,6 +146,17 @@ static int xen_smp_intr_init(unsigned int cpu)
+ goto fail;
+ per_cpu(xen_callfuncsingle_irq, cpu) = rc;
+
++ callfunc_name = kasprintf(GFP_KERNEL, "irqwork%d", cpu);
++ rc = bind_ipi_to_irqhandler(XEN_IRQ_WORK_VECTOR,
++ cpu,
++ xen_irq_work_interrupt,
++ IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
++ callfunc_name,
++ NULL);
++ if (rc < 0)
++ goto fail;
++ per_cpu(xen_irq_work, cpu) = rc;
++
+ return 0;
+
+ fail:
+@@ -155,6 +169,8 @@ static int xen_smp_intr_init(unsigned int cpu)
+ if (per_cpu(xen_callfuncsingle_irq, cpu) >= 0)
+ unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu),
+ NULL);
++ if (per_cpu(xen_irq_work, cpu) >= 0)
++ unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
+
+ return rc;
+ }
+@@ -509,6 +525,9 @@ static inline int xen_map_vector(int vector)
+ case CALL_FUNCTION_SINGLE_VECTOR:
+ xen_vector = XEN_CALL_FUNCTION_SINGLE_VECTOR;
+ break;
++ case IRQ_WORK_VECTOR:
++ xen_vector = XEN_IRQ_WORK_VECTOR;
++ break;
+ default:
+ xen_vector = -1;
+ printk(KERN_ERR "xen: vector 0x%x is not implemented\n",
+@@ -588,6 +607,16 @@ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id)
+ return IRQ_HANDLED;
+ }
+
++static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id)
++{
++ irq_enter();
++ irq_work_run();
++ inc_irq_stat(apic_irq_work_irqs);
++ irq_exit();
++
++ return IRQ_HANDLED;
++}
++
+ static const struct smp_ops xen_smp_ops __initconst = {
+ .smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu,
+ .smp_prepare_cpus = xen_smp_prepare_cpus,
+@@ -634,6 +663,7 @@ static void xen_hvm_cpu_die(unsigned int cpu)
+ unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu), NULL);
+ unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL);
+ unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), NULL);
++ unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
+ native_cpu_die(cpu);
+ }
+ commit ab6ec39a191243b9968bb9ac7f26cc7ec30c618b
+Author: Lin Ming <mlin@ss.pku.edu.cn>
+Date: Tue May 1 00:16:27 2012 +0800
+
+ xen/apic: implement io apic read with hypercall
+
+ Implements xen_io_apic_read with hypercall, so it returns proper
+ IO-APIC information instead of fabricated one.
+
+ Fallback to return an emulated IO_APIC values if hypercall fails.
+
+ [v2: fallback to return an emulated IO_APIC values if hypercall fails]
+ Signed-off-by: Lin Ming <mlin@ss.pku.edu.cn>
+ Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+
+diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
+index 73ade38caa32..1913bf2d2a9c 100644
+--- a/arch/x86/xen/apic.c
++++ b/arch/x86/xen/apic.c
+@@ -1,8 +1,21 @@
+ #include <linux/init.h>
+ #include <asm/x86_init.h>
++#include <asm/apic.h>
++#include <xen/interface/physdev.h>
++#include <asm/xen/hypercall.h>
+
+ unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
+ {
++ struct physdev_apic apic_op;
++ int ret;
++
++ apic_op.apic_physbase = mpc_ioapic_addr(apic);
++ apic_op.reg = reg;
++ ret = HYPERVISOR_physdev_op(PHYSDEVOP_apic_read, &apic_op);
++ if (!ret)
++ return apic_op.value;
++
++ /* fallback to return an emulated IO_APIC values */
+ if (reg == 0x1)
+ return 0x00170020;
+ else if (reg == 0x0)
+ commit 000c2fa2c144c499c881a101819cf1936a1f7cf2
+Author: Ruihan Li <lrh2000@pku.edu.cn>
+Date: Sun Apr 16 16:02:51 2023 +0800
+
+ bluetooth: Add cmd validity checks at the start of hci_sock_ioctl()
+
+ Previously, channel open messages were always sent to monitors on the first
+ ioctl() call for unbound HCI sockets, even if the command and arguments
+ were completely invalid. This can leave an exploitable hole with the abuse
+ of invalid ioctl calls.
+
+ This commit hardens the ioctl processing logic by first checking if the
+ command is valid, and immediately returning with an ENOIOCTLCMD error code
+ if it is not. This ensures that ioctl calls with invalid commands are free
+ of side effects, and increases the difficulty of further exploitation by
+ forcing exploitation to find a way to pass a valid command first.
+
+ Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
+ Co-developed-by: Marcel Holtmann <marcel@holtmann.org>
+ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+
+diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
+index 06581223238c..8d8950101cee 100644
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -987,6 +987,34 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,
+
+ BT_DBG("cmd %x arg %lx", cmd, arg);
+
++ /* Make sure the cmd is valid before doing anything */
++ switch (cmd) {
++ case HCIGETDEVLIST:
++ case HCIGETDEVINFO:
++ case HCIGETCONNLIST:
++ case HCIDEVUP:
++ case HCIDEVDOWN:
++ case HCIDEVRESET:
++ case HCIDEVRESTAT:
++ case HCISETSCAN:
++ case HCISETAUTH:
++ case HCISETENCRYPT:
++ case HCISETPTYPE:
++ case HCISETLINKPOL:
++ case HCISETLINKMODE:
++ case HCISETACLMTU:
++ case HCISETSCOMTU:
++ case HCIINQUIRY:
++ case HCISETRAW:
++ case HCIGETCONNINFO:
++ case HCIGETAUTHINFO:
++ case HCIBLOCKADDR:
++ case HCIUNBLOCKADDR:
++ break;
++ default:
++ return -ENOIOCTLCMD;
++ }
++
+ lock_sock(sk);
+
+ if (hci_pi(sk)->channel != HCI_CHANNEL_RAW) {commit eb4c0788964730d12e8dd520bd8f5217ca48321c
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Thu May 19 05:09:48 2022 -0700
+
+ hv_netvsc: Fix potential dereference of NULL pointer
+
+ The return value of netvsc_devinfo_get()
+ needs to be checked to avoid use of NULL
+ pointer in case of an allocation failure.
+
+ Fixes: 0efeea5fb153 ("hv_netvsc: Add the support of hibernation")
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
+ Link: https://lore.kernel.org/r/1652962188-129281-1-git-send-email-lyz_cs@pku.edu.cn
+ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+index fde1c492ca02..b1dece6b9698 100644
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -2671,7 +2671,10 @@ static int netvsc_suspend(struct hv_device *dev)
+
+ /* Save the current config info */
+ ndev_ctx->saved_netvsc_dev_info = netvsc_devinfo_get(nvdev);
+-
++ if (!ndev_ctx->saved_netvsc_dev_info) {
++ ret = -ENOMEM;
++ goto out;
++ }
+ ret = netvsc_detach(net, nvdev);
+ out:
+ rtnl_unlock();commit 087f9c3f2309ed183f7e4b85ae57121d8663224d
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Fri Mar 11 09:06:01 2022 -0800
+
+ RDMA/mlx5: Fix memory leak in error flow for subscribe event routine
+
+ In case the second xa_insert() fails, the obj_event is not released. Fix
+ the error unwind flow to free that memory to avoid a memory leak.
+
+ Fixes: 759738537142 ("IB/mlx5: Enable subscription for device events over DEVX")
+ Link: https://lore.kernel.org/r/1647018361-18266-1-git-send-email-lyz_cs@pku.edu.cn
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+
+diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
+index 08b7f6bc56c3..15c0884d1f49 100644
+--- a/drivers/infiniband/hw/mlx5/devx.c
++++ b/drivers/infiniband/hw/mlx5/devx.c
+@@ -1886,8 +1886,10 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,
+ key_level2,
+ obj_event,
+ GFP_KERNEL);
+- if (err)
++ if (err) {
++ kfree(obj_event);
+ return err;
++ }
+ INIT_LIST_HEAD(&obj_event->obj_sub_list);
+ }
+ commit 455896c53d5b803733ddd84e1bf8a430644439b6
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Sat Jan 15 21:34:56 2022 -0800
+
+ dmaengine: shdma: Fix runtime PM imbalance on error
+
+ pm_runtime_get_() increments the runtime PM usage counter even
+ when it returns an error code, thus a matching decrement is needed on
+ the error handling path to keep the counter balanced.
+
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Link: https://lore.kernel.org/r/1642311296-87020-1-git-send-email-lyz_cs@pku.edu.cn
+ Signed-off-by: Vinod Koul <vkoul@kernel.org>
+
+diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
+index 158e5e7defae..b26ed690f03c 100644
+--- a/drivers/dma/sh/shdma-base.c
++++ b/drivers/dma/sh/shdma-base.c
+@@ -115,8 +115,10 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx)
+ ret = pm_runtime_get(schan->dev);
+
+ spin_unlock_irq(&schan->chan_lock);
+- if (ret < 0)
++ if (ret < 0) {
+ dev_err(schan->dev, "%s(): GET = %d\n", __func__, ret);
++ pm_runtime_put(schan->dev);
++ }
+
+ pm_runtime_barrier(schan->dev);
+ commit e57c1a3bd5e8e0c7181f65ae55581f0236a8f284
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Fri Jan 28 05:41:02 2022 -0800
+
+ drm/v3d: fix missing unlock
+
+ [why]
+ Unlock is needed on the error handling path to prevent dead lock.
+ v3d_submit_cl_ioctl and v3d_submit_csd_ioctl is missing unlock.
+
+ [how]
+ Fix this by changing goto target on the error handling path. So
+ changing the goto to target an error handling path
+ that includes drm_gem_unlock reservations.
+
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Reviewed-by: Melissa Wen <mwen@igalia.com>
+ Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/1643377262-109975-1-git-send-email-lyz_cs@pku.edu.cn
+
+diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
+index c7ed2e1cbab6..92bc0faee84f 100644
+--- a/drivers/gpu/drm/v3d/v3d_gem.c
++++ b/drivers/gpu/drm/v3d/v3d_gem.c
+@@ -798,7 +798,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
+
+ if (!render->base.perfmon) {
+ ret = -ENOENT;
+- goto fail;
++ goto fail_perfmon;
+ }
+ }
+
+@@ -847,6 +847,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
+
+ fail_unreserve:
+ mutex_unlock(&v3d->sched_lock);
++fail_perfmon:
+ drm_gem_unlock_reservations(last_job->bo,
+ last_job->bo_count, &acquire_ctx);
+ fail:
+@@ -1027,7 +1028,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
+ args->perfmon_id);
+ if (!job->base.perfmon) {
+ ret = -ENOENT;
+- goto fail;
++ goto fail_perfmon;
+ }
+ }
+
+@@ -1056,6 +1057,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
+
+ fail_unreserve:
+ mutex_unlock(&v3d->sched_lock);
++fail_perfmon:
+ drm_gem_unlock_reservations(clean_job->bo, clean_job->bo_count,
+ &acquire_ctx);
+ fail:commit 46f47807738441e354873546dde0b000106c068a
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Sun Jan 23 23:20:35 2022 -0800
+
+ drm/bridge: Add missing pm_runtime_put_sync
+
+ pm_runtime_get_sync() will increase the rumtime PM counter
+ even when it returns an error. Thus a pairing decrement is needed
+ to prevent refcount leak. Fix this by replacing this API with
+ pm_runtime_resume_and_get(), which will not change the runtime
+ PM counter on error. Besides, a matching decrement is needed
+ on the error handling path to keep the counter balanced.
+
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ Signed-off-by: Robert Foss <robert.foss@linaro.org>
+ Link: https://patchwork.freedesktop.org/patch/msgid/1643008835-73961-1-git-send-email-lyz_cs@pku.edu.cn
+
+diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c
+index 9282e61dfbf0..30aacd939dc3 100644
+--- a/drivers/gpu/drm/bridge/nwl-dsi.c
++++ b/drivers/gpu/drm/bridge/nwl-dsi.c
+@@ -862,18 +862,19 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,
+ memcpy(&dsi->mode, adjusted_mode, sizeof(dsi->mode));
+ drm_mode_debug_printmodeline(adjusted_mode);
+
+- pm_runtime_get_sync(dev);
++ if (pm_runtime_resume_and_get(dev) < 0)
++ return;
+
+ if (clk_prepare_enable(dsi->lcdif_clk) < 0)
+- return;
++ goto runtime_put;
+ if (clk_prepare_enable(dsi->core_clk) < 0)
+- return;
++ goto runtime_put;
+
+ /* Step 1 from DSI reset-out instructions */
+ ret = reset_control_deassert(dsi->rst_pclk);
+ if (ret < 0) {
+ DRM_DEV_ERROR(dev, "Failed to deassert PCLK: %d\n", ret);
+- return;
++ goto runtime_put;
+ }
+
+ /* Step 2 from DSI reset-out instructions */
+@@ -883,13 +884,18 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,
+ ret = reset_control_deassert(dsi->rst_esc);
+ if (ret < 0) {
+ DRM_DEV_ERROR(dev, "Failed to deassert ESC: %d\n", ret);
+- return;
++ goto runtime_put;
+ }
+ ret = reset_control_deassert(dsi->rst_byte);
+ if (ret < 0) {
+ DRM_DEV_ERROR(dev, "Failed to deassert BYTE: %d\n", ret);
+- return;
++ goto runtime_put;
+ }
++
++ return;
++
++runtime_put:
++ pm_runtime_put_sync(dev);
+ }
+
+ static voidcommit 5d5c6dba2b43e28845d7d7ed32a36802329a5f52
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Fri Jan 21 11:26:13 2022 +0000
+
+ drm/amd/display: Fix memory leak
+
+ [why]
+ Resource release is needed on the error handling path
+ to prevent memory leak.
+
+ [how]
+ Fix this by adding kfree on the error handling path.
+
+ Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+index 26719efa5396..12d437d9a0e4 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+@@ -227,8 +227,10 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -389,8 +391,10 @@ static ssize_t dp_phy_settings_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user((*(rd_buf + result)), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -1359,8 +1363,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -1376,8 +1382,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -1546,8 +1554,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -1563,8 +1573,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -1731,8 +1743,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -1748,8 +1762,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -1912,8 +1928,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -1929,8 +1947,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -2088,8 +2108,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -2105,8 +2127,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -2145,8 +2169,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -2162,8 +2188,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -2217,8 +2245,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -2234,8 +2264,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -2289,8 +2321,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,
+ break;
+ }
+
+- if (!pipe_ctx)
++ if (!pipe_ctx) {
++ kfree(rd_buf);
+ return -ENXIO;
++ }
+
+ dsc = pipe_ctx->stream_res.dsc;
+ if (dsc)
+@@ -2306,8 +2340,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,
+ break;
+
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+
+ buf += 1;
+ size -= 1;
+@@ -3459,8 +3495,10 @@ static ssize_t dcc_en_bits_read(
+ dc->hwss.get_dcc_en_bits(dc, dcc_en_bits);
+
+ rd_buf = kcalloc(rd_buf_size, sizeof(char), GFP_KERNEL);
+- if (!rd_buf)
++ if (!rd_buf) {
++ kfree(dcc_en_bits);
+ return -ENOMEM;
++ }
+
+ for (i = 0; i < num_pipes; i++)
+ offset += snprintf(rd_buf + offset, rd_buf_size - offset,
+@@ -3473,8 +3511,10 @@ static ssize_t dcc_en_bits_read(
+ if (*pos >= rd_buf_size)
+ break;
+ r = put_user(*(rd_buf + result), buf);
+- if (r)
++ if (r) {
++ kfree(rd_buf);
+ return r; /* r = -EFAULT */
++ }
+ buf += 1;
+ size -= 1;
+ *pos += 1;commit 4bd8dd0d61f961e6c13cc118d4ebbdba57f8561f
+Author: Yongzhi Liu <lyz_cs@pku.edu.cn>
+Date: Tue Jan 18 15:11:51 2022 -0500
+
+ drm/amdgpu: Add missing pm_runtime_put_autosuspend
+
+ pm_runtime_get_sync() increments the runtime PM usage counter even
+ when it returns an error code, thus a matching decrement is needed
+ on the error handling path to keep the counter balanced.
+
+ Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
+ Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+index 9aea1cc5b27e..4b950de9bf66 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+@@ -1120,8 +1120,10 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struct file *f, char __user *buf,
+ return -EINVAL;
+
+ r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
+- if (r < 0)
++ if (r < 0) {
++ pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+ return r;
++ }
+
+ while (size) {
+ uint32_t value;commit 5cf069f910c5c87055fb970a8103f0ad38ba7143 +Author: Liu Junqi <liujunqi@pku.edu.cn> +Date: Thu Nov 25 12:47:29 2021 +0800 + + staging: unisys: visornic: removed a blank line at the end of function + + Removed a blank line at the end of function to clear checkpatch warning + and make it more like typical coding style. + + Signed-off-by: Liu Junqi <liujunqi@pku.edu.cn> + Link: https://lore.kernel.org/r/20211125044729.594727-3-liujunqi@pku.edu.cn + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c +index aec0db28126d..643432458105 100644 +--- a/drivers/staging/unisys/visornic/visornic_main.c ++++ b/drivers/staging/unisys/visornic/visornic_main.c +@@ -1764,7 +1764,6 @@ static void visornic_channel_interrupt(struct visor_device *dev) + napi_schedule(&devdata->napi); + + atomic_set(&devdata->interrupt_rcvd, 0); +- + } + + /* visornic_probe - probe function for visornic devices
commit 4e4437d09cbeb1babbf7986414ff9f23679c76a6
+Author: Liu Junqi <liujunqi@pku.edu.cn>
+Date: Thu Nov 25 12:47:28 2021 +0800
+
+ staging: unisys: visornic: reindent to avoid '(' at the end of line
+
+ A change to make the code more like typical coding style.
+
+ Signed-off-by: Liu Junqi <liujunqi@pku.edu.cn>
+ Link: https://lore.kernel.org/r/20211125044729.594727-2-liujunqi@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
+index 18be80648825..aec0db28126d 100644
+--- a/drivers/staging/unisys/visornic/visornic_main.c
++++ b/drivers/staging/unisys/visornic/visornic_main.c
+@@ -1759,9 +1759,8 @@ static void visornic_channel_interrupt(struct visor_device *dev)
+ if (!devdata)
+ return;
+
+- if (!visorchannel_signalempty(
+- devdata->dev->visorchannel,
+- IOCHAN_FROM_IOPART))
++ if (!visorchannel_signalempty(devdata->dev->visorchannel,
++ IOCHAN_FROM_IOPART))
+ napi_schedule(&devdata->napi);
+
+ atomic_set(&devdata->interrupt_rcvd, 0);
+ commit a70fc7d0d1beb4c6d3ce1eb1a18624fa59538f40
+Author: Liu Junqi <liujunqi@pku.edu.cn>
+Date: Thu Nov 25 12:47:27 2021 +0800
+
+ staging: unisys: visornic: fixed a typo cant -> can't
+
+ Fixed a typo: cant -> can't in visornic_main.c.
+
+ Signed-off-by: Liu Junqi <liujunqi@pku.edu.cn>
+ Link: https://lore.kernel.org/r/20211125044729.594727-1-liujunqi@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
+index 62cd9b783732..18be80648825 100644
+--- a/drivers/staging/unisys/visornic/visornic_main.c
++++ b/drivers/staging/unisys/visornic/visornic_main.c
+@@ -1590,7 +1590,7 @@ static void send_rcv_posts_if_needed(struct visornic_devdata *devdata)
+ netdev = devdata->netdev;
+ rcv_bufs_allocated = 0;
+ /* this code is trying to prevent getting stuck here forever,
+- * but still retry it if you cant allocate them all this time.
++ * but still retry it if you can't allocate them all this time.
+ */
+ cur_num_rcv_bufs_to_alloc = devdata->num_rcv_bufs_could_not_alloc;
+ while (cur_num_rcv_bufs_to_alloc > 0) {commit 515f49702423f3a9b1bb6b6d89057bb47f799062
+Author: Liu Junqi <liujunqi@pku.edu.cn>
+Date: Thu Nov 18 11:37:38 2021 +0800
+
+ staging: unisys: visorhba: use tab to indent instead of whitespace
+
+ changed the whitespace to tab to comply with kernel coding style.
+
+ Signed-off-by: Liu Junqi <liujunqi@pku.edu.cn>
+ Link: https://lore.kernel.org/r/20211118033737.576775-1-liujunqi@pku.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c
+index 694644112447..8eee131e834d 100644
+--- a/drivers/staging/unisys/visorhba/visorhba_main.c
++++ b/drivers/staging/unisys/visorhba/visorhba_main.c
+@@ -266,7 +266,7 @@ static int forward_taskmgmt_command(enum task_mgmt_types tasktype,
+ ¬ifyevent, ¬ifyresult);
+ if (ret) {
+ dev_dbg(&scsidev->sdev_gendev,
+- "visorhba: setup_scsitaskmgmt_handles returned %d\n", ret);
++ "visorhba: setup_scsitaskmgmt_handles returned %d\n", ret);
+ return FAILED;
+ }
+ commit d4ffd5df9d18031b6a53f934388726775b4452d3
+Author: Jiashuo Liang <liangjs@pku.edu.cn>
+Date: Fri Jul 30 11:01:52 2021 +0800
+
+ x86/fault: Fix wrong signal when vsyscall fails with pkey
+
+ The function __bad_area_nosemaphore() calls kernelmode_fixup_or_oops()
+ with the parameter @signal being actually @pkey, which will send a
+ signal numbered with the argument in @pkey.
+
+ This bug can be triggered when the kernel fails to access user-given
+ memory pages that are protected by a pkey, so it can go down the
+ do_user_addr_fault() path and pass the !user_mode() check in
+ __bad_area_nosemaphore().
+
+ Most cases will simply run the kernel fixup code to make an -EFAULT. But
+ when another condition current->thread.sig_on_uaccess_err is met, which
+ is only used to emulate vsyscall, the kernel will generate the wrong
+ signal.
+
+ Add a new parameter @pkey to kernelmode_fixup_or_oops() to fix this.
+
+ [ bp: Massage commit message, fix build error as reported by the 0day
+ bot: https://lkml.kernel.org/r/202109202245.APvuT8BX-lkp@intel.com ]
+
+ Fixes: 5042d40a264c ("x86/fault: Bypass no_context() for implicit kernel faults from usermode")
+ Reported-by: kernel test robot <lkp@intel.com>
+ Signed-off-by: Jiashuo Liang <liangjs@pku.edu.cn>
+ Signed-off-by: Borislav Petkov <bp@suse.de>
+ Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
+ Link: https://lkml.kernel.org/r/20210730030152.249106-1-liangjs@pku.edu.cn
+
+diff --git a/arch/x86/include/asm/pkeys.h b/arch/x86/include/asm/pkeys.h
+index 5c7bcaa79623..1d5f14aff5f6 100644
+--- a/arch/x86/include/asm/pkeys.h
++++ b/arch/x86/include/asm/pkeys.h
+@@ -2,8 +2,6 @@
+ #ifndef _ASM_X86_PKEYS_H
+ #define _ASM_X86_PKEYS_H
+
+-#define ARCH_DEFAULT_PKEY 0
+-
+ /*
+ * If more than 16 keys are ever supported, a thorough audit
+ * will be necessary to ensure that the types that store key
+diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
+index b2eefdefc108..84a2c8c4af73 100644
+--- a/arch/x86/mm/fault.c
++++ b/arch/x86/mm/fault.c
+@@ -710,7 +710,8 @@ page_fault_oops(struct pt_regs *regs, unsigned long error_code,
+
+ static noinline void
+ kernelmode_fixup_or_oops(struct pt_regs *regs, unsigned long error_code,
+- unsigned long address, int signal, int si_code)
++ unsigned long address, int signal, int si_code,
++ u32 pkey)
+ {
+ WARN_ON_ONCE(user_mode(regs));
+
+@@ -735,8 +736,12 @@ kernelmode_fixup_or_oops(struct pt_regs *regs, unsigned long error_code,
+
+ set_signal_archinfo(address, error_code);
+
+- /* XXX: hwpoison faults will set the wrong code. */
+- force_sig_fault(signal, si_code, (void __user *)address);
++ if (si_code == SEGV_PKUERR) {
++ force_sig_pkuerr((void __user *)address, pkey);
++ } else {
++ /* XXX: hwpoison faults will set the wrong code. */
++ force_sig_fault(signal, si_code, (void __user *)address);
++ }
+ }
+
+ /*
+@@ -798,7 +803,8 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+ struct task_struct *tsk = current;
+
+ if (!user_mode(regs)) {
+- kernelmode_fixup_or_oops(regs, error_code, address, pkey, si_code);
++ kernelmode_fixup_or_oops(regs, error_code, address,
++ SIGSEGV, si_code, pkey);
+ return;
+ }
+
+@@ -930,7 +936,8 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
+ {
+ /* Kernel mode? Handle exceptions or die: */
+ if (!user_mode(regs)) {
+- kernelmode_fixup_or_oops(regs, error_code, address, SIGBUS, BUS_ADRERR);
++ kernelmode_fixup_or_oops(regs, error_code, address,
++ SIGBUS, BUS_ADRERR, ARCH_DEFAULT_PKEY);
+ return;
+ }
+
+@@ -1396,7 +1403,8 @@ void do_user_addr_fault(struct pt_regs *regs,
+ */
+ if (!user_mode(regs))
+ kernelmode_fixup_or_oops(regs, error_code, address,
+- SIGBUS, BUS_ADRERR);
++ SIGBUS, BUS_ADRERR,
++ ARCH_DEFAULT_PKEY);
+ return;
+ }
+
+@@ -1416,7 +1424,8 @@ void do_user_addr_fault(struct pt_regs *regs,
+ return;
+
+ if (fatal_signal_pending(current) && !user_mode(regs)) {
+- kernelmode_fixup_or_oops(regs, error_code, address, 0, 0);
++ kernelmode_fixup_or_oops(regs, error_code, address,
++ 0, 0, ARCH_DEFAULT_PKEY);
+ return;
+ }
+
+@@ -1424,7 +1433,8 @@ void do_user_addr_fault(struct pt_regs *regs,
+ /* Kernel mode? Handle exceptions or die: */
+ if (!user_mode(regs)) {
+ kernelmode_fixup_or_oops(regs, error_code, address,
+- SIGSEGV, SEGV_MAPERR);
++ SIGSEGV, SEGV_MAPERR,
++ ARCH_DEFAULT_PKEY);
+ return;
+ }
+
+diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h
+index 6beb26b7151d..86be8bf27b41 100644
+--- a/include/linux/pkeys.h
++++ b/include/linux/pkeys.h
+@@ -4,6 +4,8 @@
+
+ #include <linux/mm.h>
+
++#define ARCH_DEFAULT_PKEY 0
++
+ #ifdef CONFIG_ARCH_HAS_PKEYS
+ #include <asm/pkeys.h>
+ #else /* ! CONFIG_ARCH_HAS_PKEYS */commit 5405b42c2f08efe67b531799ba2fdb35bac93e70
+Author: Jiashuo Liang <liangjs@pku.edu.cn>
+Date: Tue Jun 1 16:52:03 2021 +0800
+
+ x86/fault: Don't send SIGSEGV twice on SEGV_PKUERR
+
+ __bad_area_nosemaphore() calls both force_sig_pkuerr() and
+ force_sig_fault() when handling SEGV_PKUERR. This does not cause
+ problems because the second signal is filtered by the legacy_queue()
+ check in __send_signal() because in both cases, the signal is SIGSEGV,
+ the second one seeing that the first one is already pending.
+
+ This causes the kernel to do unnecessary work so send the signal only
+ once for SEGV_PKUERR.
+
+ [ bp: Massage commit message. ]
+
+ Fixes: 9db812dbb29d ("signal/x86: Call force_sig_pkuerr from __bad_area_nosemaphore")
+ Suggested-by: "Eric W. Biederman" <ebiederm@xmission.com>
+ Signed-off-by: Jiashuo Liang <liangjs@pku.edu.cn>
+ Signed-off-by: Borislav Petkov <bp@suse.de>
+ Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
+ Link: https://lkml.kernel.org/r/20210601085203.40214-1-liangjs@pku.edu.cn
+
+diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
+index 1c548ad00752..6bda7f67d737 100644
+--- a/arch/x86/mm/fault.c
++++ b/arch/x86/mm/fault.c
+@@ -836,8 +836,8 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+
+ if (si_code == SEGV_PKUERR)
+ force_sig_pkuerr((void __user *)address, pkey);
+-
+- force_sig_fault(SIGSEGV, si_code, (void __user *)address);
++ else
++ force_sig_fault(SIGSEGV, si_code, (void __user *)address);
+
+ local_irq_disable();
+ }commit dd3b8c329aa270027fba61a02a12600972dc3983 +Author: Guan Xuetao <gxt@pku.edu.cn> +Date: Wed Mar 21 21:10:56 2018 +0800 + + MAINTAINERS: UNICORE32: Change email account + + Change email account for unicore32 arch and pkunity soc drivers + Since old email server mprc.pku.edu.cn was blocked in recent years + + Signed-off-by: Guan Xuetao <gxt@pku.edu.cn> + Cc: Arnd Bergmann <arnd@arndb.de> + Signed-off-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/MAINTAINERS b/MAINTAINERS +index 48486a505a4e..f86f3b253a10 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -10930,7 +10930,7 @@ F: include/linux/pktcdvd.h + F: include/uapi/linux/pktcdvd.h + + PKUNITY SOC DRIVERS +-M: Guan Xuetao <gxt@mprc.pku.edu.cn> ++M: Guan Xuetao <gxt@pku.edu.cn> + W: http://mprc.pku.edu.cn/~guanxuetao/linux + S: Maintained + T: git git://github.com/gxt/linux.git +@@ -14154,7 +14154,7 @@ F: include/linux/uwb.h + F: include/linux/uwb/ + + UNICORE32 ARCHITECTURE: +-M: Guan Xuetao <gxt@mprc.pku.edu.cn> ++M: Guan Xuetao <gxt@pku.edu.cn> + W: http://mprc.pku.edu.cn/~guanxuetao/linux + S: Maintained + T: git git://github.com/gxt/linux.git
commit 2b1193d5287004edfbf89407149a3159656f47f1
+Author: John Hunter <zhaojunwang@pku.edu.cn>
+Date: Tue Apr 14 17:07:22 2015 +0800
+
+ drm: fix trivial typo mistake
+
+ Signed-off-by: John Hunter <zhjwpku@gmail.com>
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
+index 97c33b40005f..b009d707f562 100644
+--- a/include/drm/drm_crtc.h
++++ b/include/drm/drm_crtc.h
+@@ -975,7 +975,7 @@ struct drm_mode_set {
+ * struct drm_mode_config_funcs - basic driver provided mode setting functions
+ * @fb_create: create a new framebuffer object
+ * @output_poll_changed: function to handle output configuration changes
+- * @atomic_check: check whether a give atomic state update is possible
++ * @atomic_check: check whether a given atomic state update is possible
+ * @atomic_commit: commit an atomic state update previously verified with
+ * atomic_check()
+ *commit 16d78bc2e4d69df962a750ac37ce69dd8eda401b
+Author: John Hunter <zhaojunwang@pku.edu.cn>
+Date: Tue Apr 7 19:38:50 2015 +0800
+
+ drm: Fix some typos
+
+ Signed-off-by: John Hunter <zhjwpku@gmail.com>
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
+index 57efdbeff008..0537f327b145 100644
+--- a/drivers/gpu/drm/drm_atomic.c
++++ b/drivers/gpu/drm/drm_atomic.c
+@@ -780,7 +780,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
+ EXPORT_SYMBOL(drm_atomic_set_crtc_for_plane);
+
+ /**
+- * drm_atomic_set_fb_for_plane - set crtc for plane
++ * drm_atomic_set_fb_for_plane - set framebuffer for plane
+ * @plane_state: atomic state object for the plane
+ * @fb: fb to use for the plane
+ *
+@@ -933,7 +933,7 @@ EXPORT_SYMBOL(drm_atomic_connectors_for_crtc);
+ *
+ * This function should be used by legacy entry points which don't understand
+ * -EDEADLK semantics. For simplicity this one will grab all modeset locks after
+- * the slowpath completed.
++ * the slowpath completed.
+ */
+ void drm_atomic_legacy_backoff(struct drm_atomic_state *state)
+ {commit 0388df05088def7ce5f3dd1b2293f05739be2a23
+Author: John Hunter <zhaojunwang@pku.edu.cn>
+Date: Tue Mar 17 15:30:28 2015 +0800
+
+ drm: change connector to tmp_connector
+
+ This wasn't too harmful since we already look at connector,
+ which has the same effect as the loop for any non-cloned configs.
+ Only when we have a cloned configuration is it important to look
+ at other connectors. Furthermore existing userspace always changes
+ dpms on all of them anyway.
+
+ Signed-off-by: JohnHunter <zhjwpku@gmail.com>
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
+index 52e7e18c102a..d9ed9a54fd1e 100644
+--- a/drivers/gpu/drm/drm_atomic_helper.c
++++ b/drivers/gpu/drm/drm_atomic_helper.c
+@@ -2001,10 +2001,10 @@ void drm_atomic_helper_connector_dpms(struct drm_connector *connector,
+ WARN_ON(!drm_modeset_is_locked(&config->connection_mutex));
+
+ list_for_each_entry(tmp_connector, &config->connector_list, head) {
+- if (connector->state->crtc != crtc)
++ if (tmp_connector->state->crtc != crtc)
+ continue;
+
+- if (connector->dpms == DRM_MODE_DPMS_ON) {
++ if (tmp_connector->dpms == DRM_MODE_DPMS_ON) {
+ active = true;
+ break;
+ }commit f98bd3eff592fa708bb260cf3c6403e443cd40b7 +Author: John Hunter <zhaojunwang@pku.edu.cn> +Date: Tue Mar 17 15:30:26 2015 +0800 + + drm: Fix some typo mistake of the annotations + + There are some mistakes that the function name in the annotaions + is not matching the real function name. + And some duplication word in annotations + + Signed-off-by: John Hunter <zhjwpku@gmail.com> + Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> + +diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c +index 5bcb4baeb9cb..52e7e18c102a 100644 +--- a/drivers/gpu/drm/drm_atomic_helper.c ++++ b/drivers/gpu/drm/drm_atomic_helper.c +@@ -346,7 +346,7 @@ needs_modeset(struct drm_crtc_state *state) + } + + /** +- * drm_atomic_helper_check - validate state object for modeset changes ++ * drm_atomic_helper_check_modeset - validate state object for modeset changes + * @dev: DRM device + * @state: the driver state object + * +@@ -461,7 +461,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, + EXPORT_SYMBOL(drm_atomic_helper_check_modeset); + + /** +- * drm_atomic_helper_check - validate state object for modeset changes ++ * drm_atomic_helper_check_planes - validate state object for planes changes + * @dev: DRM device + * @state: the driver state object + * +@@ -605,7 +605,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) + + /* + * Each encoder has at most one connector (since we always steal +- * it away), so we won't call call disable hooks twice. ++ * it away), so we won't call disable hooks twice. + */ + if (encoder->bridge) + encoder->bridge->funcs->disable(encoder->bridge); +@@ -757,7 +757,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) + + /* + * Each encoder has at most one connector (since we always steal +- * it away), so we won't call call mode_set hooks twice. ++ * it away), so we won't call mode_set hooks twice. + */ + if (funcs->mode_set) + funcs->mode_set(encoder, mode, adjusted_mode); +@@ -858,7 +858,7 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, + + /* + * Each encoder has at most one connector (since we always steal +- * it away), so we won't call call enable hooks twice. ++ * it away), so we won't call enable hooks twice. + */ + if (encoder->bridge) + encoder->bridge->funcs->pre_enable(encoder->bridge); +@@ -1025,7 +1025,7 @@ int drm_atomic_helper_commit(struct drm_device *dev, + + /* + * Everything below can be run asynchronously without the need to grab +- * any modeset locks at all under one conditions: It must be guaranteed ++ * any modeset locks at all under one condition: It must be guaranteed + * that the asynchronous work has either been cancelled (if the driver + * supports it, which at least requires that the framebuffers get + * cleaned up with drm_atomic_helper_cleanup_planes()) or completed
commit ceebf4d5016bd1182b214eafd46ebd24d6cdf668 +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Tue May 27 07:53:10 2014 +0800 + + UniCore32: Change git tree location information in MAINTAINERS + + UniCore32 git repo has moved to github. + Branch 'unicore32' is used for prepared patches, and automatically merged to linux-next. + Branch 'unicore32-working' is used for development. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/MAINTAINERS b/MAINTAINERS +index e36d18d8f0eb..ddf53ff84053 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -6960,7 +6960,7 @@ PKUNITY SOC DRIVERS + M: Guan Xuetao <gxt@mprc.pku.edu.cn> + W: http://mprc.pku.edu.cn/~guanxuetao/linux + S: Maintained +-T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git ++T: git git://github.com/gxt/linux.git + F: drivers/input/serio/i8042-unicore32io.h + F: drivers/i2c/busses/i2c-puv3.c + F: drivers/video/fb-puv3.c +@@ -9277,7 +9277,7 @@ UNICORE32 ARCHITECTURE: + M: Guan Xuetao <gxt@mprc.pku.edu.cn> + W: http://mprc.pku.edu.cn/~guanxuetao/linux + S: Maintained +-T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git ++T: git git://github.com/gxt/linux.git + F: arch/unicore32/ + + UNIFDEF+
commit ddd2d384b019d1733335c0fca7eccae3c29d2a14 +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Mon Oct 15 14:41:36 2012 +0800 + + unicore32: Use Kbuild infrastructure for kvm_para.h + + All the headers but kvm_para.h use the Kbuild infrastructure to + get to the asm-generic headers. + + Cc: linux-kbuild@vger.kernel.org + Signed-off-by: Steven Rostedt <rostedt@goodmis.org> + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild +index a44b1c453d13..0514d7ad6855 100644 +--- a/arch/unicore32/include/uapi/asm/Kbuild ++++ b/arch/unicore32/include/uapi/asm/Kbuild +@@ -6,3 +6,5 @@ header-y += kvm_para.h + header-y += ptrace.h + header-y += sigcontext.h + header-y += unistd.h ++ ++generic-y += kvm_para.h +diff --git a/arch/unicore32/include/uapi/asm/kvm_para.h b/arch/unicore32/include/uapi/asm/kvm_para.h +deleted file mode 100644 +index 14fab8f0b957..000000000000 +--- a/arch/unicore32/include/uapi/asm/kvm_para.h ++++ /dev/null +@@ -1 +0,0 @@ +-#include <asm-generic/kvm_para.h>
commit 10e1e99e55378a65529c48753703c069aebce7af +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu Jun 14 11:38:25 2012 +0800 + + UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler + + For kernel/bound.c being compiled by native compiler, it will generate following errors in gcc 4.4.3: + CC kernel/bounds.s + In file included from include/linux/bug.h:4, + from include/linux/page-flags.h:9, + from kernel/bounds.c:9: + arch/unicore32/include/asm/bug.h:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void' + arch/unicore32/include/asm/bug.h:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void' + + So, we moved definitions in asm/bug.h to arch/unicore32/kernel/setup.h to solve the problem. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/asm/bug.h b/arch/unicore32/include/asm/bug.h +index b1ff8cadb086..93a56f3e2344 100644 +--- a/arch/unicore32/include/asm/bug.h ++++ b/arch/unicore32/include/asm/bug.h +@@ -19,9 +19,4 @@ extern void die(const char *msg, struct pt_regs *regs, int err); + extern void uc32_notify_die(const char *str, struct pt_regs *regs, + struct siginfo *info, unsigned long err, unsigned long trap); + +-extern asmlinkage void __backtrace(void); +-extern asmlinkage void c_backtrace(unsigned long fp, int pmode); +- +-extern void __show_regs(struct pt_regs *); +- + #endif /* __UNICORE_BUG_H__ */ +diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h +index f23955028a18..30f749da8f73 100644 +--- a/arch/unicore32/kernel/setup.h ++++ b/arch/unicore32/kernel/setup.h +@@ -30,4 +30,10 @@ extern char __vectors_start[], __vectors_end[]; + extern void kernel_thread_helper(void); + + extern void __init early_signal_init(void); ++ ++extern asmlinkage void __backtrace(void); ++extern asmlinkage void c_backtrace(unsigned long fp, int pmode); ++ ++extern void __show_regs(struct pt_regs *); ++ + #endif
commit 195d4577d1d7ab1f0398b3190547c116b56f435f +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu Jun 14 15:39:48 2012 +0800 + + UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer + + When disintegrate system.h, I left an error in asm/cmpxchg.h, which + will result in following error: + + arch/unicore32/include/asm/cmpxchg.h: In function '__xchg': + arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h +index df4d5acfd19f..8e797ad4fa24 100644 +--- a/arch/unicore32/include/asm/cmpxchg.h ++++ b/arch/unicore32/include/asm/cmpxchg.h +@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, + : "memory", "cc"); + break; + default: +- ret = __xchg_bad_pointer(); ++ __xchg_bad_pointer(); + } + + return ret;
commit 446d141e1c84d34c70592b53443b06533703c324 +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu Apr 12 09:18:46 2012 +0800 + + UniCore32 bugfix: add missed CONFIG_ZONE_DMA + + Because our PCI-bus handler confines dma zone into 128M, we should add + CONFIG_ZONE_DMA for all boards. Otherwise, all memory bigger than 128M + will be pushed into ZONE_MOVABLE. + + Cc: Arnd Bergmann <arnd@arndb.de> + Signed-off-by: Liu Guoli <liuguoli@mprc.pku.edu.cn> + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig +index e5c5473e69ce..5b95ba4e0c70 100644 +--- a/arch/unicore32/Kconfig ++++ b/arch/unicore32/Kconfig +@@ -64,6 +64,9 @@ config GENERIC_CALIBRATE_DELAY + config ARCH_MAY_HAVE_PC_FDC + bool + ++config ZONE_DMA ++ def_bool y ++ + config NEED_DMA_MAP_STATE + def_bool y +
commit 8978bfd2288adaa24d39fa15f57eb9e24ffeca12
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Wed Mar 28 18:30:03 2012 +0100
+
+ Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
+
+ Disintegrate asm/system.h for Unicore32. (Compilation successful)
+ The implementation details are not changed, but only splitted.
+ BTW, some codestyles are adjusted.
+
+ Signed-off-by: David Howells <dhowells@redhat.com>
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
+index ca113d6999c5..34b789b71115 100644
+--- a/arch/unicore32/include/asm/Kbuild
++++ b/arch/unicore32/include/asm/Kbuild
+@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
+ generic-y += atomic.h
+ generic-y += auxvec.h
+ generic-y += bitsperlong.h
+-generic-y += bug.h
+ generic-y += bugs.h
+ generic-y += cputime.h
+ generic-y += current.h
+diff --git a/arch/unicore32/include/asm/barrier.h b/arch/unicore32/include/asm/barrier.h
+new file mode 100644
+index 000000000000..a6620e5336b6
+--- /dev/null
++++ b/arch/unicore32/include/asm/barrier.h
+@@ -0,0 +1,28 @@
++/*
++ * Memory barrier implementations for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_BARRIER_H__
++#define __UNICORE_BARRIER_H__
++
++#define isb() __asm__ __volatile__ ("" : : : "memory")
++#define dsb() __asm__ __volatile__ ("" : : : "memory")
++#define dmb() __asm__ __volatile__ ("" : : : "memory")
++
++#define mb() barrier()
++#define rmb() barrier()
++#define wmb() barrier()
++#define smp_mb() barrier()
++#define smp_rmb() barrier()
++#define smp_wmb() barrier()
++#define read_barrier_depends() do { } while (0)
++#define smp_read_barrier_depends() do { } while (0)
++
++#define set_mb(var, value) do { var = value; smp_mb(); } while (0)
++
++#endif /* __UNICORE_BARRIER_H__ */
+diff --git a/arch/unicore32/include/asm/bug.h b/arch/unicore32/include/asm/bug.h
+new file mode 100644
+index 000000000000..b1ff8cadb086
+--- /dev/null
++++ b/arch/unicore32/include/asm/bug.h
+@@ -0,0 +1,27 @@
++/*
++ * Bug handling for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_BUG_H__
++#define __UNICORE_BUG_H__
++
++#include <asm-generic/bug.h>
++
++struct pt_regs;
++struct siginfo;
++
++extern void die(const char *msg, struct pt_regs *regs, int err);
++extern void uc32_notify_die(const char *str, struct pt_regs *regs,
++ struct siginfo *info, unsigned long err, unsigned long trap);
++
++extern asmlinkage void __backtrace(void);
++extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
++
++extern void __show_regs(struct pt_regs *);
++
++#endif /* __UNICORE_BUG_H__ */
+diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h
+new file mode 100644
+index 000000000000..df4d5acfd19f
+--- /dev/null
++++ b/arch/unicore32/include/asm/cmpxchg.h
+@@ -0,0 +1,61 @@
++/*
++ * Atomics xchg/cmpxchg for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_CMPXCHG_H__
++#define __UNICORE_CMPXCHG_H__
++
++/*
++ * Generate a link failure on undefined symbol if the pointer points to a value
++ * of unsupported size.
++ */
++extern void __xchg_bad_pointer(void);
++
++static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
++ int size)
++{
++ unsigned long ret;
++
++ switch (size) {
++ case 1:
++ asm volatile("swapb %0, %1, [%2]"
++ : "=&r" (ret)
++ : "r" (x), "r" (ptr)
++ : "memory", "cc");
++ break;
++ case 4:
++ asm volatile("swapw %0, %1, [%2]"
++ : "=&r" (ret)
++ : "r" (x), "r" (ptr)
++ : "memory", "cc");
++ break;
++ default:
++ ret = __xchg_bad_pointer();
++ }
++
++ return ret;
++}
++
++#define xchg(ptr, x) \
++ ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
++
++#include <asm-generic/cmpxchg-local.h>
++
++/*
++ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
++ * them available.
++ */
++#define cmpxchg_local(ptr, o, n) \
++ ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), \
++ (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))))
++#define cmpxchg64_local(ptr, o, n) \
++ __cmpxchg64_local_generic((ptr), (o), (n))
++
++#include <asm-generic/cmpxchg.h>
++
++#endif /* __UNICORE_CMPXCHG_H__ */
+diff --git a/arch/unicore32/include/asm/exec.h b/arch/unicore32/include/asm/exec.h
+new file mode 100644
+index 000000000000..06d1f0f57888
+--- /dev/null
++++ b/arch/unicore32/include/asm/exec.h
+@@ -0,0 +1,15 @@
++/*
++ * Process execution bits for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_EXEC_H__
++#define __UNICORE_EXEC_H__
++
++#define arch_align_stack(x) (x)
++
++#endif /* __UNICORE_EXEC_H__ */
+diff --git a/arch/unicore32/include/asm/hwdef-copro.h b/arch/unicore32/include/asm/hwdef-copro.h
+new file mode 100644
+index 000000000000..a3292f039a68
+--- /dev/null
++++ b/arch/unicore32/include/asm/hwdef-copro.h
+@@ -0,0 +1,48 @@
++/*
++ * Co-processor register definitions for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_HWDEF_COPRO_H__
++#define __UNICORE_HWDEF_COPRO_H__
++
++/*
++ * Control Register bits (CP#0 CR1)
++ */
++#define CR_M (1 << 0) /* MMU enable */
++#define CR_A (1 << 1) /* Alignment abort enable */
++#define CR_D (1 << 2) /* Dcache enable */
++#define CR_I (1 << 3) /* Icache enable */
++#define CR_B (1 << 4) /* Dcache write mechanism: write back */
++#define CR_T (1 << 5) /* Burst enable */
++#define CR_V (1 << 13) /* Vectors relocated to 0xffff0000 */
++
++#ifndef __ASSEMBLY__
++
++#define vectors_high() (cr_alignment & CR_V)
++
++extern unsigned long cr_no_alignment; /* defined in entry.S */
++extern unsigned long cr_alignment; /* defined in entry.S */
++
++static inline unsigned int get_cr(void)
++{
++ unsigned int val;
++ asm("movc %0, p0.c1, #0" : "=r" (val) : : "cc");
++ return val;
++}
++
++static inline void set_cr(unsigned int val)
++{
++ asm volatile("movc p0.c1, %0, #0" : : "r" (val) : "cc");
++ isb();
++}
++
++extern void adjust_cr(unsigned long mask, unsigned long set);
++
++#endif /* __ASSEMBLY__ */
++
++#endif /* __UNICORE_HWDEF_COPRO_H__ */
+diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
+index adddf6d64077..39decb6e6f57 100644
+--- a/arch/unicore32/include/asm/io.h
++++ b/arch/unicore32/include/asm/io.h
+@@ -16,7 +16,6 @@
+
+ #include <asm/byteorder.h>
+ #include <asm/memory.h>
+-#include <asm/system.h>
+
+ #define PCI_IOBASE PKUNITY_PCILIO_BASE
+ #include <asm-generic/io.h>
+diff --git a/arch/unicore32/include/asm/switch_to.h b/arch/unicore32/include/asm/switch_to.h
+new file mode 100644
+index 000000000000..39572d2bd692
+--- /dev/null
++++ b/arch/unicore32/include/asm/switch_to.h
+@@ -0,0 +1,30 @@
++/*
++ * Task switching for PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2012 GUAN Xue-tao
++ *
++ * 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 __UNICORE_SWITCH_TO_H__
++#define __UNICORE_SWITCH_TO_H__
++
++struct task_struct;
++struct thread_info;
++
++/*
++ * switch_to(prev, next) should switch from task `prev' to `next'
++ * `prev' will never be the same as `next'. schedule() itself
++ * contains the memory barrier to tell GCC not to cache `current'.
++ */
++extern struct task_struct *__switch_to(struct task_struct *,
++ struct thread_info *, struct thread_info *);
++
++#define switch_to(prev, next, last) \
++ do { \
++ last = __switch_to(prev, task_thread_info(prev), \
++ task_thread_info(next)); \
++ } while (0)
++
++#endif /* __UNICORE_SWITCH_TO_H__ */
+diff --git a/arch/unicore32/include/asm/system.h b/arch/unicore32/include/asm/system.h
+index 246b71c17fda..a7f40578587c 100644
+--- a/arch/unicore32/include/asm/system.h
++++ b/arch/unicore32/include/asm/system.h
+@@ -1,161 +1,5 @@
+-/*
+- * linux/arch/unicore32/include/asm/system.h
+- *
+- * Code specific to PKUnity SoC and UniCore ISA
+- *
+- * Copyright (C) 2001-2010 GUAN Xue-tao
+- *
+- * 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 __UNICORE_SYSTEM_H__
+-#define __UNICORE_SYSTEM_H__
+-
+-#ifdef __KERNEL__
+-
+-/*
+- * CR1 bits (CP#0 CR1)
+- */
+-#define CR_M (1 << 0) /* MMU enable */
+-#define CR_A (1 << 1) /* Alignment abort enable */
+-#define CR_D (1 << 2) /* Dcache enable */
+-#define CR_I (1 << 3) /* Icache enable */
+-#define CR_B (1 << 4) /* Dcache write mechanism: write back */
+-#define CR_T (1 << 5) /* Burst enable */
+-#define CR_V (1 << 13) /* Vectors relocated to 0xffff0000 */
+-
+-#ifndef __ASSEMBLY__
+-
+-#include <linux/linkage.h>
+-#include <linux/irqflags.h>
+-
+-struct thread_info;
+-struct task_struct;
+-
+-struct pt_regs;
+-
+-void die(const char *msg, struct pt_regs *regs, int err);
+-
+-struct siginfo;
+-void uc32_notify_die(const char *str, struct pt_regs *regs,
+- struct siginfo *info, unsigned long err, unsigned long trap);
+-
+-void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
+- struct pt_regs *),
+- int sig, int code, const char *name);
+-
+-#define xchg(ptr, x) \
+- ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
+-
+-extern asmlinkage void __backtrace(void);
+-extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
+-
+-struct mm_struct;
+-extern void show_pte(struct mm_struct *mm, unsigned long addr);
+-extern void __show_regs(struct pt_regs *);
+-
+-extern int cpu_architecture(void);
+-extern void cpu_init(void);
+-
+-#define vectors_high() (cr_alignment & CR_V)
+-
+-#define isb() __asm__ __volatile__ ("" : : : "memory")
+-#define dsb() __asm__ __volatile__ ("" : : : "memory")
+-#define dmb() __asm__ __volatile__ ("" : : : "memory")
+-
+-#define mb() barrier()
+-#define rmb() barrier()
+-#define wmb() barrier()
+-#define smp_mb() barrier()
+-#define smp_rmb() barrier()
+-#define smp_wmb() barrier()
+-#define read_barrier_depends() do { } while (0)
+-#define smp_read_barrier_depends() do { } while (0)
+-
+-#define set_mb(var, value) do { var = value; smp_mb(); } while (0)
+-#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
+-
+-extern unsigned long cr_no_alignment; /* defined in entry-unicore.S */
+-extern unsigned long cr_alignment; /* defined in entry-unicore.S */
+-
+-static inline unsigned int get_cr(void)
+-{
+- unsigned int val;
+- asm("movc %0, p0.c1, #0" : "=r" (val) : : "cc");
+- return val;
+-}
+-
+-static inline void set_cr(unsigned int val)
+-{
+- asm volatile("movc p0.c1, %0, #0 @set CR"
+- : : "r" (val) : "cc");
+- isb();
+-}
+-
+-extern void adjust_cr(unsigned long mask, unsigned long set);
+-
+-/*
+- * switch_to(prev, next) should switch from task `prev' to `next'
+- * `prev' will never be the same as `next'. schedule() itself
+- * contains the memory barrier to tell GCC not to cache `current'.
+- */
+-extern struct task_struct *__switch_to(struct task_struct *,
+- struct thread_info *, struct thread_info *);
+-extern void panic(const char *fmt, ...);
+-
+-#define switch_to(prev, next, last) \
+-do { \
+- last = __switch_to(prev, \
+- task_thread_info(prev), task_thread_info(next)); \
+-} while (0)
+-
+-static inline unsigned long
+-__xchg(unsigned long x, volatile void *ptr, int size)
+-{
+- unsigned long ret;
+-
+- switch (size) {
+- case 1:
+- asm volatile("@ __xchg1\n"
+- " swapb %0, %1, [%2]"
+- : "=&r" (ret)
+- : "r" (x), "r" (ptr)
+- : "memory", "cc");
+- break;
+- case 4:
+- asm volatile("@ __xchg4\n"
+- " swapw %0, %1, [%2]"
+- : "=&r" (ret)
+- : "r" (x), "r" (ptr)
+- : "memory", "cc");
+- break;
+- default:
+- panic("xchg: bad data size: ptr 0x%p, size %d\n",
+- ptr, size);
+- }
+-
+- return ret;
+-}
+-
+-#include <asm-generic/cmpxchg-local.h>
+-
+-/*
+- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
+- * them available.
+- */
+-#define cmpxchg_local(ptr, o, n) \
+- ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), \
+- (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))))
+-#define cmpxchg64_local(ptr, o, n) \
+- __cmpxchg64_local_generic((ptr), (o), (n))
+-
+-#include <asm-generic/cmpxchg.h>
+-
+-#endif /* __ASSEMBLY__ */
+-
+-#define arch_align_stack(x) (x)
+-
+-#endif /* __KERNEL__ */
+-
+-#endif
++/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
++#include <asm/barrier.h>
++#include <asm/cmpxchg.h>
++#include <asm/exec.h>
++#include <asm/switch_to.h>
+diff --git a/arch/unicore32/include/asm/uaccess.h b/arch/unicore32/include/asm/uaccess.h
+index 2acda503a6d9..897e11ad8124 100644
+--- a/arch/unicore32/include/asm/uaccess.h
++++ b/arch/unicore32/include/asm/uaccess.h
+@@ -16,7 +16,6 @@
+ #include <linux/errno.h>
+
+ #include <asm/memory.h>
+-#include <asm/system.h>
+
+ #define __copy_from_user __copy_from_user
+ #define __copy_to_user __copy_to_user
+diff --git a/arch/unicore32/kernel/dma.c b/arch/unicore32/kernel/dma.c
+index ae441bc3122c..ed2d4d78d9c4 100644
+--- a/arch/unicore32/kernel/dma.c
++++ b/arch/unicore32/kernel/dma.c
+@@ -18,7 +18,6 @@
+ #include <linux/errno.h>
+ #include <linux/io.h>
+
+-#include <asm/system.h>
+ #include <asm/irq.h>
+ #include <mach/hardware.h>
+ #include <mach/dma.h>
+diff --git a/arch/unicore32/kernel/head.S b/arch/unicore32/kernel/head.S
+index 8caf322e110d..e8f0b98c02ee 100644
+--- a/arch/unicore32/kernel/head.S
++++ b/arch/unicore32/kernel/head.S
+@@ -17,7 +17,7 @@
+ #include <generated/asm-offsets.h>
+ #include <asm/memory.h>
+ #include <asm/thread_info.h>
+-#include <asm/system.h>
++#include <asm/hwdef-copro.h>
+ #include <asm/pgtable-hwdef.h>
+
+ #if (PHYS_OFFSET & 0x003fffff)
+diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
+index 7d0f0b7983a0..d75ef8b6cb56 100644
+--- a/arch/unicore32/kernel/hibernate.c
++++ b/arch/unicore32/kernel/hibernate.c
+@@ -15,7 +15,6 @@
+ #include <linux/suspend.h>
+ #include <linux/bootmem.h>
+
+-#include <asm/system.h>
+ #include <asm/page.h>
+ #include <asm/pgtable.h>
+ #include <asm/pgalloc.h>
+diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
+index d4efa7d679ff..0be5ccd7ccd2 100644
+--- a/arch/unicore32/kernel/irq.c
++++ b/arch/unicore32/kernel/irq.c
+@@ -26,7 +26,6 @@
+ #include <linux/syscore_ops.h>
+ #include <linux/gpio.h>
+
+-#include <asm/system.h>
+ #include <mach/hardware.h>
+
+ #include "setup.h"
+diff --git a/arch/unicore32/kernel/ksyms.c b/arch/unicore32/kernel/ksyms.c
+index d98bd812cae1..d285d71cbe35 100644
+--- a/arch/unicore32/kernel/ksyms.c
++++ b/arch/unicore32/kernel/ksyms.c
+@@ -20,7 +20,6 @@
+ #include <linux/io.h>
+
+ #include <asm/checksum.h>
+-#include <asm/system.h>
+
+ #include "ksyms.h"
+
+diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
+index 52edc2b62873..1b3f152bb9c5 100644
+--- a/arch/unicore32/kernel/process.c
++++ b/arch/unicore32/kernel/process.c
+@@ -34,7 +34,6 @@
+
+ #include <asm/cacheflush.h>
+ #include <asm/processor.h>
+-#include <asm/system.h>
+ #include <asm/stacktrace.h>
+
+ #include "setup.h"
+diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h
+index dcd1306eb5c6..f23955028a18 100644
+--- a/arch/unicore32/kernel/setup.h
++++ b/arch/unicore32/kernel/setup.h
+@@ -12,8 +12,11 @@
+ #ifndef __UNICORE_KERNEL_SETUP_H__
+ #define __UNICORE_KERNEL_SETUP_H__
+
++#include <asm/hwdef-copro.h>
++
+ extern void paging_init(void);
+ extern void puv3_core_init(void);
++extern void cpu_init(void);
+
+ extern void puv3_ps2_init(void);
+ extern void pci_puv3_preinit(void);
+diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
+index b9a26465e728..2054f0d4db13 100644
+--- a/arch/unicore32/kernel/traps.c
++++ b/arch/unicore32/kernel/traps.c
+@@ -26,7 +26,6 @@
+ #include <linux/unistd.h>
+
+ #include <asm/cacheflush.h>
+-#include <asm/system.h>
+ #include <asm/traps.h>
+
+ #include "setup.h"
+diff --git a/arch/unicore32/mm/alignment.c b/arch/unicore32/mm/alignment.c
+index 28f576d733ee..de7dc5fdd58b 100644
+--- a/arch/unicore32/mm/alignment.c
++++ b/arch/unicore32/mm/alignment.c
+@@ -24,6 +24,8 @@
+ #include <asm/tlbflush.h>
+ #include <asm/unaligned.h>
+
++#include "mm.h"
++
+ #define CODING_BITS(i) (i & 0xe0000120)
+
+ #define LDST_P_BIT(i) (i & (1 << 28)) /* Preindex */
+diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
+index 283aa4b50b7a..2eeb9c04cab0 100644
+--- a/arch/unicore32/mm/fault.c
++++ b/arch/unicore32/mm/fault.c
+@@ -20,7 +20,6 @@
+ #include <linux/sched.h>
+ #include <linux/io.h>
+
+-#include <asm/system.h>
+ #include <asm/pgtable.h>
+ #include <asm/tlbflush.h>
+
+diff --git a/arch/unicore32/mm/flush.c b/arch/unicore32/mm/flush.c
+index 93478cc8b26d..6d4c096ffa2a 100644
+--- a/arch/unicore32/mm/flush.c
++++ b/arch/unicore32/mm/flush.c
+@@ -14,7 +14,6 @@
+ #include <linux/pagemap.h>
+
+ #include <asm/cacheflush.h>
+-#include <asm/system.h>
+ #include <asm/tlbflush.h>
+
+ void flush_cache_mm(struct mm_struct *mm)
+diff --git a/arch/unicore32/mm/mm.h b/arch/unicore32/mm/mm.h
+index 3296bca0f1f7..05c7f532eee2 100644
+--- a/arch/unicore32/mm/mm.h
++++ b/arch/unicore32/mm/mm.h
+@@ -9,6 +9,8 @@
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
++#include <asm/hwdef-copro.h>
++
+ /* the upper-most page table pointer */
+ extern pmd_t *top_pmd;
+ extern int sysctl_overcommit_memory;
+@@ -34,6 +36,9 @@ struct mem_type {
+ const struct mem_type *get_mem_type(unsigned int type);
+
+ extern void __flush_dcache_page(struct address_space *, struct page *);
++extern void hook_fault_code(int nr, int (*fn)
++ (unsigned long, unsigned int, struct pt_regs *),
++ int sig, int code, const char *name);
+
+ void __init bootmem_init(void);
+ void uc32_mm_memblock_reserve(void);commit b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Wed Dec 28 09:24:29 2011 +0800
+
+ rtc-puv3: solve section mismatch in rtc-puv3.c
+
+ The patch renames puv3_rtcdrv to puv3_rtc_driver, so that modpost will know
+ that this is simply a list of pointers to driver functions, in which case
+ the section mismatch is OK. (Thanks Michal Marek)
+
+ Cc: Axel Lin <axel.lin@gmail.com>
+ Cc: Michal Marek <mmarek@suse.cz>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Alessandro Zummo <a.zummo@towertech.it>
+ Cc: rtc-linux@googlegroups.com
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+ --
+ Section mismatch warning information:
+
+ WARNING: drivers/rtc/built-in.o(.data+0x90): Section mismatch in
+ reference from the variable puv3_rtcdrv to the
+ function .devinit.text:puv3_rtc_probe()
+ The variable puv3_rtcdrv references
+ the function __devinit puv3_rtc_probe()
+ If the reference is valid then annotate the
+ variable with __init* or __refdata (see linux/init.h) or name the
+ variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+ WARNING: drivers/rtc/built-in.o(.data+0x94): Section mismatch in
+ reference from the variable puv3_rtcdrv to the
+ function .devexit.text:puv3_rtc_remove()
+ The variable puv3_rtcdrv references
+ the function __devexit puv3_rtc_remove()
+ If the reference is valid then annotate the
+ variable with __exit* (see linux/init.h) or name the variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+ WARNING: drivers/built-in.o(.data+0x6c04): Section mismatch in reference
+ from the variable puv3_rtcdrv to the
+ function .devinit.text:puv3_rtc_probe()
+ The variable puv3_rtcdrv references
+ the function __devinit puv3_rtc_probe()
+ If the reference is valid then annotate the
+ variable with __init* or __refdata (see linux/init.h) or name the
+ variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+ WARNING: drivers/built-in.o(.data+0x6c08): Section mismatch in reference
+ from the variable puv3_rtcdrv to the
+ function .devexit.text:puv3_rtc_remove()
+ The variable puv3_rtcdrv references
+ the function __devexit puv3_rtc_remove()
+ If the reference is valid then annotate the
+ variable with __exit* (see linux/init.h) or name the variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+ WARNING: vmlinux.o(.data+0x1126c): Section mismatch in reference from
+ the variable puv3_rtcdrv to the function .devinit.text:puv3_rtc_probe()
+ The variable puv3_rtcdrv references
+ the function __devinit puv3_rtc_probe()
+ If the reference is valid then annotate the
+ variable with __init* or __refdata (see linux/init.h) or name the
+ variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+ WARNING: vmlinux.o(.data+0x11270): Section mismatch in reference from
+ the variable puv3_rtcdrv to the function .devexit.text:puv3_rtc_remove()
+ The variable puv3_rtcdrv references
+ the function __devexit puv3_rtc_remove()
+ If the reference is valid then annotate the
+ variable with __exit* (see linux/init.h) or name the variable:
+ *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,
+ *_console
+
+diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
+index 6490a02b1703..ab0acaeb2371 100644
+--- a/drivers/rtc/rtc-puv3.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -326,7 +326,7 @@ static int puv3_rtc_resume(struct platform_device *pdev)
+ #define puv3_rtc_resume NULL
+ #endif
+
+-static struct platform_driver puv3_rtcdrv = {
++static struct platform_driver puv3_rtc_driver = {
+ .probe = puv3_rtc_probe,
+ .remove = __devexit_p(puv3_rtc_remove),
+ .suspend = puv3_rtc_suspend,
+@@ -337,7 +337,7 @@ static struct platform_driver puv3_rtcdrv = {
+ }
+ };
+
+-module_platform_driver(puv3_rtcdrv);
++module_platform_driver(puv3_rtc_driver);
+
+ MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
+ MODULE_AUTHOR("Hu Dongliang");commit 60e2b00ea200e1527668bfb766ecbdf578ad7de8
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Mon Dec 26 17:03:50 2011 +0800
+
+ rtc-puv3: using module_platform_driver()
+
+ This patch converts the driver to use the module_platform_driver()
+ macro which makes the code smaller and a bit simpler.
+
+ Signed-off-by: Axel Lin <axel.lin@gmail.com>
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
+index 540ead3cb3c7..6490a02b1703 100644
+--- a/drivers/rtc/rtc-puv3.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -337,21 +337,7 @@ static struct platform_driver puv3_rtcdrv = {
+ }
+ };
+
+-static char __initdata banner[] = "PKUnity-v3 RTC, (c) 2009 PKUnity Co.\n";
+-
+-static int __init puv3_rtc_init(void)
+-{
+- printk(banner);
+- return platform_driver_register(&puv3_rtcdrv);
+-}
+-
+-static void __exit puv3_rtc_exit(void)
+-{
+- platform_driver_unregister(&puv3_rtcdrv);
+-}
+-
+-module_init(puv3_rtc_init);
+-module_exit(puv3_rtc_exit);
++module_platform_driver(puv3_rtcdrv);
+
+ MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
+ MODULE_AUTHOR("Hu Dongliang");commit 858af58f67d4aba8afb02438e74292b9273cdb10
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Mon Dec 26 16:59:34 2011 +0800
+
+ i2c-puv3: using module_platform_driver()
+
+ This patch converts the driver to use the module_platform_driver()
+ macro which makes the code smaller and a bit simpler.
+
+ Signed-off-by: Axel Lin <axel.lin@gmail.com>
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
+index fac673940849..93709fbe30eb 100644
+--- a/drivers/i2c/busses/i2c-puv3.c
++++ b/drivers/i2c/busses/i2c-puv3.c
+@@ -276,8 +276,6 @@ static int puv3_i2c_resume(struct platform_device *dev)
+ #define puv3_i2c_resume NULL
+ #endif
+
+-MODULE_ALIAS("platform:puv3_i2c");
+-
+ static struct platform_driver puv3_i2c_driver = {
+ .probe = puv3_i2c_probe,
+ .remove = __devexit_p(puv3_i2c_remove),
+@@ -289,18 +287,8 @@ static struct platform_driver puv3_i2c_driver = {
+ }
+ };
+
+-static int __init puv3_i2c_init(void)
+-{
+- return platform_driver_register(&puv3_i2c_driver);
+-}
+-
+-static void __exit puv3_i2c_exit(void)
+-{
+- platform_driver_unregister(&puv3_i2c_driver);
+-}
+-
+-module_init(puv3_i2c_init);
+-module_exit(puv3_i2c_exit);
++module_platform_driver(puv3_i2c_driver);
+
+ MODULE_DESCRIPTION("PKUnity v3 I2C driver");
+ MODULE_LICENSE("GPL v2");
++MODULE_ALIAS("platform:puv3_i2c");commit a9196b0bd3284fa3388998c9208a708a8f2e4c83
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Dec 23 09:15:39 2011 +0800
+
+ rtc-puv3: irq: remove IRQF_DISABLED
+
+ This flag is deprecated, so is removed now.
+
+ Signed-off-by: Yong Zhang <yong.zhang@gmail.com>
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
+index e4b6880aabd0..540ead3cb3c7 100644
+--- a/drivers/rtc/rtc-puv3.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -164,7 +164,7 @@ static int puv3_rtc_open(struct device *dev)
+ int ret;
+
+ ret = request_irq(puv3_rtc_alarmno, puv3_rtc_alarmirq,
+- IRQF_DISABLED, "pkunity-rtc alarm", rtc_dev);
++ 0, "pkunity-rtc alarm", rtc_dev);
+
+ if (ret) {
+ dev_err(dev, "IRQ%d error %d\n", puv3_rtc_alarmno, ret);
+@@ -172,7 +172,7 @@ static int puv3_rtc_open(struct device *dev)
+ }
+
+ ret = request_irq(puv3_rtc_tickno, puv3_rtc_tickirq,
+- IRQF_DISABLED, "pkunity-rtc tick", rtc_dev);
++ 0, "pkunity-rtc tick", rtc_dev);
+
+ if (ret) {
+ dev_err(dev, "IRQ%d error %d\n", puv3_rtc_tickno, ret);commit a50e4213e71adc7dde0d514aabd8af7275fee39f +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu Aug 18 15:38:05 2011 +0800 + + unicore32: add ioremap_nocache definition + + Bugfix for following error messages: + lib/iomap.c: In function 'pci_iomap': + lib/iomap.c:274: error: implicit declaration of function 'ioremap_nocache' + lib/iomap.c:274: warning: return makes pointer from integer without a cast + + Also see commit <f1ecc69838a2d7c8a3e1909f637d4083c071777d> + it will hide the ioremap_nocache function for systems with an MMU + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Cc: Arnd Bergmann <arnd@arndb.de> + Cc: Jonas Bonn <jonas@southpole.se> + +diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h +index a75ad0b117cc..adddf6d64077 100644 +--- a/arch/unicore32/include/asm/io.h ++++ b/arch/unicore32/include/asm/io.h +@@ -37,6 +37,7 @@ extern void __uc32_iounmap(volatile void __iomem *addr); + */ + #define ioremap(cookie, size) __uc32_ioremap(cookie, size) + #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) ++#define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size) + #define iounmap(cookie) __uc32_iounmap(cookie) + + #define HAVE_ARCH_PIO_SIZE+
commit 62439a2954b9027c9ec481e1d39cd5d63f7c1b17 +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu Aug 18 15:43:10 2011 +0800 + + unicore32: delete specified xlate_dev_mem_ptr + + For the commit <f1ecc69838a2d7c8a3e1909f637d4083c071777d> has changed + xlate_dev_mem_ptr definition in asm-generic/io.h for the systems with + an MMU, so delete it from unicore32 specified io.h. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Cc: Arnd Bergmann <arnd@arndb.de> + Cc: Jonas Bonn <jonas@southpole.se> + +diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h +index 1a5c5a5eb39c..a75ad0b117cc 100644 +--- a/arch/unicore32/include/asm/io.h ++++ b/arch/unicore32/include/asm/io.h +@@ -39,13 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr); + #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) + #define iounmap(cookie) __uc32_iounmap(cookie) + +-/* +- * Convert a physical pointer to a virtual kernel pointer for /dev/mem +- * access +- */ +-#undef xlate_dev_mem_ptr +-#define xlate_dev_mem_ptr(p) __va(p) +- + #define HAVE_ARCH_PIO_SIZE + #define PIO_OFFSET (unsigned int)(PCI_IOBASE) + #define PIO_MASK (unsigned int)(IO_SPACE_LIMIT)
commit eb52d5801302a3515506891c13338fbaa7222f36 +Author: Yu Yue <yuyue@mprc.pku.edu.cn> +Date: Fri Aug 26 18:03:42 2011 +0800 + + of: add include asm/setup.h in drivers/of/fdt.c + + In the file drivers/of/fdt.c, it uses the COMMAND_LINE_SIZE which is stated + in asm/setup.h, so asm/setup.h should be included in drivers/of/fdt.c. + + Signed-off-by: Yu Yue <yuyue@mprc.pku.edu.cn> + Signed-off-by: Guan Xuetao <guanxuetao@mprc.pku.edu.cn> + + Cc: Grant Likerly <grant.likely@secretlab.ca> + Cc: devicetree-discuss@lists.ozlabs.org + Cc: Arnd Bergmann <arnd@arndb.de> + +diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c +index 91a375fb6ae6..ea2bd1be2640 100644 +--- a/drivers/of/fdt.c ++++ b/drivers/of/fdt.c +@@ -23,6 +23,7 @@ + #include <asm/machdep.h> + #endif /* CONFIG_PPC */ + ++#include <asm/setup.h> + #include <asm/page.h> + + char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)
commit e13b91c1c47e7be178d2d7914452040ee82c0bd2
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Mon Jun 13 11:44:49 2011 +0800
+
+ unicore32: fix build error for find bitops
+
+ Remove the __uc32_ prefix in find bitops functions.
+ Move find_* macros behind asm-generic/bitops.h inclusion.
+ see commit <19de85ef574c3a2182e3ccad9581805052f14946>
+ bitops: add #ifndef for each of find bitops
+ also see commit <63e424c84429903c92a0f1e9654c31ccaf6694d0>
+ arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Cc: Akinobu Mita <akinobu.mita@gmail.com>
+ Acked-by: Akinobu Mita <akinobu.mita@gmail.com>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/bitops.h b/arch/unicore32/include/asm/bitops.h
+index 1628a6328994..401f597bc38c 100644
+--- a/arch/unicore32/include/asm/bitops.h
++++ b/arch/unicore32/include/asm/bitops.h
+@@ -13,12 +13,6 @@
+ #ifndef __UNICORE_BITOPS_H__
+ #define __UNICORE_BITOPS_H__
+
+-#define find_next_bit __uc32_find_next_bit
+-#define find_next_zero_bit __uc32_find_next_zero_bit
+-
+-#define find_first_bit __uc32_find_first_bit
+-#define find_first_zero_bit __uc32_find_first_zero_bit
+-
+ #define _ASM_GENERIC_BITOPS_FLS_H_
+ #define _ASM_GENERIC_BITOPS___FLS_H_
+ #define _ASM_GENERIC_BITOPS_FFS_H_
+@@ -44,4 +38,10 @@ static inline int fls(int x)
+
+ #include <asm-generic/bitops.h>
+
++/* following definitions: to avoid using codes in lib/find_*.c */
++#define find_next_bit find_next_bit
++#define find_next_zero_bit find_next_zero_bit
++#define find_first_bit find_first_bit
++#define find_first_zero_bit find_first_zero_bit
++
+ #endif /* __UNICORE_BITOPS_H__ */
+diff --git a/arch/unicore32/kernel/ksyms.c b/arch/unicore32/kernel/ksyms.c
+index a8970809428a..d98bd812cae1 100644
+--- a/arch/unicore32/kernel/ksyms.c
++++ b/arch/unicore32/kernel/ksyms.c
+@@ -24,8 +24,8 @@
+
+ #include "ksyms.h"
+
+-EXPORT_SYMBOL(__uc32_find_next_zero_bit);
+-EXPORT_SYMBOL(__uc32_find_next_bit);
++EXPORT_SYMBOL(find_next_zero_bit);
++EXPORT_SYMBOL(find_next_bit);
+
+ EXPORT_SYMBOL(__backtrace);
+
+diff --git a/arch/unicore32/lib/findbit.S b/arch/unicore32/lib/findbit.S
+index c360ce905d8b..c77746247d36 100644
+--- a/arch/unicore32/lib/findbit.S
++++ b/arch/unicore32/lib/findbit.S
+@@ -17,7 +17,7 @@
+ * Purpose : Find a 'zero' bit
+ * Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
+ */
+-__uc32_find_first_zero_bit:
++ENTRY(find_first_zero_bit)
+ cxor.a r1, #0
+ beq 3f
+ mov r2, #0
+@@ -29,13 +29,14 @@ __uc32_find_first_zero_bit:
+ bub 1b
+ 3: mov r0, r1 @ no free bits
+ mov pc, lr
++ENDPROC(find_first_zero_bit)
+
+ /*
+ * Purpose : Find next 'zero' bit
+ * Prototype: int find_next_zero_bit
+ * (void *addr, unsigned int maxbit, int offset)
+ */
+-ENTRY(__uc32_find_next_zero_bit)
++ENTRY(find_next_zero_bit)
+ cxor.a r1, #0
+ beq 3b
+ and.a ip, r2, #7
+@@ -47,14 +48,14 @@ ENTRY(__uc32_find_next_zero_bit)
+ or r2, r2, #7 @ if zero, then no bits here
+ add r2, r2, #1 @ align bit pointer
+ b 2b @ loop for next bit
+-ENDPROC(__uc32_find_next_zero_bit)
++ENDPROC(find_next_zero_bit)
+
+ /*
+ * Purpose : Find a 'one' bit
+ * Prototype: int find_first_bit
+ * (const unsigned long *addr, unsigned int maxbit);
+ */
+-__uc32_find_first_bit:
++ENTRY(find_first_bit)
+ cxor.a r1, #0
+ beq 3f
+ mov r2, #0
+@@ -66,13 +67,14 @@ __uc32_find_first_bit:
+ bub 1b
+ 3: mov r0, r1 @ no free bits
+ mov pc, lr
++ENDPROC(find_first_bit)
+
+ /*
+ * Purpose : Find next 'one' bit
+ * Prototype: int find_next_zero_bit
+ * (void *addr, unsigned int maxbit, int offset)
+ */
+-ENTRY(__uc32_find_next_bit)
++ENTRY(find_next_bit)
+ cxor.a r1, #0
+ beq 3b
+ and.a ip, r2, #7
+@@ -83,7 +85,7 @@ ENTRY(__uc32_find_next_bit)
+ or r2, r2, #7 @ if zero, then no bits here
+ add r2, r2, #1 @ align bit pointer
+ b 2b @ loop for next bit
+-ENDPROC(__uc32_find_next_bit)
++ENDPROC(find_next_bit)
+
+ /*
+ * One or more bits in the LSB of r3 are assumed to be set.commit 62b62c5c29468412cadd39dfb1113d3f0a323cfe +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu May 26 18:17:43 2011 +0800 + + unicore32: using generic-y format for one line asm-generic files + + The patch adds one-line asm-generic files in arch/unicore32/include/asm/Kbuild + Also, remove the old implementation in arch/unicore32/Makefile + see commit from Sam Ravnborg <d8ecc5cd8e227bc318513b5306ae88a474b8886d> + kbuild: asm-generic support + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile +index 6555abbaeb87..6af4bc415f2b 100644 +--- a/arch/unicore32/Makefile ++++ b/arch/unicore32/Makefile +@@ -40,39 +40,6 @@ core-y += arch/unicore32/mm/ + + libs-y += arch/unicore32/lib/ + +-ASM_GENERATED_DIR := $(srctree)/arch/unicore32/include/generated +-LINUXINCLUDE += -I$(ASM_GENERATED_DIR) +- +-ASM_GENERIC_HEADERS := atomic.h auxvec.h +-ASM_GENERIC_HEADERS += bitsperlong.h bug.h bugs.h +-ASM_GENERIC_HEADERS += cputime.h current.h +-ASM_GENERIC_HEADERS += device.h div64.h +-ASM_GENERIC_HEADERS += emergency-restart.h errno.h +-ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h futex.h +-ASM_GENERIC_HEADERS += hardirq.h hw_irq.h +-ASM_GENERIC_HEADERS += ioctl.h ioctls.h ipcbuf.h irq_regs.h +-ASM_GENERIC_HEADERS += kdebug.h kmap_types.h +-ASM_GENERIC_HEADERS += local.h +-ASM_GENERIC_HEADERS += mman.h module.h msgbuf.h +-ASM_GENERIC_HEADERS += param.h parport.h percpu.h poll.h posix_types.h +-ASM_GENERIC_HEADERS += resource.h +-ASM_GENERIC_HEADERS += scatterlist.h sections.h segment.h sembuf.h serial.h +-ASM_GENERIC_HEADERS += setup.h shmbuf.h shmparam.h +-ASM_GENERIC_HEADERS += siginfo.h signal.h sizes.h +-ASM_GENERIC_HEADERS += socket.h sockios.h stat.h statfs.h swab.h syscalls.h +-ASM_GENERIC_HEADERS += termbits.h termios.h topology.h types.h +-ASM_GENERIC_HEADERS += ucontext.h unaligned.h user.h +-ASM_GENERIC_HEADERS += vga.h +-ASM_GENERIC_HEADERS += xor.h +- +-archprepare: +-ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR))) +- $(Q)mkdir -p $(ASM_GENERATED_DIR)/asm +- $(Q)$(foreach a, $(ASM_GENERIC_HEADERS), \ +- echo '#include <asm-generic/$a>' \ +- > $(ASM_GENERATED_DIR)/asm/$a; ) +-endif +- + boot := arch/unicore32/boot + + # Default defconfig and target when executing plain make +@@ -84,8 +51,6 @@ all: $(KBUILD_IMAGE) + zImage Image uImage: vmlinux + $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + +-MRPROPER_DIRS += $(ASM_GENERATED_DIR) +- + archclean: + $(Q)$(MAKE) $(clean)=$(boot) + +diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild +index b200fdaca44d..ca113d6999c5 100644 +--- a/arch/unicore32/include/asm/Kbuild ++++ b/arch/unicore32/include/asm/Kbuild +@@ -1,2 +1,61 @@ + include include/asm-generic/Kbuild.asm + ++generic-y += atomic.h ++generic-y += auxvec.h ++generic-y += bitsperlong.h ++generic-y += bug.h ++generic-y += bugs.h ++generic-y += cputime.h ++generic-y += current.h ++generic-y += device.h ++generic-y += div64.h ++generic-y += emergency-restart.h ++generic-y += errno.h ++generic-y += fb.h ++generic-y += fcntl.h ++generic-y += ftrace.h ++generic-y += futex.h ++generic-y += hardirq.h ++generic-y += hw_irq.h ++generic-y += ioctl.h ++generic-y += ioctls.h ++generic-y += ipcbuf.h ++generic-y += irq_regs.h ++generic-y += kdebug.h ++generic-y += kmap_types.h ++generic-y += local.h ++generic-y += mman.h ++generic-y += module.h ++generic-y += msgbuf.h ++generic-y += param.h ++generic-y += parport.h ++generic-y += percpu.h ++generic-y += poll.h ++generic-y += posix_types.h ++generic-y += resource.h ++generic-y += scatterlist.h ++generic-y += sections.h ++generic-y += segment.h ++generic-y += sembuf.h ++generic-y += serial.h ++generic-y += setup.h ++generic-y += shmbuf.h ++generic-y += shmparam.h ++generic-y += siginfo.h ++generic-y += signal.h ++generic-y += sizes.h ++generic-y += socket.h ++generic-y += sockios.h ++generic-y += stat.h ++generic-y += statfs.h ++generic-y += swab.h ++generic-y += syscalls.h ++generic-y += termbits.h ++generic-y += termios.h ++generic-y += topology.h ++generic-y += types.h ++generic-y += ucontext.h ++generic-y += unaligned.h ++generic-y += user.h ++generic-y += vga.h ++generic-y += xor.h
commit 42733b3c4861799b3c30c1e416099324bb577960 +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Thu May 26 17:19:20 2011 +0800 + + unicore32: change PERCPU to PERCPU_SECTION + + The patch changes PERCPU to PERCPU_SECTION + see commit from Tejun Heo <0415b00d175e0d8945e6785aad21b5f157976ce0> + percpu: Always align percpu output section to PAGE_SIZE + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Tejun Heo <tj@kernel.org> + +diff --git a/arch/unicore32/kernel/vmlinux.lds.S b/arch/unicore32/kernel/vmlinux.lds.S +index 9bf7f7af52c5..77e407e49a63 100644 +--- a/arch/unicore32/kernel/vmlinux.lds.S ++++ b/arch/unicore32/kernel/vmlinux.lds.S +@@ -30,7 +30,7 @@ SECTIONS + HEAD_TEXT_SECTION + INIT_TEXT_SECTION(PAGE_SIZE) + INIT_DATA_SECTION(16) +- PERCPU(L1_CACHE_BYTES, PAGE_SIZE) ++ PERCPU_SECTION(L1_CACHE_BYTES) + __init_end = .; + + _stext = .;
commit 978b42e6f6f48560b18661a5e187aec7329a094b +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Mon May 16 15:28:19 2011 +0800 + + unicore32: add KBUILD_DEFCONFIG with unicore32_defconfig (old debug_defconfig) + + Rename debug_defconfig to unicore32_defconfig, which is a minimal config for + PKUnity-v3 (130nm) SoC board. + Also, add KBUILD_DEFCONFIG to use 'make defconfig'. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile +index 76a8beec7d03..6555abbaeb87 100644 +--- a/arch/unicore32/Makefile ++++ b/arch/unicore32/Makefile +@@ -75,7 +75,8 @@ endif + + boot := arch/unicore32/boot + +-# Default target when executing plain make ++# Default defconfig and target when executing plain make ++KBUILD_DEFCONFIG := $(ARCH)_defconfig + KBUILD_IMAGE := zImage + + all: $(KBUILD_IMAGE) +diff --git a/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/unicore32_defconfig +similarity index 99% +rename from arch/unicore32/configs/debug_defconfig +rename to arch/unicore32/configs/unicore32_defconfig +index 9b9c2519a38f..c9dd3198b6f7 100644 +--- a/arch/unicore32/configs/debug_defconfig ++++ b/arch/unicore32/configs/unicore32_defconfig +@@ -1,6 +1,6 @@ + ### General setup + CONFIG_EXPERIMENTAL=y +-CONFIG_LOCALVERSION="-debug" ++CONFIG_LOCALVERSION="-unicore32" + CONFIG_SWAP=y + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y
commit f4728fd21f6d81bb2100da7eb9c675f1a74ad30d +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Wed Apr 20 19:06:53 2011 +0800 + + unicore32: change zImage physical address, though it's PIC codes + + U-boot will load the kernel image to 48M physical memory address. + The patch changes it to the correct address, though it's PIC codes. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile +index 95373428cb3d..b0954a2d23cf 100644 +--- a/arch/unicore32/boot/compressed/Makefile ++++ b/arch/unicore32/boot/compressed/Makefile +@@ -59,7 +59,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \ + # We now have a PIC decompressor implementation. Decompressors running + # from RAM should not define ZTEXTADDR. Decompressors running directly + # from ROM or Flash must define ZTEXTADDR (preferably via the config) +-ZTEXTADDR := 0 ++ZTEXTADDR := 0x03000000 + ZBSSADDR := ALIGN(4) + + SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
commit 2809e80b8a73d556b2302e273966fb15db16c51e
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Thu May 26 16:43:27 2011 +0800
+
+ unicore32: move rtc-puv3.c to drivers/rtc directory
+
+ The patch moves rtc driver for PKUnity-v3 SoC from arch/unicore32/kernel/
+ to drivers/rtc/, with renaming it to rtc-puv3.c.
+ Also, Kconfig, Makefile, and MAINTAINERS are modified correspondingly.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index b5ea4d033730..bbe49d8c22af 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4945,6 +4945,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.gi
+ F: drivers/input/serio/i8042-unicore32io.h
+ F: drivers/i2c/busses/i2c-puv3.c
+ F: drivers/video/fb-puv3.c
++F: drivers/rtc/rtc-puv3.c
+
+ PMC SIERRA MaxRAID DRIVER
+ M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+index d3a303246c9f..e57dcce9bfda 100644
+--- a/arch/unicore32/Kconfig
++++ b/arch/unicore32/Kconfig
+@@ -231,10 +231,6 @@ config PUV3_PWM
+ help
+ Enable support for NB0916 PWM controllers
+
+-config PUV3_RTC
+- tristate "PKUnity v3 RTC Support"
+- depends on !ARCH_FPGA
+-
+ if PUV3_NB0916
+
+ menu "PKUnity NetBook-0916 Features"
+diff --git a/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/debug_defconfig
+index b5fbde9f1cb2..9b9c2519a38f 100644
+--- a/arch/unicore32/configs/debug_defconfig
++++ b/arch/unicore32/configs/debug_defconfig
+@@ -64,7 +64,6 @@ CONFIG_I2C_BATTERY_BQ27200=n
+ CONFIG_I2C_EEPROM_AT24=n
+ CONFIG_LCD_BACKLIGHT=n
+
+-CONFIG_PUV3_RTC=y
+ CONFIG_PUV3_UMAL=y
+ CONFIG_PUV3_MUSB=n
+ CONFIG_PUV3_AC97=n
+@@ -167,8 +166,9 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
+ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+
+ # Real Time Clock
+-CONFIG_RTC_LIB=m
+-CONFIG_RTC_CLASS=m
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_DRV_PUV3=y
+
+ ### File systems
+ CONFIG_EXT2_FS=m
+diff --git a/arch/unicore32/kernel/Makefile b/arch/unicore32/kernel/Makefile
+index ec23a2fb2f50..aeb0f181568e 100644
+--- a/arch/unicore32/kernel/Makefile
++++ b/arch/unicore32/kernel/Makefile
+@@ -16,7 +16,6 @@ obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o
+ obj-$(CONFIG_ARCH_PUV3) += clock.o irq.o time.o
+
+ obj-$(CONFIG_PUV3_GPIO) += gpio.o
+-obj-$(CONFIG_PUV3_RTC) += rtc.o
+ obj-$(CONFIG_PUV3_PWM) += pwm.o
+ obj-$(CONFIG_PUV3_PM) += pm.o sleep.o
+ obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate_asm.o
+diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
+index f822e13dc04b..ce2aabf5c550 100644
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -1051,4 +1051,13 @@ config RTC_DRV_TILE
+ Enable support for the Linux driver side of the Tilera
+ hypervisor's real-time clock interface.
+
++config RTC_DRV_PUV3
++ tristate "PKUnity v3 RTC support"
++ depends on ARCH_PUV3
++ help
++ This enables support for the RTC in the PKUnity-v3 SoCs.
++
++ This drive can also be built as a module. If so, the module
++ will be called rtc-puv3.
++
+ endif # RTC_CLASS
+diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
+index 213d725f16d4..0ffefe877bfa 100644
+--- a/drivers/rtc/Makefile
++++ b/drivers/rtc/Makefile
+@@ -78,6 +78,7 @@ obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
+ obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o
+ obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
+ obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
++obj-$(CONFIG_RTC_DRV_PUV3) += rtc-puv3.o
+ obj-$(CONFIG_RTC_DRV_PXA) += rtc-pxa.o
+ obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o
+ obj-$(CONFIG_RTC_DRV_RP5C01) += rtc-rp5c01.o
+diff --git a/arch/unicore32/kernel/rtc.c b/drivers/rtc/rtc-puv3.c
+similarity index 98%
+rename from arch/unicore32/kernel/rtc.c
+rename to drivers/rtc/rtc-puv3.c
+index 8cad70b3302c..46f14b82f3ab 100644
+--- a/arch/unicore32/kernel/rtc.c
++++ b/drivers/rtc/rtc-puv3.c
+@@ -1,7 +1,5 @@
+ /*
+- * linux/arch/unicore32/kernel/rtc.c
+- *
+- * Code specific to PKUnity SoC and UniCore ISA
++ * RTC driver code specific to PKUnity SoC and UniCore ISA
+ *
+ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
+ * Copyright (C) 2001-2010 Guan Xuetao
+@@ -36,7 +34,6 @@ static int puv3_rtc_tickno = IRQ_RTC;
+ static DEFINE_SPINLOCK(puv3_rtc_pie_lock);
+
+ /* IRQ Handlers */
+-
+ static irqreturn_t puv3_rtc_alarmirq(int irq, void *id)
+ {
+ struct rtc_device *rdev = id;
+@@ -89,7 +86,6 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
+ }
+
+ /* Time read/write */
+-
+ static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
+ {
+ rtc_time_to_tm(readl(RTC_RCNR), rtc_tm);
+@@ -196,7 +192,6 @@ static void puv3_rtc_release(struct device *dev)
+ struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
+
+ /* do not clear AIE here, it may be needed for wake */
+-
+ puv3_rtc_setpie(dev, 0);
+ free_irq(puv3_rtc_alarmno, rtc_dev);
+ free_irq(puv3_rtc_tickno, rtc_dev);
+@@ -218,7 +213,6 @@ static void puv3_rtc_enable(struct platform_device *pdev, int en)
+ writel(readl(RTC_RTSR) & ~RTC_RTSR_HZE, RTC_RTSR);
+ } else {
+ /* re-enable the device, and check it is ok */
+-
+ if ((readl(RTC_RTSR) & RTC_RTSR_HZE) == 0) {
+ dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
+ writel(readl(RTC_RTSR) | RTC_RTSR_HZE, RTC_RTSR);
+@@ -251,7 +245,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
+ pr_debug("%s: probe=%p\n", __func__, pdev);
+
+ /* find the IRQs */
+-
+ puv3_rtc_tickno = platform_get_irq(pdev, 1);
+ if (puv3_rtc_tickno < 0) {
+ dev_err(&pdev->dev, "no irq for rtc tick\n");
+@@ -268,7 +261,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
+ puv3_rtc_tickno, puv3_rtc_alarmno);
+
+ /* get the memory region */
+-
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (res == NULL) {
+ dev_err(&pdev->dev, "failed to get memory region resource\n");
+@@ -288,7 +280,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
+ puv3_rtc_enable(pdev, 1);
+
+ /* register RTC and exit */
+-
+ rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
+ THIS_MODULE);
+
+@@ -315,8 +306,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
+
+ #ifdef CONFIG_PM
+
+-/* RTC Power management control */
+-
+ static int ticnt_save;
+
+ static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+@@ -368,4 +357,3 @@ module_exit(puv3_rtc_exit);
+ MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
+ MODULE_AUTHOR("Hu Dongliang");
+ MODULE_LICENSE("GPL v2");
+-commit 6b794743b2c5e21825d35b5d5dd57d6fcc388198
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Apr 1 16:38:59 2011 +0800
+
+ unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable
+
+ 1. get videomemory by __get_free_pages() in fb-puv3.c
+ 2. remove resource reservation for old fixed UNIGFX_MMAP & UVC_MMAP space
+ 3. remove unused macros: PKUNTIY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE,
+ PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE and KUSER_UNIGFX_BASE
+ 4. remove unused header linux/vmalloc.h in fb-puv3.h
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h
+index a18bdc3810e6..8040d575dddb 100644
+--- a/arch/unicore32/include/mach/PKUnity.h
++++ b/arch/unicore32/include/mach/PKUnity.h
+@@ -23,16 +23,6 @@
+ #define PKUNITY_SDRAM_BASE 0x00000000 /* 0x00000000 - 0x7FFFFFFF 2GB */
+ #define PKUNITY_MMIO_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */
+
+-/*
+- * PKUNITY Memory Map Addresses: 0x0D000000 - 0x0EFFFFFF (32MB)
+- * 0x0D000000 - 0x0DFFFFFF 16MB: for UVC
+- * 0x0E000000 - 0x0EFFFFFF 16MB: for UNIGFX
+- */
+-#define PKUNITY_UVC_MMAP_BASE 0x0D000000
+-#define PKUNITY_UVC_MMAP_SIZE 0x01000000 /* 16MB */
+-#define PKUNITY_UNIGFX_MMAP_BASE 0x0E000000
+-#define PKUNITY_UNIGFX_MMAP_SIZE 0x01000000 /* 16MB */
+-
+ /*
+ * PKUNITY System Bus Addresses (PCI): 0x80000000 - 0xBFFFFFFF (1GB)
+ * 0x80000000 - 0x8000000B 12B PCI Configuration regs
+diff --git a/arch/unicore32/include/mach/memory.h b/arch/unicore32/include/mach/memory.h
+index 0bf21c944710..4be72c21d491 100644
+--- a/arch/unicore32/include/mach/memory.h
++++ b/arch/unicore32/include/mach/memory.h
+@@ -50,7 +50,6 @@ void puv3_pci_adjust_zones(unsigned long *size, unsigned long *holes);
+
+ /* kuser area */
+ #define KUSER_VECPAGE_BASE (KUSER_BASE + UL(0x3fff0000))
+-#define KUSER_UNIGFX_BASE (PAGE_OFFSET + PKUNITY_UNIGFX_MMAP_BASE)
+ /* kuser_vecpage (0xbfff0000) is ro, and vectors page (0xffff0000) is rw */
+ #define kuser_vecpage_to_vectors(x) ((x) - (KUSER_VECPAGE_BASE) \
+ + (VECTORS_BASE))
+diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
+index 8b1b6beb858e..1a505a787765 100644
+--- a/arch/unicore32/kernel/puv3-core.c
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -99,11 +99,6 @@ static struct resource puv3_unigfx_resources[] = {
+ .end = io_v2p(PKUNITY_UNIGFX_BASE) + 0xfff,
+ .flags = IORESOURCE_MEM,
+ },
+- [1] = {
+- .start = PKUNITY_UNIGFX_MMAP_BASE,
+- .end = PKUNITY_UNIGFX_MMAP_BASE + PKUNITY_UNIGFX_MMAP_SIZE,
+- .flags = IORESOURCE_MEM,
+- },
+ };
+
+ static struct resource puv3_rtc_resources[] = {
+diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c
+index 1e175a82844d..471b6bca8da4 100644
+--- a/arch/unicore32/kernel/setup.c
++++ b/arch/unicore32/kernel/setup.c
+@@ -63,12 +63,6 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
+ * Standard memory resources
+ */
+ static struct resource mem_res[] = {
+- {
+- .name = "Video RAM",
+- .start = 0,
+- .end = 0,
+- .flags = IORESOURCE_MEM
+- },
+ {
+ .name = "Kernel text",
+ .start = 0,
+@@ -83,9 +77,8 @@ static struct resource mem_res[] = {
+ }
+ };
+
+-#define video_ram mem_res[0]
+-#define kernel_code mem_res[1]
+-#define kernel_data mem_res[2]
++#define kernel_code mem_res[0]
++#define kernel_data mem_res[1]
+
+ /*
+ * These functions re-use the assembly code in head.S, which
+@@ -224,10 +217,6 @@ request_standard_resources(struct meminfo *mi)
+ kernel_data.end <= res->end)
+ request_resource(res, &kernel_data);
+ }
+-
+- video_ram.start = PKUNITY_UNIGFX_MMAP_BASE;
+- video_ram.end = PKUNITY_UNIGFX_MMAP_BASE + PKUNITY_UNIGFX_MMAP_SIZE;
+- request_resource(&iomem_resource, &video_ram);
+ }
+
+ static void (*init_machine)(void) __initdata;
+diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c
+index 7bf3d588631f..db2d334941b4 100644
+--- a/arch/unicore32/mm/mmu.c
++++ b/arch/unicore32/mm/mmu.c
+@@ -338,15 +338,6 @@ void __init uc32_mm_memblock_reserve(void)
+ * and can only be in node 0.
+ */
+ memblock_reserve(__pa(swapper_pg_dir), PTRS_PER_PGD * sizeof(pgd_t));
+-
+-#ifdef CONFIG_PUV3_UNIGFX
+- /*
+- * These should likewise go elsewhere. They pre-reserve the
+- * screen/video memory region at the 48M~64M of main system memory.
+- */
+- memblock_reserve(PKUNITY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE);
+- memblock_reserve(PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE);
+-#endif
+ }
+
+ /*
+@@ -370,17 +361,6 @@ static void __init devicemaps_init(void)
+ for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE)
+ pmd_clear(pmd_off_k(addr));
+
+- /*
+- * Create a mapping for UniGFX VRAM
+- */
+-#ifdef CONFIG_PUV3_UNIGFX
+- map.pfn = __phys_to_pfn(PKUNITY_UNIGFX_MMAP_BASE);
+- map.virtual = KUSER_UNIGFX_BASE;
+- map.length = PKUNITY_UNIGFX_MMAP_SIZE;
+- map.type = MT_KUSER;
+- create_mapping(&map);
+-#endif
+-
+ /*
+ * Create a mapping for the machine vectors at the high-vectors
+ * location (0xffff0000). If we aren't using high-vectors, also
+diff --git a/drivers/video/fb-puv3.c b/drivers/video/fb-puv3.c
+index dbd2dc4745d1..27f2c57e06e9 100644
+--- a/drivers/video/fb-puv3.c
++++ b/drivers/video/fb-puv3.c
+@@ -13,7 +13,6 @@
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+-#include <linux/vmalloc.h>
+ #include <linux/platform_device.h>
+ #include <linux/clk.h>
+ #include <linux/fb.h>
+@@ -531,7 +530,7 @@ static int unifb_set_par(struct fb_info *info)
+ return -EINVAL;
+ }
+
+- writel(PKUNITY_UNIGFX_MMAP_BASE, UDE_FSA);
++ writel(info->fix.smem_start, UDE_FSA);
+ writel(info->var.yres, UDE_LS);
+ writel(get_line_length(info->var.xres,
+ info->var.bits_per_pixel) >> 3, UDE_PS);
+@@ -680,13 +679,27 @@ static int unifb_probe(struct platform_device *dev)
+ struct fb_info *info;
+ u32 unifb_regs[UNIFB_REGS_NUM];
+ int retval = -ENOMEM;
+- struct resource *iomem, *mapmem;
++ struct resource *iomem;
++ void *videomemory;
++
++ videomemory = (void *)__get_free_pages(GFP_KERNEL | __GFP_COMP,
++ get_order(UNIFB_MEMSIZE));
++ if (!videomemory)
++ goto err;
++
++ memset(videomemory, 0, UNIFB_MEMSIZE);
++
++ unifb_fix.smem_start = virt_to_phys(videomemory);
++ unifb_fix.smem_len = UNIFB_MEMSIZE;
++
++ iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
++ unifb_fix.mmio_start = iomem->start;
+
+ info = framebuffer_alloc(sizeof(u32)*256, &dev->dev);
+ if (!info)
+ goto err;
+
+- info->screen_base = (char __iomem *)KUSER_UNIGFX_BASE;
++ info->screen_base = (char __iomem *)videomemory;
+ info->fbops = &unifb_ops;
+
+ retval = fb_find_mode(&info->var, info, NULL,
+@@ -695,13 +708,6 @@ static int unifb_probe(struct platform_device *dev)
+ if (!retval || (retval == 4))
+ info->var = unifb_default;
+
+- iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
+- unifb_fix.mmio_start = iomem->start;
+-
+- mapmem = platform_get_resource(dev, IORESOURCE_MEM, 1);
+- unifb_fix.smem_start = mapmem->start;
+- unifb_fix.smem_len = UNIFB_MEMSIZE;
+-
+ info->fix = unifb_fix;
+ info->pseudo_palette = info->par;
+ info->par = NULL;commit 858e4f4ba14441c2d43eed55dcd660c09bae38df
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Tue Mar 29 20:38:51 2011 +0800
+
+ unicore32 rtc driver fix: cleanup irq_set_freq and irq_set_state
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/kernel/rtc.c b/arch/unicore32/kernel/rtc.c
+index c5f068295b51..8cad70b3302c 100644
+--- a/arch/unicore32/kernel/rtc.c
++++ b/arch/unicore32/kernel/rtc.c
+@@ -88,11 +88,6 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
+ return 0;
+ }
+
+-static int puv3_rtc_setfreq(struct device *dev, int freq)
+-{
+- return 0;
+-}
+-
+ /* Time read/write */
+
+ static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
+@@ -214,8 +209,6 @@ static const struct rtc_class_ops puv3_rtcops = {
+ .set_time = puv3_rtc_settime,
+ .read_alarm = puv3_rtc_getalarm,
+ .set_alarm = puv3_rtc_setalarm,
+- .irq_set_freq = puv3_rtc_setfreq,
+- .irq_set_state = puv3_rtc_setpie,
+ .proc = puv3_rtc_proc,
+ };
+
+@@ -294,8 +287,6 @@ static int puv3_rtc_probe(struct platform_device *pdev)
+
+ puv3_rtc_enable(pdev, 1);
+
+- puv3_rtc_setfreq(&pdev->dev, 1);
+-
+ /* register RTC and exit */
+
+ rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
+ commit 0bfdc8e121fd61adbc03848af3ca15fcbef2d1d8
+Author: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Tue Mar 29 22:17:42 2011 +0800
+
+ unicore32 fix: remove arch-specific futex support
+
+ The futex functions in unicore32 are not used and verified,
+ so just replaced by asm-generic version.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile
+index e08d6d370a8a..76a8beec7d03 100644
+--- a/arch/unicore32/Makefile
++++ b/arch/unicore32/Makefile
+@@ -48,7 +48,7 @@ ASM_GENERIC_HEADERS += bitsperlong.h bug.h bugs.h
+ ASM_GENERIC_HEADERS += cputime.h current.h
+ ASM_GENERIC_HEADERS += device.h div64.h
+ ASM_GENERIC_HEADERS += emergency-restart.h errno.h
+-ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h
++ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h futex.h
+ ASM_GENERIC_HEADERS += hardirq.h hw_irq.h
+ ASM_GENERIC_HEADERS += ioctl.h ioctls.h ipcbuf.h irq_regs.h
+ ASM_GENERIC_HEADERS += kdebug.h kmap_types.h
+diff --git a/arch/unicore32/include/asm/futex.h b/arch/unicore32/include/asm/futex.h
+deleted file mode 100644
+index 07dea6170558..000000000000
+--- a/arch/unicore32/include/asm/futex.h
++++ /dev/null
+@@ -1,143 +0,0 @@
+-/*
+- * linux/arch/unicore32/include/asm/futex.h
+- *
+- * Code specific to PKUnity SoC and UniCore ISA
+- *
+- * Copyright (C) 2001-2010 GUAN Xue-tao
+- *
+- * 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 __UNICORE_FUTEX_H__
+-#define __UNICORE_FUTEX_H__
+-
+-#ifdef __KERNEL__
+-
+-#include <linux/futex.h>
+-#include <linux/preempt.h>
+-#include <linux/uaccess.h>
+-#include <linux/errno.h>
+-
+-#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
+- __asm__ __volatile__( \
+- "1: ldw.u %1, [%2]\n" \
+- " " insn "\n" \
+- "2: stw.u %0, [%2]\n" \
+- " mov %0, #0\n" \
+- "3:\n" \
+- " .pushsection __ex_table,\"a\"\n" \
+- " .align 3\n" \
+- " .long 1b, 4f, 2b, 4f\n" \
+- " .popsection\n" \
+- " .pushsection .fixup,\"ax\"\n" \
+- "4: mov %0, %4\n" \
+- " b 3b\n" \
+- " .popsection" \
+- : "=&r" (ret), "=&r" (oldval) \
+- : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \
+- : "cc", "memory")
+-
+-static inline int
+-futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
+-{
+- int op = (encoded_op >> 28) & 7;
+- int cmp = (encoded_op >> 24) & 15;
+- int oparg = (encoded_op << 8) >> 20;
+- int cmparg = (encoded_op << 20) >> 20;
+- int oldval = 0, ret;
+-
+- if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
+- oparg = 1 << oparg;
+-
+- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+- return -EFAULT;
+-
+- pagefault_disable(); /* implies preempt_disable() */
+-
+- switch (op) {
+- case FUTEX_OP_SET:
+- __futex_atomic_op("mov %0, %3", ret, oldval, uaddr, oparg);
+- break;
+- case FUTEX_OP_ADD:
+- __futex_atomic_op("add %0, %1, %3", ret, oldval, uaddr, oparg);
+- break;
+- case FUTEX_OP_OR:
+- __futex_atomic_op("or %0, %1, %3", ret, oldval, uaddr, oparg);
+- break;
+- case FUTEX_OP_ANDN:
+- __futex_atomic_op("and %0, %1, %3",
+- ret, oldval, uaddr, ~oparg);
+- break;
+- case FUTEX_OP_XOR:
+- __futex_atomic_op("xor %0, %1, %3", ret, oldval, uaddr, oparg);
+- break;
+- default:
+- ret = -ENOSYS;
+- }
+-
+- pagefault_enable(); /* subsumes preempt_enable() */
+-
+- if (!ret) {
+- switch (cmp) {
+- case FUTEX_OP_CMP_EQ:
+- ret = (oldval == cmparg);
+- break;
+- case FUTEX_OP_CMP_NE:
+- ret = (oldval != cmparg);
+- break;
+- case FUTEX_OP_CMP_LT:
+- ret = (oldval < cmparg);
+- break;
+- case FUTEX_OP_CMP_GE:
+- ret = (oldval >= cmparg);
+- break;
+- case FUTEX_OP_CMP_LE:
+- ret = (oldval <= cmparg);
+- break;
+- case FUTEX_OP_CMP_GT:
+- ret = (oldval > cmparg);
+- break;
+- default:
+- ret = -ENOSYS;
+- }
+- }
+- return ret;
+-}
+-
+-static inline int
+-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
+-{
+- int val;
+-
+- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+- return -EFAULT;
+-
+- pagefault_disable(); /* implies preempt_disable() */
+-
+- __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
+- "1: ldw.u %0, [%3]\n"
+- " cmpxor.a %0, %1\n"
+- " bne 3f\n"
+- "2: stw.u %2, [%3]\n"
+- "3:\n"
+- " .pushsection __ex_table,\"a\"\n"
+- " .align 3\n"
+- " .long 1b, 4f, 2b, 4f\n"
+- " .popsection\n"
+- " .pushsection .fixup,\"ax\"\n"
+- "4: mov %0, %4\n"
+- " b 3b\n"
+- " .popsection"
+- : "=&r" (val)
+- : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
+- : "cc", "memory");
+-
+- pagefault_enable(); /* subsumes preempt_enable() */
+-
+- return val;
+-}
+-
+-#endif /* __KERNEL__ */
+-#endif /* __UNICORE_FUTEX_H__ */commit df93878c9623146de8050308d65bcfeea4fb0aca +Author: Guan Xuetao <gxt@mprc.pku.edu.cn> +Date: Tue Mar 29 21:30:04 2011 +0800 + + unicore32 ldscript fix: add cacheline parameter to PERCPU() macro + + Also, adjust cacheline parameter of RW_DATA_SECTION and EXCEPTION_TABLE + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/arch/unicore32/kernel/vmlinux.lds.S b/arch/unicore32/kernel/vmlinux.lds.S +index 0b4eb89729e7..9bf7f7af52c5 100644 +--- a/arch/unicore32/kernel/vmlinux.lds.S ++++ b/arch/unicore32/kernel/vmlinux.lds.S +@@ -14,6 +14,7 @@ + #include <asm/thread_info.h> + #include <asm/memory.h> + #include <asm/page.h> ++#include <asm/cache.h> + + OUTPUT_ARCH(unicore32) + ENTRY(stext) +@@ -29,7 +30,7 @@ SECTIONS + HEAD_TEXT_SECTION + INIT_TEXT_SECTION(PAGE_SIZE) + INIT_DATA_SECTION(16) +- PERCPU(PAGE_SIZE) ++ PERCPU(L1_CACHE_BYTES, PAGE_SIZE) + __init_end = .; + + _stext = .; +@@ -45,10 +46,10 @@ SECTIONS + + _sdata = .; + RO_DATA_SECTION(PAGE_SIZE) +- RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) ++ RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) + _edata = .; + +- EXCEPTION_TABLE(32) ++ EXCEPTION_TABLE(L1_CACHE_BYTES) + NOTES + + BSS_SECTION(0, 0, 0)
commit 289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Mar 4 20:00:11 2011 +0800
+
+ unicore32: rewrite arch-specific tlb.h to use asm-generic version
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/tlb.h b/arch/unicore32/include/asm/tlb.h
+index 02ee40e47a0d..9cca15cdae94 100644
+--- a/arch/unicore32/include/asm/tlb.h
++++ b/arch/unicore32/include/asm/tlb.h
+@@ -12,87 +12,17 @@
+ #ifndef __UNICORE_TLB_H__
+ #define __UNICORE_TLB_H__
+
+-#include <asm/cacheflush.h>
+-#include <asm/tlbflush.h>
+-#include <asm/pgalloc.h>
+-
+-/*
+- * TLB handling. This allows us to remove pages from the page
+- * tables, and efficiently handle the TLB issues.
+- */
+-struct mmu_gather {
+- struct mm_struct *mm;
+- unsigned int fullmm;
+- unsigned long range_start;
+- unsigned long range_end;
+-};
+-
+-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
+-
+-static inline struct mmu_gather *
+-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
+-{
+- struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
+-
+- tlb->mm = mm;
+- tlb->fullmm = full_mm_flush;
+-
+- return tlb;
+-}
+-
+-static inline void
+-tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
+-{
+- if (tlb->fullmm)
+- flush_tlb_mm(tlb->mm);
+-
+- /* keep the page table cache within bounds */
+- check_pgt_cache();
+-
+- put_cpu_var(mmu_gathers);
+-}
+-
+-/*
+- * Memorize the range for the TLB flush.
+- */
+-static inline void
+-tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long addr)
+-{
+- if (!tlb->fullmm) {
+- if (addr < tlb->range_start)
+- tlb->range_start = addr;
+- if (addr + PAGE_SIZE > tlb->range_end)
+- tlb->range_end = addr + PAGE_SIZE;
+- }
+-}
+-
+-/*
+- * In the case of tlb vma handling, we can optimise these away in the
+- * case where we're doing a full MM flush. When we're doing a munmap,
+- * the vmas are adjusted to only cover the region to be torn down.
+- */
+-static inline void
+-tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
+-{
+- if (!tlb->fullmm) {
+- flush_cache_range(vma, vma->vm_start, vma->vm_end);
+- tlb->range_start = TASK_SIZE;
+- tlb->range_end = 0;
+- }
+-}
+-
+-static inline void
+-tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
+-{
+- if (!tlb->fullmm && tlb->range_end > 0)
+- flush_tlb_range(vma, tlb->range_start, tlb->range_end);
+-}
+-
+-#define tlb_remove_page(tlb, page) free_page_and_swap_cache(page)
+-#define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep)
+-#define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp)
+-#define pud_free_tlb(tlb, x, addr) do { } while (0)
+-
+-#define tlb_migrate_finish(mm) do { } while (0)
++#define tlb_start_vma(tlb, vma) do { } while (0)
++#define tlb_end_vma(tlb, vma) do { } while (0)
++#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
++#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
++
++#define __pte_free_tlb(tlb, pte, addr) \
++ do { \
++ pgtable_page_dtor(pte); \
++ tlb_remove_page((tlb), (pte)); \
++ } while (0)
++
++#include <asm-generic/tlb.h>
+
+ #endifcommit 1cf46c42d7688a2e09de87fc9201b0e9a0961866
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Mar 4 18:07:48 2011 +0800
+
+ unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
+
+ 1. remove __REG macro
+ 2. add (void __iomem *) to io_p2v macro
+ 3. add (phys_addr_t) to io_v2p macro
+ 4. add PKUNITY_AHB_BASE and PKUNITY_APB_BASE definitions
+ 5. modify all PKUNITY_mmio_BASEs from physical addr to virtual addr
+ 6. adjust prefix macro for all usage of PKUNITY_mmio_BASEs
+ -- by advice with Arnd Bergmann
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
+index 2483fcbadbe4..4bd87f3d13d4 100644
+--- a/arch/unicore32/include/asm/io.h
++++ b/arch/unicore32/include/asm/io.h
+@@ -18,7 +18,7 @@
+ #include <asm/memory.h>
+ #include <asm/system.h>
+
+-#define PCI_IOBASE io_p2v(PKUNITY_PCILIO_BASE)
++#define PCI_IOBASE PKUNITY_PCILIO_BASE
+ #include <asm-generic/io.h>
+
+ /*
+diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h
+index 940e9ed0941c..a18bdc3810e6 100644
+--- a/arch/unicore32/include/mach/PKUnity.h
++++ b/arch/unicore32/include/mach/PKUnity.h
+@@ -22,83 +22,87 @@
+ */
+ #define PKUNITY_SDRAM_BASE 0x00000000 /* 0x00000000 - 0x7FFFFFFF 2GB */
+ #define PKUNITY_MMIO_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */
+-#define PKUNITY_PCI_BASE 0x80000000 /* 0x80000000 - 0xBFFFFFFF 1GB */
+-#include "regs-pci.h"
+-#define PKUNITY_BOOT_ROM2_BASE 0xF4000000 /* 0xF4000000 - 0xF7FFFFFF 64MB */
+-#define PKUNITY_BOOT_SRAM2_BASE 0xF8000000 /* 0xF8000000 - 0xFBFFFFFF 64MB */
+-#define PKUNITY_BOOT_FLASH_BASE 0xFC000000 /* 0xFC000000 - 0xFFFFFFFF 64MB */
+
+ /*
+ * PKUNITY Memory Map Addresses: 0x0D000000 - 0x0EFFFFFF (32MB)
++ * 0x0D000000 - 0x0DFFFFFF 16MB: for UVC
++ * 0x0E000000 - 0x0EFFFFFF 16MB: for UNIGFX
+ */
+-#define PKUNITY_UVC_MMAP_BASE 0x0D000000 /* 0x0D000000 - 0x0DFFFFFF 16MB */
++#define PKUNITY_UVC_MMAP_BASE 0x0D000000
+ #define PKUNITY_UVC_MMAP_SIZE 0x01000000 /* 16MB */
+-#define PKUNITY_UNIGFX_MMAP_BASE 0x0E000000 /* 0x0E000000 - 0x0EFFFFFF 16MB */
++#define PKUNITY_UNIGFX_MMAP_BASE 0x0E000000
+ #define PKUNITY_UNIGFX_MMAP_SIZE 0x01000000 /* 16MB */
+
+ /*
+ * PKUNITY System Bus Addresses (PCI): 0x80000000 - 0xBFFFFFFF (1GB)
++ * 0x80000000 - 0x8000000B 12B PCI Configuration regs
++ * 0x80010000 - 0x80010250 592B PCI Bridge Base
++ * 0x80030000 - 0x8003FFFF 64KB PCI Legacy IO
++ * 0x90000000 - 0x97FFFFFF 128MB PCI AHB-PCI MEM-mapping
++ * 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping
+ */
+-/* PCI Configuration regs */
+-#define PKUNITY_PCICFG_BASE 0x80000000 /* 0x80000000 - 0x8000000B 12B */
+-/* PCI Bridge Base */
+-#define PKUNITY_PCIBRI_BASE 0x80010000 /* 0x80010000 - 0x80010250 592B */
+-/* PCI Legacy IO */
+-#define PKUNITY_PCILIO_BASE 0x80030000 /* 0x80030000 - 0x8003FFFF 64KB */
+-/* PCI AHB-PCI MEM-mapping */
+-#define PKUNITY_PCIMEM_BASE 0x90000000 /* 0x90000000 - 0x97FFFFFF 128MB */
+-/* PCI PCI-AHB MEM-mapping */
+-#define PKUNITY_PCIAHB_BASE 0x98000000 /* 0x98000000 - 0x9FFFFFFF 128MB */
++#define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */
++#include "regs-pci.h"
++
++#define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0)
++#define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000)
++#define PKUNITY_PCILIO_BASE (PKUNITY_PCI_BASE + 0x00030000)
++#define PKUNITY_PCIMEM_BASE (PKUNITY_PCI_BASE + 0x10000000)
++#define PKUNITY_PCIAHB_BASE (PKUNITY_PCI_BASE + 0x18000000)
+
+ /*
+ * PKUNITY System Bus Addresses (AHB): 0xC0000000 - 0xEDFFFFFF (640MB)
+ */
++#define PKUNITY_AHB_BASE io_p2v(0xC0000000)
++
+ /* AHB-0 is DDR2 SDRAM */
+ /* AHB-1 is PCI Space */
+-#define PKUNITY_ARBITER_BASE 0xC0000000 /* AHB-2 */
+-#define PKUNITY_DDR2CTRL_BASE 0xC0100000 /* AHB-3 */
+-#define PKUNITY_DMAC_BASE 0xC0200000 /* AHB-4 */
++#define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */
++#define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */
++#define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */
+ #include "regs-dmac.h"
+-#define PKUNITY_UMAL_BASE 0xC0300000 /* AHB-5 */
++#define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */
+ #include "regs-umal.h"
+-#define PKUNITY_USB_BASE 0xC0400000 /* AHB-6 */
+-#define PKUNITY_SATA_BASE 0xC0500000 /* AHB-7 */
+-#define PKUNITY_SMC_BASE 0xC0600000 /* AHB-8 */
++#define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */
++#define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */
++#define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */
+ /* AHB-9 is for APB bridge */
+-#define PKUNITY_MME_BASE 0xC0700000 /* AHB-10 */
+-#define PKUNITY_UNIGFX_BASE 0xC0800000 /* AHB-11 */
++#define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */
++#define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */
+ #include "regs-unigfx.h"
+-#define PKUNITY_NAND_BASE 0xC0900000 /* AHB-12 */
++#define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */
+ #include "regs-nand.h"
+-#define PKUNITY_H264D_BASE 0xC0A00000 /* AHB-13 */
+-#define PKUNITY_H264E_BASE 0xC0B00000 /* AHB-14 */
++#define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */
++#define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */
+
+ /*
+ * PKUNITY Peripheral Bus Addresses (APB): 0xEE000000 - 0xEFFFFFFF (128MB)
+ */
+-#define PKUNITY_UART0_BASE 0xEE000000 /* APB-0 */
+-#define PKUNITY_UART1_BASE 0xEE100000 /* APB-1 */
++#define PKUNITY_APB_BASE io_p2v(0xEE000000)
++
++#define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */
++#define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */
+ #include "regs-uart.h"
+-#define PKUNITY_I2C_BASE 0xEE200000 /* APB-2 */
++#define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */
+ #include "regs-i2c.h"
+-#define PKUNITY_SPI_BASE 0xEE300000 /* APB-3 */
++#define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */
+ #include "regs-spi.h"
+-#define PKUNITY_AC97_BASE 0xEE400000 /* APB-4 */
++#define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */
+ #include "regs-ac97.h"
+-#define PKUNITY_GPIO_BASE 0xEE500000 /* APB-5 */
++#define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */
+ #include "regs-gpio.h"
+-#define PKUNITY_INTC_BASE 0xEE600000 /* APB-6 */
++#define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */
+ #include "regs-intc.h"
+-#define PKUNITY_RTC_BASE 0xEE700000 /* APB-7 */
++#define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */
+ #include "regs-rtc.h"
+-#define PKUNITY_OST_BASE 0xEE800000 /* APB-8 */
++#define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */
+ #include "regs-ost.h"
+-#define PKUNITY_RESETC_BASE 0xEE900000 /* APB-9 */
++#define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */
+ #include "regs-resetc.h"
+-#define PKUNITY_PM_BASE 0xEEA00000 /* APB-10 */
++#define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */
+ #include "regs-pm.h"
+-#define PKUNITY_PS2_BASE 0xEEB00000 /* APB-11 */
++#define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */
+ #include "regs-ps2.h"
+-#define PKUNITY_SDC_BASE 0xEEC00000 /* APB-12 */
++#define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */
+ #include "regs-sdc.h"
+
+diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h
+index b71405ab6de6..930bea6e129a 100644
+--- a/arch/unicore32/include/mach/hardware.h
++++ b/arch/unicore32/include/mach/hardware.h
+@@ -17,17 +17,16 @@
+
+ #include "PKUnity.h"
+
++#ifndef __ASSEMBLY__
++#define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE)
++#define io_v2p(x) (phys_addr_t)((x) + PKUNITY_MMIO_BASE)
++#else
+ #define io_p2v(x) ((x) - PKUNITY_MMIO_BASE)
+ #define io_v2p(x) ((x) + PKUNITY_MMIO_BASE)
+-
+-#ifndef __ASSEMBLY__
+-
+-# define __REG(x) (void __iomem *)io_p2v(x)
+-
+ #endif
+
+ #define PCIBIOS_MIN_IO 0x4000 /* should lower than 64KB */
+-#define PCIBIOS_MIN_MEM PKUNITY_PCIMEM_BASE
++#define PCIBIOS_MIN_MEM io_v2p(PKUNITY_PCIMEM_BASE)
+
+ /*
+ * We override the standard dma-mask routines for bouncing.
+diff --git a/arch/unicore32/include/mach/memory.h b/arch/unicore32/include/mach/memory.h
+index b774eff3ea65..0bf21c944710 100644
+--- a/arch/unicore32/include/mach/memory.h
++++ b/arch/unicore32/include/mach/memory.h
+@@ -45,8 +45,8 @@ void puv3_pci_adjust_zones(unsigned long *size, unsigned long *holes);
+ #define is_pcibus_device(dev) (dev && \
+ (strncmp(dev->bus->name, "pci", 3) == 0))
+
+-#define __virt_to_pcibus(x) (__virt_to_phys(x) + PKUNITY_PCIAHB_BASE)
+-#define __pcibus_to_virt(x) __phys_to_virt((x) - PKUNITY_PCIAHB_BASE)
++#define __virt_to_pcibus(x) (__virt_to_phys((x) + PKUNITY_PCIAHB_BASE))
++#define __pcibus_to_virt(x) (__phys_to_virt(x) - PKUNITY_PCIAHB_BASE)
+
+ /* kuser area */
+ #define KUSER_VECPAGE_BASE (KUSER_BASE + UL(0x3fff0000))
+diff --git a/arch/unicore32/include/mach/regs-ac97.h b/arch/unicore32/include/mach/regs-ac97.h
+index ce299bf4adae..b7563e9d6503 100644
+--- a/arch/unicore32/include/mach/regs-ac97.h
++++ b/arch/unicore32/include/mach/regs-ac97.h
+@@ -2,16 +2,16 @@
+ * PKUnity AC97 Registers
+ */
+
+-#define PKUNITY_AC97_CONR __REG(PKUNITY_AC97_BASE + 0x0000)
+-#define PKUNITY_AC97_OCR __REG(PKUNITY_AC97_BASE + 0x0004)
+-#define PKUNITY_AC97_ICR __REG(PKUNITY_AC97_BASE + 0x0008)
+-#define PKUNITY_AC97_CRAC __REG(PKUNITY_AC97_BASE + 0x000C)
+-#define PKUNITY_AC97_INTR __REG(PKUNITY_AC97_BASE + 0x0010)
+-#define PKUNITY_AC97_INTRSTAT __REG(PKUNITY_AC97_BASE + 0x0014)
+-#define PKUNITY_AC97_INTRCLEAR __REG(PKUNITY_AC97_BASE + 0x0018)
+-#define PKUNITY_AC97_ENABLE __REG(PKUNITY_AC97_BASE + 0x001C)
+-#define PKUNITY_AC97_OUT_FIFO __REG(PKUNITY_AC97_BASE + 0x0020)
+-#define PKUNITY_AC97_IN_FIFO __REG(PKUNITY_AC97_BASE + 0x0030)
++#define PKUNITY_AC97_CONR (PKUNITY_AC97_BASE + 0x0000)
++#define PKUNITY_AC97_OCR (PKUNITY_AC97_BASE + 0x0004)
++#define PKUNITY_AC97_ICR (PKUNITY_AC97_BASE + 0x0008)
++#define PKUNITY_AC97_CRAC (PKUNITY_AC97_BASE + 0x000C)
++#define PKUNITY_AC97_INTR (PKUNITY_AC97_BASE + 0x0010)
++#define PKUNITY_AC97_INTRSTAT (PKUNITY_AC97_BASE + 0x0014)
++#define PKUNITY_AC97_INTRCLEAR (PKUNITY_AC97_BASE + 0x0018)
++#define PKUNITY_AC97_ENABLE (PKUNITY_AC97_BASE + 0x001C)
++#define PKUNITY_AC97_OUT_FIFO (PKUNITY_AC97_BASE + 0x0020)
++#define PKUNITY_AC97_IN_FIFO (PKUNITY_AC97_BASE + 0x0030)
+
+ #define AC97_CODEC_REG(v) FIELD((v), 7, 16)
+ #define AC97_CODEC_VAL(v) FIELD((v), 16, 0)
+diff --git a/arch/unicore32/include/mach/regs-dmac.h b/arch/unicore32/include/mach/regs-dmac.h
+index 09fce9d0d640..66de9e7d1c8f 100644
+--- a/arch/unicore32/include/mach/regs-dmac.h
++++ b/arch/unicore32/include/mach/regs-dmac.h
+@@ -5,27 +5,27 @@
+ /*
+ * Interrupt Status Reg DMAC_ISR.
+ */
+-#define DMAC_ISR __REG(PKUNITY_DMAC_BASE + 0x0020)
++#define DMAC_ISR (PKUNITY_DMAC_BASE + 0x0020)
+ /*
+ * Interrupt Transfer Complete Status Reg DMAC_ITCSR.
+ */
+-#define DMAC_ITCSR __REG(PKUNITY_DMAC_BASE + 0x0050)
++#define DMAC_ITCSR (PKUNITY_DMAC_BASE + 0x0050)
+ /*
+ * Interrupt Transfer Complete Clear Reg DMAC_ITCCR.
+ */
+-#define DMAC_ITCCR __REG(PKUNITY_DMAC_BASE + 0x0060)
++#define DMAC_ITCCR (PKUNITY_DMAC_BASE + 0x0060)
+ /*
+ * Interrupt Error Status Reg DMAC_IESR.
+ */
+-#define DMAC_IESR __REG(PKUNITY_DMAC_BASE + 0x0080)
++#define DMAC_IESR (PKUNITY_DMAC_BASE + 0x0080)
+ /*
+ * Interrupt Error Clear Reg DMAC_IECR.
+ */
+-#define DMAC_IECR __REG(PKUNITY_DMAC_BASE + 0x0090)
++#define DMAC_IECR (PKUNITY_DMAC_BASE + 0x0090)
+ /*
+ * Enable Channels Reg DMAC_ENCH.
+ */
+-#define DMAC_ENCH __REG(PKUNITY_DMAC_BASE + 0x00B0)
++#define DMAC_ENCH (PKUNITY_DMAC_BASE + 0x00B0)
+
+ /*
+ * DMA control reg. Space [byte]
+@@ -35,19 +35,19 @@
+ /*
+ * Source Addr DMAC_SRCADDR(ch).
+ */
+-#define DMAC_SRCADDR(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x00)
++#define DMAC_SRCADDR(ch) (PKUNITY_DMAC_BASE + (ch)*DMASp + 0x00)
+ /*
+ * Destination Addr DMAC_DESTADDR(ch).
+ */
+-#define DMAC_DESTADDR(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x04)
++#define DMAC_DESTADDR(ch) (PKUNITY_DMAC_BASE + (ch)*DMASp + 0x04)
+ /*
+ * Control Reg DMAC_CONTROL(ch).
+ */
+-#define DMAC_CONTROL(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x0C)
++#define DMAC_CONTROL(ch) (PKUNITY_DMAC_BASE + (ch)*DMASp + 0x0C)
+ /*
+ * Configuration Reg DMAC_CONFIG(ch).
+ */
+-#define DMAC_CONFIG(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x10)
++#define DMAC_CONFIG(ch) (PKUNITY_DMAC_BASE + (ch)*DMASp + 0x10)
+
+ #define DMAC_IR_MASK FMASK(6, 0)
+ /*
+diff --git a/arch/unicore32/include/mach/regs-gpio.h b/arch/unicore32/include/mach/regs-gpio.h
+index 5dd99d4c209e..0273b861ef96 100644
+--- a/arch/unicore32/include/mach/regs-gpio.h
++++ b/arch/unicore32/include/mach/regs-gpio.h
+@@ -5,35 +5,35 @@
+ /*
+ * Voltage Status Reg GPIO_GPLR.
+ */
+-#define GPIO_GPLR __REG(PKUNITY_GPIO_BASE + 0x0000)
++#define GPIO_GPLR (PKUNITY_GPIO_BASE + 0x0000)
+ /*
+ * Pin Direction Reg GPIO_GPDR.
+ */
+-#define GPIO_GPDR __REG(PKUNITY_GPIO_BASE + 0x0004)
++#define GPIO_GPDR (PKUNITY_GPIO_BASE + 0x0004)
+ /*
+ * Output Pin Set Reg GPIO_GPSR.
+ */
+-#define GPIO_GPSR __REG(PKUNITY_GPIO_BASE + 0x0008)
++#define GPIO_GPSR (PKUNITY_GPIO_BASE + 0x0008)
+ /*
+ * Output Pin Clear Reg GPIO_GPCR.
+ */
+-#define GPIO_GPCR __REG(PKUNITY_GPIO_BASE + 0x000C)
++#define GPIO_GPCR (PKUNITY_GPIO_BASE + 0x000C)
+ /*
+ * Raise Edge Detect Reg GPIO_GRER.
+ */
+-#define GPIO_GRER __REG(PKUNITY_GPIO_BASE + 0x0010)
++#define GPIO_GRER (PKUNITY_GPIO_BASE + 0x0010)
+ /*
+ * Fall Edge Detect Reg GPIO_GFER.
+ */
+-#define GPIO_GFER __REG(PKUNITY_GPIO_BASE + 0x0014)
++#define GPIO_GFER (PKUNITY_GPIO_BASE + 0x0014)
+ /*
+ * Edge Status Reg GPIO_GEDR.
+ */
+-#define GPIO_GEDR __REG(PKUNITY_GPIO_BASE + 0x0018)
++#define GPIO_GEDR (PKUNITY_GPIO_BASE + 0x0018)
+ /*
+ * Sepcial Voltage Detect Reg GPIO_GPIR.
+ */
+-#define GPIO_GPIR __REG(PKUNITY_GPIO_BASE + 0x0020)
++#define GPIO_GPIR (PKUNITY_GPIO_BASE + 0x0020)
+
+ #define GPIO_MIN (0)
+ #define GPIO_MAX (27)
+diff --git a/arch/unicore32/include/mach/regs-i2c.h b/arch/unicore32/include/mach/regs-i2c.h
+index 70b704f8dda8..463d108f8bfb 100644
+--- a/arch/unicore32/include/mach/regs-i2c.h
++++ b/arch/unicore32/include/mach/regs-i2c.h
+@@ -5,35 +5,35 @@
+ /*
+ * Control Reg I2C_CON.
+ */
+-#define I2C_CON __REG(PKUNITY_I2C_BASE + 0x0000)
++#define I2C_CON (PKUNITY_I2C_BASE + 0x0000)
+ /*
+ * Target Address Reg I2C_TAR.
+ */
+-#define I2C_TAR __REG(PKUNITY_I2C_BASE + 0x0004)
++#define I2C_TAR (PKUNITY_I2C_BASE + 0x0004)
+ /*
+ * Data buffer and command Reg I2C_DATACMD.
+ */
+-#define I2C_DATACMD __REG(PKUNITY_I2C_BASE + 0x0010)
++#define I2C_DATACMD (PKUNITY_I2C_BASE + 0x0010)
+ /*
+ * Enable Reg I2C_ENABLE.
+ */
+-#define I2C_ENABLE __REG(PKUNITY_I2C_BASE + 0x006C)
++#define I2C_ENABLE (PKUNITY_I2C_BASE + 0x006C)
+ /*
+ * Status Reg I2C_STATUS.
+ */
+-#define I2C_STATUS __REG(PKUNITY_I2C_BASE + 0x0070)
++#define I2C_STATUS (PKUNITY_I2C_BASE + 0x0070)
+ /*
+ * Tx FIFO Length Reg I2C_TXFLR.
+ */
+-#define I2C_TXFLR __REG(PKUNITY_I2C_BASE + 0x0074)
++#define I2C_TXFLR (PKUNITY_I2C_BASE + 0x0074)
+ /*
+ * Rx FIFO Length Reg I2C_RXFLR.
+ */
+-#define I2C_RXFLR __REG(PKUNITY_I2C_BASE + 0x0078)
++#define I2C_RXFLR (PKUNITY_I2C_BASE + 0x0078)
+ /*
+ * Enable Status Reg I2C_ENSTATUS.
+ */
+-#define I2C_ENSTATUS __REG(PKUNITY_I2C_BASE + 0x009C)
++#define I2C_ENSTATUS (PKUNITY_I2C_BASE + 0x009C)
+
+ #define I2C_CON_MASTER FIELD(1, 1, 0)
+ #define I2C_CON_SPEED_STD FIELD(1, 2, 1)
+diff --git a/arch/unicore32/include/mach/regs-intc.h b/arch/unicore32/include/mach/regs-intc.h
+index 409ae4776145..25648f89cbd3 100644
+--- a/arch/unicore32/include/mach/regs-intc.h
++++ b/arch/unicore32/include/mach/regs-intc.h
+@@ -4,25 +4,25 @@
+ /*
+ * INTC Level Reg INTC_ICLR.
+ */
+-#define INTC_ICLR __REG(PKUNITY_INTC_BASE + 0x0000)
++#define INTC_ICLR (PKUNITY_INTC_BASE + 0x0000)
+ /*
+ * INTC Mask Reg INTC_ICMR.
+ */
+-#define INTC_ICMR __REG(PKUNITY_INTC_BASE + 0x0004)
++#define INTC_ICMR (PKUNITY_INTC_BASE + 0x0004)
+ /*
+ * INTC Pending Reg INTC_ICPR.
+ */
+-#define INTC_ICPR __REG(PKUNITY_INTC_BASE + 0x0008)
++#define INTC_ICPR (PKUNITY_INTC_BASE + 0x0008)
+ /*
+ * INTC IRQ Pending Reg INTC_ICIP.
+ */
+-#define INTC_ICIP __REG(PKUNITY_INTC_BASE + 0x000C)
++#define INTC_ICIP (PKUNITY_INTC_BASE + 0x000C)
+ /*
+ * INTC REAL Pending Reg INTC_ICFP.
+ */
+-#define INTC_ICFP __REG(PKUNITY_INTC_BASE + 0x0010)
++#define INTC_ICFP (PKUNITY_INTC_BASE + 0x0010)
+ /*
+ * INTC Control Reg INTC_ICCR.
+ */
+-#define INTC_ICCR __REG(PKUNITY_INTC_BASE + 0x0014)
++#define INTC_ICCR (PKUNITY_INTC_BASE + 0x0014)
+
+diff --git a/arch/unicore32/include/mach/regs-nand.h b/arch/unicore32/include/mach/regs-nand.h
+index 0c33fe8c3090..a7c5563bb550 100644
+--- a/arch/unicore32/include/mach/regs-nand.h
++++ b/arch/unicore32/include/mach/regs-nand.h
+@@ -4,67 +4,67 @@
+ /*
+ * ID Reg. 0 NAND_IDR0
+ */
+-#define NAND_IDR0 __REG(PKUNITY_NAND_BASE + 0x0000)
++#define NAND_IDR0 (PKUNITY_NAND_BASE + 0x0000)
+ /*
+ * ID Reg. 1 NAND_IDR1
+ */
+-#define NAND_IDR1 __REG(PKUNITY_NAND_BASE + 0x0004)
++#define NAND_IDR1 (PKUNITY_NAND_BASE + 0x0004)
+ /*
+ * ID Reg. 2 NAND_IDR2
+ */
+-#define NAND_IDR2 __REG(PKUNITY_NAND_BASE + 0x0008)
++#define NAND_IDR2 (PKUNITY_NAND_BASE + 0x0008)
+ /*
+ * ID Reg. 3 NAND_IDR3
+ */
+-#define NAND_IDR3 __REG(PKUNITY_NAND_BASE + 0x000C)
++#define NAND_IDR3 (PKUNITY_NAND_BASE + 0x000C)
+ /*
+ * Page Address Reg 0 NAND_PAR0
+ */
+-#define NAND_PAR0 __REG(PKUNITY_NAND_BASE + 0x0010)
++#define NAND_PAR0 (PKUNITY_NAND_BASE + 0x0010)
+ /*
+ * Page Address Reg 1 NAND_PAR1
+ */
+-#define NAND_PAR1 __REG(PKUNITY_NAND_BASE + 0x0014)
++#define NAND_PAR1 (PKUNITY_NAND_BASE + 0x0014)
+ /*
+ * Page Address Reg 2 NAND_PAR2
+ */
+-#define NAND_PAR2 __REG(PKUNITY_NAND_BASE + 0x0018)
++#define NAND_PAR2 (PKUNITY_NAND_BASE + 0x0018)
+ /*
+ * ECC Enable Reg NAND_ECCEN
+ */
+-#define NAND_ECCEN __REG(PKUNITY_NAND_BASE + 0x001C)
++#define NAND_ECCEN (PKUNITY_NAND_BASE + 0x001C)
+ /*
+ * Buffer Reg NAND_BUF
+ */
+-#define NAND_BUF __REG(PKUNITY_NAND_BASE + 0x0020)
++#define NAND_BUF (PKUNITY_NAND_BASE + 0x0020)
+ /*
+ * ECC Status Reg NAND_ECCSR
+ */
+-#define NAND_ECCSR __REG(PKUNITY_NAND_BASE + 0x0024)
++#define NAND_ECCSR (PKUNITY_NAND_BASE + 0x0024)
+ /*
+ * Command Reg NAND_CMD
+ */
+-#define NAND_CMD __REG(PKUNITY_NAND_BASE + 0x0028)
++#define NAND_CMD (PKUNITY_NAND_BASE + 0x0028)
+ /*
+ * DMA Configure Reg NAND_DMACR
+ */
+-#define NAND_DMACR __REG(PKUNITY_NAND_BASE + 0x002C)
++#define NAND_DMACR (PKUNITY_NAND_BASE + 0x002C)
+ /*
+ * Interrupt Reg NAND_IR
+ */
+-#define NAND_IR __REG(PKUNITY_NAND_BASE + 0x0030)
++#define NAND_IR (PKUNITY_NAND_BASE + 0x0030)
+ /*
+ * Interrupt Mask Reg NAND_IMR
+ */
+-#define NAND_IMR __REG(PKUNITY_NAND_BASE + 0x0034)
++#define NAND_IMR (PKUNITY_NAND_BASE + 0x0034)
+ /*
+ * Chip Enable Reg NAND_CHIPEN
+ */
+-#define NAND_CHIPEN __REG(PKUNITY_NAND_BASE + 0x0038)
++#define NAND_CHIPEN (PKUNITY_NAND_BASE + 0x0038)
+ /*
+ * Address Reg NAND_ADDR
+ */
+-#define NAND_ADDR __REG(PKUNITY_NAND_BASE + 0x003C)
++#define NAND_ADDR (PKUNITY_NAND_BASE + 0x003C)
+
+ /*
+ * Command bits NAND_CMD_CMD_MASK
+diff --git a/arch/unicore32/include/mach/regs-ost.h b/arch/unicore32/include/mach/regs-ost.h
+index 33049a827518..7b91fe698eed 100644
+--- a/arch/unicore32/include/mach/regs-ost.h
++++ b/arch/unicore32/include/mach/regs-ost.h
+@@ -4,47 +4,47 @@
+ /*
+ * Match Reg 0 OST_OSMR0
+ */
+-#define OST_OSMR0 __REG(PKUNITY_OST_BASE + 0x0000)
++#define OST_OSMR0 (PKUNITY_OST_BASE + 0x0000)
+ /*
+ * Match Reg 1 OST_OSMR1
+ */
+-#define OST_OSMR1 __REG(PKUNITY_OST_BASE + 0x0004)
++#define OST_OSMR1 (PKUNITY_OST_BASE + 0x0004)
+ /*
+ * Match Reg 2 OST_OSMR2
+ */
+-#define OST_OSMR2 __REG(PKUNITY_OST_BASE + 0x0008)
++#define OST_OSMR2 (PKUNITY_OST_BASE + 0x0008)
+ /*
+ * Match Reg 3 OST_OSMR3
+ */
+-#define OST_OSMR3 __REG(PKUNITY_OST_BASE + 0x000C)
++#define OST_OSMR3 (PKUNITY_OST_BASE + 0x000C)
+ /*
+ * Counter Reg OST_OSCR
+ */
+-#define OST_OSCR __REG(PKUNITY_OST_BASE + 0x0010)
++#define OST_OSCR (PKUNITY_OST_BASE + 0x0010)
+ /*
+ * Status Reg OST_OSSR
+ */
+-#define OST_OSSR __REG(PKUNITY_OST_BASE + 0x0014)
++#define OST_OSSR (PKUNITY_OST_BASE + 0x0014)
+ /*
+ * Watchdog Enable Reg OST_OWER
+ */
+-#define OST_OWER __REG(PKUNITY_OST_BASE + 0x0018)
++#define OST_OWER (PKUNITY_OST_BASE + 0x0018)
+ /*
+ * Interrupt Enable Reg OST_OIER
+ */
+-#define OST_OIER __REG(PKUNITY_OST_BASE + 0x001C)
++#define OST_OIER (PKUNITY_OST_BASE + 0x001C)
+ /*
+ * PWM Pulse Width Control Reg OST_PWMPWCR
+ */
+-#define OST_PWMPWCR __REG(PKUNITY_OST_BASE + 0x0080)
++#define OST_PWMPWCR (PKUNITY_OST_BASE + 0x0080)
+ /*
+ * PWM Duty Cycle Control Reg OST_PWMDCCR
+ */
+-#define OST_PWMDCCR __REG(PKUNITY_OST_BASE + 0x0084)
++#define OST_PWMDCCR (PKUNITY_OST_BASE + 0x0084)
+ /*
+ * PWM Period Control Reg OST_PWMPCR
+ */
+-#define OST_PWMPCR __REG(PKUNITY_OST_BASE + 0x0088)
++#define OST_PWMPCR (PKUNITY_OST_BASE + 0x0088)
+
+ /*
+ * Match detected 0 OST_OSSR_M0
+diff --git a/arch/unicore32/include/mach/regs-pci.h b/arch/unicore32/include/mach/regs-pci.h
+index e8e1f1a52fd0..6a9341686bf8 100644
+--- a/arch/unicore32/include/mach/regs-pci.h
++++ b/arch/unicore32/include/mach/regs-pci.h
+@@ -8,79 +8,79 @@
+ /*
+ * PCICFG Bridge Base Reg.
+ */
+-#define PCICFG_BRIBASE __REG(PKUNITY_PCICFG_BASE + 0x0000)
++#define PCICFG_BRIBASE (PKUNITY_PCICFG_BASE + 0x0000)
+ /*
+ * PCICFG Address Reg.
+ */
+-#define PCICFG_ADDR __REG(PKUNITY_PCICFG_BASE + 0x0004)
++#define PCICFG_ADDR (PKUNITY_PCICFG_BASE + 0x0004)
+ /*
+ * PCICFG Address Reg.
+ */
+-#define PCICFG_DATA __REG(PKUNITY_PCICFG_BASE + 0x0008)
++#define PCICFG_DATA (PKUNITY_PCICFG_BASE + 0x0008)
+
+ /*
+ * PCI Bridge configuration space
+ */
+-#define PCIBRI_ID __REG(PKUNITY_PCIBRI_BASE + 0x0000)
+-#define PCIBRI_CMD __REG(PKUNITY_PCIBRI_BASE + 0x0004)
+-#define PCIBRI_CLASS __REG(PKUNITY_PCIBRI_BASE + 0x0008)
+-#define PCIBRI_LTR __REG(PKUNITY_PCIBRI_BASE + 0x000C)
+-#define PCIBRI_BAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0010)
+-#define PCIBRI_BAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0014)
+-#define PCIBRI_BAR2 __REG(PKUNITY_PCIBRI_BASE + 0x0018)
+-#define PCIBRI_BAR3 __REG(PKUNITY_PCIBRI_BASE + 0x001C)
+-#define PCIBRI_BAR4 __REG(PKUNITY_PCIBRI_BASE + 0x0020)
+-#define PCIBRI_BAR5 __REG(PKUNITY_PCIBRI_BASE + 0x0024)
++#define PCIBRI_ID (PKUNITY_PCIBRI_BASE + 0x0000)
++#define PCIBRI_CMD (PKUNITY_PCIBRI_BASE + 0x0004)
++#define PCIBRI_CLASS (PKUNITY_PCIBRI_BASE + 0x0008)
++#define PCIBRI_LTR (PKUNITY_PCIBRI_BASE + 0x000C)
++#define PCIBRI_BAR0 (PKUNITY_PCIBRI_BASE + 0x0010)
++#define PCIBRI_BAR1 (PKUNITY_PCIBRI_BASE + 0x0014)
++#define PCIBRI_BAR2 (PKUNITY_PCIBRI_BASE + 0x0018)
++#define PCIBRI_BAR3 (PKUNITY_PCIBRI_BASE + 0x001C)
++#define PCIBRI_BAR4 (PKUNITY_PCIBRI_BASE + 0x0020)
++#define PCIBRI_BAR5 (PKUNITY_PCIBRI_BASE + 0x0024)
+
+-#define PCIBRI_PCICTL0 __REG(PKUNITY_PCIBRI_BASE + 0x0100)
+-#define PCIBRI_PCIBAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0104)
+-#define PCIBRI_PCIAMR0 __REG(PKUNITY_PCIBRI_BASE + 0x0108)
+-#define PCIBRI_PCITAR0 __REG(PKUNITY_PCIBRI_BASE + 0x010C)
+-#define PCIBRI_PCICTL1 __REG(PKUNITY_PCIBRI_BASE + 0x0110)
+-#define PCIBRI_PCIBAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0114)
+-#define PCIBRI_PCIAMR1 __REG(PKUNITY_PCIBRI_BASE + 0x0118)
+-#define PCIBRI_PCITAR1 __REG(PKUNITY_PCIBRI_BASE + 0x011C)
+-#define PCIBRI_PCICTL2 __REG(PKUNITY_PCIBRI_BASE + 0x0120)
+-#define PCIBRI_PCIBAR2 __REG(PKUNITY_PCIBRI_BASE + 0x0124)
+-#define PCIBRI_PCIAMR2 __REG(PKUNITY_PCIBRI_BASE + 0x0128)
+-#define PCIBRI_PCITAR2 __REG(PKUNITY_PCIBRI_BASE + 0x012C)
+-#define PCIBRI_PCICTL3 __REG(PKUNITY_PCIBRI_BASE + 0x0130)
+-#define PCIBRI_PCIBAR3 __REG(PKUNITY_PCIBRI_BASE + 0x0134)
+-#define PCIBRI_PCIAMR3 __REG(PKUNITY_PCIBRI_BASE + 0x0138)
+-#define PCIBRI_PCITAR3 __REG(PKUNITY_PCIBRI_BASE + 0x013C)
+-#define PCIBRI_PCICTL4 __REG(PKUNITY_PCIBRI_BASE + 0x0140)
+-#define PCIBRI_PCIBAR4 __REG(PKUNITY_PCIBRI_BASE + 0x0144)
+-#define PCIBRI_PCIAMR4 __REG(PKUNITY_PCIBRI_BASE + 0x0148)
+-#define PCIBRI_PCITAR4 __REG(PKUNITY_PCIBRI_BASE + 0x014C)
+-#define PCIBRI_PCICTL5 __REG(PKUNITY_PCIBRI_BASE + 0x0150)
+-#define PCIBRI_PCIBAR5 __REG(PKUNITY_PCIBRI_BASE + 0x0154)
+-#define PCIBRI_PCIAMR5 __REG(PKUNITY_PCIBRI_BASE + 0x0158)
+-#define PCIBRI_PCITAR5 __REG(PKUNITY_PCIBRI_BASE + 0x015C)
++#define PCIBRI_PCICTL0 (PKUNITY_PCIBRI_BASE + 0x0100)
++#define PCIBRI_PCIBAR0 (PKUNITY_PCIBRI_BASE + 0x0104)
++#define PCIBRI_PCIAMR0 (PKUNITY_PCIBRI_BASE + 0x0108)
++#define PCIBRI_PCITAR0 (PKUNITY_PCIBRI_BASE + 0x010C)
++#define PCIBRI_PCICTL1 (PKUNITY_PCIBRI_BASE + 0x0110)
++#define PCIBRI_PCIBAR1 (PKUNITY_PCIBRI_BASE + 0x0114)
++#define PCIBRI_PCIAMR1 (PKUNITY_PCIBRI_BASE + 0x0118)
++#define PCIBRI_PCITAR1 (PKUNITY_PCIBRI_BASE + 0x011C)
++#define PCIBRI_PCICTL2 (PKUNITY_PCIBRI_BASE + 0x0120)
++#define PCIBRI_PCIBAR2 (PKUNITY_PCIBRI_BASE + 0x0124)
++#define PCIBRI_PCIAMR2 (PKUNITY_PCIBRI_BASE + 0x0128)
++#define PCIBRI_PCITAR2 (PKUNITY_PCIBRI_BASE + 0x012C)
++#define PCIBRI_PCICTL3 (PKUNITY_PCIBRI_BASE + 0x0130)
++#define PCIBRI_PCIBAR3 (PKUNITY_PCIBRI_BASE + 0x0134)
++#define PCIBRI_PCIAMR3 (PKUNITY_PCIBRI_BASE + 0x0138)
++#define PCIBRI_PCITAR3 (PKUNITY_PCIBRI_BASE + 0x013C)
++#define PCIBRI_PCICTL4 (PKUNITY_PCIBRI_BASE + 0x0140)
++#define PCIBRI_PCIBAR4 (PKUNITY_PCIBRI_BASE + 0x0144)
++#define PCIBRI_PCIAMR4 (PKUNITY_PCIBRI_BASE + 0x0148)
++#define PCIBRI_PCITAR4 (PKUNITY_PCIBRI_BASE + 0x014C)
++#define PCIBRI_PCICTL5 (PKUNITY_PCIBRI_BASE + 0x0150)
++#define PCIBRI_PCIBAR5 (PKUNITY_PCIBRI_BASE + 0x0154)
++#define PCIBRI_PCIAMR5 (PKUNITY_PCIBRI_BASE + 0x0158)
++#define PCIBRI_PCITAR5 (PKUNITY_PCIBRI_BASE + 0x015C)
+
+-#define PCIBRI_AHBCTL0 __REG(PKUNITY_PCIBRI_BASE + 0x0180)
+-#define PCIBRI_AHBBAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0184)
+-#define PCIBRI_AHBAMR0 __REG(PKUNITY_PCIBRI_BASE + 0x0188)
+-#define PCIBRI_AHBTAR0 __REG(PKUNITY_PCIBRI_BASE + 0x018C)
+-#define PCIBRI_AHBCTL1 __REG(PKUNITY_PCIBRI_BASE + 0x0190)
+-#define PCIBRI_AHBBAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0194)
+-#define PCIBRI_AHBAMR1 __REG(PKUNITY_PCIBRI_BASE + 0x0198)
+-#define PCIBRI_AHBTAR1 __REG(PKUNITY_PCIBRI_BASE + 0x019C)
+-#define PCIBRI_AHBCTL2 __REG(PKUNITY_PCIBRI_BASE + 0x01A0)
+-#define PCIBRI_AHBBAR2 __REG(PKUNITY_PCIBRI_BASE + 0x01A4)
+-#define PCIBRI_AHBAMR2 __REG(PKUNITY_PCIBRI_BASE + 0x01A8)
+-#define PCIBRI_AHBTAR2 __REG(PKUNITY_PCIBRI_BASE + 0x01AC)
+-#define PCIBRI_AHBCTL3 __REG(PKUNITY_PCIBRI_BASE + 0x01B0)
+-#define PCIBRI_AHBBAR3 __REG(PKUNITY_PCIBRI_BASE + 0x01B4)
+-#define PCIBRI_AHBAMR3 __REG(PKUNITY_PCIBRI_BASE + 0x01B8)
+-#define PCIBRI_AHBTAR3 __REG(PKUNITY_PCIBRI_BASE + 0x01BC)
+-#define PCIBRI_AHBCTL4 __REG(PKUNITY_PCIBRI_BASE + 0x01C0)
+-#define PCIBRI_AHBBAR4 __REG(PKUNITY_PCIBRI_BASE + 0x01C4)
+-#define PCIBRI_AHBAMR4 __REG(PKUNITY_PCIBRI_BASE + 0x01C8)
+-#define PCIBRI_AHBTAR4 __REG(PKUNITY_PCIBRI_BASE + 0x01CC)
+-#define PCIBRI_AHBCTL5 __REG(PKUNITY_PCIBRI_BASE + 0x01D0)
+-#define PCIBRI_AHBBAR5 __REG(PKUNITY_PCIBRI_BASE + 0x01D4)
+-#define PCIBRI_AHBAMR5 __REG(PKUNITY_PCIBRI_BASE + 0x01D8)
+-#define PCIBRI_AHBTAR5 __REG(PKUNITY_PCIBRI_BASE + 0x01DC)
++#define PCIBRI_AHBCTL0 (PKUNITY_PCIBRI_BASE + 0x0180)
++#define PCIBRI_AHBBAR0 (PKUNITY_PCIBRI_BASE + 0x0184)
++#define PCIBRI_AHBAMR0 (PKUNITY_PCIBRI_BASE + 0x0188)
++#define PCIBRI_AHBTAR0 (PKUNITY_PCIBRI_BASE + 0x018C)
++#define PCIBRI_AHBCTL1 (PKUNITY_PCIBRI_BASE + 0x0190)
++#define PCIBRI_AHBBAR1 (PKUNITY_PCIBRI_BASE + 0x0194)
++#define PCIBRI_AHBAMR1 (PKUNITY_PCIBRI_BASE + 0x0198)
++#define PCIBRI_AHBTAR1 (PKUNITY_PCIBRI_BASE + 0x019C)
++#define PCIBRI_AHBCTL2 (PKUNITY_PCIBRI_BASE + 0x01A0)
++#define PCIBRI_AHBBAR2 (PKUNITY_PCIBRI_BASE + 0x01A4)
++#define PCIBRI_AHBAMR2 (PKUNITY_PCIBRI_BASE + 0x01A8)
++#define PCIBRI_AHBTAR2 (PKUNITY_PCIBRI_BASE + 0x01AC)
++#define PCIBRI_AHBCTL3 (PKUNITY_PCIBRI_BASE + 0x01B0)
++#define PCIBRI_AHBBAR3 (PKUNITY_PCIBRI_BASE + 0x01B4)
++#define PCIBRI_AHBAMR3 (PKUNITY_PCIBRI_BASE + 0x01B8)
++#define PCIBRI_AHBTAR3 (PKUNITY_PCIBRI_BASE + 0x01BC)
++#define PCIBRI_AHBCTL4 (PKUNITY_PCIBRI_BASE + 0x01C0)
++#define PCIBRI_AHBBAR4 (PKUNITY_PCIBRI_BASE + 0x01C4)
++#define PCIBRI_AHBAMR4 (PKUNITY_PCIBRI_BASE + 0x01C8)
++#define PCIBRI_AHBTAR4 (PKUNITY_PCIBRI_BASE + 0x01CC)
++#define PCIBRI_AHBCTL5 (PKUNITY_PCIBRI_BASE + 0x01D0)
++#define PCIBRI_AHBBAR5 (PKUNITY_PCIBRI_BASE + 0x01D4)
++#define PCIBRI_AHBAMR5 (PKUNITY_PCIBRI_BASE + 0x01D8)
++#define PCIBRI_AHBTAR5 (PKUNITY_PCIBRI_BASE + 0x01DC)
+
+ #define PCIBRI_CTLx_AT FIELD(1, 1, 2)
+ #define PCIBRI_CTLx_PREF FIELD(1, 1, 1)
+diff --git a/arch/unicore32/include/mach/regs-pm.h b/arch/unicore32/include/mach/regs-pm.h
+index ed2d2fc6ad0c..854844aa8f4b 100644
+--- a/arch/unicore32/include/mach/regs-pm.h
++++ b/arch/unicore32/include/mach/regs-pm.h
+@@ -4,75 +4,75 @@
+ /*
+ * PM Control Reg PM_PMCR
+ */
+-#define PM_PMCR __REG(PKUNITY_PM_BASE + 0x0000)
++#define PM_PMCR (PKUNITY_PM_BASE + 0x0000)
+ /*
+ * PM General Conf. Reg PM_PGCR
+ */
+-#define PM_PGCR __REG(PKUNITY_PM_BASE + 0x0004)
++#define PM_PGCR (PKUNITY_PM_BASE + 0x0004)
+ /*
+ * PM PLL Conf. Reg PM_PPCR
+ */
+-#define PM_PPCR __REG(PKUNITY_PM_BASE + 0x0008)
++#define PM_PPCR (PKUNITY_PM_BASE + 0x0008)
+ /*
+ * PM Wakeup Enable Reg PM_PWER
+ */
+-#define PM_PWER __REG(PKUNITY_PM_BASE + 0x000C)
++#define PM_PWER (PKUNITY_PM_BASE + 0x000C)
+ /*
+ * PM GPIO Sleep Status Reg PM_PGSR
+ */
+-#define PM_PGSR __REG(PKUNITY_PM_BASE + 0x0010)
++#define PM_PGSR (PKUNITY_PM_BASE + 0x0010)
+ /*
+ * PM Clock Gate Reg PM_PCGR
+ */
+-#define PM_PCGR __REG(PKUNITY_PM_BASE + 0x0014)
++#define PM_PCGR (PKUNITY_PM_BASE + 0x0014)
+ /*
+ * PM SYS PLL Conf. Reg PM_PLLSYSCFG
+ */
+-#define PM_PLLSYSCFG __REG(PKUNITY_PM_BASE + 0x0018)
++#define PM_PLLSYSCFG (PKUNITY_PM_BASE + 0x0018)
+ /*
+ * PM DDR PLL Conf. Reg PM_PLLDDRCFG
+ */
+-#define PM_PLLDDRCFG __REG(PKUNITY_PM_BASE + 0x001C)
++#define PM_PLLDDRCFG (PKUNITY_PM_BASE + 0x001C)
+ /*
+ * PM VGA PLL Conf. Reg PM_PLLVGACFG
+ */
+-#define PM_PLLVGACFG __REG(PKUNITY_PM_BASE + 0x0020)
++#define PM_PLLVGACFG (PKUNITY_PM_BASE + 0x0020)
+ /*
+ * PM Div Conf. Reg PM_DIVCFG
+ */
+-#define PM_DIVCFG __REG(PKUNITY_PM_BASE + 0x0024)
++#define PM_DIVCFG (PKUNITY_PM_BASE + 0x0024)
+ /*
+ * PM SYS PLL Status Reg PM_PLLSYSSTATUS
+ */
+-#define PM_PLLSYSSTATUS __REG(PKUNITY_PM_BASE + 0x0028)
++#define PM_PLLSYSSTATUS (PKUNITY_PM_BASE + 0x0028)
+ /*
+ * PM DDR PLL Status Reg PM_PLLDDRSTATUS
+ */
+-#define PM_PLLDDRSTATUS __REG(PKUNITY_PM_BASE + 0x002C)
++#define PM_PLLDDRSTATUS (PKUNITY_PM_BASE + 0x002C)
+ /*
+ * PM VGA PLL Status Reg PM_PLLVGASTATUS
+ */
+-#define PM_PLLVGASTATUS __REG(PKUNITY_PM_BASE + 0x0030)
++#define PM_PLLVGASTATUS (PKUNITY_PM_BASE + 0x0030)
+ /*
+ * PM Div Status Reg PM_DIVSTATUS
+ */
+-#define PM_DIVSTATUS __REG(PKUNITY_PM_BASE + 0x0034)
++#define PM_DIVSTATUS (PKUNITY_PM_BASE + 0x0034)
+ /*
+ * PM Software Reset Reg PM_SWRESET
+ */
+-#define PM_SWRESET __REG(PKUNITY_PM_BASE + 0x0038)
++#define PM_SWRESET (PKUNITY_PM_BASE + 0x0038)
+ /*
+ * PM DDR2 PAD Start Reg PM_DDR2START
+ */
+-#define PM_DDR2START __REG(PKUNITY_PM_BASE + 0x003C)
++#define PM_DDR2START (PKUNITY_PM_BASE + 0x003C)
+ /*
+ * PM DDR2 PAD Status Reg PM_DDR2CAL0
+ */
+-#define PM_DDR2CAL0 __REG(PKUNITY_PM_BASE + 0x0040)
++#define PM_DDR2CAL0 (PKUNITY_PM_BASE + 0x0040)
+ /*
+ * PM PLL DFC Done Reg PM_PLLDFCDONE
+ */
+-#define PM_PLLDFCDONE __REG(PKUNITY_PM_BASE + 0x0044)
++#define PM_PLLDFCDONE (PKUNITY_PM_BASE + 0x0044)
+
+ #define PM_PMCR_SFB FIELD(1, 1, 0)
+ #define PM_PMCR_IFB FIELD(1, 1, 1)
+diff --git a/arch/unicore32/include/mach/regs-ps2.h b/arch/unicore32/include/mach/regs-ps2.h
+index 7da2071838ab..17d4e6dc0069 100644
+--- a/arch/unicore32/include/mach/regs-ps2.h
++++ b/arch/unicore32/include/mach/regs-ps2.h
+@@ -4,17 +4,17 @@
+ /*
+ * the same as I8042_DATA_REG PS2_DATA
+ */
+-#define PS2_DATA __REG(PKUNITY_PS2_BASE + 0x0060)
++#define PS2_DATA (PKUNITY_PS2_BASE + 0x0060)
+ /*
+ * the same as I8042_COMMAND_REG PS2_COMMAND
+ */
+-#define PS2_COMMAND __REG(PKUNITY_PS2_BASE + 0x0064)
++#define PS2_COMMAND (PKUNITY_PS2_BASE + 0x0064)
+ /*
+ * the same as I8042_STATUS_REG PS2_STATUS
+ */
+-#define PS2_STATUS __REG(PKUNITY_PS2_BASE + 0x0064)
++#define PS2_STATUS (PKUNITY_PS2_BASE + 0x0064)
+ /*
+ * counter reg PS2_CNT
+ */
+-#define PS2_CNT __REG(PKUNITY_PS2_BASE + 0x0068)
++#define PS2_CNT (PKUNITY_PS2_BASE + 0x0068)
+
+diff --git a/arch/unicore32/include/mach/regs-resetc.h b/arch/unicore32/include/mach/regs-resetc.h
+index 17639898fd84..39900cf4c936 100644
+--- a/arch/unicore32/include/mach/regs-resetc.h
++++ b/arch/unicore32/include/mach/regs-resetc.h
+@@ -4,11 +4,11 @@
+ /*
+ * Software Reset Register
+ */
+-#define RESETC_SWRR __REG(PKUNITY_RESETC_BASE + 0x0000)
++#define RESETC_SWRR (PKUNITY_RESETC_BASE + 0x0000)
+ /*
+ * Reset Status Register
+ */
+-#define RESETC_RSSR __REG(PKUNITY_RESETC_BASE + 0x0004)
++#define RESETC_RSSR (PKUNITY_RESETC_BASE + 0x0004)
+
+ /*
+ * Software Reset Bit
+diff --git a/arch/unicore32/include/mach/regs-rtc.h b/arch/unicore32/include/mach/regs-rtc.h
+index 155e38757186..e94ca193271d 100644
+--- a/arch/unicore32/include/mach/regs-rtc.h
++++ b/arch/unicore32/include/mach/regs-rtc.h
+@@ -4,19 +4,19 @@
+ /*
+ * RTC Alarm Reg RTC_RTAR
+ */
+-#define RTC_RTAR __REG(PKUNITY_RTC_BASE + 0x0000)
++#define RTC_RTAR (PKUNITY_RTC_BASE + 0x0000)
+ /*
+ * RTC Count Reg RTC_RCNR
+ */
+-#define RTC_RCNR __REG(PKUNITY_RTC_BASE + 0x0004)
++#define RTC_RCNR (PKUNITY_RTC_BASE + 0x0004)
+ /*
+ * RTC Trim Reg RTC_RTTR
+ */
+-#define RTC_RTTR __REG(PKUNITY_RTC_BASE + 0x0008)
++#define RTC_RTTR (PKUNITY_RTC_BASE + 0x0008)
+ /*
+ * RTC Status Reg RTC_RTSR
+ */
+-#define RTC_RTSR __REG(PKUNITY_RTC_BASE + 0x0010)
++#define RTC_RTSR (PKUNITY_RTC_BASE + 0x0010)
+
+ /*
+ * ALarm detected RTC_RTSR_AL
+diff --git a/arch/unicore32/include/mach/regs-sdc.h b/arch/unicore32/include/mach/regs-sdc.h
+index 3457b88c453c..1303ecf660ba 100644
+--- a/arch/unicore32/include/mach/regs-sdc.h
++++ b/arch/unicore32/include/mach/regs-sdc.h
+@@ -4,67 +4,67 @@
+ /*
+ * Clock Control Reg SDC_CCR
+ */
+-#define SDC_CCR __REG(PKUNITY_SDC_BASE + 0x0000)
++#define SDC_CCR (PKUNITY_SDC_BASE + 0x0000)
+ /*
+ * Software Reset Reg SDC_SRR
+ */
+-#define SDC_SRR __REG(PKUNITY_SDC_BASE + 0x0004)
++#define SDC_SRR (PKUNITY_SDC_BASE + 0x0004)
+ /*
+ * Argument Reg SDC_ARGUMENT
+ */
+-#define SDC_ARGUMENT __REG(PKUNITY_SDC_BASE + 0x0008)
++#define SDC_ARGUMENT (PKUNITY_SDC_BASE + 0x0008)
+ /*
+ * Command Reg SDC_COMMAND
+ */
+-#define SDC_COMMAND __REG(PKUNITY_SDC_BASE + 0x000C)
++#define SDC_COMMAND (PKUNITY_SDC_BASE + 0x000C)
+ /*
+ * Block Size Reg SDC_BLOCKSIZE
+ */
+-#define SDC_BLOCKSIZE __REG(PKUNITY_SDC_BASE + 0x0010)
++#define SDC_BLOCKSIZE (PKUNITY_SDC_BASE + 0x0010)
+ /*
+ * Block Cound Reg SDC_BLOCKCOUNT
+ */
+-#define SDC_BLOCKCOUNT __REG(PKUNITY_SDC_BASE + 0x0014)
++#define SDC_BLOCKCOUNT (PKUNITY_SDC_BASE + 0x0014)
+ /*
+ * Transfer Mode Reg SDC_TMR
+ */
+-#define SDC_TMR __REG(PKUNITY_SDC_BASE + 0x0018)
++#define SDC_TMR (PKUNITY_SDC_BASE + 0x0018)
+ /*
+ * Response Reg. 0 SDC_RES0
+ */
+-#define SDC_RES0 __REG(PKUNITY_SDC_BASE + 0x001C)
++#define SDC_RES0 (PKUNITY_SDC_BASE + 0x001C)
+ /*
+ * Response Reg. 1 SDC_RES1
+ */
+-#define SDC_RES1 __REG(PKUNITY_SDC_BASE + 0x0020)
++#define SDC_RES1 (PKUNITY_SDC_BASE + 0x0020)
+ /*
+ * Response Reg. 2 SDC_RES2
+ */
+-#define SDC_RES2 __REG(PKUNITY_SDC_BASE + 0x0024)
++#define SDC_RES2 (PKUNITY_SDC_BASE + 0x0024)
+ /*
+ * Response Reg. 3 SDC_RES3
+ */
+-#define SDC_RES3 __REG(PKUNITY_SDC_BASE + 0x0028)
++#define SDC_RES3 (PKUNITY_SDC_BASE + 0x0028)
+ /*
+ * Read Timeout Control Reg SDC_RTCR
+ */
+-#define SDC_RTCR __REG(PKUNITY_SDC_BASE + 0x002C)
++#define SDC_RTCR (PKUNITY_SDC_BASE + 0x002C)
+ /*
+ * Interrupt Status Reg SDC_ISR
+ */
+-#define SDC_ISR __REG(PKUNITY_SDC_BASE + 0x0030)
++#define SDC_ISR (PKUNITY_SDC_BASE + 0x0030)
+ /*
+ * Interrupt Status Mask Reg SDC_ISMR
+ */
+-#define SDC_ISMR __REG(PKUNITY_SDC_BASE + 0x0034)
++#define SDC_ISMR (PKUNITY_SDC_BASE + 0x0034)
+ /*
+ * RX FIFO SDC_RXFIFO
+ */
+-#define SDC_RXFIFO __REG(PKUNITY_SDC_BASE + 0x0038)
++#define SDC_RXFIFO (PKUNITY_SDC_BASE + 0x0038)
+ /*
+ * TX FIFO SDC_TXFIFO
+ */
+-#define SDC_TXFIFO __REG(PKUNITY_SDC_BASE + 0x003C)
++#define SDC_TXFIFO (PKUNITY_SDC_BASE + 0x003C)
+
+ /*
+ * SD Clock Enable SDC_CCR_CLKEN
+diff --git a/arch/unicore32/include/mach/regs-spi.h b/arch/unicore32/include/mach/regs-spi.h
+index cadc713c55b9..de16895e2dc0 100644
+--- a/arch/unicore32/include/mach/regs-spi.h
++++ b/arch/unicore32/include/mach/regs-spi.h
+@@ -4,27 +4,27 @@
+ /*
+ * Control reg. 0 SPI_CR0
+ */
+-#define SPI_CR0 __REG(PKUNITY_SPI_BASE + 0x0000)
++#define SPI_CR0 (PKUNITY_SPI_BASE + 0x0000)
+ /*
+ * Control reg. 1 SPI_CR1
+ */
+-#define SPI_CR1 __REG(PKUNITY_SPI_BASE + 0x0004)
++#define SPI_CR1 (PKUNITY_SPI_BASE + 0x0004)
+ /*
+ * Enable reg SPI_SSIENR
+ */
+-#define SPI_SSIENR __REG(PKUNITY_SPI_BASE + 0x0008)
++#define SPI_SSIENR (PKUNITY_SPI_BASE + 0x0008)
+ /*
+ * Status reg SPI_SR
+ */
+-#define SPI_SR __REG(PKUNITY_SPI_BASE + 0x0028)
++#define SPI_SR (PKUNITY_SPI_BASE + 0x0028)
+ /*
+ * Interrupt Mask reg SPI_IMR
+ */
+-#define SPI_IMR __REG(PKUNITY_SPI_BASE + 0x002C)
++#define SPI_IMR (PKUNITY_SPI_BASE + 0x002C)
+ /*
+ * Interrupt Status reg SPI_ISR
+ */
+-#define SPI_ISR __REG(PKUNITY_SPI_BASE + 0x0030)
++#define SPI_ISR (PKUNITY_SPI_BASE + 0x0030)
+
+ /*
+ * Enable SPI Controller SPI_SSIENR_EN
+diff --git a/arch/unicore32/include/mach/regs-umal.h b/arch/unicore32/include/mach/regs-umal.h
+index 2e718d1e86cc..885bb62fee71 100644
+--- a/arch/unicore32/include/mach/regs-umal.h
++++ b/arch/unicore32/include/mach/regs-umal.h
+@@ -10,86 +10,86 @@
+ /*
+ * TX/RX reset and control UMAL_CFG1
+ */
+-#define UMAL_CFG1 __REG(PKUNITY_UMAL_BASE + 0x0000)
++#define UMAL_CFG1 (PKUNITY_UMAL_BASE + 0x0000)
+ /*
+ * MAC interface mode control UMAL_CFG2
+ */
+-#define UMAL_CFG2 __REG(PKUNITY_UMAL_BASE + 0x0004)
++#define UMAL_CFG2 (PKUNITY_UMAL_BASE + 0x0004)
+ /*
+ * Inter Packet/Frame Gap UMAL_IPGIFG
+ */
+-#define UMAL_IPGIFG __REG(PKUNITY_UMAL_BASE + 0x0008)
++#define UMAL_IPGIFG (PKUNITY_UMAL_BASE + 0x0008)
+ /*
+ * Collision retry or backoff UMAL_HALFDUPLEX
+ */
+-#define UMAL_HALFDUPLEX __REG(PKUNITY_UMAL_BASE + 0x000c)
++#define UMAL_HALFDUPLEX (PKUNITY_UMAL_BASE + 0x000c)
+ /*
+ * Maximum Frame Length UMAL_MAXFRAME
+ */
+-#define UMAL_MAXFRAME __REG(PKUNITY_UMAL_BASE + 0x0010)
++#define UMAL_MAXFRAME (PKUNITY_UMAL_BASE + 0x0010)
+ /*
+ * Test Regsiter UMAL_TESTREG
+ */
+-#define UMAL_TESTREG __REG(PKUNITY_UMAL_BASE + 0x001c)
++#define UMAL_TESTREG (PKUNITY_UMAL_BASE + 0x001c)
+ /*
+ * MII Management Configure UMAL_MIICFG
+ */
+-#define UMAL_MIICFG __REG(PKUNITY_UMAL_BASE + 0x0020)
++#define UMAL_MIICFG (PKUNITY_UMAL_BASE + 0x0020)
+ /*
+ * MII Management Command UMAL_MIICMD
+ */
+-#define UMAL_MIICMD __REG(PKUNITY_UMAL_BASE + 0x0024)
++#define UMAL_MIICMD (PKUNITY_UMAL_BASE + 0x0024)
+ /*
+ * MII Management Address UMAL_MIIADDR
+ */
+-#define UMAL_MIIADDR __REG(PKUNITY_UMAL_BASE + 0x0028)
++#define UMAL_MIIADDR (PKUNITY_UMAL_BASE + 0x0028)
+ /*
+ * MII Management Control UMAL_MIICTRL
+ */
+-#define UMAL_MIICTRL __REG(PKUNITY_UMAL_BASE + 0x002c)
++#define UMAL_MIICTRL (PKUNITY_UMAL_BASE + 0x002c)
+ /*
+ * MII Management Status UMAL_MIISTATUS
+ */
+-#define UMAL_MIISTATUS __REG(PKUNITY_UMAL_BASE + 0x0030)
++#define UMAL_MIISTATUS (PKUNITY_UMAL_BASE + 0x0030)
+ /*
+ * MII Managment Indicator UMAL_MIIIDCT
+ */
+-#define UMAL_MIIIDCT __REG(PKUNITY_UMAL_BASE + 0x0034)
++#define UMAL_MIIIDCT (PKUNITY_UMAL_BASE + 0x0034)
+ /*
+ * Interface Control UMAL_IFCTRL
+ */
+-#define UMAL_IFCTRL __REG(PKUNITY_UMAL_BASE + 0x0038)
++#define UMAL_IFCTRL (PKUNITY_UMAL_BASE + 0x0038)
+ /*
+ * Interface Status UMAL_IFSTATUS
+ */
+-#define UMAL_IFSTATUS __REG(PKUNITY_UMAL_BASE + 0x003c)
++#define UMAL_IFSTATUS (PKUNITY_UMAL_BASE + 0x003c)
+ /*
+ * MAC address (high 4 bytes) UMAL_STADDR1
+ */
+-#define UMAL_STADDR1 __REG(PKUNITY_UMAL_BASE + 0x0040)
++#define UMAL_STADDR1 (PKUNITY_UMAL_BASE + 0x0040)
+ /*
+ * MAC address (low 2 bytes) UMAL_STADDR2
+ */
+-#define UMAL_STADDR2 __REG(PKUNITY_UMAL_BASE + 0x0044)
++#define UMAL_STADDR2 (PKUNITY_UMAL_BASE + 0x0044)
+
+ /* FIFO MODULE OF UMAL */
+ /* UMAL's FIFO module provides data queuing for increased system level
+ * throughput
+ */
+-#define UMAL_FIFOCFG0 __REG(PKUNITY_UMAL_BASE + 0x0048)
+-#define UMAL_FIFOCFG1 __REG(PKUNITY_UMAL_BASE + 0x004c)
+-#define UMAL_FIFOCFG2 __REG(PKUNITY_UMAL_BASE + 0x0050)
+-#define UMAL_FIFOCFG3 __REG(PKUNITY_UMAL_BASE + 0x0054)
+-#define UMAL_FIFOCFG4 __REG(PKUNITY_UMAL_BASE + 0x0058)
+-#define UMAL_FIFOCFG5 __REG(PKUNITY_UMAL_BASE + 0x005c)
+-#define UMAL_FIFORAM0 __REG(PKUNITY_UMAL_BASE + 0x0060)
+-#define UMAL_FIFORAM1 __REG(PKUNITY_UMAL_BASE + 0x0064)
+-#define UMAL_FIFORAM2 __REG(PKUNITY_UMAL_BASE + 0x0068)
+-#define UMAL_FIFORAM3 __REG(PKUNITY_UMAL_BASE + 0x006c)
+-#define UMAL_FIFORAM4 __REG(PKUNITY_UMAL_BASE + 0x0070)
+-#define UMAL_FIFORAM5 __REG(PKUNITY_UMAL_BASE + 0x0074)
+-#define UMAL_FIFORAM6 __REG(PKUNITY_UMAL_BASE + 0x0078)
+-#define UMAL_FIFORAM7 __REG(PKUNITY_UMAL_BASE + 0x007c)
++#define UMAL_FIFOCFG0 (PKUNITY_UMAL_BASE + 0x0048)
++#define UMAL_FIFOCFG1 (PKUNITY_UMAL_BASE + 0x004c)
++#define UMAL_FIFOCFG2 (PKUNITY_UMAL_BASE + 0x0050)
++#define UMAL_FIFOCFG3 (PKUNITY_UMAL_BASE + 0x0054)
++#define UMAL_FIFOCFG4 (PKUNITY_UMAL_BASE + 0x0058)
++#define UMAL_FIFOCFG5 (PKUNITY_UMAL_BASE + 0x005c)
++#define UMAL_FIFORAM0 (PKUNITY_UMAL_BASE + 0x0060)
++#define UMAL_FIFORAM1 (PKUNITY_UMAL_BASE + 0x0064)
++#define UMAL_FIFORAM2 (PKUNITY_UMAL_BASE + 0x0068)
++#define UMAL_FIFORAM3 (PKUNITY_UMAL_BASE + 0x006c)
++#define UMAL_FIFORAM4 (PKUNITY_UMAL_BASE + 0x0070)
++#define UMAL_FIFORAM5 (PKUNITY_UMAL_BASE + 0x0074)
++#define UMAL_FIFORAM6 (PKUNITY_UMAL_BASE + 0x0078)
++#define UMAL_FIFORAM7 (PKUNITY_UMAL_BASE + 0x007c)
+
+ /* MAHBE MODUEL OF UMAL */
+ /* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master
+@@ -99,35 +99,35 @@
+ /*
+ * Transmit Control UMAL_DMATxCtrl
+ */
+-#define UMAL_DMATxCtrl __REG(PKUNITY_UMAL_BASE + 0x0180)
++#define UMAL_DMATxCtrl (PKUNITY_UMAL_BASE + 0x0180)
+ /*
+ * Pointer to TX Descripter UMAL_DMATxDescriptor
+ */
+-#define UMAL_DMATxDescriptor __REG(PKUNITY_UMAL_BASE + 0x0184)
++#define UMAL_DMATxDescriptor (PKUNITY_UMAL_BASE + 0x0184)
+ /*
+ * Status of Tx Packet Transfers UMAL_DMATxStatus
+ */
+-#define UMAL_DMATxStatus __REG(PKUNITY_UMAL_BASE + 0x0188)
++#define UMAL_DMATxStatus (PKUNITY_UMAL_BASE + 0x0188)
+ /*
+ * Receive Control UMAL_DMARxCtrl
+ */
+-#define UMAL_DMARxCtrl __REG(PKUNITY_UMAL_BASE + 0x018c)
++#define UMAL_DMARxCtrl (PKUNITY_UMAL_BASE + 0x018c)
+ /*
+ * Pointer to Rx Descriptor UMAL_DMARxDescriptor
+ */
+-#define UMAL_DMARxDescriptor __REG(PKUNITY_UMAL_BASE + 0x0190)
++#define UMAL_DMARxDescriptor (PKUNITY_UMAL_BASE + 0x0190)
+ /*
+ * Status of Rx Packet Transfers UMAL_DMARxStatus
+ */
+-#define UMAL_DMARxStatus __REG(PKUNITY_UMAL_BASE + 0x0194)
++#define UMAL_DMARxStatus (PKUNITY_UMAL_BASE + 0x0194)
+ /*
+ * Interrupt Mask UMAL_DMAIntrMask
+ */
+-#define UMAL_DMAIntrMask __REG(PKUNITY_UMAL_BASE + 0x0198)
++#define UMAL_DMAIntrMask (PKUNITY_UMAL_BASE + 0x0198)
+ /*
+ * Interrupts, read only UMAL_DMAInterrupt
+ */
+-#define UMAL_DMAInterrupt __REG(PKUNITY_UMAL_BASE + 0x019c)
++#define UMAL_DMAInterrupt (PKUNITY_UMAL_BASE + 0x019c)
+
+ /*
+ * Commands for UMAL_CFG1 register
+diff --git a/arch/unicore32/include/mach/regs-unigfx.h b/arch/unicore32/include/mach/regs-unigfx.h
+index 58bbd540a393..faf8b287fccf 100644
+--- a/arch/unicore32/include/mach/regs-unigfx.h
++++ b/arch/unicore32/include/mach/regs-unigfx.h
+@@ -11,67 +11,67 @@
+ /*
+ * control reg UDE_CFG
+ */
+-#define UDE_CFG __REG(UDE_BASE + 0x0000)
++#define UDE_CFG (UDE_BASE + 0x0000)
+ /*
+ * framebuffer start address reg UDE_FSA
+ */
+-#define UDE_FSA __REG(UDE_BASE + 0x0004)
++#define UDE_FSA (UDE_BASE + 0x0004)
+ /*
+ * line size reg UDE_LS
+ */
+-#define UDE_LS __REG(UDE_BASE + 0x0008)
++#define UDE_LS (UDE_BASE + 0x0008)
+ /*
+ * pitch size reg UDE_PS
+ */
+-#define UDE_PS __REG(UDE_BASE + 0x000C)
++#define UDE_PS (UDE_BASE + 0x000C)
+ /*
+ * horizontal active time reg UDE_HAT
+ */
+-#define UDE_HAT __REG(UDE_BASE + 0x0010)
++#define UDE_HAT (UDE_BASE + 0x0010)
+ /*
+ * horizontal blank time reg UDE_HBT
+ */
+-#define UDE_HBT __REG(UDE_BASE + 0x0014)
++#define UDE_HBT (UDE_BASE + 0x0014)
+ /*
+ * horizontal sync time reg UDE_HST
+ */
+-#define UDE_HST __REG(UDE_BASE + 0x0018)
++#define UDE_HST (UDE_BASE + 0x0018)
+ /*
+ * vertival active time reg UDE_VAT
+ */
+-#define UDE_VAT __REG(UDE_BASE + 0x001C)
++#define UDE_VAT (UDE_BASE + 0x001C)
+ /*
+ * vertival blank time reg UDE_VBT
+ */
+-#define UDE_VBT __REG(UDE_BASE + 0x0020)
++#define UDE_VBT (UDE_BASE + 0x0020)
+ /*
+ * vertival sync time reg UDE_VST
+ */
+-#define UDE_VST __REG(UDE_BASE + 0x0024)
++#define UDE_VST (UDE_BASE + 0x0024)
+ /*
+ * cursor position UDE_CXY
+ */
+-#define UDE_CXY __REG(UDE_BASE + 0x0028)
++#define UDE_CXY (UDE_BASE + 0x0028)
+ /*
+ * cursor front color UDE_CC0
+ */
+-#define UDE_CC0 __REG(UDE_BASE + 0x002C)
++#define UDE_CC0 (UDE_BASE + 0x002C)
+ /*
+ * cursor background color UDE_CC1
+ */
+-#define UDE_CC1 __REG(UDE_BASE + 0x0030)
++#define UDE_CC1 (UDE_BASE + 0x0030)
+ /*
+ * video position UDE_VXY
+ */
+-#define UDE_VXY __REG(UDE_BASE + 0x0034)
++#define UDE_VXY (UDE_BASE + 0x0034)
+ /*
+ * video start address reg UDE_VSA
+ */
+-#define UDE_VSA __REG(UDE_BASE + 0x0040)
++#define UDE_VSA (UDE_BASE + 0x0040)
+ /*
+ * video size reg UDE_VS
+ */
+-#define UDE_VS __REG(UDE_BASE + 0x004C)
++#define UDE_VS (UDE_BASE + 0x004C)
+
+ /*
+ * command reg for UNIGFX GE
+@@ -79,102 +79,102 @@
+ /*
+ * src xy reg UGE_SRCXY
+ */
+-#define UGE_SRCXY __REG(UGE_BASE + 0x0000)
++#define UGE_SRCXY (UGE_BASE + 0x0000)
+ /*
+ * dst xy reg UGE_DSTXY
+ */
+-#define UGE_DSTXY __REG(UGE_BASE + 0x0004)
++#define UGE_DSTXY (UGE_BASE + 0x0004)
+ /*
+ * pitch reg UGE_PITCH
+ */
+-#define UGE_PITCH __REG(UGE_BASE + 0x0008)
++#define UGE_PITCH (UGE_BASE + 0x0008)
+ /*
+ * src start reg UGE_SRCSTART
+ */
+-#define UGE_SRCSTART __REG(UGE_BASE + 0x000C)
++#define UGE_SRCSTART (UGE_BASE + 0x000C)
+ /*
+ * dst start reg UGE_DSTSTART
+ */
+-#define UGE_DSTSTART __REG(UGE_BASE + 0x0010)
++#define UGE_DSTSTART (UGE_BASE + 0x0010)
+ /*
+ * width height reg UGE_WIDHEIGHT
+ */
+-#define UGE_WIDHEIGHT __REG(UGE_BASE + 0x0014)
++#define UGE_WIDHEIGHT (UGE_BASE + 0x0014)
+ /*
+ * rop alpah reg UGE_ROPALPHA
+ */
+-#define UGE_ROPALPHA __REG(UGE_BASE + 0x0018)
++#define UGE_ROPALPHA (UGE_BASE + 0x0018)
+ /*
+ * front color UGE_FCOLOR
+ */
+-#define UGE_FCOLOR __REG(UGE_BASE + 0x001C)
++#define UGE_FCOLOR (UGE_BASE + 0x001C)
+ /*
+ * background color UGE_BCOLOR
+ */
+-#define UGE_BCOLOR __REG(UGE_BASE + 0x0020)
++#define UGE_BCOLOR (UGE_BASE + 0x0020)
+ /*
+ * src color key for high value UGE_SCH
+ */
+-#define UGE_SCH __REG(UGE_BASE + 0x0024)
++#define UGE_SCH (UGE_BASE + 0x0024)
+ /*
+ * dst color key for high value UGE_DCH
+ */
+-#define UGE_DCH __REG(UGE_BASE + 0x0028)
++#define UGE_DCH (UGE_BASE + 0x0028)
+ /*
+ * src color key for low value UGE_SCL
+ */
+-#define UGE_SCL __REG(UGE_BASE + 0x002C)
++#define UGE_SCL (UGE_BASE + 0x002C)
+ /*
+ * dst color key for low value UGE_DCL
+ */
+-#define UGE_DCL __REG(UGE_BASE + 0x0030)
++#define UGE_DCL (UGE_BASE + 0x0030)
+ /*
+ * clip 0 reg UGE_CLIP0
+ */
+-#define UGE_CLIP0 __REG(UGE_BASE + 0x0034)
++#define UGE_CLIP0 (UGE_BASE + 0x0034)
+ /*
+ * clip 1 reg UGE_CLIP1
+ */
+-#define UGE_CLIP1 __REG(UGE_BASE + 0x0038)
++#define UGE_CLIP1 (UGE_BASE + 0x0038)
+ /*
+ * command reg UGE_COMMAND
+ */
+-#define UGE_COMMAND __REG(UGE_BASE + 0x003C)
++#define UGE_COMMAND (UGE_BASE + 0x003C)
+ /*
+ * pattern 0 UGE_P0
+ */
+-#define UGE_P0 __REG(UGE_BASE + 0x0040)
+-#define UGE_P1 __REG(UGE_BASE + 0x0044)
+-#define UGE_P2 __REG(UGE_BASE + 0x0048)
+-#define UGE_P3 __REG(UGE_BASE + 0x004C)
+-#define UGE_P4 __REG(UGE_BASE + 0x0050)
+-#define UGE_P5 __REG(UGE_BASE + 0x0054)
+-#define UGE_P6 __REG(UGE_BASE + 0x0058)
+-#define UGE_P7 __REG(UGE_BASE + 0x005C)
+-#define UGE_P8 __REG(UGE_BASE + 0x0060)
+-#define UGE_P9 __REG(UGE_BASE + 0x0064)
+-#define UGE_P10 __REG(UGE_BASE + 0x0068)
+-#define UGE_P11 __REG(UGE_BASE + 0x006C)
+-#define UGE_P12 __REG(UGE_BASE + 0x0070)
+-#define UGE_P13 __REG(UGE_BASE + 0x0074)
+-#define UGE_P14 __REG(UGE_BASE + 0x0078)
+-#define UGE_P15 __REG(UGE_BASE + 0x007C)
+-#define UGE_P16 __REG(UGE_BASE + 0x0080)
+-#define UGE_P17 __REG(UGE_BASE + 0x0084)
+-#define UGE_P18 __REG(UGE_BASE + 0x0088)
+-#define UGE_P19 __REG(UGE_BASE + 0x008C)
+-#define UGE_P20 __REG(UGE_BASE + 0x0090)
+-#define UGE_P21 __REG(UGE_BASE + 0x0094)
+-#define UGE_P22 __REG(UGE_BASE + 0x0098)
+-#define UGE_P23 __REG(UGE_BASE + 0x009C)
+-#define UGE_P24 __REG(UGE_BASE + 0x00A0)
+-#define UGE_P25 __REG(UGE_BASE + 0x00A4)
+-#define UGE_P26 __REG(UGE_BASE + 0x00A8)
+-#define UGE_P27 __REG(UGE_BASE + 0x00AC)
+-#define UGE_P28 __REG(UGE_BASE + 0x00B0)
+-#define UGE_P29 __REG(UGE_BASE + 0x00B4)
+-#define UGE_P30 __REG(UGE_BASE + 0x00B8)
+-#define UGE_P31 __REG(UGE_BASE + 0x00BC)
++#define UGE_P0 (UGE_BASE + 0x0040)
++#define UGE_P1 (UGE_BASE + 0x0044)
++#define UGE_P2 (UGE_BASE + 0x0048)
++#define UGE_P3 (UGE_BASE + 0x004C)
++#define UGE_P4 (UGE_BASE + 0x0050)
++#define UGE_P5 (UGE_BASE + 0x0054)
++#define UGE_P6 (UGE_BASE + 0x0058)
++#define UGE_P7 (UGE_BASE + 0x005C)
++#define UGE_P8 (UGE_BASE + 0x0060)
++#define UGE_P9 (UGE_BASE + 0x0064)
++#define UGE_P10 (UGE_BASE + 0x0068)
++#define UGE_P11 (UGE_BASE + 0x006C)
++#define UGE_P12 (UGE_BASE + 0x0070)
++#define UGE_P13 (UGE_BASE + 0x0074)
++#define UGE_P14 (UGE_BASE + 0x0078)
++#define UGE_P15 (UGE_BASE + 0x007C)
++#define UGE_P16 (UGE_BASE + 0x0080)
++#define UGE_P17 (UGE_BASE + 0x0084)
++#define UGE_P18 (UGE_BASE + 0x0088)
++#define UGE_P19 (UGE_BASE + 0x008C)
++#define UGE_P20 (UGE_BASE + 0x0090)
++#define UGE_P21 (UGE_BASE + 0x0094)
++#define UGE_P22 (UGE_BASE + 0x0098)
++#define UGE_P23 (UGE_BASE + 0x009C)
++#define UGE_P24 (UGE_BASE + 0x00A0)
++#define UGE_P25 (UGE_BASE + 0x00A4)
++#define UGE_P26 (UGE_BASE + 0x00A8)
++#define UGE_P27 (UGE_BASE + 0x00AC)
++#define UGE_P28 (UGE_BASE + 0x00B0)
++#define UGE_P29 (UGE_BASE + 0x00B4)
++#define UGE_P30 (UGE_BASE + 0x00B8)
++#define UGE_P31 (UGE_BASE + 0x00BC)
+
+ #define UDE_CFG_DST_MASK FMASK(2, 8)
+ #define UDE_CFG_DST8 FIELD(0x0, 2, 8)
+diff --git a/arch/unicore32/kernel/entry.S b/arch/unicore32/kernel/entry.S
+index 83698b7c8f5b..00a259f9819e 100644
+--- a/arch/unicore32/kernel/entry.S
++++ b/arch/unicore32/kernel/entry.S
+@@ -91,7 +91,7 @@
+ .endm
+
+ .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
+- ldw \base, =(io_p2v(PKUNITY_INTC_BASE))
++ ldw \base, =(PKUNITY_INTC_BASE)
+ ldw \irqstat, [\base+], #0xC @ INTC_ICIP
+ ldw \tmp, [\base+], #0x4 @ INTC_ICMR
+ and.a \irqstat, \irqstat, \tmp
+diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
+index e1dbfcb61873..b23624cf3062 100644
+--- a/arch/unicore32/kernel/irq.c
++++ b/arch/unicore32/kernel/irq.c
+@@ -226,8 +226,8 @@ static struct irq_chip puv3_normal_chip = {
+
+ static struct resource irq_resource = {
+ .name = "irqs",
+- .start = PKUNITY_INTC_BASE,
+- .end = PKUNITY_INTC_BASE + 0xFFFFF,
++ .start = io_v2p(PKUNITY_INTC_BASE),
++ .end = io_v2p(PKUNITY_INTC_BASE) + 0xFFFFF,
+ };
+
+ static struct puv3_irq_state {
+diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
+index 65c265ee8e94..100eab842e66 100644
+--- a/arch/unicore32/kernel/pci.c
++++ b/arch/unicore32/kernel/pci.c
+@@ -75,27 +75,27 @@ void pci_puv3_preinit(void)
+ {
+ printk(KERN_DEBUG "PCI: PKUnity PCI Controller Initializing ...\n");
+ /* config PCI bridge base */
+- writel(PKUNITY_PCIBRI_BASE, PCICFG_BRIBASE);
++ writel(io_v2p(PKUNITY_PCIBRI_BASE), PCICFG_BRIBASE);
+
+ writel(0, PCIBRI_AHBCTL0);
+- writel(PKUNITY_PCIBRI_BASE | PCIBRI_BARx_MEM, PCIBRI_AHBBAR0);
++ writel(io_v2p(PKUNITY_PCIBRI_BASE) | PCIBRI_BARx_MEM, PCIBRI_AHBBAR0);
+ writel(0xFFFF0000, PCIBRI_AHBAMR0);
+ writel(0, PCIBRI_AHBTAR0);
+
+ writel(PCIBRI_CTLx_AT, PCIBRI_AHBCTL1);
+- writel(PKUNITY_PCILIO_BASE | PCIBRI_BARx_IO, PCIBRI_AHBBAR1);
++ writel(io_v2p(PKUNITY_PCILIO_BASE) | PCIBRI_BARx_IO, PCIBRI_AHBBAR1);
+ writel(0xFFFF0000, PCIBRI_AHBAMR1);
+ writel(0x00000000, PCIBRI_AHBTAR1);
+
+ writel(PCIBRI_CTLx_PREF, PCIBRI_AHBCTL2);
+- writel(PKUNITY_PCIMEM_BASE | PCIBRI_BARx_MEM, PCIBRI_AHBBAR2);
++ writel(io_v2p(PKUNITY_PCIMEM_BASE) | PCIBRI_BARx_MEM, PCIBRI_AHBBAR2);
+ writel(0xF8000000, PCIBRI_AHBAMR2);
+ writel(0, PCIBRI_AHBTAR2);
+
+- writel(PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM, PCIBRI_BAR1);
++ writel(io_v2p(PKUNITY_PCIAHB_BASE) | PCIBRI_BARx_MEM, PCIBRI_BAR1);
+
+ writel(PCIBRI_CTLx_AT | PCIBRI_CTLx_PREF, PCIBRI_PCICTL0);
+- writel(PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM, PCIBRI_PCIBAR0);
++ writel(io_v2p(PKUNITY_PCIAHB_BASE) | PCIBRI_BARx_MEM, PCIBRI_PCIBAR0);
+ writel(0xF8000000, PCIBRI_PCIAMR0);
+ writel(PKUNITY_SDRAM_BASE, PCIBRI_PCITAR0);
+
+diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
+index 7d10e7b07c20..8b1b6beb858e 100644
+--- a/arch/unicore32/kernel/puv3-core.c
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -50,8 +50,8 @@ unsigned long long sched_clock(void)
+ static struct resource puv3_usb_resources[] = {
+ /* order is significant! */
+ {
+- .start = PKUNITY_USB_BASE,
+- .end = PKUNITY_USB_BASE + 0x3ff,
++ .start = io_v2p(PKUNITY_USB_BASE),
++ .end = io_v2p(PKUNITY_USB_BASE) + 0x3ff,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_USB,
+@@ -82,8 +82,8 @@ static struct musb_hdrc_platform_data puv3_usb_plat = {
+
+ static struct resource puv3_mmc_resources[] = {
+ [0] = {
+- .start = PKUNITY_SDC_BASE,
+- .end = PKUNITY_SDC_BASE + 0xfff,
++ .start = io_v2p(PKUNITY_SDC_BASE),
++ .end = io_v2p(PKUNITY_SDC_BASE) + 0xfff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+@@ -95,8 +95,8 @@ static struct resource puv3_mmc_resources[] = {
+
+ static struct resource puv3_unigfx_resources[] = {
+ [0] = {
+- .start = PKUNITY_UNIGFX_BASE,
+- .end = PKUNITY_UNIGFX_BASE + 0xfff,
++ .start = io_v2p(PKUNITY_UNIGFX_BASE),
++ .end = io_v2p(PKUNITY_UNIGFX_BASE) + 0xfff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+@@ -108,8 +108,8 @@ static struct resource puv3_unigfx_resources[] = {
+
+ static struct resource puv3_rtc_resources[] = {
+ [0] = {
+- .start = PKUNITY_RTC_BASE,
+- .end = PKUNITY_RTC_BASE + 0xff,
++ .start = io_v2p(PKUNITY_RTC_BASE),
++ .end = io_v2p(PKUNITY_RTC_BASE) + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+@@ -126,16 +126,16 @@ static struct resource puv3_rtc_resources[] = {
+
+ static struct resource puv3_pwm_resources[] = {
+ [0] = {
+- .start = PKUNITY_OST_BASE + 0x80,
+- .end = PKUNITY_OST_BASE + 0xff,
++ .start = io_v2p(PKUNITY_OST_BASE) + 0x80,
++ .end = io_v2p(PKUNITY_OST_BASE) + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct resource puv3_uart0_resources[] = {
+ [0] = {
+- .start = PKUNITY_UART0_BASE,
+- .end = PKUNITY_UART0_BASE + 0xff,
++ .start = io_v2p(PKUNITY_UART0_BASE),
++ .end = io_v2p(PKUNITY_UART0_BASE) + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+@@ -147,8 +147,8 @@ static struct resource puv3_uart0_resources[] = {
+
+ static struct resource puv3_uart1_resources[] = {
+ [0] = {
+- .start = PKUNITY_UART1_BASE,
+- .end = PKUNITY_UART1_BASE + 0xff,
++ .start = io_v2p(PKUNITY_UART1_BASE),
++ .end = io_v2p(PKUNITY_UART1_BASE) + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+@@ -160,8 +160,8 @@ static struct resource puv3_uart1_resources[] = {
+
+ static struct resource puv3_umal_resources[] = {
+ [0] = {
+- .start = PKUNITY_UMAL_BASE,
+- .end = PKUNITY_UMAL_BASE + 0x1fff,
++ .start = io_v2p(PKUNITY_UMAL_BASE),
++ .end = io_v2p(PKUNITY_UMAL_BASE) + 0x1fff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c
+index a78e60420653..e731c561ed4e 100644
+--- a/arch/unicore32/kernel/puv3-nb0916.c
++++ b/arch/unicore32/kernel/puv3-nb0916.c
+@@ -39,8 +39,8 @@ static struct resource physmap_flash_resource = {
+
+ static struct resource puv3_i2c_resources[] = {
+ [0] = {
+- .start = PKUNITY_I2C_BASE,
+- .end = PKUNITY_I2C_BASE + 0xff,
++ .start = io_v2p(PKUNITY_I2C_BASE),
++ .end = io_v2p(PKUNITY_I2C_BASE) + 0xff,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+diff --git a/arch/unicore32/kernel/sleep.S b/arch/unicore32/kernel/sleep.S
+index f7c3fc87f7fe..607a104aec59 100644
+--- a/arch/unicore32/kernel/sleep.S
++++ b/arch/unicore32/kernel/sleep.S
+@@ -76,10 +76,10 @@ ENTRY(puv3_cpu_suspend)
+
+
+ @ DDR2 BaseAddr
+- ldw r0, =io_p2v(PKUNITY_DDR2CTRL_BASE)
++ ldw r0, =(PKUNITY_DDR2CTRL_BASE)
+
+ @ PM BaseAddr
+- ldw r1, =io_p2v(PKUNITY_PM_BASE)
++ ldw r1, =(PKUNITY_PM_BASE)
+
+ @ set PLL_SYS_CFG reg, 275
+ movl r6, #0x00002401commit 4fde87cb13a29c06e0b4c2cba86445492098fbc2
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sun Feb 27 12:46:06 2011 +0800
+
+ unicore32: replace unicore32-specific iomap functions with generic lib implementation
+
+ 1. define and enable CONFIG_GENERIC_IOMAP
+ 2. define unicore32-specific PCI_IOBASE for asm-generic/io.h
+ 3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros
+ 4. remove all unicore32-specific iomap functions
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-and-Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+index 7f65018e64ac..4a36db45fb3d 100644
+--- a/arch/unicore32/Kconfig
++++ b/arch/unicore32/Kconfig
+@@ -30,6 +30,9 @@ config GENERIC_CLOCKEVENTS
+ config GENERIC_CSUM
+ def_bool y
+
++config GENERIC_IOMAP
++ def_bool y
++
+ config NO_IOPORT
+ bool
+
+diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
+index d73457c1800a..2483fcbadbe4 100644
+--- a/arch/unicore32/include/asm/io.h
++++ b/arch/unicore32/include/asm/io.h
+@@ -18,6 +18,7 @@
+ #include <asm/memory.h>
+ #include <asm/system.h>
+
++#define PCI_IOBASE io_p2v(PKUNITY_PCILIO_BASE)
+ #include <asm-generic/io.h>
+
+ /*
+@@ -38,9 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
+ #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size)
+ #define iounmap(cookie) __uc32_iounmap(cookie)
+
+-extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
+-extern void ioport_unmap(void __iomem *addr);
+-
+ /*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+@@ -48,5 +46,10 @@ extern void ioport_unmap(void __iomem *addr);
+ #undef xlate_dev_mem_ptr
+ #define xlate_dev_mem_ptr(p) __va(p)
+
++#define HAVE_ARCH_PIO_SIZE
++#define PIO_OFFSET (unsigned int)(PCI_IOBASE)
++#define PIO_MASK (unsigned int)(IO_SPACE_LIMIT)
++#define PIO_RESERVED (PIO_OFFSET + PIO_MASK + 1)
++
+ #endif /* __KERNEL__ */
+ #endif /* __UNICORE_IO_H__ */
+diff --git a/arch/unicore32/mm/Makefile b/arch/unicore32/mm/Makefile
+index f3ff41039f51..46c166699319 100644
+--- a/arch/unicore32/mm/Makefile
++++ b/arch/unicore32/mm/Makefile
+@@ -3,7 +3,7 @@
+ #
+
+ obj-y := extable.o fault.o init.o pgd.o mmu.o
+-obj-y += iomap.o flush.o ioremap.o
++obj-y += flush.o ioremap.o
+
+ obj-$(CONFIG_SWIOTLB) += dma-swiotlb.o
+
+diff --git a/arch/unicore32/mm/iomap.c b/arch/unicore32/mm/iomap.c
+deleted file mode 100644
+index a7e1a3d2e069..000000000000
+--- a/arch/unicore32/mm/iomap.c
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/*
+- * linux/arch/unicore32/mm/iomap.c
+- *
+- * Code specific to PKUnity SoC and UniCore ISA
+- *
+- * Copyright (C) 2001-2010 GUAN Xue-tao
+- *
+- * 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.
+- *
+- * Map IO port and PCI memory spaces so that {read,write}[bwl] can
+- * be used to access this memory.
+- */
+-#include <linux/module.h>
+-#include <linux/pci.h>
+-#include <linux/ioport.h>
+-#include <linux/io.h>
+-
+-#ifdef __io
+-void __iomem *ioport_map(unsigned long port, unsigned int nr)
+-{
+- /* we map PC lagcy 64K IO port to PCI IO space 0x80030000 */
+- return (void __iomem *) (unsigned long)
+- io_p2v((port & 0xffff) + PKUNITY_PCILIO_BASE);
+-}
+-EXPORT_SYMBOL(ioport_map);
+-
+-void ioport_unmap(void __iomem *addr)
+-{
+-}
+-EXPORT_SYMBOL(ioport_unmap);
+-#endif
+-
+-#ifdef CONFIG_PCI
+-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+-{
+- resource_size_t start = pci_resource_start(dev, bar);
+- resource_size_t len = pci_resource_len(dev, bar);
+- unsigned long flags = pci_resource_flags(dev, bar);
+-
+- if (!len || !start)
+- return NULL;
+- if (maxlen && len > maxlen)
+- len = maxlen;
+- if (flags & IORESOURCE_IO)
+- return ioport_map(start, len);
+- if (flags & IORESOURCE_MEM) {
+- if (flags & IORESOURCE_CACHEABLE)
+- return ioremap(start, len);
+- return ioremap_nocache(start, len);
+- }
+- return NULL;
+-}
+-EXPORT_SYMBOL(pci_iomap);
+-#endifcommit ce443ab5fd536941da1d529ba3963324f941fc29
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 21:39:10 2011 +0800
+
+ unicore32 machine related: add frame buffer driver for pkunity-v3 soc
+
+ change from original version -- by advice of Paul Mundt
+ 1. remove videomemorysize definitions
+ 2. remove unifb_enable and unifb_setup
+ 3. use dev_warn instead of printk in fb driver
+ 4. remove judgement for FB_ACCEL_PUV3_UNIGFX
+ 5. adjust clk_get and clk_set_rate calls
+ 6. add resources definitions
+ 7. remove unifb_option
+ 8. adjust register for platform_device
+ 9. adjust unifb_ops position and unifb_regs assignment position
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index fa842ba63a1b..98f942eb7286 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4902,6 +4902,7 @@ S: Maintained
+ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+ F: drivers/input/serio/i8042-unicore32io.h
+ F: drivers/i2c/busses/i2c-puv3.c
++F: drivers/video/fb-puv3.c
+
+ PMC SIERRA MaxRAID DRIVER
+ M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+diff --git a/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/debug_defconfig
+index bf42abdd9683..b5fbde9f1cb2 100644
+--- a/arch/unicore32/configs/debug_defconfig
++++ b/arch/unicore32/configs/debug_defconfig
+@@ -66,7 +66,6 @@ CONFIG_LCD_BACKLIGHT=n
+
+ CONFIG_PUV3_RTC=y
+ CONFIG_PUV3_UMAL=y
+-CONFIG_PUV3_UNIGFX=y
+ CONFIG_PUV3_MUSB=n
+ CONFIG_PUV3_AC97=n
+ CONFIG_PUV3_NAND=n
+@@ -130,6 +129,8 @@ CONFIG_VIDEO_DEV=n
+ CONFIG_USB_VIDEO_CLASS=n
+
+ # Graphics support
++CONFIG_FB=y
++CONFIG_FB_PUV3_UNIGFX=y
+ # Console display driver support
+ CONFIG_VGA_CONSOLE=n
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+diff --git a/arch/unicore32/include/mach/memory.h b/arch/unicore32/include/mach/memory.h
+index 541949dfa5b4..b774eff3ea65 100644
+--- a/arch/unicore32/include/mach/memory.h
++++ b/arch/unicore32/include/mach/memory.h
+@@ -50,7 +50,7 @@ void puv3_pci_adjust_zones(unsigned long *size, unsigned long *holes);
+
+ /* kuser area */
+ #define KUSER_VECPAGE_BASE (KUSER_BASE + UL(0x3fff0000))
+-#define KUSER_UNIGFX_BASE (KUSER_BASE + PKUNITY_UNIGFX_MMAP_BASE)
++#define KUSER_UNIGFX_BASE (PAGE_OFFSET + PKUNITY_UNIGFX_MMAP_BASE)
+ /* kuser_vecpage (0xbfff0000) is ro, and vectors page (0xffff0000) is rw */
+ #define kuser_vecpage_to_vectors(x) ((x) - (KUSER_VECPAGE_BASE) \
+ + (VECTORS_BASE))
+diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
+index 6edf928a106c..7d10e7b07c20 100644
+--- a/arch/unicore32/kernel/puv3-core.c
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -93,6 +93,19 @@ static struct resource puv3_mmc_resources[] = {
+ },
+ };
+
++static struct resource puv3_unigfx_resources[] = {
++ [0] = {
++ .start = PKUNITY_UNIGFX_BASE,
++ .end = PKUNITY_UNIGFX_BASE + 0xfff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = PKUNITY_UNIGFX_MMAP_BASE,
++ .end = PKUNITY_UNIGFX_MMAP_BASE + PKUNITY_UNIGFX_MMAP_SIZE,
++ .flags = IORESOURCE_MEM,
++ },
++};
++
+ static struct resource puv3_rtc_resources[] = {
+ [0] = {
+ .start = PKUNITY_RTC_BASE,
+@@ -256,6 +269,8 @@ void __init puv3_core_init(void)
+ puv3_umal_resources, ARRAY_SIZE(puv3_umal_resources));
+ platform_device_register_simple("PKUnity-v3-MMC", -1,
+ puv3_mmc_resources, ARRAY_SIZE(puv3_mmc_resources));
++ platform_device_register_simple("PKUnity-v3-UNIGFX", -1,
++ puv3_unigfx_resources, ARRAY_SIZE(puv3_unigfx_resources));
+ platform_device_register_simple("PKUnity-v3-PWM", -1,
+ puv3_pwm_resources, ARRAY_SIZE(puv3_pwm_resources));
+ platform_device_register_simple("PKUnity-v3-UART", 0,
+diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
+index 6bafb51bb437..ec55a87899ab 100644
+--- a/drivers/video/Kconfig
++++ b/drivers/video/Kconfig
+@@ -2365,6 +2365,17 @@ config FB_JZ4740
+ help
+ Framebuffer support for the JZ4740 SoC.
+
++config FB_PUV3_UNIGFX
++ tristate "PKUnity v3 Unigfx framebuffer support"
++ depends on FB && UNICORE32 && ARCH_PUV3
++ select FB_SYS_FILLRECT
++ select FB_SYS_COPYAREA
++ select FB_SYS_IMAGEBLIT
++ select FB_SYS_FOPS
++ help
++ Choose this option if you want to use the Unigfx device as a
++ framebuffer device. Without the support of PCI & AGP.
++
+ source "drivers/video/omap/Kconfig"
+ source "drivers/video/omap2/Kconfig"
+
+diff --git a/drivers/video/Makefile b/drivers/video/Makefile
+index 8c8fabdff9d0..b0eb3da24670 100644
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
+@@ -139,6 +139,7 @@ obj-$(CONFIG_FB_MB862XX) += mb862xx/
+ obj-$(CONFIG_FB_MSM) += msm/
+ obj-$(CONFIG_FB_NUC900) += nuc900fb.o
+ obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o
++obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o
+
+ # Platform or fallback drivers go here
+ obj-$(CONFIG_FB_UVESA) += uvesafb.o
+diff --git a/drivers/video/fb-puv3.c b/drivers/video/fb-puv3.c
+new file mode 100644
+index 000000000000..dbd2dc4745d1
+--- /dev/null
++++ b/drivers/video/fb-puv3.c
+@@ -0,0 +1,846 @@
++/*
++ * Frame Buffer Driver for PKUnity-v3 Unigfx
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/vmalloc.h>
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <linux/fb.h>
++#include <linux/init.h>
++#include <linux/console.h>
++
++#include <asm/sizes.h>
++#include <mach/hardware.h>
++
++/* Platform_data reserved for unifb registers. */
++#define UNIFB_REGS_NUM 10
++/* RAM reserved for the frame buffer. */
++#define UNIFB_MEMSIZE (SZ_4M) /* 4 MB for 1024*768*32b */
++
++/*
++ * cause UNIGFX don not have EDID
++ * all the modes are organized as follow
++ */
++static const struct fb_videomode unifb_modes[] = {
++ /* 0 640x480-60 VESA */
++ { "640x480@60", 60, 640, 480, 25175000, 48, 16, 34, 10, 96, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 1 640x480-75 VESA */
++ { "640x480@75", 75, 640, 480, 31500000, 120, 16, 18, 1, 64, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 2 800x600-60 VESA */
++ { "800x600@60", 60, 800, 600, 40000000, 88, 40, 26, 1, 128, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 3 800x600-75 VESA */
++ { "800x600@75", 75, 800, 600, 49500000, 160, 16, 23, 1, 80, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 4 1024x768-60 VESA */
++ { "1024x768@60", 60, 1024, 768, 65000000, 160, 24, 34, 3, 136, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 5 1024x768-75 VESA */
++ { "1024x768@75", 75, 1024, 768, 78750000, 176, 16, 30, 1, 96, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 6 1280x960-60 VESA */
++ { "1280x960@60", 60, 1280, 960, 108000000, 312, 96, 38, 1, 112, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 7 1440x900-60 VESA */
++ { "1440x900@60", 60, 1440, 900, 106500000, 232, 80, 30, 3, 152, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 8 FIXME 9 1024x600-60 VESA UNTESTED */
++ { "1024x600@60", 60, 1024, 600, 50650000, 160, 24, 26, 1, 136, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 9 FIXME 10 1024x600-75 VESA UNTESTED */
++ { "1024x600@75", 75, 1024, 600, 61500000, 176, 16, 23, 1, 96, 1,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++ /* 10 FIXME 11 1366x768-60 VESA UNTESTED */
++ { "1366x768@60", 60, 1366, 768, 85500000, 256, 58, 18, 1, 112, 3,
++ 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
++};
++
++static struct fb_var_screeninfo unifb_default = {
++ .xres = 640,
++ .yres = 480,
++ .xres_virtual = 640,
++ .yres_virtual = 480,
++ .bits_per_pixel = 16,
++ .red = { 11, 5, 0 },
++ .green = { 5, 6, 0 },
++ .blue = { 0, 5, 0 },
++ .activate = FB_ACTIVATE_NOW,
++ .height = -1,
++ .width = -1,
++ .pixclock = 25175000,
++ .left_margin = 48,
++ .right_margin = 16,
++ .upper_margin = 33,
++ .lower_margin = 10,
++ .hsync_len = 96,
++ .vsync_len = 2,
++ .vmode = FB_VMODE_NONINTERLACED,
++};
++
++static struct fb_fix_screeninfo unifb_fix = {
++ .id = "UNIGFX FB",
++ .type = FB_TYPE_PACKED_PIXELS,
++ .visual = FB_VISUAL_TRUECOLOR,
++ .xpanstep = 1,
++ .ypanstep = 1,
++ .ywrapstep = 1,
++ .accel = FB_ACCEL_NONE,
++};
++
++static void unifb_sync(struct fb_info *info)
++{
++ /* TODO: may, this can be replaced by interrupt */
++ int cnt;
++
++ for (cnt = 0; cnt < 0x10000000; cnt++) {
++ if (readl(UGE_COMMAND) & 0x1000000)
++ return;
++ }
++
++ if (cnt > 0x8000000)
++ dev_warn(info->device, "Warning: UniGFX GE time out ...\n");
++}
++
++static void unifb_prim_fillrect(struct fb_info *info,
++ const struct fb_fillrect *region)
++{
++ int awidth = region->width;
++ int aheight = region->height;
++ int m_iBpp = info->var.bits_per_pixel;
++ int screen_width = info->var.xres;
++ int src_sel = 1; /* from fg_color */
++ int pat_sel = 1;
++ int src_x0 = 0;
++ int dst_x0 = region->dx;
++ int src_y0 = 0;
++ int dst_y0 = region->dy;
++ int rop_alpha_sel = 0;
++ int rop_alpha_code = 0xCC;
++ int x_dir = 1;
++ int y_dir = 1;
++ int alpha_r = 0;
++ int alpha_sel = 0;
++ int dst_pitch = screen_width * (m_iBpp / 8);
++ int dst_offset = dst_y0 * dst_pitch + dst_x0 * (m_iBpp / 8);
++ int src_pitch = screen_width * (m_iBpp / 8);
++ int src_offset = src_y0 * src_pitch + src_x0 * (m_iBpp / 8);
++ unsigned int command = 0;
++ int clip_region = 0;
++ int clip_en = 0;
++ int tp_en = 0;
++ int fg_color = 0;
++ int bottom = info->var.yres - 1;
++ int right = info->var.xres - 1;
++ int top = 0;
++
++ bottom = (bottom << 16) | right;
++ command = (rop_alpha_sel << 26) | (pat_sel << 18) | (src_sel << 16)
++ | (x_dir << 20) | (y_dir << 21) | (command << 24)
++ | (clip_region << 23) | (clip_en << 22) | (tp_en << 27);
++ src_pitch = (dst_pitch << 16) | src_pitch;
++ awidth = awidth | (aheight << 16);
++ alpha_r = ((rop_alpha_code & 0xff) << 8) | (alpha_r & 0xff)
++ | (alpha_sel << 16);
++ src_x0 = (src_x0 & 0x1fff) | ((src_y0 & 0x1fff) << 16);
++ dst_x0 = (dst_x0 & 0x1fff) | ((dst_y0 & 0x1fff) << 16);
++ fg_color = region->color;
++
++ unifb_sync(info);
++
++ writel(((u32 *)(info->pseudo_palette))[fg_color], UGE_FCOLOR);
++ writel(0, UGE_BCOLOR);
++ writel(src_pitch, UGE_PITCH);
++ writel(src_offset, UGE_SRCSTART);
++ writel(dst_offset, UGE_DSTSTART);
++ writel(awidth, UGE_WIDHEIGHT);
++ writel(top, UGE_CLIP0);
++ writel(bottom, UGE_CLIP1);
++ writel(alpha_r, UGE_ROPALPHA);
++ writel(src_x0, UGE_SRCXY);
++ writel(dst_x0, UGE_DSTXY);
++ writel(command, UGE_COMMAND);
++}
++
++static void unifb_fillrect(struct fb_info *info,
++ const struct fb_fillrect *region)
++{
++ struct fb_fillrect modded;
++ int vxres, vyres;
++
++ if (info->flags & FBINFO_HWACCEL_DISABLED) {
++ sys_fillrect(info, region);
++ return;
++ }
++
++ vxres = info->var.xres_virtual;
++ vyres = info->var.yres_virtual;
++
++ memcpy(&modded, region, sizeof(struct fb_fillrect));
++
++ if (!modded.width || !modded.height ||
++ modded.dx >= vxres || modded.dy >= vyres)
++ return;
++
++ if (modded.dx + modded.width > vxres)
++ modded.width = vxres - modded.dx;
++ if (modded.dy + modded.height > vyres)
++ modded.height = vyres - modded.dy;
++
++ unifb_prim_fillrect(info, &modded);
++}
++
++static void unifb_prim_copyarea(struct fb_info *info,
++ const struct fb_copyarea *area)
++{
++ int awidth = area->width;
++ int aheight = area->height;
++ int m_iBpp = info->var.bits_per_pixel;
++ int screen_width = info->var.xres;
++ int src_sel = 2; /* from mem */
++ int pat_sel = 0;
++ int src_x0 = area->sx;
++ int dst_x0 = area->dx;
++ int src_y0 = area->sy;
++ int dst_y0 = area->dy;
++
++ int rop_alpha_sel = 0;
++ int rop_alpha_code = 0xCC;
++ int x_dir = 1;
++ int y_dir = 1;
++
++ int alpha_r = 0;
++ int alpha_sel = 0;
++ int dst_pitch = screen_width * (m_iBpp / 8);
++ int dst_offset = dst_y0 * dst_pitch + dst_x0 * (m_iBpp / 8);
++ int src_pitch = screen_width * (m_iBpp / 8);
++ int src_offset = src_y0 * src_pitch + src_x0 * (m_iBpp / 8);
++ unsigned int command = 0;
++ int clip_region = 0;
++ int clip_en = 1;
++ int tp_en = 0;
++ int top = 0;
++ int bottom = info->var.yres;
++ int right = info->var.xres;
++ int fg_color = 0;
++ int bg_color = 0;
++
++ if (src_x0 < 0)
++ src_x0 = 0;
++ if (src_y0 < 0)
++ src_y0 = 0;
++
++ if (src_y0 - dst_y0 > 0) {
++ y_dir = 1;
++ } else {
++ y_dir = 0;
++ src_offset = (src_y0 + aheight) * src_pitch +
++ src_x0 * (m_iBpp / 8);
++ dst_offset = (dst_y0 + aheight) * dst_pitch +
++ dst_x0 * (m_iBpp / 8);
++ src_y0 += aheight;
++ dst_y0 += aheight;
++ }
++
++ command = (rop_alpha_sel << 26) | (pat_sel << 18) | (src_sel << 16) |
++ (x_dir << 20) | (y_dir << 21) | (command << 24) |
++ (clip_region << 23) | (clip_en << 22) | (tp_en << 27);
++ src_pitch = (dst_pitch << 16) | src_pitch;
++ awidth = awidth | (aheight << 16);
++ alpha_r = ((rop_alpha_code & 0xff) << 8) | (alpha_r & 0xff) |
++ (alpha_sel << 16);
++ src_x0 = (src_x0 & 0x1fff) | ((src_y0 & 0x1fff) << 16);
++ dst_x0 = (dst_x0 & 0x1fff) | ((dst_y0 & 0x1fff) << 16);
++ bottom = (bottom << 16) | right;
++
++ unifb_sync(info);
++
++ writel(src_pitch, UGE_PITCH);
++ writel(src_offset, UGE_SRCSTART);
++ writel(dst_offset, UGE_DSTSTART);
++ writel(awidth, UGE_WIDHEIGHT);
++ writel(top, UGE_CLIP0);
++ writel(bottom, UGE_CLIP1);
++ writel(bg_color, UGE_BCOLOR);
++ writel(fg_color, UGE_FCOLOR);
++ writel(alpha_r, UGE_ROPALPHA);
++ writel(src_x0, UGE_SRCXY);
++ writel(dst_x0, UGE_DSTXY);
++ writel(command, UGE_COMMAND);
++}
++
++static void unifb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
++{
++ struct fb_copyarea modded;
++ u32 vxres, vyres;
++ modded.sx = area->sx;
++ modded.sy = area->sy;
++ modded.dx = area->dx;
++ modded.dy = area->dy;
++ modded.width = area->width;
++ modded.height = area->height;
++
++ if (info->flags & FBINFO_HWACCEL_DISABLED) {
++ sys_copyarea(info, area);
++ return;
++ }
++
++ vxres = info->var.xres_virtual;
++ vyres = info->var.yres_virtual;
++
++ if (!modded.width || !modded.height ||
++ modded.sx >= vxres || modded.sy >= vyres ||
++ modded.dx >= vxres || modded.dy >= vyres)
++ return;
++
++ if (modded.sx + modded.width > vxres)
++ modded.width = vxres - modded.sx;
++ if (modded.dx + modded.width > vxres)
++ modded.width = vxres - modded.dx;
++ if (modded.sy + modded.height > vyres)
++ modded.height = vyres - modded.sy;
++ if (modded.dy + modded.height > vyres)
++ modded.height = vyres - modded.dy;
++
++ unifb_prim_copyarea(info, &modded);
++}
++
++static void unifb_imageblit(struct fb_info *info, const struct fb_image *image)
++{
++ sys_imageblit(info, image);
++}
++
++static u_long get_line_length(int xres_virtual, int bpp)
++{
++ u_long length;
++
++ length = xres_virtual * bpp;
++ length = (length + 31) & ~31;
++ length >>= 3;
++ return length;
++}
++
++/*
++ * Setting the video mode has been split into two parts.
++ * First part, xxxfb_check_var, must not write anything
++ * to hardware, it should only verify and adjust var.
++ * This means it doesn't alter par but it does use hardware
++ * data from it to check this var.
++ */
++static int unifb_check_var(struct fb_var_screeninfo *var,
++ struct fb_info *info)
++{
++ u_long line_length;
++
++ /*
++ * FB_VMODE_CONUPDATE and FB_VMODE_SMOOTH_XPAN are equal!
++ * as FB_VMODE_SMOOTH_XPAN is only used internally
++ */
++
++ if (var->vmode & FB_VMODE_CONUPDATE) {
++ var->vmode |= FB_VMODE_YWRAP;
++ var->xoffset = info->var.xoffset;
++ var->yoffset = info->var.yoffset;
++ }
++
++ /*
++ * Some very basic checks
++ */
++ if (!var->xres)
++ var->xres = 1;
++ if (!var->yres)
++ var->yres = 1;
++ if (var->xres > var->xres_virtual)
++ var->xres_virtual = var->xres;
++ if (var->yres > var->yres_virtual)
++ var->yres_virtual = var->yres;
++ if (var->bits_per_pixel <= 1)
++ var->bits_per_pixel = 1;
++ else if (var->bits_per_pixel <= 8)
++ var->bits_per_pixel = 8;
++ else if (var->bits_per_pixel <= 16)
++ var->bits_per_pixel = 16;
++ else if (var->bits_per_pixel <= 24)
++ var->bits_per_pixel = 24;
++ else if (var->bits_per_pixel <= 32)
++ var->bits_per_pixel = 32;
++ else
++ return -EINVAL;
++
++ if (var->xres_virtual < var->xoffset + var->xres)
++ var->xres_virtual = var->xoffset + var->xres;
++ if (var->yres_virtual < var->yoffset + var->yres)
++ var->yres_virtual = var->yoffset + var->yres;
++
++ /*
++ * Memory limit
++ */
++ line_length =
++ get_line_length(var->xres_virtual, var->bits_per_pixel);
++ if (line_length * var->yres_virtual > UNIFB_MEMSIZE)
++ return -ENOMEM;
++
++ /*
++ * Now that we checked it we alter var. The reason being is that the
++ * video mode passed in might not work but slight changes to it might
++ * make it work. This way we let the user know what is acceptable.
++ */
++ switch (var->bits_per_pixel) {
++ case 1:
++ case 8:
++ var->red.offset = 0;
++ var->red.length = 8;
++ var->green.offset = 0;
++ var->green.length = 8;
++ var->blue.offset = 0;
++ var->blue.length = 8;
++ var->transp.offset = 0;
++ var->transp.length = 0;
++ break;
++ case 16: /* RGBA 5551 */
++ if (var->transp.length) {
++ var->red.offset = 0;
++ var->red.length = 5;
++ var->green.offset = 5;
++ var->green.length = 5;
++ var->blue.offset = 10;
++ var->blue.length = 5;
++ var->transp.offset = 15;
++ var->transp.length = 1;
++ } else { /* RGB 565 */
++ var->red.offset = 11;
++ var->red.length = 5;
++ var->green.offset = 5;
++ var->green.length = 6;
++ var->blue.offset = 0;
++ var->blue.length = 5;
++ var->transp.offset = 0;
++ var->transp.length = 0;
++ }
++ break;
++ case 24: /* RGB 888 */
++ var->red.offset = 0;
++ var->red.length = 8;
++ var->green.offset = 8;
++ var->green.length = 8;
++ var->blue.offset = 16;
++ var->blue.length = 8;
++ var->transp.offset = 0;
++ var->transp.length = 0;
++ break;
++ case 32: /* RGBA 8888 */
++ var->red.offset = 16;
++ var->red.length = 8;
++ var->green.offset = 8;
++ var->green.length = 8;
++ var->blue.offset = 0;
++ var->blue.length = 8;
++ var->transp.offset = 24;
++ var->transp.length = 8;
++ break;
++ }
++ var->red.msb_right = 0;
++ var->green.msb_right = 0;
++ var->blue.msb_right = 0;
++ var->transp.msb_right = 0;
++
++ return 0;
++}
++
++/*
++ * This routine actually sets the video mode. It's in here where we
++ * the hardware state info->par and fix which can be affected by the
++ * change in par. For this driver it doesn't do much.
++ */
++static int unifb_set_par(struct fb_info *info)
++{
++ int hTotal, vTotal, hSyncStart, hSyncEnd, vSyncStart, vSyncEnd;
++ int format;
++
++#ifdef CONFIG_PUV3_PM
++ struct clk *clk_vga;
++ u32 pixclk = 0;
++ int i;
++
++ for (i = 0; i <= 10; i++) {
++ if (info->var.xres == unifb_modes[i].xres
++ && info->var.yres == unifb_modes[i].yres
++ && info->var.upper_margin == unifb_modes[i].upper_margin
++ && info->var.lower_margin == unifb_modes[i].lower_margin
++ && info->var.left_margin == unifb_modes[i].left_margin
++ && info->var.right_margin == unifb_modes[i].right_margin
++ && info->var.hsync_len == unifb_modes[i].hsync_len
++ && info->var.vsync_len == unifb_modes[i].vsync_len) {
++ pixclk = unifb_modes[i].pixclock;
++ break;
++ }
++ }
++
++ /* set clock rate */
++ clk_vga = clk_get(info->device, "VGA_CLK");
++ if (clk_vga == ERR_PTR(-ENOENT))
++ return -ENOENT;
++
++ if (pixclk != 0) {
++ if (clk_set_rate(clk_vga, pixclk)) { /* set clock failed */
++ info->fix = unifb_fix;
++ info->var = unifb_default;
++ if (clk_set_rate(clk_vga, unifb_default.pixclock))
++ return -EINVAL;
++ }
++ }
++#endif
++
++ info->fix.line_length = get_line_length(info->var.xres_virtual,
++ info->var.bits_per_pixel);
++
++ hSyncStart = info->var.xres + info->var.right_margin;
++ hSyncEnd = hSyncStart + info->var.hsync_len;
++ hTotal = hSyncEnd + info->var.left_margin;
++
++ vSyncStart = info->var.yres + info->var.lower_margin;
++ vSyncEnd = vSyncStart + info->var.vsync_len;
++ vTotal = vSyncEnd + info->var.upper_margin;
++
++ switch (info->var.bits_per_pixel) {
++ case 8:
++ format = UDE_CFG_DST8;
++ break;
++ case 16:
++ format = UDE_CFG_DST16;
++ break;
++ case 24:
++ format = UDE_CFG_DST24;
++ break;
++ case 32:
++ format = UDE_CFG_DST32;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ writel(PKUNITY_UNIGFX_MMAP_BASE, UDE_FSA);
++ writel(info->var.yres, UDE_LS);
++ writel(get_line_length(info->var.xres,
++ info->var.bits_per_pixel) >> 3, UDE_PS);
++ /* >> 3 for hardware required. */
++ writel((hTotal << 16) | (info->var.xres), UDE_HAT);
++ writel(((hTotal - 1) << 16) | (info->var.xres - 1), UDE_HBT);
++ writel(((hSyncEnd - 1) << 16) | (hSyncStart - 1), UDE_HST);
++ writel((vTotal << 16) | (info->var.yres), UDE_VAT);
++ writel(((vTotal - 1) << 16) | (info->var.yres - 1), UDE_VBT);
++ writel(((vSyncEnd - 1) << 16) | (vSyncStart - 1), UDE_VST);
++ writel(UDE_CFG_GDEN_ENABLE | UDE_CFG_TIMEUP_ENABLE
++ | format | 0xC0000001, UDE_CFG);
++
++ return 0;
++}
++
++/*
++ * Set a single color register. The values supplied are already
++ * rounded down to the hardware's capabilities (according to the
++ * entries in the var structure). Return != 0 for invalid regno.
++ */
++static int unifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
++ u_int transp, struct fb_info *info)
++{
++ if (regno >= 256) /* no. of hw registers */
++ return 1;
++
++ /* grayscale works only partially under directcolor */
++ if (info->var.grayscale) {
++ /* grayscale = 0.30*R + 0.59*G + 0.11*B */
++ red = green = blue =
++ (red * 77 + green * 151 + blue * 28) >> 8;
++ }
++
++#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16)
++ switch (info->fix.visual) {
++ case FB_VISUAL_TRUECOLOR:
++ case FB_VISUAL_PSEUDOCOLOR:
++ red = CNVT_TOHW(red, info->var.red.length);
++ green = CNVT_TOHW(green, info->var.green.length);
++ blue = CNVT_TOHW(blue, info->var.blue.length);
++ transp = CNVT_TOHW(transp, info->var.transp.length);
++ break;
++ case FB_VISUAL_DIRECTCOLOR:
++ red = CNVT_TOHW(red, 8); /* expect 8 bit DAC */
++ green = CNVT_TOHW(green, 8);
++ blue = CNVT_TOHW(blue, 8);
++ /* hey, there is bug in transp handling... */
++ transp = CNVT_TOHW(transp, 8);
++ break;
++ }
++#undef CNVT_TOHW
++ /* Truecolor has hardware independent palette */
++ if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
++ u32 v;
++
++ if (regno >= 16)
++ return 1;
++
++ v = (red << info->var.red.offset) |
++ (green << info->var.green.offset) |
++ (blue << info->var.blue.offset) |
++ (transp << info->var.transp.offset);
++ switch (info->var.bits_per_pixel) {
++ case 8:
++ break;
++ case 16:
++ case 24:
++ case 32:
++ ((u32 *) (info->pseudo_palette))[regno] = v;
++ break;
++ default:
++ return 1;
++ }
++ return 0;
++ }
++ return 0;
++}
++
++/*
++ * Pan or Wrap the Display
++ *
++ * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
++ */
++static int unifb_pan_display(struct fb_var_screeninfo *var,
++ struct fb_info *info)
++{
++ if (var->vmode & FB_VMODE_YWRAP) {
++ if (var->yoffset < 0
++ || var->yoffset >= info->var.yres_virtual
++ || var->xoffset)
++ return -EINVAL;
++ } else {
++ if (var->xoffset + var->xres > info->var.xres_virtual ||
++ var->yoffset + var->yres > info->var.yres_virtual)
++ return -EINVAL;
++ }
++ info->var.xoffset = var->xoffset;
++ info->var.yoffset = var->yoffset;
++ if (var->vmode & FB_VMODE_YWRAP)
++ info->var.vmode |= FB_VMODE_YWRAP;
++ else
++ info->var.vmode &= ~FB_VMODE_YWRAP;
++ return 0;
++}
++
++int unifb_mmap(struct fb_info *info,
++ struct vm_area_struct *vma)
++{
++ unsigned long size = vma->vm_end - vma->vm_start;
++ unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
++ unsigned long pos = info->fix.smem_start + offset;
++
++ if (offset + size > info->fix.smem_len)
++ return -EINVAL;
++
++ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++
++ if (io_remap_pfn_range(vma, vma->vm_start, pos >> PAGE_SHIFT, size,
++ vma->vm_page_prot))
++ return -EAGAIN;
++
++ vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
++ return 0;
++
++}
++
++static struct fb_ops unifb_ops = {
++ .fb_read = fb_sys_read,
++ .fb_write = fb_sys_write,
++ .fb_check_var = unifb_check_var,
++ .fb_set_par = unifb_set_par,
++ .fb_setcolreg = unifb_setcolreg,
++ .fb_pan_display = unifb_pan_display,
++ .fb_fillrect = unifb_fillrect,
++ .fb_copyarea = unifb_copyarea,
++ .fb_imageblit = unifb_imageblit,
++ .fb_mmap = unifb_mmap,
++};
++
++/*
++ * Initialisation
++ */
++static int unifb_probe(struct platform_device *dev)
++{
++ struct fb_info *info;
++ u32 unifb_regs[UNIFB_REGS_NUM];
++ int retval = -ENOMEM;
++ struct resource *iomem, *mapmem;
++
++ info = framebuffer_alloc(sizeof(u32)*256, &dev->dev);
++ if (!info)
++ goto err;
++
++ info->screen_base = (char __iomem *)KUSER_UNIGFX_BASE;
++ info->fbops = &unifb_ops;
++
++ retval = fb_find_mode(&info->var, info, NULL,
++ unifb_modes, 10, &unifb_modes[0], 16);
++
++ if (!retval || (retval == 4))
++ info->var = unifb_default;
++
++ iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
++ unifb_fix.mmio_start = iomem->start;
++
++ mapmem = platform_get_resource(dev, IORESOURCE_MEM, 1);
++ unifb_fix.smem_start = mapmem->start;
++ unifb_fix.smem_len = UNIFB_MEMSIZE;
++
++ info->fix = unifb_fix;
++ info->pseudo_palette = info->par;
++ info->par = NULL;
++ info->flags = FBINFO_FLAG_DEFAULT;
++#ifdef FB_ACCEL_PUV3_UNIGFX
++ info->fix.accel = FB_ACCEL_PUV3_UNIGFX;
++#endif
++
++ retval = fb_alloc_cmap(&info->cmap, 256, 0);
++ if (retval < 0)
++ goto err1;
++
++ retval = register_framebuffer(info);
++ if (retval < 0)
++ goto err2;
++ platform_set_drvdata(dev, info);
++ platform_device_add_data(dev, unifb_regs, sizeof(u32) * UNIFB_REGS_NUM);
++
++ printk(KERN_INFO
++ "fb%d: Virtual frame buffer device, using %dM of video memory\n",
++ info->node, UNIFB_MEMSIZE >> 20);
++ return 0;
++err2:
++ fb_dealloc_cmap(&info->cmap);
++err1:
++ framebuffer_release(info);
++err:
++ return retval;
++}
++
++static int unifb_remove(struct platform_device *dev)
++{
++ struct fb_info *info = platform_get_drvdata(dev);
++
++ if (info) {
++ unregister_framebuffer(info);
++ fb_dealloc_cmap(&info->cmap);
++ framebuffer_release(info);
++ }
++ return 0;
++}
++
++#ifdef CONFIG_PM
++static int unifb_resume(struct platform_device *dev)
++{
++ int rc = 0;
++ u32 *unifb_regs = dev->dev.platform_data;
++
++ if (dev->dev.power.power_state.event == PM_EVENT_ON)
++ return 0;
++
++ console_lock();
++
++ if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
++ writel(unifb_regs[0], UDE_FSA);
++ writel(unifb_regs[1], UDE_LS);
++ writel(unifb_regs[2], UDE_PS);
++ writel(unifb_regs[3], UDE_HAT);
++ writel(unifb_regs[4], UDE_HBT);
++ writel(unifb_regs[5], UDE_HST);
++ writel(unifb_regs[6], UDE_VAT);
++ writel(unifb_regs[7], UDE_VBT);
++ writel(unifb_regs[8], UDE_VST);
++ writel(unifb_regs[9], UDE_CFG);
++ }
++ dev->dev.power.power_state = PMSG_ON;
++
++ console_unlock();
++
++ return rc;
++}
++
++static int unifb_suspend(struct platform_device *dev, pm_message_t mesg)
++{
++ u32 *unifb_regs = dev->dev.platform_data;
++
++ unifb_regs[0] = readl(UDE_FSA);
++ unifb_regs[1] = readl(UDE_LS);
++ unifb_regs[2] = readl(UDE_PS);
++ unifb_regs[3] = readl(UDE_HAT);
++ unifb_regs[4] = readl(UDE_HBT);
++ unifb_regs[5] = readl(UDE_HST);
++ unifb_regs[6] = readl(UDE_VAT);
++ unifb_regs[7] = readl(UDE_VBT);
++ unifb_regs[8] = readl(UDE_VST);
++ unifb_regs[9] = readl(UDE_CFG);
++
++ if (mesg.event == dev->dev.power.power_state.event)
++ return 0;
++
++ switch (mesg.event) {
++ case PM_EVENT_FREEZE: /* about to take snapshot */
++ case PM_EVENT_PRETHAW: /* before restoring snapshot */
++ goto done;
++ }
++
++ console_lock();
++
++ /* do nothing... */
++
++ console_unlock();
++
++done:
++ dev->dev.power.power_state = mesg;
++
++ return 0;
++}
++#else
++#define unifb_resume NULL
++#define unifb_suspend NULL
++#endif
++
++static struct platform_driver unifb_driver = {
++ .probe = unifb_probe,
++ .remove = unifb_remove,
++ .resume = unifb_resume,
++ .suspend = unifb_suspend,
++ .driver = {
++ .name = "PKUnity-v3-UNIGFX",
++ },
++};
++
++static int __init unifb_init(void)
++{
++#ifndef MODULE
++ if (fb_get_options("unifb", NULL))
++ return -ENODEV;
++#endif
++
++ return platform_driver_register(&unifb_driver);
++}
++
++module_init(unifb_init);
++
++static void __exit unifb_exit(void)
++{
++ platform_driver_unregister(&unifb_driver);
++}
++
++module_exit(unifb_exit);
++
++MODULE_LICENSE("GPL v2");
+diff --git a/include/linux/fb.h b/include/linux/fb.h
+index 68ba85a00c06..b2a36391d2a1 100644
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -152,6 +152,8 @@
+ #define FB_ACCEL_PROSAVAGE_DDR 0x8d /* S3 ProSavage DDR */
+ #define FB_ACCEL_PROSAVAGE_DDRK 0x8e /* S3 ProSavage DDR-K */
+
++#define FB_ACCEL_PUV3_UNIGFX 0xa0 /* PKUnity-v3 Unigfx */
++
+ struct fb_fix_screeninfo {
+ char id[16]; /* identification string eg "TT Builtin" */
+ unsigned long smem_start; /* Start of frame buffer mem */commit d10e4a660d11212a41ac5d2c116a655e25e2d38a
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 21:29:29 2011 +0800
+
+ unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
+
+ change from original version -- by advice of Jean Delvare
+ 1. remove global variable i2c_reg, replaced by local variables
+ 2. replace ENXIO with ENODEV when no platform resources
+ 3. add adapter->nr assignment before i2c_add_numbered_adapter() call
+ 4. add judgement for i2c_del_adapter() return value
+ 5. release adapter when driver removed
+ 6. add __devexit for puv3_i2c_remove() function
+ 7. modify several names to more appropriated ones
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index e8b15bfec6d6..fa842ba63a1b 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -4901,6 +4901,7 @@ W: http://mprc.pku.edu.cn/~guanxuetao/linux
+ S: Maintained
+ T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+ F: drivers/input/serio/i8042-unicore32io.h
++F: drivers/i2c/busses/i2c-puv3.c
+
+ PMC SIERRA MaxRAID DRIVER
+ M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+diff --git a/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/debug_defconfig
+index 3647f68147da..bf42abdd9683 100644
+--- a/arch/unicore32/configs/debug_defconfig
++++ b/arch/unicore32/configs/debug_defconfig
+@@ -114,6 +114,10 @@ CONFIG_INPUT_EVDEV=m
+ # Keyboards
+ CONFIG_KEYBOARD_GPIO=m
+
++# I2C support
++CONFIG_I2C=y
++CONFIG_I2C_PUV3=y
++
+ # Hardware Monitoring support
+ #CONFIG_SENSORS_LM75=m
+ # Generic Thermal sysfs driver
+diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
+index 113505a6434e..cbfcf6fb4a61 100644
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
+@@ -523,6 +523,17 @@ config I2C_PNX
+ This driver can also be built as a module. If so, the module
+ will be called i2c-pnx.
+
++config I2C_PUV3
++ tristate "PKUnity v3 I2C bus support"
++ depends on UNICORE32 && ARCH_PUV3
++ select I2C_ALGOBIT
++ help
++ This driver supports the I2C IP inside the PKUnity-v3 SoC.
++ This I2C bus controller is under AMBA/AXI bus.
++
++ This driver can also be built as a module. If so, the module
++ will be called i2c-puv3.
++
+ config I2C_PXA
+ tristate "Intel PXA2XX I2C adapter"
+ depends on ARCH_PXA || ARCH_MMP
+diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
+index 9d2d0ec7fb23..a83966acc5ab 100644
+--- a/drivers/i2c/busses/Makefile
++++ b/drivers/i2c/busses/Makefile
+@@ -51,6 +51,7 @@ obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o
+ obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o
+ obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o
+ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o
++obj-$(CONFIG_I2C_PUV3) += i2c-puv3.o
+ obj-$(CONFIG_I2C_PXA) += i2c-pxa.o
+ obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o
+ obj-$(CONFIG_I2C_S6000) += i2c-s6000.o
+diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c
+new file mode 100644
+index 000000000000..fac673940849
+--- /dev/null
++++ b/drivers/i2c/busses/i2c-puv3.c
+@@ -0,0 +1,306 @@
++/*
++ * I2C driver for PKUnity-v3 SoC
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/types.h>
++#include <linux/delay.h>
++#include <linux/i2c.h>
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <mach/hardware.h>
++
++/*
++ * Poll the i2c status register until the specified bit is set.
++ * Returns 0 if timed out (100 msec).
++ */
++static short poll_status(unsigned long bit)
++{
++ int loop_cntr = 1000;
++
++ if (bit & I2C_STATUS_TFNF) {
++ do {
++ udelay(10);
++ } while (!(readl(I2C_STATUS) & bit) && (--loop_cntr > 0));
++ } else {
++ /* RXRDY handler */
++ do {
++ if (readl(I2C_TAR) == I2C_TAR_EEPROM)
++ msleep(20);
++ else
++ udelay(10);
++ } while (!(readl(I2C_RXFLR) & 0xf) && (--loop_cntr > 0));
++ }
++
++ return (loop_cntr > 0);
++}
++
++static int xfer_read(struct i2c_adapter *adap, unsigned char *buf, int length)
++{
++ int i2c_reg = *buf;
++
++ /* Read data */
++ while (length--) {
++ if (!poll_status(I2C_STATUS_TFNF)) {
++ dev_dbg(&adap->dev, "Tx FIFO Not Full timeout\n");
++ return -ETIMEDOUT;
++ }
++
++ /* send addr */
++ writel(i2c_reg | I2C_DATACMD_WRITE, I2C_DATACMD);
++
++ /* get ready to next write */
++ i2c_reg++;
++
++ /* send read CMD */
++ writel(I2C_DATACMD_READ, I2C_DATACMD);
++
++ /* wait until the Rx FIFO have available */
++ if (!poll_status(I2C_STATUS_RFNE)) {
++ dev_dbg(&adap->dev, "RXRDY timeout\n");
++ return -ETIMEDOUT;
++ }
++
++ /* read the data to buf */
++ *buf = (readl(I2C_DATACMD) & I2C_DATACMD_DAT_MASK);
++ buf++;
++ }
++
++ return 0;
++}
++
++static int xfer_write(struct i2c_adapter *adap, unsigned char *buf, int length)
++{
++ int i2c_reg = *buf;
++
++ /* Do nothing but storing the reg_num to a static variable */
++ if (i2c_reg == -1) {
++ printk(KERN_WARNING "Error i2c reg\n");
++ return -ETIMEDOUT;
++ }
++
++ if (length == 1)
++ return 0;
++
++ buf++;
++ length--;
++ while (length--) {
++ /* send addr */
++ writel(i2c_reg | I2C_DATACMD_WRITE, I2C_DATACMD);
++
++ /* send write CMD */
++ writel(*buf | I2C_DATACMD_WRITE, I2C_DATACMD);
++
++ /* wait until the Rx FIFO have available */
++ msleep(20);
++
++ /* read the data to buf */
++ i2c_reg++;
++ buf++;
++ }
++
++ return 0;
++}
++
++/*
++ * Generic i2c master transfer entrypoint.
++ *
++ */
++static int puv3_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *pmsg,
++ int num)
++{
++ int i, ret;
++ unsigned char swap;
++
++ /* Disable i2c */
++ writel(I2C_ENABLE_DISABLE, I2C_ENABLE);
++
++ /* Set the work mode and speed*/
++ writel(I2C_CON_MASTER | I2C_CON_SPEED_STD | I2C_CON_SLAVEDISABLE, I2C_CON);
++
++ writel(pmsg->addr, I2C_TAR);
++
++ /* Enable i2c */
++ writel(I2C_ENABLE_ENABLE, I2C_ENABLE);
++
++ dev_dbg(&adap->dev, "puv3_i2c_xfer: processing %d messages:\n", num);
++
++ for (i = 0; i < num; i++) {
++ dev_dbg(&adap->dev, " #%d: %sing %d byte%s %s 0x%02x\n", i,
++ pmsg->flags & I2C_M_RD ? "read" : "writ",
++ pmsg->len, pmsg->len > 1 ? "s" : "",
++ pmsg->flags & I2C_M_RD ? "from" : "to", pmsg->addr);
++
++ if (pmsg->len && pmsg->buf) { /* sanity check */
++ if (pmsg->flags & I2C_M_RD)
++ ret = xfer_read(adap, pmsg->buf, pmsg->len);
++ else
++ ret = xfer_write(adap, pmsg->buf, pmsg->len);
++
++ if (ret)
++ return ret;
++
++ }
++ dev_dbg(&adap->dev, "transfer complete\n");
++ pmsg++; /* next message */
++ }
++
++ /* XXX: fixup be16_to_cpu in bq27x00_battery.c */
++ if (pmsg->addr == I2C_TAR_PWIC) {
++ swap = pmsg->buf[0];
++ pmsg->buf[0] = pmsg->buf[1];
++ pmsg->buf[1] = swap;
++ }
++
++ return i;
++}
++
++/*
++ * Return list of supported functionality.
++ */
++static u32 puv3_i2c_func(struct i2c_adapter *adapter)
++{
++ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
++}
++
++static struct i2c_algorithm puv3_i2c_algorithm = {
++ .master_xfer = puv3_i2c_xfer,
++ .functionality = puv3_i2c_func,
++};
++
++/*
++ * Main initialization routine.
++ */
++static int __devinit puv3_i2c_probe(struct platform_device *pdev)
++{
++ struct i2c_adapter *adapter;
++ struct resource *mem;
++ int rc;
++
++ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (!mem)
++ return -ENODEV;
++
++ if (!request_mem_region(mem->start, resource_size(mem), "puv3_i2c"))
++ return -EBUSY;
++
++ adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
++ if (adapter == NULL) {
++ dev_err(&pdev->dev, "can't allocate inteface!\n");
++ rc = -ENOMEM;
++ goto fail_nomem;
++ }
++ snprintf(adapter->name, sizeof(adapter->name), "PUV3-I2C at 0x%08x",
++ mem->start);
++ adapter->algo = &puv3_i2c_algorithm;
++ adapter->class = I2C_CLASS_HWMON;
++ adapter->dev.parent = &pdev->dev;
++
++ platform_set_drvdata(pdev, adapter);
++
++ adapter->nr = pdev->id;
++ rc = i2c_add_numbered_adapter(adapter);
++ if (rc) {
++ dev_err(&pdev->dev, "Adapter '%s' registration failed\n",
++ adapter->name);
++ goto fail_add_adapter;
++ }
++
++ dev_info(&pdev->dev, "PKUnity v3 i2c bus adapter.\n");
++ return 0;
++
++fail_add_adapter:
++ platform_set_drvdata(pdev, NULL);
++ kfree(adapter);
++fail_nomem:
++ release_mem_region(mem->start, resource_size(mem));
++
++ return rc;
++}
++
++static int __devexit puv3_i2c_remove(struct platform_device *pdev)
++{
++ struct i2c_adapter *adapter = platform_get_drvdata(pdev);
++ struct resource *mem;
++ int rc;
++
++ rc = i2c_del_adapter(adapter);
++ if (rc) {
++ dev_err(&pdev->dev, "Adapter '%s' delete fail\n",
++ adapter->name);
++ return rc;
++ }
++
++ put_device(&pdev->dev);
++ platform_set_drvdata(pdev, NULL);
++
++ mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ release_mem_region(mem->start, resource_size(mem));
++
++ return rc;
++}
++
++#ifdef CONFIG_PM
++static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t state)
++{
++ int poll_count;
++ /* Disable the IIC */
++ writel(I2C_ENABLE_DISABLE, I2C_ENABLE);
++ for (poll_count = 0; poll_count < 50; poll_count++) {
++ if (readl(I2C_ENSTATUS) & I2C_ENSTATUS_ENABLE)
++ udelay(25);
++ }
++
++ return 0;
++}
++
++static int puv3_i2c_resume(struct platform_device *dev)
++{
++ return 0 ;
++}
++#else
++#define puv3_i2c_suspend NULL
++#define puv3_i2c_resume NULL
++#endif
++
++MODULE_ALIAS("platform:puv3_i2c");
++
++static struct platform_driver puv3_i2c_driver = {
++ .probe = puv3_i2c_probe,
++ .remove = __devexit_p(puv3_i2c_remove),
++ .suspend = puv3_i2c_suspend,
++ .resume = puv3_i2c_resume,
++ .driver = {
++ .name = "PKUnity-v3-I2C",
++ .owner = THIS_MODULE,
++ }
++};
++
++static int __init puv3_i2c_init(void)
++{
++ return platform_driver_register(&puv3_i2c_driver);
++}
++
++static void __exit puv3_i2c_exit(void)
++{
++ platform_driver_unregister(&puv3_i2c_driver);
++}
++
++module_init(puv3_i2c_init);
++module_exit(puv3_i2c_exit);
++
++MODULE_DESCRIPTION("PKUnity v3 I2C driver");
++MODULE_LICENSE("GPL v2");commit e5abf78b57199a417eb01ff922a5ea6ff9e10b61
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 21:21:18 2011 +0800
+
+ unicore32 io: redefine __REG(x) and re-use readl/writel funcs
+
+ -- by advice of Arnd Bergmann
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/gpio.h b/arch/unicore32/include/asm/gpio.h
+index 3aaa41e9e413..2716f14e3ff6 100644
+--- a/arch/unicore32/include/asm/gpio.h
++++ b/arch/unicore32/include/asm/gpio.h
+@@ -13,6 +13,7 @@
+ #ifndef __UNICORE_GPIO_H__
+ #define __UNICORE_GPIO_H__
+
++#include <linux/io.h>
+ #include <asm/irq.h>
+ #include <mach/hardware.h>
+ #include <asm-generic/gpio.h>
+@@ -66,7 +67,7 @@
+ static inline int gpio_get_value(unsigned gpio)
+ {
+ if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))
+- return GPIO_GPLR & GPIO_GPIO(gpio);
++ return readl(GPIO_GPLR) & GPIO_GPIO(gpio);
+ else
+ return __gpio_get_value(gpio);
+ }
+@@ -75,9 +76,9 @@ static inline void gpio_set_value(unsigned gpio, int value)
+ {
+ if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))
+ if (value)
+- GPIO_GPSR = GPIO_GPIO(gpio);
++ writel(GPIO_GPIO(gpio), GPIO_GPSR);
+ else
+- GPIO_GPCR = GPIO_GPIO(gpio);
++ writel(GPIO_GPIO(gpio), GPIO_GPCR);
+ else
+ __gpio_set_value(gpio, value);
+ }
+@@ -86,7 +87,7 @@ static inline void gpio_set_value(unsigned gpio, int value)
+
+ static inline unsigned gpio_to_irq(unsigned gpio)
+ {
+- if ((gpio < IRQ_GPIOHIGH) && (FIELD(1, 1, gpio) & GPIO_GPIR))
++ if ((gpio < IRQ_GPIOHIGH) && (FIELD(1, 1, gpio) & readl(GPIO_GPIR)))
+ return IRQ_GPIOLOW0 + gpio;
+ else
+ return IRQ_GPIO0 + gpio;
+diff --git a/arch/unicore32/include/mach/dma.h b/arch/unicore32/include/mach/dma.h
+index 3e3224a10525..d655c1b6e083 100644
+--- a/arch/unicore32/include/mach/dma.h
++++ b/arch/unicore32/include/mach/dma.h
+@@ -35,7 +35,14 @@ extern int puv3_request_dma(char *name,
+
+ extern void puv3_free_dma(int dma_ch);
+
+-#define puv3_stop_dma(ch) (DMAC_CONFIG(ch) &= ~DMAC_CONFIG_EN)
+-#define puv3_resume_dma(ch) (DMAC_CONFIG(ch) |= DMAC_CONFIG_EN)
++static inline void puv3_stop_dma(int ch)
++{
++ writel(readl(DMAC_CONFIG(ch)) & ~DMAC_CONFIG_EN, DMAC_CONFIG(ch));
++}
++
++static inline void puv3_resume_dma(int ch)
++{
++ writel(readl(DMAC_CONFIG(ch)) | DMAC_CONFIG_EN, DMAC_CONFIG(ch));
++}
+
+ #endif /* __MACH_PUV3_DMA_H__ */
+diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h
+index c7d3dd6b4eff..b71405ab6de6 100644
+--- a/arch/unicore32/include/mach/hardware.h
++++ b/arch/unicore32/include/mach/hardware.h
+@@ -22,13 +22,7 @@
+
+ #ifndef __ASSEMBLY__
+
+-# define __REG(x) (*((volatile unsigned long *)io_p2v(x)))
+-# define __PREG(x) (io_v2p((unsigned long)&(x)))
+-
+-#else
+-
+-# define __REG(x) io_p2v(x)
+-# define __PREG(x) io_v2p(x)
++# define __REG(x) (void __iomem *)io_p2v(x)
+
+ #endif
+
+diff --git a/arch/unicore32/kernel/clock.c b/arch/unicore32/kernel/clock.c
+index 80323db581fd..18d4563e6fa5 100644
+--- a/arch/unicore32/kernel/clock.c
++++ b/arch/unicore32/kernel/clock.c
+@@ -20,6 +20,7 @@
+ #include <linux/clk.h>
+ #include <linux/mutex.h>
+ #include <linux/delay.h>
++#include <linux/io.h>
+
+ #include <mach/hardware.h>
+
+@@ -152,28 +153,29 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
+ if (ret)
+ return ret;
+
+- if (PM_PLLVGACFG == pll_vgacfg)
++ if (readl(PM_PLLVGACFG) == pll_vgacfg)
+ return 0;
+
+ /* set pll vga cfg reg. */
+- PM_PLLVGACFG = pll_vgacfg;
++ writel(pll_vgacfg, PM_PLLVGACFG);
+
+- PM_PMCR = PM_PMCR_CFBVGA;
+- while ((PM_PLLDFCDONE & PM_PLLDFCDONE_VGADFC)
++ writel(PM_PMCR_CFBVGA, PM_PMCR);
++ while ((readl(PM_PLLDFCDONE) & PM_PLLDFCDONE_VGADFC)
+ != PM_PLLDFCDONE_VGADFC)
+ udelay(100); /* about 1ms */
+
+ /* set div cfg reg. */
+- PM_PCGR |= PM_PCGR_VGACLK;
++ writel(readl(PM_PCGR) | PM_PCGR_VGACLK, PM_PCGR);
+
+- PM_DIVCFG = (PM_DIVCFG & ~PM_DIVCFG_VGACLK_MASK)
+- | PM_DIVCFG_VGACLK(pll_vgadiv);
++ writel((readl(PM_DIVCFG) & ~PM_DIVCFG_VGACLK_MASK)
++ | PM_DIVCFG_VGACLK(pll_vgadiv), PM_DIVCFG);
+
+- PM_SWRESET |= PM_SWRESET_VGADIV;
+- while ((PM_SWRESET & PM_SWRESET_VGADIV) == PM_SWRESET_VGADIV)
++ writel(readl(PM_SWRESET) | PM_SWRESET_VGADIV, PM_SWRESET);
++ while ((readl(PM_SWRESET) & PM_SWRESET_VGADIV)
++ == PM_SWRESET_VGADIV)
+ udelay(100); /* 65536 bclk32, about 320us */
+
+- PM_PCGR &= ~PM_PCGR_VGACLK;
++ writel(readl(PM_PCGR) & ~PM_PCGR_VGACLK, PM_PCGR);
+ }
+ #ifdef CONFIG_CPU_FREQ
+ if (clk == &clk_mclk_clk) {
+@@ -323,15 +325,15 @@ struct {
+ static int __init clk_init(void)
+ {
+ #ifdef CONFIG_PUV3_PM
+- u32 pllrate, divstatus = PM_DIVSTATUS;
+- u32 pcgr_val = PM_PCGR;
++ u32 pllrate, divstatus = readl(PM_DIVSTATUS);
++ u32 pcgr_val = readl(PM_PCGR);
+ int i;
+
+ pcgr_val |= PM_PCGR_BCLKMME | PM_PCGR_BCLKH264E | PM_PCGR_BCLKH264D
+ | PM_PCGR_HECLK | PM_PCGR_HDCLK;
+- PM_PCGR = pcgr_val;
++ writel(pcgr_val, PM_PCGR);
+
+- pllrate = PM_PLLSYSSTATUS;
++ pllrate = readl(PM_PLLSYSSTATUS);
+
+ /* lookup pmclk_table */
+ clk_mclk_clk.rate = 0;
+@@ -346,7 +348,7 @@ static int __init clk_init(void)
+ clk_bclk32_clk.rate = clk_mclk_clk.rate /
+ (((divstatus & 0x0000f000) >> 12) + 1);
+
+- pllrate = PM_PLLDDRSTATUS;
++ pllrate = readl(PM_PLLDDRSTATUS);
+
+ /* lookup pddr_table */
+ clk_ddr_clk.rate = 0;
+@@ -357,7 +359,7 @@ static int __init clk_init(void)
+ }
+ }
+
+- pllrate = PM_PLLVGASTATUS;
++ pllrate = readl(PM_PLLVGASTATUS);
+
+ /* lookup pvga_table */
+ clk_vga_clk.rate = 0;
+diff --git a/arch/unicore32/kernel/dma.c b/arch/unicore32/kernel/dma.c
+index b8dcc2514e9a..ae441bc3122c 100644
+--- a/arch/unicore32/kernel/dma.c
++++ b/arch/unicore32/kernel/dma.c
+@@ -16,6 +16,7 @@
+ #include <linux/kernel.h>
+ #include <linux/interrupt.h>
+ #include <linux/errno.h>
++#include <linux/io.h>
+
+ #include <asm/system.h>
+ #include <asm/irq.h>
+@@ -94,15 +95,16 @@ EXPORT_SYMBOL(puv3_free_dma);
+
+ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
+ {
+- int i, dint = DMAC_ITCSR;
++ int i, dint;
+
++ dint = readl(DMAC_ITCSR);
+ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
+ if (dint & DMAC_CHANNEL(i)) {
+ struct dma_channel *channel = &dma_channels[i];
+
+ /* Clear TC interrupt of channel i */
+- DMAC_ITCCR = DMAC_CHANNEL(i);
+- DMAC_ITCCR = 0;
++ writel(DMAC_CHANNEL(i), DMAC_ITCCR);
++ writel(0, DMAC_ITCCR);
+
+ if (channel->name && channel->irq_handler) {
+ channel->irq_handler(i, channel->data);
+@@ -121,15 +123,16 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
+
+ static irqreturn_t dma_err_handler(int irq, void *dev_id)
+ {
+- int i, dint = DMAC_IESR;
++ int i, dint;
+
++ dint = readl(DMAC_IESR);
+ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
+ if (dint & DMAC_CHANNEL(i)) {
+ struct dma_channel *channel = &dma_channels[i];
+
+ /* Clear Err interrupt of channel i */
+- DMAC_IECR = DMAC_CHANNEL(i);
+- DMAC_IECR = 0;
++ writel(DMAC_CHANNEL(i), DMAC_IECR);
++ writel(0, DMAC_IECR);
+
+ if (channel->name && channel->err_handler) {
+ channel->err_handler(i, channel->data);
+diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c
+index 4cb28308bb5f..cb12ec39552c 100644
+--- a/arch/unicore32/kernel/gpio.c
++++ b/arch/unicore32/kernel/gpio.c
+@@ -52,15 +52,15 @@ device_initcall(puv3_gpio_leds_init);
+
+ static int puv3_gpio_get(struct gpio_chip *chip, unsigned offset)
+ {
+- return GPIO_GPLR & GPIO_GPIO(offset);
++ return readl(GPIO_GPLR) & GPIO_GPIO(offset);
+ }
+
+ static void puv3_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+ {
+ if (value)
+- GPIO_GPSR = GPIO_GPIO(offset);
++ writel(GPIO_GPIO(offset), GPIO_GPSR);
+ else
+- GPIO_GPCR = GPIO_GPIO(offset);
++ writel(GPIO_GPIO(offset), GPIO_GPCR);
+ }
+
+ static int puv3_direction_input(struct gpio_chip *chip, unsigned offset)
+@@ -68,7 +68,7 @@ static int puv3_direction_input(struct gpio_chip *chip, unsigned offset)
+ unsigned long flags;
+
+ local_irq_save(flags);
+- GPIO_GPDR &= ~GPIO_GPIO(offset);
++ writel(readl(GPIO_GPDR) & ~GPIO_GPIO(offset), GPIO_GPDR);
+ local_irq_restore(flags);
+ return 0;
+ }
+@@ -80,7 +80,7 @@ static int puv3_direction_output(struct gpio_chip *chip, unsigned offset,
+
+ local_irq_save(flags);
+ puv3_gpio_set(chip, offset, value);
+- GPIO_GPDR |= GPIO_GPIO(offset);
++ writel(readl(GPIO_GPDR) | GPIO_GPIO(offset), GPIO_GPDR);
+ local_irq_restore(flags);
+ return 0;
+ }
+@@ -97,7 +97,7 @@ static struct gpio_chip puv3_gpio_chip = {
+
+ void __init puv3_init_gpio(void)
+ {
+- GPIO_GPDR = GPIO_DIR;
++ writel(GPIO_DIR, GPIO_GPDR);
+ #if defined(CONFIG_PUV3_NB0916) || defined(CONFIG_PUV3_SMW0919) \
+ || defined(CONFIG_PUV3_DB0913)
+ gpio_set_value(GPO_WIFI_EN, 1);
+diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
+index 38e30897dea3..e1dbfcb61873 100644
+--- a/arch/unicore32/kernel/irq.c
++++ b/arch/unicore32/kernel/irq.c
+@@ -66,8 +66,8 @@ static int puv3_gpio_type(struct irq_data *d, unsigned int type)
+ else
+ GPIO_IRQ_falling_edge &= ~mask;
+
+- GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
+- GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++ writel(GPIO_IRQ_rising_edge & GPIO_IRQ_mask, GPIO_GRER);
++ writel(GPIO_IRQ_falling_edge & GPIO_IRQ_mask, GPIO_GFER);
+
+ return 0;
+ }
+@@ -77,25 +77,25 @@ static int puv3_gpio_type(struct irq_data *d, unsigned int type)
+ */
+ static void puv3_low_gpio_ack(struct irq_data *d)
+ {
+- GPIO_GEDR = (1 << d->irq);
++ writel((1 << d->irq), GPIO_GEDR);
+ }
+
+ static void puv3_low_gpio_mask(struct irq_data *d)
+ {
+- INTC_ICMR &= ~(1 << d->irq);
++ writel(readl(INTC_ICMR) & ~(1 << d->irq), INTC_ICMR);
+ }
+
+ static void puv3_low_gpio_unmask(struct irq_data *d)
+ {
+- INTC_ICMR |= 1 << d->irq;
++ writel(readl(INTC_ICMR) | (1 << d->irq), INTC_ICMR);
+ }
+
+ static int puv3_low_gpio_wake(struct irq_data *d, unsigned int on)
+ {
+ if (on)
+- PM_PWER |= 1 << d->irq;
++ writel(readl(PM_PWER) | (1 << d->irq), PM_PWER);
+ else
+- PM_PWER &= ~(1 << d->irq);
++ writel(readl(PM_PWER) & ~(1 << d->irq), PM_PWER);
+ return 0;
+ }
+
+@@ -118,13 +118,13 @@ puv3_gpio_handler(unsigned int irq, struct irq_desc *desc)
+ {
+ unsigned int mask;
+
+- mask = GPIO_GEDR;
++ mask = readl(GPIO_GEDR);
+ do {
+ /*
+ * clear down all currently active IRQ sources.
+ * We will be processing them all.
+ */
+- GPIO_GEDR = mask;
++ writel(mask, GPIO_GEDR);
+
+ irq = IRQ_GPIO0;
+ do {
+@@ -133,7 +133,7 @@ puv3_gpio_handler(unsigned int irq, struct irq_desc *desc)
+ mask >>= 1;
+ irq++;
+ } while (mask);
+- mask = GPIO_GEDR;
++ mask = readl(GPIO_GEDR);
+ } while (mask);
+ }
+
+@@ -146,7 +146,7 @@ static void puv3_high_gpio_ack(struct irq_data *d)
+ {
+ unsigned int mask = GPIO_MASK(d->irq);
+
+- GPIO_GEDR = mask;
++ writel(mask, GPIO_GEDR);
+ }
+
+ static void puv3_high_gpio_mask(struct irq_data *d)
+@@ -155,8 +155,8 @@ static void puv3_high_gpio_mask(struct irq_data *d)
+
+ GPIO_IRQ_mask &= ~mask;
+
+- GPIO_GRER &= ~mask;
+- GPIO_GFER &= ~mask;
++ writel(readl(GPIO_GRER) & ~mask, GPIO_GRER);
++ writel(readl(GPIO_GFER) & ~mask, GPIO_GFER);
+ }
+
+ static void puv3_high_gpio_unmask(struct irq_data *d)
+@@ -165,16 +165,16 @@ static void puv3_high_gpio_unmask(struct irq_data *d)
+
+ GPIO_IRQ_mask |= mask;
+
+- GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
+- GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++ writel(GPIO_IRQ_rising_edge & GPIO_IRQ_mask, GPIO_GRER);
++ writel(GPIO_IRQ_falling_edge & GPIO_IRQ_mask, GPIO_GFER);
+ }
+
+ static int puv3_high_gpio_wake(struct irq_data *d, unsigned int on)
+ {
+ if (on)
+- PM_PWER |= PM_PWER_GPIOHIGH;
++ writel(readl(PM_PWER) | PM_PWER_GPIOHIGH, PM_PWER);
+ else
+- PM_PWER &= ~PM_PWER_GPIOHIGH;
++ writel(readl(PM_PWER) & ~PM_PWER_GPIOHIGH, PM_PWER);
+ return 0;
+ }
+
+@@ -193,12 +193,12 @@ static struct irq_chip puv3_high_gpio_chip = {
+ */
+ static void puv3_mask_irq(struct irq_data *d)
+ {
+- INTC_ICMR &= ~(1 << d->irq);
++ writel(readl(INTC_ICMR) & ~(1 << d->irq), INTC_ICMR);
+ }
+
+ static void puv3_unmask_irq(struct irq_data *d)
+ {
+- INTC_ICMR |= (1 << d->irq);
++ writel(readl(INTC_ICMR) | (1 << d->irq), INTC_ICMR);
+ }
+
+ /*
+@@ -208,9 +208,9 @@ static int puv3_set_wake(struct irq_data *d, unsigned int on)
+ {
+ if (d->irq == IRQ_RTCAlarm) {
+ if (on)
+- PM_PWER |= PM_PWER_RTC;
++ writel(readl(PM_PWER) | PM_PWER_RTC, PM_PWER);
+ else
+- PM_PWER &= ~PM_PWER_RTC;
++ writel(readl(PM_PWER) & ~PM_PWER_RTC, PM_PWER);
+ return 0;
+ }
+ return -EINVAL;
+@@ -242,25 +242,25 @@ static int puv3_irq_suspend(struct sys_device *dev, pm_message_t state)
+ struct puv3_irq_state *st = &puv3_irq_state;
+
+ st->saved = 1;
+- st->icmr = INTC_ICMR;
+- st->iclr = INTC_ICLR;
+- st->iccr = INTC_ICCR;
++ st->icmr = readl(INTC_ICMR);
++ st->iclr = readl(INTC_ICLR);
++ st->iccr = readl(INTC_ICCR);
+
+ /*
+ * Disable all GPIO-based interrupts.
+ */
+- INTC_ICMR &= ~(0x1ff);
++ writel(readl(INTC_ICMR) & ~(0x1ff), INTC_ICMR);
+
+ /*
+ * Set the appropriate edges for wakeup.
+ */
+- GPIO_GRER = PM_PWER & GPIO_IRQ_rising_edge;
+- GPIO_GFER = PM_PWER & GPIO_IRQ_falling_edge;
++ writel(readl(PM_PWER) & GPIO_IRQ_rising_edge, GPIO_GRER);
++ writel(readl(PM_PWER) & GPIO_IRQ_falling_edge, GPIO_GFER);
+
+ /*
+ * Clear any pending GPIO interrupts.
+ */
+- GPIO_GEDR = GPIO_GEDR;
++ writel(readl(GPIO_GEDR), GPIO_GEDR);
+
+ return 0;
+ }
+@@ -270,13 +270,13 @@ static int puv3_irq_resume(struct sys_device *dev)
+ struct puv3_irq_state *st = &puv3_irq_state;
+
+ if (st->saved) {
+- INTC_ICCR = st->iccr;
+- INTC_ICLR = st->iclr;
++ writel(st->iccr, INTC_ICCR);
++ writel(st->iclr, INTC_ICLR);
+
+- GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
+- GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++ writel(GPIO_IRQ_rising_edge & GPIO_IRQ_mask, GPIO_GRER);
++ writel(GPIO_IRQ_falling_edge & GPIO_IRQ_mask, GPIO_GFER);
+
+- INTC_ICMR = st->icmr;
++ writel(st->icmr, INTC_ICMR);
+ }
+ return 0;
+ }
+@@ -307,18 +307,18 @@ void __init init_IRQ(void)
+ request_resource(&iomem_resource, &irq_resource);
+
+ /* disable all IRQs */
+- INTC_ICMR = 0;
++ writel(0, INTC_ICMR);
+
+ /* all IRQs are IRQ, not REAL */
+- INTC_ICLR = 0;
++ writel(0, INTC_ICLR);
+
+ /* clear all GPIO edge detects */
+- GPIO_GPIR = FMASK(8, 0) & ~FIELD(1, 1, GPI_SOFF_REQ);
+- GPIO_GFER = 0;
+- GPIO_GRER = 0;
+- GPIO_GEDR = 0x0FFFFFFF;
++ writel(FMASK(8, 0) & ~FIELD(1, 1, GPI_SOFF_REQ), GPIO_GPIR);
++ writel(0, GPIO_GFER);
++ writel(0, GPIO_GRER);
++ writel(0x0FFFFFFF, GPIO_GEDR);
+
+- INTC_ICCR = 1;
++ writel(1, INTC_ICCR);
+
+ for (irq = 0; irq < IRQ_GPIOHIGH; irq++) {
+ set_irq_chip(irq, &puv3_low_gpio_chip);
+diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
+index d4e55e2d2d29..65c265ee8e94 100644
+--- a/arch/unicore32/kernel/pci.c
++++ b/arch/unicore32/kernel/pci.c
+@@ -30,16 +30,16 @@ static int
+ puv3_read_config(struct pci_bus *bus, unsigned int devfn, int where,
+ int size, u32 *value)
+ {
+- PCICFG_ADDR = CONFIG_CMD(bus, devfn, where);
++ writel(CONFIG_CMD(bus, devfn, where), PCICFG_ADDR);
+ switch (size) {
+ case 1:
+- *value = (PCICFG_DATA >> ((where & 3) * 8)) & 0xFF;
++ *value = (readl(PCICFG_DATA) >> ((where & 3) * 8)) & 0xFF;
+ break;
+ case 2:
+- *value = (PCICFG_DATA >> ((where & 2) * 8)) & 0xFFFF;
++ *value = (readl(PCICFG_DATA) >> ((where & 2) * 8)) & 0xFFFF;
+ break;
+ case 4:
+- *value = PCICFG_DATA;
++ *value = readl(PCICFG_DATA);
+ break;
+ }
+ return PCIBIOS_SUCCESSFUL;
+@@ -49,18 +49,18 @@ static int
+ puv3_write_config(struct pci_bus *bus, unsigned int devfn, int where,
+ int size, u32 value)
+ {
+- PCICFG_ADDR = CONFIG_CMD(bus, devfn, where);
++ writel(CONFIG_CMD(bus, devfn, where), PCICFG_ADDR);
+ switch (size) {
+ case 1:
+- PCICFG_DATA = (PCICFG_DATA & ~FMASK(8, (where&3)*8))
+- | FIELD(value, 8, (where&3)*8);
++ writel((readl(PCICFG_DATA) & ~FMASK(8, (where&3)*8))
++ | FIELD(value, 8, (where&3)*8), PCICFG_DATA);
+ break;
+ case 2:
+- PCICFG_DATA = (PCICFG_DATA & ~FMASK(16, (where&2)*8))
+- | FIELD(value, 16, (where&2)*8);
++ writel((readl(PCICFG_DATA) & ~FMASK(16, (where&2)*8))
++ | FIELD(value, 16, (where&2)*8), PCICFG_DATA);
+ break;
+ case 4:
+- PCICFG_DATA = value;
++ writel(value, PCICFG_DATA);
+ break;
+ }
+ return PCIBIOS_SUCCESSFUL;
+@@ -75,31 +75,31 @@ void pci_puv3_preinit(void)
+ {
+ printk(KERN_DEBUG "PCI: PKUnity PCI Controller Initializing ...\n");
+ /* config PCI bridge base */
+- PCICFG_BRIBASE = PKUNITY_PCIBRI_BASE;
++ writel(PKUNITY_PCIBRI_BASE, PCICFG_BRIBASE);
+
+- PCIBRI_AHBCTL0 = 0;
+- PCIBRI_AHBBAR0 = PKUNITY_PCIBRI_BASE | PCIBRI_BARx_MEM;
+- PCIBRI_AHBAMR0 = 0xFFFF0000;
+- PCIBRI_AHBTAR0 = 0;
++ writel(0, PCIBRI_AHBCTL0);
++ writel(PKUNITY_PCIBRI_BASE | PCIBRI_BARx_MEM, PCIBRI_AHBBAR0);
++ writel(0xFFFF0000, PCIBRI_AHBAMR0);
++ writel(0, PCIBRI_AHBTAR0);
+
+- PCIBRI_AHBCTL1 = PCIBRI_CTLx_AT;
+- PCIBRI_AHBBAR1 = PKUNITY_PCILIO_BASE | PCIBRI_BARx_IO;
+- PCIBRI_AHBAMR1 = 0xFFFF0000;
+- PCIBRI_AHBTAR1 = 0x00000000;
++ writel(PCIBRI_CTLx_AT, PCIBRI_AHBCTL1);
++ writel(PKUNITY_PCILIO_BASE | PCIBRI_BARx_IO, PCIBRI_AHBBAR1);
++ writel(0xFFFF0000, PCIBRI_AHBAMR1);
++ writel(0x00000000, PCIBRI_AHBTAR1);
+
+- PCIBRI_AHBCTL2 = PCIBRI_CTLx_PREF;
+- PCIBRI_AHBBAR2 = PKUNITY_PCIMEM_BASE | PCIBRI_BARx_MEM;
+- PCIBRI_AHBAMR2 = 0xF8000000;
+- PCIBRI_AHBTAR2 = 0;
++ writel(PCIBRI_CTLx_PREF, PCIBRI_AHBCTL2);
++ writel(PKUNITY_PCIMEM_BASE | PCIBRI_BARx_MEM, PCIBRI_AHBBAR2);
++ writel(0xF8000000, PCIBRI_AHBAMR2);
++ writel(0, PCIBRI_AHBTAR2);
+
+- PCIBRI_BAR1 = PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM;
++ writel(PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM, PCIBRI_BAR1);
+
+- PCIBRI_PCICTL0 = PCIBRI_CTLx_AT | PCIBRI_CTLx_PREF;
+- PCIBRI_PCIBAR0 = PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM;
+- PCIBRI_PCIAMR0 = 0xF8000000;
+- PCIBRI_PCITAR0 = PKUNITY_SDRAM_BASE;
++ writel(PCIBRI_CTLx_AT | PCIBRI_CTLx_PREF, PCIBRI_PCICTL0);
++ writel(PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM, PCIBRI_PCIBAR0);
++ writel(0xF8000000, PCIBRI_PCIAMR0);
++ writel(PKUNITY_SDRAM_BASE, PCIBRI_PCITAR0);
+
+- PCIBRI_CMD = PCIBRI_CMD | PCIBRI_CMD_IO | PCIBRI_CMD_MEM;
++ writel(readl(PCIBRI_CMD) | PCIBRI_CMD_IO | PCIBRI_CMD_MEM, PCIBRI_CMD);
+ }
+
+ static int __init pci_puv3_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
+index 8d4a273ae086..ba401df971ed 100644
+--- a/arch/unicore32/kernel/process.c
++++ b/arch/unicore32/kernel/process.c
+@@ -125,9 +125,9 @@ void machine_restart(char *cmd)
+ /* Jump into ROM at address 0xffff0000 */
+ cpu_reset(VECTORS_BASE);
+ } else {
+- PM_PLLSYSCFG = 0x00002001; /* cpu clk = 250M */
+- PM_PLLDDRCFG = 0x00100800; /* ddr clk = 44M */
+- PM_PLLVGACFG = 0x00002001; /* vga clk = 250M */
++ writel(0x00002001, PM_PLLSYSCFG); /* cpu clk = 250M */
++ writel(0x00100800, PM_PLLDDRCFG); /* ddr clk = 44M */
++ writel(0x00002001, PM_PLLVGACFG); /* vga clk = 250M */
+
+ /* Use on-chip reset capability */
+ /* following instructions must be in one icache line */
+@@ -141,10 +141,10 @@ void machine_restart(char *cmd)
+ " nop; nop; nop\n\t"
+ /* prefetch 3 instructions at most */
+ :
+- : "r" ((unsigned long)&PM_PMCR),
++ : "r" (PM_PMCR),
+ "r" (PM_PMCR_CFBSYS | PM_PMCR_CFBDDR
+ | PM_PMCR_CFBVGA),
+- "r" ((unsigned long)&RESETC_SWRR),
++ "r" (RESETC_SWRR),
+ "r" (RESETC_SWRR_SRB)
+ : "r0", "memory");
+ }
+diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
+index 26cc52b51e7b..6edf928a106c 100644
+--- a/arch/unicore32/kernel/puv3-core.c
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -36,7 +36,7 @@
+ */
+ unsigned long long sched_clock(void)
+ {
+- unsigned long long v = cnt32_to_63(OST_OSCR);
++ unsigned long long v = cnt32_to_63(readl(OST_OSCR));
+
+ /* original conservative method, but overflow frequently
+ * v *= NSEC_PER_SEC >> 12;
+@@ -187,15 +187,15 @@ static void puv3_cpu_pm_restore(unsigned long *sleep_save)
+ static int puv3_cpu_pm_prepare(void)
+ {
+ /* set resume return address */
+- PM_DIVCFG = virt_to_phys(puv3_cpu_resume);
++ writel(virt_to_phys(puv3_cpu_resume), PM_DIVCFG);
+ return 0;
+ }
+
+ static void puv3_cpu_pm_enter(suspend_state_t state)
+ {
+ /* Clear reset status */
+- RESETC_RSSR = RESETC_RSSR_HWR | RESETC_RSSR_WDR
+- | RESETC_RSSR_SMR | RESETC_RSSR_SWR;
++ writel(RESETC_RSSR_HWR | RESETC_RSSR_WDR
++ | RESETC_RSSR_SMR | RESETC_RSSR_SWR, RESETC_RSSR);
+
+ switch (state) {
+ /* case PM_SUSPEND_ON:
+@@ -242,7 +242,7 @@ void puv3_ps2_init(void)
+ struct clk *bclk32;
+
+ bclk32 = clk_get(NULL, "BUS32_CLK");
+- PS2_CNT = clk_get_rate(bclk32) / 200000; /* should > 5us */
++ writel(clk_get_rate(bclk32) / 200000, PS2_CNT); /* should > 5us */
+ }
+
+ void __init puv3_core_init(void)
+diff --git a/arch/unicore32/kernel/rtc.c b/arch/unicore32/kernel/rtc.c
+index 5e4db4158589..c5f068295b51 100644
+--- a/arch/unicore32/kernel/rtc.c
++++ b/arch/unicore32/kernel/rtc.c
+@@ -41,7 +41,7 @@ static irqreturn_t puv3_rtc_alarmirq(int irq, void *id)
+ {
+ struct rtc_device *rdev = id;
+
+- RTC_RTSR |= RTC_RTSR_AL;
++ writel(readl(RTC_RTSR) | RTC_RTSR_AL, RTC_RTSR);
+ rtc_update_irq(rdev, 1, RTC_AF | RTC_IRQF);
+ return IRQ_HANDLED;
+ }
+@@ -50,7 +50,7 @@ static irqreturn_t puv3_rtc_tickirq(int irq, void *id)
+ {
+ struct rtc_device *rdev = id;
+
+- RTC_RTSR |= RTC_RTSR_HZ;
++ writel(readl(RTC_RTSR) | RTC_RTSR_HZ, RTC_RTSR);
+ rtc_update_irq(rdev, 1, RTC_PF | RTC_IRQF);
+ return IRQ_HANDLED;
+ }
+@@ -62,12 +62,12 @@ static void puv3_rtc_setaie(int to)
+
+ pr_debug("%s: aie=%d\n", __func__, to);
+
+- tmp = RTC_RTSR & ~RTC_RTSR_ALE;
++ tmp = readl(RTC_RTSR) & ~RTC_RTSR_ALE;
+
+ if (to)
+ tmp |= RTC_RTSR_ALE;
+
+- RTC_RTSR = tmp;
++ writel(tmp, RTC_RTSR);
+ }
+
+ static int puv3_rtc_setpie(struct device *dev, int enabled)
+@@ -77,12 +77,12 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
+ pr_debug("%s: pie=%d\n", __func__, enabled);
+
+ spin_lock_irq(&puv3_rtc_pie_lock);
+- tmp = RTC_RTSR & ~RTC_RTSR_HZE;
++ tmp = readl(RTC_RTSR) & ~RTC_RTSR_HZE;
+
+ if (enabled)
+ tmp |= RTC_RTSR_HZE;
+
+- RTC_RTSR = tmp;
++ writel(tmp, RTC_RTSR);
+ spin_unlock_irq(&puv3_rtc_pie_lock);
+
+ return 0;
+@@ -97,7 +97,7 @@ static int puv3_rtc_setfreq(struct device *dev, int freq)
+
+ static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
+ {
+- rtc_time_to_tm(RTC_RCNR, rtc_tm);
++ rtc_time_to_tm(readl(RTC_RCNR), rtc_tm);
+
+ pr_debug("read time %02x.%02x.%02x %02x/%02x/%02x\n",
+ rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,
+@@ -115,7 +115,7 @@ static int puv3_rtc_settime(struct device *dev, struct rtc_time *tm)
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+ rtc_tm_to_time(tm, &rtc_count);
+- RTC_RCNR = rtc_count;
++ writel(rtc_count, RTC_RCNR);
+
+ return 0;
+ }
+@@ -124,9 +124,9 @@ static int puv3_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
+ {
+ struct rtc_time *alm_tm = &alrm->time;
+
+- rtc_time_to_tm(RTC_RTAR, alm_tm);
++ rtc_time_to_tm(readl(RTC_RTAR), alm_tm);
+
+- alrm->enabled = RTC_RTSR & RTC_RTSR_ALE;
++ alrm->enabled = readl(RTC_RTSR) & RTC_RTSR_ALE;
+
+ pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
+ alrm->enabled,
+@@ -147,7 +147,7 @@ static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
+ tm->tm_hour & 0xff, tm->tm_min & 0xff, tm->tm_sec);
+
+ rtc_tm_to_time(tm, &rtcalarm_count);
+- RTC_RTAR = rtcalarm_count;
++ writel(rtcalarm_count, RTC_RTAR);
+
+ puv3_rtc_setaie(alrm->enabled);
+
+@@ -162,7 +162,7 @@ static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
+ static int puv3_rtc_proc(struct device *dev, struct seq_file *seq)
+ {
+ seq_printf(seq, "periodic_IRQ\t: %s\n",
+- (RTC_RTSR & RTC_RTSR_HZE) ? "yes" : "no");
++ (readl(RTC_RTSR) & RTC_RTSR_HZE) ? "yes" : "no");
+ return 0;
+ }
+
+@@ -222,13 +222,13 @@ static const struct rtc_class_ops puv3_rtcops = {
+ static void puv3_rtc_enable(struct platform_device *pdev, int en)
+ {
+ if (!en) {
+- RTC_RTSR &= ~RTC_RTSR_HZE;
++ writel(readl(RTC_RTSR) & ~RTC_RTSR_HZE, RTC_RTSR);
+ } else {
+ /* re-enable the device, and check it is ok */
+
+- if ((RTC_RTSR & RTC_RTSR_HZE) == 0) {
++ if ((readl(RTC_RTSR) & RTC_RTSR_HZE) == 0) {
+ dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
+- RTC_RTSR |= RTC_RTSR_HZE;
++ writel(readl(RTC_RTSR) | RTC_RTSR_HZE, RTC_RTSR);
+ }
+ }
+ }
+@@ -331,7 +331,7 @@ static int ticnt_save;
+ static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+ {
+ /* save RTAR for anyone using periodic interrupts */
+- ticnt_save = RTC_RTAR;
++ ticnt_save = readl(RTC_RTAR);
+ puv3_rtc_enable(pdev, 0);
+ return 0;
+ }
+@@ -339,7 +339,7 @@ static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+ static int puv3_rtc_resume(struct platform_device *pdev)
+ {
+ puv3_rtc_enable(pdev, 1);
+- RTC_RTAR = ticnt_save;
++ writel(ticnt_save, RTC_RTAR);
+ return 0;
+ }
+ #else
+diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c
+index 8bb4b815bce9..080710c09241 100644
+--- a/arch/unicore32/kernel/time.c
++++ b/arch/unicore32/kernel/time.c
+@@ -26,8 +26,8 @@ static irqreturn_t puv3_ost0_interrupt(int irq, void *dev_id)
+ struct clock_event_device *c = dev_id;
+
+ /* Disarm the compare/match, signal the event. */
+- OST_OIER &= ~OST_OIER_E0;
+- OST_OSSR &= ~OST_OSSR_M0;
++ writel(readl(OST_OIER) & ~OST_OIER_E0, OST_OIER);
++ writel(readl(OST_OSSR) & ~OST_OSSR_M0, OST_OSSR);
+ c->event_handler(c);
+
+ return IRQ_HANDLED;
+@@ -38,10 +38,10 @@ puv3_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c)
+ {
+ unsigned long next, oscr;
+
+- OST_OIER |= OST_OIER_E0;
+- next = OST_OSCR + delta;
+- OST_OSMR0 = next;
+- oscr = OST_OSCR;
++ writel(readl(OST_OIER) | OST_OIER_E0, OST_OIER);
++ next = readl(OST_OSCR) + delta;
++ writel(next, OST_OSMR0);
++ oscr = readl(OST_OSCR);
+
+ return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
+ }
+@@ -53,8 +53,8 @@ puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
+ case CLOCK_EVT_MODE_ONESHOT:
+ case CLOCK_EVT_MODE_UNUSED:
+ case CLOCK_EVT_MODE_SHUTDOWN:
+- OST_OIER &= ~OST_OIER_E0;
+- OST_OSSR &= ~OST_OSSR_M0;
++ writel(readl(OST_OIER) & ~OST_OIER_E0, OST_OIER);
++ writel(readl(OST_OSSR) & ~OST_OSSR_M0, OST_OSSR);
+ break;
+
+ case CLOCK_EVT_MODE_RESUME:
+@@ -73,7 +73,7 @@ static struct clock_event_device ckevt_puv3_osmr0 = {
+
+ static cycle_t puv3_read_oscr(struct clocksource *cs)
+ {
+- return OST_OSCR;
++ return readl(OST_OSCR);
+ }
+
+ static struct clocksource cksrc_puv3_oscr = {
+@@ -93,8 +93,8 @@ static struct irqaction puv3_timer_irq = {
+
+ void __init time_init(void)
+ {
+- OST_OIER = 0; /* disable any timer interrupts */
+- OST_OSSR = 0; /* clear status on all timers */
++ writel(0, OST_OIER); /* disable any timer interrupts */
++ writel(0, OST_OSSR); /* clear status on all timers */
+
+ clockevents_calc_mult_shift(&ckevt_puv3_osmr0, CLOCK_TICK_RATE, 5);
+
+@@ -115,26 +115,26 @@ unsigned long osmr[4], oier;
+
+ void puv3_timer_suspend(void)
+ {
+- osmr[0] = OST_OSMR0;
+- osmr[1] = OST_OSMR1;
+- osmr[2] = OST_OSMR2;
+- osmr[3] = OST_OSMR3;
+- oier = OST_OIER;
++ osmr[0] = readl(OST_OSMR0);
++ osmr[1] = readl(OST_OSMR1);
++ osmr[2] = readl(OST_OSMR2);
++ osmr[3] = readl(OST_OSMR3);
++ oier = readl(OST_OIER);
+ }
+
+ void puv3_timer_resume(void)
+ {
+- OST_OSSR = 0;
+- OST_OSMR0 = osmr[0];
+- OST_OSMR1 = osmr[1];
+- OST_OSMR2 = osmr[2];
+- OST_OSMR3 = osmr[3];
+- OST_OIER = oier;
++ writel(0, OST_OSSR);
++ writel(osmr[0], OST_OSMR0);
++ writel(osmr[1], OST_OSMR1);
++ writel(osmr[2], OST_OSMR2);
++ writel(osmr[3], OST_OSMR3);
++ writel(oier, OST_OIER);
+
+ /*
+ * OSMR0 is the system timer: make sure OSCR is sufficiently behind
+ */
+- OST_OSCR = OST_OSMR0 - LATCH;
++ writel(readl(OST_OSMR0) - LATCH, OST_OSCR);
+ }
+ #else
+ void puv3_timer_suspend(void) { };
+diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
+index 620b040b81b0..73f5cc124a36 100644
+--- a/drivers/input/serio/i8042-unicore32io.h
++++ b/drivers/input/serio/i8042-unicore32io.h
+@@ -29,11 +29,11 @@
+ /*
+ * Register numbers.
+ */
+-#define I8042_COMMAND_REG ((volatile void __iomem *)&PS2_COMMAND)
+-#define I8042_STATUS_REG ((volatile void __iomem *)&PS2_STATUS)
+-#define I8042_DATA_REG ((volatile void __iomem *)&PS2_DATA)
++#define I8042_COMMAND_REG PS2_COMMAND
++#define I8042_STATUS_REG PS2_STATUS
++#define I8042_DATA_REG PS2_DATA
+
+-#define I8042_REGION_START (resource_size_t)(&PS2_DATA)
++#define I8042_REGION_START (resource_size_t)(PS2_DATA)
+ #define I8042_REGION_SIZE (resource_size_t)(16)
+
+ static inline int i8042_read_data(void)commit 4517366d870b89d6fb8c0c90deb6c73d975908af
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Feb 25 17:58:00 2011 +0800
+
+ unicore32 i8042 upgrade and bugfix: adjust resource request region type
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
+index 2cdd8726446f..620b040b81b0 100644
+--- a/drivers/input/serio/i8042-unicore32io.h
++++ b/drivers/input/serio/i8042-unicore32io.h
+@@ -58,7 +58,7 @@ static inline void i8042_write_command(int val)
+
+ static inline int i8042_platform_init(void)
+ {
+- if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
++ if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
+ return -EBUSY;
+
+ i8042_reset = 1;
+@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
+
+ static inline void i8042_platform_exit(void)
+ {
+- release_region(I8042_REGION_START, I8042_REGION_SIZE);
++ release_mem_region(I8042_REGION_START, I8042_REGION_SIZE);
+ }
+
+ #endif /* _I8042_UNICORE32_H */commit 4ef2ec63cc5117d099960c49910533e467942e27 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Tue Feb 22 17:34:47 2011 +0800 + + unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/mm/pgd.c b/arch/unicore32/mm/pgd.c +index 632cef7cd378..08b8d4295e70 100644 +--- a/arch/unicore32/mm/pgd.c ++++ b/arch/unicore32/mm/pgd.c +@@ -54,7 +54,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) + if (!new_pmd) + goto no_pmd; + +- new_pte = pte_alloc_map(mm, new_pmd, 0); ++ new_pte = pte_alloc_map(mm, NULL, new_pmd, 0); + if (!new_pte) + goto no_pte; ++
commit 3838b82c0a6806daf820acacf02cd9aefe9df7b8
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Fri Feb 18 18:38:33 2011 +0800
+
+ unicore32 i8042: adjust io funcs of i8042-unicore32io.h
+
+ replace inb/outb with readb/writeb in i8042-unicore32io.h
+ and correct typecasting of register and region macros
+ -- by advice with Arnd Bergmann
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
+index 6a7e8b3ce61a..2cdd8726446f 100644
+--- a/drivers/input/serio/i8042-unicore32io.h
++++ b/drivers/input/serio/i8042-unicore32io.h
+@@ -29,33 +29,36 @@
+ /*
+ * Register numbers.
+ */
+-#define I8042_COMMAND_REG ((unsigned long)&PS2_COMMAND)
+-#define I8042_STATUS_REG ((unsigned long)&PS2_STATUS)
+-#define I8042_DATA_REG ((unsigned long)&PS2_DATA)
++#define I8042_COMMAND_REG ((volatile void __iomem *)&PS2_COMMAND)
++#define I8042_STATUS_REG ((volatile void __iomem *)&PS2_STATUS)
++#define I8042_DATA_REG ((volatile void __iomem *)&PS2_DATA)
++
++#define I8042_REGION_START (resource_size_t)(&PS2_DATA)
++#define I8042_REGION_SIZE (resource_size_t)(16)
+
+ static inline int i8042_read_data(void)
+ {
+- return inb(I8042_DATA_REG);
++ return readb(I8042_DATA_REG);
+ }
+
+ static inline int i8042_read_status(void)
+ {
+- return inb(I8042_STATUS_REG);
++ return readb(I8042_STATUS_REG);
+ }
+
+ static inline void i8042_write_data(int val)
+ {
+- outb(val, I8042_DATA_REG);
++ writeb(val, I8042_DATA_REG);
+ }
+
+ static inline void i8042_write_command(int val)
+ {
+- outb(val, I8042_COMMAND_REG);
++ writeb(val, I8042_COMMAND_REG);
+ }
+
+ static inline int i8042_platform_init(void)
+ {
+- if (!request_region(I8042_DATA_REG, 16, "i8042"))
++ if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
+ return -EBUSY;
+
+ i8042_reset = 1;
+@@ -64,7 +67,7 @@ static inline int i8042_platform_init(void)
+
+ static inline void i8042_platform_exit(void)
+ {
+- release_region(I8042_DATA_REG, 16);
++ release_region(I8042_REGION_START, I8042_REGION_SIZE);
+ }
+
+ #endif /* _I8042_UNICORE32_H */commit bd42aa75b4231b5fd3742de4c4b84ad590a7d654 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sat Feb 26 20:49:47 2011 +0800 + + unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE + + for the term IOSPACE normally refers to the PCI PIO space + -- by advice with Arnd Bergmann + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h +index fa11eba0afd6..940e9ed0941c 100644 +--- a/arch/unicore32/include/mach/PKUnity.h ++++ b/arch/unicore32/include/mach/PKUnity.h +@@ -21,7 +21,7 @@ + * Memory Definitions + */ + #define PKUNITY_SDRAM_BASE 0x00000000 /* 0x00000000 - 0x7FFFFFFF 2GB */ +-#define PKUNITY_IOSPACE_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */ ++#define PKUNITY_MMIO_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */ + #define PKUNITY_PCI_BASE 0x80000000 /* 0x80000000 - 0xBFFFFFFF 1GB */ + #include "regs-pci.h" + #define PKUNITY_BOOT_ROM2_BASE 0xF4000000 /* 0xF4000000 - 0xF7FFFFFF 64MB */ +diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h +index 3fb7236f8d69..c7d3dd6b4eff 100644 +--- a/arch/unicore32/include/mach/hardware.h ++++ b/arch/unicore32/include/mach/hardware.h +@@ -17,8 +17,8 @@ + + #include "PKUnity.h" + +-#define io_p2v(x) ((x) - PKUNITY_IOSPACE_BASE) +-#define io_v2p(x) ((x) + PKUNITY_IOSPACE_BASE) ++#define io_p2v(x) ((x) - PKUNITY_MMIO_BASE) ++#define io_v2p(x) ((x) + PKUNITY_MMIO_BASE) + + #ifndef __ASSEMBLY__ +
commit 36a8b8c399480b5388ddd198ead78c9dd0e50df0
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Thu Feb 17 19:15:36 2011 +0800
+
+ unicore32: modify function names and parameters for irq_chips
+
+ -- by advice with Thomas Gleixner
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+index 90835c959476..7f65018e64ac 100644
+--- a/arch/unicore32/Kconfig
++++ b/arch/unicore32/Kconfig
+@@ -10,6 +10,7 @@ config UNICORE32
+ select HAVE_KERNEL_LZMA
+ select GENERIC_FIND_FIRST_BIT
+ select GENERIC_IRQ_PROBE
++ select GENERIC_HARDIRQS_NO_DEPRECATED
+ select ARCH_WANT_FRAME_POINTERS
+ help
+ UniCore-32 is 32-bit Instruction Set Architecture,
+diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
+index 7c211f597833..38e30897dea3 100644
+--- a/arch/unicore32/kernel/irq.c
++++ b/arch/unicore32/kernel/irq.c
+@@ -42,14 +42,14 @@ static int GPIO_IRQ_mask = 0;
+
+ #define GPIO_MASK(irq) (1 << (irq - IRQ_GPIO0))
+
+-static int puv3_gpio_type(unsigned int irq, unsigned int type)
++static int puv3_gpio_type(struct irq_data *d, unsigned int type)
+ {
+ unsigned int mask;
+
+- if (irq < IRQ_GPIOHIGH)
+- mask = 1 << irq;
++ if (d->irq < IRQ_GPIOHIGH)
++ mask = 1 << d->irq;
+ else
+- mask = GPIO_MASK(irq);
++ mask = GPIO_MASK(d->irq);
+
+ if (type == IRQ_TYPE_PROBE) {
+ if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
+@@ -75,37 +75,37 @@ static int puv3_gpio_type(unsigned int irq, unsigned int type)
+ /*
+ * GPIO IRQs must be acknowledged. This is for IRQs from 0 to 7.
+ */
+-static void puv3_low_gpio_ack(unsigned int irq)
++static void puv3_low_gpio_ack(struct irq_data *d)
+ {
+- GPIO_GEDR = (1 << irq);
++ GPIO_GEDR = (1 << d->irq);
+ }
+
+-static void puv3_low_gpio_mask(unsigned int irq)
++static void puv3_low_gpio_mask(struct irq_data *d)
+ {
+- INTC_ICMR &= ~(1 << irq);
++ INTC_ICMR &= ~(1 << d->irq);
+ }
+
+-static void puv3_low_gpio_unmask(unsigned int irq)
++static void puv3_low_gpio_unmask(struct irq_data *d)
+ {
+- INTC_ICMR |= 1 << irq;
++ INTC_ICMR |= 1 << d->irq;
+ }
+
+-static int puv3_low_gpio_wake(unsigned int irq, unsigned int on)
++static int puv3_low_gpio_wake(struct irq_data *d, unsigned int on)
+ {
+ if (on)
+- PM_PWER |= 1 << irq;
++ PM_PWER |= 1 << d->irq;
+ else
+- PM_PWER &= ~(1 << irq);
++ PM_PWER &= ~(1 << d->irq);
+ return 0;
+ }
+
+ static struct irq_chip puv3_low_gpio_chip = {
+ .name = "GPIO-low",
+- .ack = puv3_low_gpio_ack,
+- .mask = puv3_low_gpio_mask,
+- .unmask = puv3_low_gpio_unmask,
+- .set_type = puv3_gpio_type,
+- .set_wake = puv3_low_gpio_wake,
++ .irq_ack = puv3_low_gpio_ack,
++ .irq_mask = puv3_low_gpio_mask,
++ .irq_unmask = puv3_low_gpio_unmask,
++ .irq_set_type = puv3_gpio_type,
++ .irq_set_wake = puv3_low_gpio_wake,
+ };
+
+ /*
+@@ -142,16 +142,16 @@ puv3_gpio_handler(unsigned int irq, struct irq_desc *desc)
+ * In addition, the IRQs are all collected up into one bit in the
+ * interrupt controller registers.
+ */
+-static void puv3_high_gpio_ack(unsigned int irq)
++static void puv3_high_gpio_ack(struct irq_data *d)
+ {
+- unsigned int mask = GPIO_MASK(irq);
++ unsigned int mask = GPIO_MASK(d->irq);
+
+ GPIO_GEDR = mask;
+ }
+
+-static void puv3_high_gpio_mask(unsigned int irq)
++static void puv3_high_gpio_mask(struct irq_data *d)
+ {
+- unsigned int mask = GPIO_MASK(irq);
++ unsigned int mask = GPIO_MASK(d->irq);
+
+ GPIO_IRQ_mask &= ~mask;
+
+@@ -159,9 +159,9 @@ static void puv3_high_gpio_mask(unsigned int irq)
+ GPIO_GFER &= ~mask;
+ }
+
+-static void puv3_high_gpio_unmask(unsigned int irq)
++static void puv3_high_gpio_unmask(struct irq_data *d)
+ {
+- unsigned int mask = GPIO_MASK(irq);
++ unsigned int mask = GPIO_MASK(d->irq);
+
+ GPIO_IRQ_mask |= mask;
+
+@@ -169,7 +169,7 @@ static void puv3_high_gpio_unmask(unsigned int irq)
+ GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
+ }
+
+-static int puv3_high_gpio_wake(unsigned int irq, unsigned int on)
++static int puv3_high_gpio_wake(struct irq_data *d, unsigned int on)
+ {
+ if (on)
+ PM_PWER |= PM_PWER_GPIOHIGH;
+@@ -180,33 +180,33 @@ static int puv3_high_gpio_wake(unsigned int irq, unsigned int on)
+
+ static struct irq_chip puv3_high_gpio_chip = {
+ .name = "GPIO-high",
+- .ack = puv3_high_gpio_ack,
+- .mask = puv3_high_gpio_mask,
+- .unmask = puv3_high_gpio_unmask,
+- .set_type = puv3_gpio_type,
+- .set_wake = puv3_high_gpio_wake,
++ .irq_ack = puv3_high_gpio_ack,
++ .irq_mask = puv3_high_gpio_mask,
++ .irq_unmask = puv3_high_gpio_unmask,
++ .irq_set_type = puv3_gpio_type,
++ .irq_set_wake = puv3_high_gpio_wake,
+ };
+
+ /*
+ * We don't need to ACK IRQs on the PKUnity unless they're GPIOs
+ * this is for internal IRQs i.e. from 8 to 31.
+ */
+-static void puv3_mask_irq(unsigned int irq)
++static void puv3_mask_irq(struct irq_data *d)
+ {
+- INTC_ICMR &= ~(1 << irq);
++ INTC_ICMR &= ~(1 << d->irq);
+ }
+
+-static void puv3_unmask_irq(unsigned int irq)
++static void puv3_unmask_irq(struct irq_data *d)
+ {
+- INTC_ICMR |= (1 << irq);
++ INTC_ICMR |= (1 << d->irq);
+ }
+
+ /*
+ * Apart form GPIOs, only the RTC alarm can be a wakeup event.
+ */
+-static int puv3_set_wake(unsigned int irq, unsigned int on)
++static int puv3_set_wake(struct irq_data *d, unsigned int on)
+ {
+- if (irq == IRQ_RTCAlarm) {
++ if (d->irq == IRQ_RTCAlarm) {
+ if (on)
+ PM_PWER |= PM_PWER_RTC;
+ else
+@@ -218,10 +218,10 @@ static int puv3_set_wake(unsigned int irq, unsigned int on)
+
+ static struct irq_chip puv3_normal_chip = {
+ .name = "PKUnity-v3",
+- .ack = puv3_mask_irq,
+- .mask = puv3_mask_irq,
+- .unmask = puv3_unmask_irq,
+- .set_wake = puv3_set_wake,
++ .irq_ack = puv3_mask_irq,
++ .irq_mask = puv3_mask_irq,
++ .irq_unmask = puv3_unmask_irq,
++ .irq_set_wake = puv3_set_wake,
+ };
+
+ static struct resource irq_resource = {
+@@ -383,7 +383,7 @@ int show_interrupts(struct seq_file *p, void *v)
+ seq_printf(p, "%3d: ", i);
+ for_each_present_cpu(cpu)
+ seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
+- seq_printf(p, " %10s", desc->chip->name ? : "-");
++ seq_printf(p, " %10s", desc->irq_data.chip->name ? : "-");
+ seq_printf(p, " %s", action->name);
+ for (action = action->next; action; action = action->next)
+ seq_printf(p, ", %s", action->name);commit 3ab457cadd15bb388b200813222af1d5fb71c9d6 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Thu Feb 17 19:06:59 2011 +0800 + + unicore32: remove unused lines in arch/unicore32/include/asm/irq.h + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/asm/irq.h b/arch/unicore32/include/asm/irq.h +index ade8bb87111d..baea93e2a6e6 100644 +--- a/arch/unicore32/include/asm/irq.h ++++ b/arch/unicore32/include/asm/irq.h +@@ -95,9 +95,7 @@ + #define IRQ_SD_CD IRQ_GPIO6 /* falling or rising trigger */ + + #ifndef __ASSEMBLY__ +-struct irqaction; + struct pt_regs; +-extern void migrate_irqs(void); + + extern void asm_do_IRQ(unsigned int, struct pt_regs *); +
commit a913a8234bb812d21bb0f75c2458f9eb941ddf91
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Thu Feb 17 17:50:43 2011 +0800
+
+ unicore32 time.c: change calculate method for clock_event_device
+
+ apply clockevents_calc_mult_shift() to get rid of
+ shift assignment and mult calculation for osmr0
+ -- by advice with Thomas Gleixner
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c
+index 8090d763a606..8bb4b815bce9 100644
+--- a/arch/unicore32/kernel/time.c
++++ b/arch/unicore32/kernel/time.c
+@@ -66,11 +66,6 @@ puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
+ static struct clock_event_device ckevt_puv3_osmr0 = {
+ .name = "osmr0",
+ .features = CLOCK_EVT_FEAT_ONESHOT,
+-#ifdef CONFIG_ARCH_FPGA
+- .shift = 18, /* correct shift val: 16, but warn_on_slowpath */
+-#else
+- .shift = 30,
+-#endif
+ .rating = 200,
+ .set_next_event = puv3_osmr0_set_next_event,
+ .set_mode = puv3_osmr0_set_mode,
+@@ -101,8 +96,8 @@ void __init time_init(void)
+ OST_OIER = 0; /* disable any timer interrupts */
+ OST_OSSR = 0; /* clear status on all timers */
+
+- ckevt_puv3_osmr0.mult =
+- div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt_puv3_osmr0.shift);
++ clockevents_calc_mult_shift(&ckevt_puv3_osmr0, CLOCK_TICK_RATE, 5);
++
+ ckevt_puv3_osmr0.max_delta_ns =
+ clockevent_delta2ns(0x7fffffff, &ckevt_puv3_osmr0);
+ ckevt_puv3_osmr0.min_delta_ns =commit b31d82737d068bf7ff8ed4592914c8fd7fdb51f0 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sun Jan 16 00:35:49 2011 +0800 + + unicore32: ADD MAINTAINER for unicore32 architecture + + Add MAINTAINER list for unicore32 architecture and pkunity soc drivers. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/MAINTAINERS b/MAINTAINERS +index f1bc3dc6b369..e8b15bfec6d6 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -4895,6 +4895,13 @@ S: Maintained + F: drivers/block/pktcdvd.c + F: include/linux/pktcdvd.h + ++PKUNITY SOC DRIVERS ++M: Guan Xuetao <gxt@mprc.pku.edu.cn> ++W: http://mprc.pku.edu.cn/~guanxuetao/linux ++S: Maintained ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git ++F: drivers/input/serio/i8042-unicore32io.h ++ + PMC SIERRA MaxRAID DRIVER + M: Anil Ravindranath <anil_ravindranath@pmc-sierra.com> + L: linux-scsi@vger.kernel.org +@@ -6259,6 +6266,13 @@ F: drivers/uwb/ + F: include/linux/uwb.h + F: include/linux/uwb/ + ++UNICORE32 ARCHITECTURE: ++M: Guan Xuetao <gxt@mprc.pku.edu.cn> ++W: http://mprc.pku.edu.cn/~guanxuetao/linux ++S: Maintained ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git ++F: arch/unicore32/ ++ + UNIFDEF + M: Tony Finch <dot@dotat.at> + W: http://dotat.at/prog/unifdef
commit 425ad52b86d9710719b3aa811d6cab56b3852981
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:28:19 2011 +0800
+
+ unicore32 machine related files: ps2 driver
+
+ This patch implements arch-specific ps2 driver.
+
+ By reviewed with Dmitry Torokhov:
+ 1. move i8042-ucio.h to drivers/input/serio/i8042-unicore32io.h
+ 2. move puv3_ps2_init() to arch/unicore32/kernel/puv3-core.c
+ 3. remove unused comments.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Dmitry Torokhov <dtor@mail.ru>
+
+diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
+new file mode 100644
+index 000000000000..6a7e8b3ce61a
+--- /dev/null
++++ b/drivers/input/serio/i8042-unicore32io.h
+@@ -0,0 +1,70 @@
++/*
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2011 Guan Xuetao
++ *
++ * 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 _I8042_UNICORE32_H
++#define _I8042_UNICORE32_H
++
++#include <mach/hardware.h>
++
++/*
++ * Names.
++ */
++#define I8042_KBD_PHYS_DESC "isa0060/serio0"
++#define I8042_AUX_PHYS_DESC "isa0060/serio1"
++#define I8042_MUX_PHYS_DESC "isa0060/serio%d"
++
++/*
++ * IRQs.
++ */
++#define I8042_KBD_IRQ IRQ_PS2_KBD
++#define I8042_AUX_IRQ IRQ_PS2_AUX
++
++/*
++ * Register numbers.
++ */
++#define I8042_COMMAND_REG ((unsigned long)&PS2_COMMAND)
++#define I8042_STATUS_REG ((unsigned long)&PS2_STATUS)
++#define I8042_DATA_REG ((unsigned long)&PS2_DATA)
++
++static inline int i8042_read_data(void)
++{
++ return inb(I8042_DATA_REG);
++}
++
++static inline int i8042_read_status(void)
++{
++ return inb(I8042_STATUS_REG);
++}
++
++static inline void i8042_write_data(int val)
++{
++ outb(val, I8042_DATA_REG);
++}
++
++static inline void i8042_write_command(int val)
++{
++ outb(val, I8042_COMMAND_REG);
++}
++
++static inline int i8042_platform_init(void)
++{
++ if (!request_region(I8042_DATA_REG, 16, "i8042"))
++ return -EBUSY;
++
++ i8042_reset = 1;
++ return 0;
++}
++
++static inline void i8042_platform_exit(void)
++{
++ release_region(I8042_DATA_REG, 16);
++}
++
++#endif /* _I8042_UNICORE32_H */
+diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
+index ac1d759d0f55..3452708fbe3b 100644
+--- a/drivers/input/serio/i8042.h
++++ b/drivers/input/serio/i8042.h
+@@ -26,6 +26,8 @@
+ #include "i8042-sparcio.h"
+ #elif defined(CONFIG_X86) || defined(CONFIG_IA64)
+ #include "i8042-x86ia64io.h"
++#elif defined(CONFIG_UNICORE32)
++#include "i8042-unicore32io.h"
+ #else
+ #include "i8042-io.h"
+ #endifcommit 700598cef866011b878f389c30414d31fa5bb87b
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:25:14 2011 +0800
+
+ unicore32 machine related files: pci bus handling
+
+ This patch implements arch-specific pci bus driver.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h
+new file mode 100644
+index 000000000000..c5b28b459535
+--- /dev/null
++++ b/arch/unicore32/include/asm/pci.h
+@@ -0,0 +1,46 @@
++/*
++ * linux/arch/unicore32/include/asm/pci.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PCI_H__
++#define __UNICORE_PCI_H__
++
++#ifdef __KERNEL__
++#include <asm-generic/pci-dma-compat.h>
++#include <asm-generic/pci.h>
++#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
++
++static inline void pcibios_set_master(struct pci_dev *dev)
++{
++ /* No special bus mastering setup handling */
++}
++
++static inline void pcibios_penalize_isa_irq(int irq, int active)
++{
++ /* We don't do dynamic PCI IRQ allocation */
++}
++
++#ifdef CONFIG_PCI
++static inline void pci_dma_burst_advice(struct pci_dev *pdev,
++ enum pci_dma_burst_strategy *strat,
++ unsigned long *strategy_parameter)
++{
++ *strat = PCI_DMA_BURST_INFINITY;
++ *strategy_parameter = ~0UL;
++}
++#endif
++
++#define HAVE_PCI_MMAP
++extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
++ enum pci_mmap_state mmap_state, int write_combine);
++
++#endif /* __KERNEL__ */
++
++#endif
+diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
+new file mode 100644
+index 000000000000..d4e55e2d2d29
+--- /dev/null
++++ b/arch/unicore32/kernel/pci.c
+@@ -0,0 +1,404 @@
++/*
++ * linux/arch/unicore32/kernel/pci.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * PCI bios-type initialisation for PCI machines
++ *
++ */
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/interrupt.h>
++#include <linux/pci.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/io.h>
++
++static int debug_pci;
++static int use_firmware;
++
++#define CONFIG_CMD(bus, devfn, where) \
++ (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3))
++
++static int
++puv3_read_config(struct pci_bus *bus, unsigned int devfn, int where,
++ int size, u32 *value)
++{
++ PCICFG_ADDR = CONFIG_CMD(bus, devfn, where);
++ switch (size) {
++ case 1:
++ *value = (PCICFG_DATA >> ((where & 3) * 8)) & 0xFF;
++ break;
++ case 2:
++ *value = (PCICFG_DATA >> ((where & 2) * 8)) & 0xFFFF;
++ break;
++ case 4:
++ *value = PCICFG_DATA;
++ break;
++ }
++ return PCIBIOS_SUCCESSFUL;
++}
++
++static int
++puv3_write_config(struct pci_bus *bus, unsigned int devfn, int where,
++ int size, u32 value)
++{
++ PCICFG_ADDR = CONFIG_CMD(bus, devfn, where);
++ switch (size) {
++ case 1:
++ PCICFG_DATA = (PCICFG_DATA & ~FMASK(8, (where&3)*8))
++ | FIELD(value, 8, (where&3)*8);
++ break;
++ case 2:
++ PCICFG_DATA = (PCICFG_DATA & ~FMASK(16, (where&2)*8))
++ | FIELD(value, 16, (where&2)*8);
++ break;
++ case 4:
++ PCICFG_DATA = value;
++ break;
++ }
++ return PCIBIOS_SUCCESSFUL;
++}
++
++struct pci_ops pci_puv3_ops = {
++ .read = puv3_read_config,
++ .write = puv3_write_config,
++};
++
++void pci_puv3_preinit(void)
++{
++ printk(KERN_DEBUG "PCI: PKUnity PCI Controller Initializing ...\n");
++ /* config PCI bridge base */
++ PCICFG_BRIBASE = PKUNITY_PCIBRI_BASE;
++
++ PCIBRI_AHBCTL0 = 0;
++ PCIBRI_AHBBAR0 = PKUNITY_PCIBRI_BASE | PCIBRI_BARx_MEM;
++ PCIBRI_AHBAMR0 = 0xFFFF0000;
++ PCIBRI_AHBTAR0 = 0;
++
++ PCIBRI_AHBCTL1 = PCIBRI_CTLx_AT;
++ PCIBRI_AHBBAR1 = PKUNITY_PCILIO_BASE | PCIBRI_BARx_IO;
++ PCIBRI_AHBAMR1 = 0xFFFF0000;
++ PCIBRI_AHBTAR1 = 0x00000000;
++
++ PCIBRI_AHBCTL2 = PCIBRI_CTLx_PREF;
++ PCIBRI_AHBBAR2 = PKUNITY_PCIMEM_BASE | PCIBRI_BARx_MEM;
++ PCIBRI_AHBAMR2 = 0xF8000000;
++ PCIBRI_AHBTAR2 = 0;
++
++ PCIBRI_BAR1 = PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM;
++
++ PCIBRI_PCICTL0 = PCIBRI_CTLx_AT | PCIBRI_CTLx_PREF;
++ PCIBRI_PCIBAR0 = PKUNITY_PCIAHB_BASE | PCIBRI_BARx_MEM;
++ PCIBRI_PCIAMR0 = 0xF8000000;
++ PCIBRI_PCITAR0 = PKUNITY_SDRAM_BASE;
++
++ PCIBRI_CMD = PCIBRI_CMD | PCIBRI_CMD_IO | PCIBRI_CMD_MEM;
++}
++
++static int __init pci_puv3_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
++{
++ if (dev->bus->number == 0) {
++#ifdef CONFIG_ARCH_FPGA /* 4 pci slots */
++ if (dev->devfn == 0x00)
++ return IRQ_PCIINTA;
++ else if (dev->devfn == 0x08)
++ return IRQ_PCIINTB;
++ else if (dev->devfn == 0x10)
++ return IRQ_PCIINTC;
++ else if (dev->devfn == 0x18)
++ return IRQ_PCIINTD;
++#endif
++#ifdef CONFIG_PUV3_DB0913 /* 3 pci slots */
++ if (dev->devfn == 0x30)
++ return IRQ_PCIINTB;
++ else if (dev->devfn == 0x60)
++ return IRQ_PCIINTC;
++ else if (dev->devfn == 0x58)
++ return IRQ_PCIINTD;
++#endif
++#if defined(CONFIG_PUV3_NB0916) || defined(CONFIG_PUV3_SMW0919)
++ /* only support 2 pci devices */
++ if (dev->devfn == 0x00)
++ return IRQ_PCIINTC; /* sata */
++#endif
++ }
++ return -1;
++}
++
++/*
++ * Only first 128MB of memory can be accessed via PCI.
++ * We use GFP_DMA to allocate safe buffers to do map/unmap.
++ * This is really ugly and we need a better way of specifying
++ * DMA-capable regions of memory.
++ */
++void __init puv3_pci_adjust_zones(unsigned long *zone_size,
++ unsigned long *zhole_size)
++{
++ unsigned int sz = SZ_128M >> PAGE_SHIFT;
++
++ /*
++ * Only adjust if > 128M on current system
++ */
++ if (zone_size[0] <= sz)
++ return;
++
++ zone_size[1] = zone_size[0] - sz;
++ zone_size[0] = sz;
++ zhole_size[1] = zhole_size[0];
++ zhole_size[0] = 0;
++}
++
++void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
++{
++ if (debug_pci)
++ printk(KERN_DEBUG "PCI: Assigning IRQ %02d to %s\n",
++ irq, pci_name(dev));
++ pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
++}
++
++/*
++ * If the bus contains any of these devices, then we must not turn on
++ * parity checking of any kind.
++ */
++static inline int pdev_bad_for_parity(struct pci_dev *dev)
++{
++ return 0;
++}
++
++/*
++ * pcibios_fixup_bus - Called after each bus is probed,
++ * but before its children are examined.
++ */
++void __devinit pcibios_fixup_bus(struct pci_bus *bus)
++{
++ struct pci_dev *dev;
++ u16 features = PCI_COMMAND_SERR
++ | PCI_COMMAND_PARITY
++ | PCI_COMMAND_FAST_BACK;
++
++ bus->resource[0] = &ioport_resource;
++ bus->resource[1] = &iomem_resource;
++
++ /*
++ * Walk the devices on this bus, working out what we can
++ * and can't support.
++ */
++ list_for_each_entry(dev, &bus->devices, bus_list) {
++ u16 status;
++
++ pci_read_config_word(dev, PCI_STATUS, &status);
++
++ /*
++ * If any device on this bus does not support fast back
++ * to back transfers, then the bus as a whole is not able
++ * to support them. Having fast back to back transfers
++ * on saves us one PCI cycle per transaction.
++ */
++ if (!(status & PCI_STATUS_FAST_BACK))
++ features &= ~PCI_COMMAND_FAST_BACK;
++
++ if (pdev_bad_for_parity(dev))
++ features &= ~(PCI_COMMAND_SERR
++ | PCI_COMMAND_PARITY);
++
++ switch (dev->class >> 8) {
++ case PCI_CLASS_BRIDGE_PCI:
++ pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &status);
++ status |= PCI_BRIDGE_CTL_PARITY
++ | PCI_BRIDGE_CTL_MASTER_ABORT;
++ status &= ~(PCI_BRIDGE_CTL_BUS_RESET
++ | PCI_BRIDGE_CTL_FAST_BACK);
++ pci_write_config_word(dev, PCI_BRIDGE_CONTROL, status);
++ break;
++
++ case PCI_CLASS_BRIDGE_CARDBUS:
++ pci_read_config_word(dev, PCI_CB_BRIDGE_CONTROL,
++ &status);
++ status |= PCI_CB_BRIDGE_CTL_PARITY
++ | PCI_CB_BRIDGE_CTL_MASTER_ABORT;
++ pci_write_config_word(dev, PCI_CB_BRIDGE_CONTROL,
++ status);
++ break;
++ }
++ }
++
++ /*
++ * Now walk the devices again, this time setting them up.
++ */
++ list_for_each_entry(dev, &bus->devices, bus_list) {
++ u16 cmd;
++
++ pci_read_config_word(dev, PCI_COMMAND, &cmd);
++ cmd |= features;
++ pci_write_config_word(dev, PCI_COMMAND, cmd);
++
++ pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
++ L1_CACHE_BYTES >> 2);
++ }
++
++ /*
++ * Propagate the flags to the PCI bridge.
++ */
++ if (bus->self && bus->self->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
++ if (features & PCI_COMMAND_FAST_BACK)
++ bus->bridge_ctl |= PCI_BRIDGE_CTL_FAST_BACK;
++ if (features & PCI_COMMAND_PARITY)
++ bus->bridge_ctl |= PCI_BRIDGE_CTL_PARITY;
++ }
++
++ /*
++ * Report what we did for this bus
++ */
++ printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n",
++ bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis");
++}
++#ifdef CONFIG_HOTPLUG
++EXPORT_SYMBOL(pcibios_fixup_bus);
++#endif
++
++static int __init pci_common_init(void)
++{
++ struct pci_bus *puv3_bus;
++
++ pci_puv3_preinit();
++
++ puv3_bus = pci_scan_bus(0, &pci_puv3_ops, NULL);
++
++ if (!puv3_bus)
++ panic("PCI: unable to scan bus!");
++
++ pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
++
++ if (!use_firmware) {
++ /*
++ * Size the bridge windows.
++ */
++ pci_bus_size_bridges(puv3_bus);
++
++ /*
++ * Assign resources.
++ */
++ pci_bus_assign_resources(puv3_bus);
++ }
++
++ /*
++ * Tell drivers about devices found.
++ */
++ pci_bus_add_devices(puv3_bus);
++
++ return 0;
++}
++subsys_initcall(pci_common_init);
++
++char * __devinit pcibios_setup(char *str)
++{
++ if (!strcmp(str, "debug")) {
++ debug_pci = 1;
++ return NULL;
++ } else if (!strcmp(str, "firmware")) {
++ use_firmware = 1;
++ return NULL;
++ }
++ return str;
++}
++
++/*
++ * From arch/i386/kernel/pci-i386.c:
++ *
++ * We need to avoid collisions with `mirrored' VGA ports
++ * and other strange ISA hardware, so we always want the
++ * addresses to be allocated in the 0x000-0x0ff region
++ * modulo 0x400.
++ *
++ * Why? Because some silly external IO cards only decode
++ * the low 10 bits of the IO address. The 0x00-0xff region
++ * is reserved for motherboard devices that decode all 16
++ * bits, so it's ok to allocate at, say, 0x2800-0x28ff,
++ * but we want to try to avoid allocating at 0x2900-0x2bff
++ * which might be mirrored at 0x0100-0x03ff..
++ */
++resource_size_t pcibios_align_resource(void *data, const struct resource *res,
++ resource_size_t size, resource_size_t align)
++{
++ resource_size_t start = res->start;
++
++ if (res->flags & IORESOURCE_IO && start & 0x300)
++ start = (start + 0x3ff) & ~0x3ff;
++
++ start = (start + align - 1) & ~(align - 1);
++
++ return start;
++}
++
++/**
++ * pcibios_enable_device - Enable I/O and memory.
++ * @dev: PCI device to be enabled
++ */
++int pcibios_enable_device(struct pci_dev *dev, int mask)
++{
++ u16 cmd, old_cmd;
++ int idx;
++ struct resource *r;
++
++ pci_read_config_word(dev, PCI_COMMAND, &cmd);
++ old_cmd = cmd;
++ for (idx = 0; idx < 6; idx++) {
++ /* Only set up the requested stuff */
++ if (!(mask & (1 << idx)))
++ continue;
++
++ r = dev->resource + idx;
++ if (!r->start && r->end) {
++ printk(KERN_ERR "PCI: Device %s not available because"
++ " of resource collisions\n", pci_name(dev));
++ return -EINVAL;
++ }
++ if (r->flags & IORESOURCE_IO)
++ cmd |= PCI_COMMAND_IO;
++ if (r->flags & IORESOURCE_MEM)
++ cmd |= PCI_COMMAND_MEMORY;
++ }
++
++ /*
++ * Bridges (eg, cardbus bridges) need to be fully enabled
++ */
++ if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
++ cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
++
++ if (cmd != old_cmd) {
++ printk("PCI: enabling device %s (%04x -> %04x)\n",
++ pci_name(dev), old_cmd, cmd);
++ pci_write_config_word(dev, PCI_COMMAND, cmd);
++ }
++ return 0;
++}
++
++int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
++ enum pci_mmap_state mmap_state, int write_combine)
++{
++ unsigned long phys;
++
++ if (mmap_state == pci_mmap_io)
++ return -EINVAL;
++
++ phys = vma->vm_pgoff;
++
++ /*
++ * Mark this as IO
++ */
++ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++
++ if (remap_pfn_range(vma, vma->vm_start, phys,
++ vma->vm_end - vma->vm_start,
++ vma->vm_page_prot))
++ return -EAGAIN;
++
++ return 0;
++}
+diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
+index 98e6fdf34d30..77cf813ba264 100644
+--- a/drivers/pci/Makefile
++++ b/drivers/pci/Makefile
+@@ -42,6 +42,7 @@ obj-$(CONFIG_PCI_IOV) += iov.o
+ obj-$(CONFIG_X86) += setup-bus.o
+ obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
+ obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
++obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
+ obj-$(CONFIG_PARISC) += setup-bus.o
+ obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
+ obj-$(CONFIG_PPC) += setup-bus.ocommit b08b4f8e63e60a64f81e194269be14afee396f33 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sat Feb 26 20:08:36 2011 +0800 + + unicore32 machine related files: hardware registers + + This patch adds all hardware registers definitions. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + +diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h +new file mode 100644 +index 000000000000..fa11eba0afd6 +--- /dev/null ++++ b/arch/unicore32/include/mach/PKUnity.h +@@ -0,0 +1,104 @@ ++/* ++ * linux/arch/unicore32/include/mach/PKUnity.h ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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. ++ */ ++ ++/* Be sure that virtual mapping is defined right */ ++#ifndef __MACH_PUV3_HARDWARE_H__ ++#error You must include hardware.h not PKUnity.h ++#endif ++ ++#include "bitfield.h" ++ ++/* ++ * Memory Definitions ++ */ ++#define PKUNITY_SDRAM_BASE 0x00000000 /* 0x00000000 - 0x7FFFFFFF 2GB */ ++#define PKUNITY_IOSPACE_BASE 0x80000000 /* 0x80000000 - 0xFFFFFFFF 2GB */ ++#define PKUNITY_PCI_BASE 0x80000000 /* 0x80000000 - 0xBFFFFFFF 1GB */ ++#include "regs-pci.h" ++#define PKUNITY_BOOT_ROM2_BASE 0xF4000000 /* 0xF4000000 - 0xF7FFFFFF 64MB */ ++#define PKUNITY_BOOT_SRAM2_BASE 0xF8000000 /* 0xF8000000 - 0xFBFFFFFF 64MB */ ++#define PKUNITY_BOOT_FLASH_BASE 0xFC000000 /* 0xFC000000 - 0xFFFFFFFF 64MB */ ++ ++/* ++ * PKUNITY Memory Map Addresses: 0x0D000000 - 0x0EFFFFFF (32MB) ++ */ ++#define PKUNITY_UVC_MMAP_BASE 0x0D000000 /* 0x0D000000 - 0x0DFFFFFF 16MB */ ++#define PKUNITY_UVC_MMAP_SIZE 0x01000000 /* 16MB */ ++#define PKUNITY_UNIGFX_MMAP_BASE 0x0E000000 /* 0x0E000000 - 0x0EFFFFFF 16MB */ ++#define PKUNITY_UNIGFX_MMAP_SIZE 0x01000000 /* 16MB */ ++ ++/* ++ * PKUNITY System Bus Addresses (PCI): 0x80000000 - 0xBFFFFFFF (1GB) ++ */ ++/* PCI Configuration regs */ ++#define PKUNITY_PCICFG_BASE 0x80000000 /* 0x80000000 - 0x8000000B 12B */ ++/* PCI Bridge Base */ ++#define PKUNITY_PCIBRI_BASE 0x80010000 /* 0x80010000 - 0x80010250 592B */ ++/* PCI Legacy IO */ ++#define PKUNITY_PCILIO_BASE 0x80030000 /* 0x80030000 - 0x8003FFFF 64KB */ ++/* PCI AHB-PCI MEM-mapping */ ++#define PKUNITY_PCIMEM_BASE 0x90000000 /* 0x90000000 - 0x97FFFFFF 128MB */ ++/* PCI PCI-AHB MEM-mapping */ ++#define PKUNITY_PCIAHB_BASE 0x98000000 /* 0x98000000 - 0x9FFFFFFF 128MB */ ++ ++/* ++ * PKUNITY System Bus Addresses (AHB): 0xC0000000 - 0xEDFFFFFF (640MB) ++ */ ++/* AHB-0 is DDR2 SDRAM */ ++/* AHB-1 is PCI Space */ ++#define PKUNITY_ARBITER_BASE 0xC0000000 /* AHB-2 */ ++#define PKUNITY_DDR2CTRL_BASE 0xC0100000 /* AHB-3 */ ++#define PKUNITY_DMAC_BASE 0xC0200000 /* AHB-4 */ ++#include "regs-dmac.h" ++#define PKUNITY_UMAL_BASE 0xC0300000 /* AHB-5 */ ++#include "regs-umal.h" ++#define PKUNITY_USB_BASE 0xC0400000 /* AHB-6 */ ++#define PKUNITY_SATA_BASE 0xC0500000 /* AHB-7 */ ++#define PKUNITY_SMC_BASE 0xC0600000 /* AHB-8 */ ++/* AHB-9 is for APB bridge */ ++#define PKUNITY_MME_BASE 0xC0700000 /* AHB-10 */ ++#define PKUNITY_UNIGFX_BASE 0xC0800000 /* AHB-11 */ ++#include "regs-unigfx.h" ++#define PKUNITY_NAND_BASE 0xC0900000 /* AHB-12 */ ++#include "regs-nand.h" ++#define PKUNITY_H264D_BASE 0xC0A00000 /* AHB-13 */ ++#define PKUNITY_H264E_BASE 0xC0B00000 /* AHB-14 */ ++ ++/* ++ * PKUNITY Peripheral Bus Addresses (APB): 0xEE000000 - 0xEFFFFFFF (128MB) ++ */ ++#define PKUNITY_UART0_BASE 0xEE000000 /* APB-0 */ ++#define PKUNITY_UART1_BASE 0xEE100000 /* APB-1 */ ++#include "regs-uart.h" ++#define PKUNITY_I2C_BASE 0xEE200000 /* APB-2 */ ++#include "regs-i2c.h" ++#define PKUNITY_SPI_BASE 0xEE300000 /* APB-3 */ ++#include "regs-spi.h" ++#define PKUNITY_AC97_BASE 0xEE400000 /* APB-4 */ ++#include "regs-ac97.h" ++#define PKUNITY_GPIO_BASE 0xEE500000 /* APB-5 */ ++#include "regs-gpio.h" ++#define PKUNITY_INTC_BASE 0xEE600000 /* APB-6 */ ++#include "regs-intc.h" ++#define PKUNITY_RTC_BASE 0xEE700000 /* APB-7 */ ++#include "regs-rtc.h" ++#define PKUNITY_OST_BASE 0xEE800000 /* APB-8 */ ++#include "regs-ost.h" ++#define PKUNITY_RESETC_BASE 0xEE900000 /* APB-9 */ ++#include "regs-resetc.h" ++#define PKUNITY_PM_BASE 0xEEA00000 /* APB-10 */ ++#include "regs-pm.h" ++#define PKUNITY_PS2_BASE 0xEEB00000 /* APB-11 */ ++#include "regs-ps2.h" ++#define PKUNITY_SDC_BASE 0xEEC00000 /* APB-12 */ ++#include "regs-sdc.h" ++ +diff --git a/arch/unicore32/include/mach/bitfield.h b/arch/unicore32/include/mach/bitfield.h +new file mode 100644 +index 000000000000..128a70281efc +--- /dev/null ++++ b/arch/unicore32/include/mach/bitfield.h +@@ -0,0 +1,24 @@ ++/* ++ * linux/arch/unicore32/include/mach/bitfield.h ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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 __MACH_PUV3_BITFIELD_H__ ++#define __MACH_PUV3_BITFIELD_H__ ++ ++#ifndef __ASSEMBLY__ ++#define UData(Data) ((unsigned long) (Data)) ++#else ++#define UData(Data) (Data) ++#endif ++ ++#define FIELD(val, vmask, vshift) (((val) & ((UData(1) << (vmask)) - 1)) << (vshift)) ++#define FMASK(vmask, vshift) (((UData(1) << (vmask)) - 1) << (vshift)) ++ ++#endif /* __MACH_PUV3_BITFIELD_H__ */ +diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h +new file mode 100644 +index 000000000000..3fb7236f8d69 +--- /dev/null ++++ b/arch/unicore32/include/mach/hardware.h +@@ -0,0 +1,45 @@ ++/* ++ * linux/arch/unicore32/include/mach/hardware.h ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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 file contains the hardware definitions for PKUnity architecture ++ */ ++ ++#ifndef __MACH_PUV3_HARDWARE_H__ ++#define __MACH_PUV3_HARDWARE_H__ ++ ++#include "PKUnity.h" ++ ++#define io_p2v(x) ((x) - PKUNITY_IOSPACE_BASE) ++#define io_v2p(x) ((x) + PKUNITY_IOSPACE_BASE) ++ ++#ifndef __ASSEMBLY__ ++ ++# define __REG(x) (*((volatile unsigned long *)io_p2v(x))) ++# define __PREG(x) (io_v2p((unsigned long)&(x))) ++ ++#else ++ ++# define __REG(x) io_p2v(x) ++# define __PREG(x) io_v2p(x) ++ ++#endif ++ ++#define PCIBIOS_MIN_IO 0x4000 /* should lower than 64KB */ ++#define PCIBIOS_MIN_MEM PKUNITY_PCIMEM_BASE ++ ++/* ++ * We override the standard dma-mask routines for bouncing. ++ */ ++#define HAVE_ARCH_PCI_SET_DMA_MASK ++ ++#define pcibios_assign_all_busses() 1 ++ ++#endif /* __MACH_PUV3_HARDWARE_H__ */ +diff --git a/arch/unicore32/include/mach/regs-ac97.h b/arch/unicore32/include/mach/regs-ac97.h +new file mode 100644 +index 000000000000..ce299bf4adae +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-ac97.h +@@ -0,0 +1,32 @@ ++/* ++ * PKUnity AC97 Registers ++ */ ++ ++#define PKUNITY_AC97_CONR __REG(PKUNITY_AC97_BASE + 0x0000) ++#define PKUNITY_AC97_OCR __REG(PKUNITY_AC97_BASE + 0x0004) ++#define PKUNITY_AC97_ICR __REG(PKUNITY_AC97_BASE + 0x0008) ++#define PKUNITY_AC97_CRAC __REG(PKUNITY_AC97_BASE + 0x000C) ++#define PKUNITY_AC97_INTR __REG(PKUNITY_AC97_BASE + 0x0010) ++#define PKUNITY_AC97_INTRSTAT __REG(PKUNITY_AC97_BASE + 0x0014) ++#define PKUNITY_AC97_INTRCLEAR __REG(PKUNITY_AC97_BASE + 0x0018) ++#define PKUNITY_AC97_ENABLE __REG(PKUNITY_AC97_BASE + 0x001C) ++#define PKUNITY_AC97_OUT_FIFO __REG(PKUNITY_AC97_BASE + 0x0020) ++#define PKUNITY_AC97_IN_FIFO __REG(PKUNITY_AC97_BASE + 0x0030) ++ ++#define AC97_CODEC_REG(v) FIELD((v), 7, 16) ++#define AC97_CODEC_VAL(v) FIELD((v), 16, 0) ++#define AC97_CODEC_WRITECOMPLETE FIELD(1, 1, 2) ++ ++/* ++ * VAR PLAY SAMPLE RATE ++ */ ++#define AC97_CMD_VPSAMPLE (FIELD(3, 2, 16) | FIELD(3, 2, 0)) ++ ++/* ++ * FIX CAPTURE SAMPLE RATE ++ */ ++#define AC97_CMD_FCSAMPLE FIELD(7, 3, 0) ++ ++#define AC97_CMD_RESET FIELD(1, 1, 0) ++#define AC97_CMD_ENABLE FIELD(1, 1, 0) ++#define AC97_CMD_DISABLE FIELD(0, 1, 0) +diff --git a/arch/unicore32/include/mach/regs-dmac.h b/arch/unicore32/include/mach/regs-dmac.h +new file mode 100644 +index 000000000000..09fce9d0d640 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-dmac.h +@@ -0,0 +1,81 @@ ++/* ++ * PKUnity Direct Memory Access Controller (DMAC) ++ */ ++ ++/* ++ * Interrupt Status Reg DMAC_ISR. ++ */ ++#define DMAC_ISR __REG(PKUNITY_DMAC_BASE + 0x0020) ++/* ++ * Interrupt Transfer Complete Status Reg DMAC_ITCSR. ++ */ ++#define DMAC_ITCSR __REG(PKUNITY_DMAC_BASE + 0x0050) ++/* ++ * Interrupt Transfer Complete Clear Reg DMAC_ITCCR. ++ */ ++#define DMAC_ITCCR __REG(PKUNITY_DMAC_BASE + 0x0060) ++/* ++ * Interrupt Error Status Reg DMAC_IESR. ++ */ ++#define DMAC_IESR __REG(PKUNITY_DMAC_BASE + 0x0080) ++/* ++ * Interrupt Error Clear Reg DMAC_IECR. ++ */ ++#define DMAC_IECR __REG(PKUNITY_DMAC_BASE + 0x0090) ++/* ++ * Enable Channels Reg DMAC_ENCH. ++ */ ++#define DMAC_ENCH __REG(PKUNITY_DMAC_BASE + 0x00B0) ++ ++/* ++ * DMA control reg. Space [byte] ++ */ ++#define DMASp 0x00000100 ++ ++/* ++ * Source Addr DMAC_SRCADDR(ch). ++ */ ++#define DMAC_SRCADDR(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x00) ++/* ++ * Destination Addr DMAC_DESTADDR(ch). ++ */ ++#define DMAC_DESTADDR(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x04) ++/* ++ * Control Reg DMAC_CONTROL(ch). ++ */ ++#define DMAC_CONTROL(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x0C) ++/* ++ * Configuration Reg DMAC_CONFIG(ch). ++ */ ++#define DMAC_CONFIG(ch) __REG(PKUNITY_DMAC_BASE + (ch)*DMASp + 0x10) ++ ++#define DMAC_IR_MASK FMASK(6, 0) ++/* ++ * select channel (ch) ++ */ ++#define DMAC_CHANNEL(ch) FIELD(1, 1, (ch)) ++ ++#define DMAC_CONTROL_SIZE_BYTE(v) (FIELD((v), 12, 14) | \ ++ FIELD(0, 3, 9) | FIELD(0, 3, 6)) ++#define DMAC_CONTROL_SIZE_HWORD(v) (FIELD((v) >> 1, 12, 14) | \ ++ FIELD(1, 3, 9) | FIELD(1, 3, 6)) ++#define DMAC_CONTROL_SIZE_WORD(v) (FIELD((v) >> 2, 12, 14) | \ ++ FIELD(2, 3, 9) | FIELD(2, 3, 6)) ++#define DMAC_CONTROL_DI FIELD(1, 1, 13) ++#define DMAC_CONTROL_SI FIELD(1, 1, 12) ++#define DMAC_CONTROL_BURST_1BYTE (FIELD(0, 3, 3) | FIELD(0, 3, 0)) ++#define DMAC_CONTROL_BURST_4BYTE (FIELD(3, 3, 3) | FIELD(3, 3, 0)) ++#define DMAC_CONTROL_BURST_8BYTE (FIELD(5, 3, 3) | FIELD(5, 3, 0)) ++#define DMAC_CONTROL_BURST_16BYTE (FIELD(7, 3, 3) | FIELD(7, 3, 0)) ++ ++#define DMAC_CONFIG_UART0_WR (FIELD(2, 4, 11) | FIELD(1, 2, 1)) ++#define DMAC_CONFIG_UART0_RD (FIELD(2, 4, 7) | FIELD(2, 2, 1)) ++#define DMAC_CONFIG_UART1_WR (FIELD(3, 4, 11) | FIELD(1, 2, 1)) ++#define DMAC_CONFIG_UART1RD (FIELD(3, 4, 7) | FIELD(2, 2, 1)) ++#define DMAC_CONFIG_AC97WR (FIELD(4, 4, 11) | FIELD(1, 2, 1)) ++#define DMAC_CONFIG_AC97RD (FIELD(4, 4, 7) | FIELD(2, 2, 1)) ++#define DMAC_CONFIG_MMCWR (FIELD(7, 4, 11) | FIELD(1, 2, 1)) ++#define DMAC_CONFIG_MMCRD (FIELD(7, 4, 7) | FIELD(2, 2, 1)) ++#define DMAC_CONFIG_MASKITC FIELD(1, 1, 4) ++#define DMAC_CONFIG_MASKIE FIELD(1, 1, 3) ++#define DMAC_CONFIG_EN FIELD(1, 1, 0) +diff --git a/arch/unicore32/include/mach/regs-gpio.h b/arch/unicore32/include/mach/regs-gpio.h +new file mode 100644 +index 000000000000..5dd99d4c209e +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-gpio.h +@@ -0,0 +1,70 @@ ++/* ++ * PKUnity General-Purpose Input/Output (GPIO) Registers ++ */ ++ ++/* ++ * Voltage Status Reg GPIO_GPLR. ++ */ ++#define GPIO_GPLR __REG(PKUNITY_GPIO_BASE + 0x0000) ++/* ++ * Pin Direction Reg GPIO_GPDR. ++ */ ++#define GPIO_GPDR __REG(PKUNITY_GPIO_BASE + 0x0004) ++/* ++ * Output Pin Set Reg GPIO_GPSR. ++ */ ++#define GPIO_GPSR __REG(PKUNITY_GPIO_BASE + 0x0008) ++/* ++ * Output Pin Clear Reg GPIO_GPCR. ++ */ ++#define GPIO_GPCR __REG(PKUNITY_GPIO_BASE + 0x000C) ++/* ++ * Raise Edge Detect Reg GPIO_GRER. ++ */ ++#define GPIO_GRER __REG(PKUNITY_GPIO_BASE + 0x0010) ++/* ++ * Fall Edge Detect Reg GPIO_GFER. ++ */ ++#define GPIO_GFER __REG(PKUNITY_GPIO_BASE + 0x0014) ++/* ++ * Edge Status Reg GPIO_GEDR. ++ */ ++#define GPIO_GEDR __REG(PKUNITY_GPIO_BASE + 0x0018) ++/* ++ * Sepcial Voltage Detect Reg GPIO_GPIR. ++ */ ++#define GPIO_GPIR __REG(PKUNITY_GPIO_BASE + 0x0020) ++ ++#define GPIO_MIN (0) ++#define GPIO_MAX (27) ++ ++#define GPIO_GPIO(Nb) (0x00000001 << (Nb)) /* GPIO [0..27] */ ++#define GPIO_GPIO0 GPIO_GPIO(0) /* GPIO [0] */ ++#define GPIO_GPIO1 GPIO_GPIO(1) /* GPIO [1] */ ++#define GPIO_GPIO2 GPIO_GPIO(2) /* GPIO [2] */ ++#define GPIO_GPIO3 GPIO_GPIO(3) /* GPIO [3] */ ++#define GPIO_GPIO4 GPIO_GPIO(4) /* GPIO [4] */ ++#define GPIO_GPIO5 GPIO_GPIO(5) /* GPIO [5] */ ++#define GPIO_GPIO6 GPIO_GPIO(6) /* GPIO [6] */ ++#define GPIO_GPIO7 GPIO_GPIO(7) /* GPIO [7] */ ++#define GPIO_GPIO8 GPIO_GPIO(8) /* GPIO [8] */ ++#define GPIO_GPIO9 GPIO_GPIO(9) /* GPIO [9] */ ++#define GPIO_GPIO10 GPIO_GPIO(10) /* GPIO [10] */ ++#define GPIO_GPIO11 GPIO_GPIO(11) /* GPIO [11] */ ++#define GPIO_GPIO12 GPIO_GPIO(12) /* GPIO [12] */ ++#define GPIO_GPIO13 GPIO_GPIO(13) /* GPIO [13] */ ++#define GPIO_GPIO14 GPIO_GPIO(14) /* GPIO [14] */ ++#define GPIO_GPIO15 GPIO_GPIO(15) /* GPIO [15] */ ++#define GPIO_GPIO16 GPIO_GPIO(16) /* GPIO [16] */ ++#define GPIO_GPIO17 GPIO_GPIO(17) /* GPIO [17] */ ++#define GPIO_GPIO18 GPIO_GPIO(18) /* GPIO [18] */ ++#define GPIO_GPIO19 GPIO_GPIO(19) /* GPIO [19] */ ++#define GPIO_GPIO20 GPIO_GPIO(20) /* GPIO [20] */ ++#define GPIO_GPIO21 GPIO_GPIO(21) /* GPIO [21] */ ++#define GPIO_GPIO22 GPIO_GPIO(22) /* GPIO [22] */ ++#define GPIO_GPIO23 GPIO_GPIO(23) /* GPIO [23] */ ++#define GPIO_GPIO24 GPIO_GPIO(24) /* GPIO [24] */ ++#define GPIO_GPIO25 GPIO_GPIO(25) /* GPIO [25] */ ++#define GPIO_GPIO26 GPIO_GPIO(26) /* GPIO [26] */ ++#define GPIO_GPIO27 GPIO_GPIO(27) /* GPIO [27] */ ++ +diff --git a/arch/unicore32/include/mach/regs-i2c.h b/arch/unicore32/include/mach/regs-i2c.h +new file mode 100644 +index 000000000000..70b704f8dda8 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-i2c.h +@@ -0,0 +1,63 @@ ++/* ++ * PKUnity Inter-integrated Circuit (I2C) Registers ++ */ ++ ++/* ++ * Control Reg I2C_CON. ++ */ ++#define I2C_CON __REG(PKUNITY_I2C_BASE + 0x0000) ++/* ++ * Target Address Reg I2C_TAR. ++ */ ++#define I2C_TAR __REG(PKUNITY_I2C_BASE + 0x0004) ++/* ++ * Data buffer and command Reg I2C_DATACMD. ++ */ ++#define I2C_DATACMD __REG(PKUNITY_I2C_BASE + 0x0010) ++/* ++ * Enable Reg I2C_ENABLE. ++ */ ++#define I2C_ENABLE __REG(PKUNITY_I2C_BASE + 0x006C) ++/* ++ * Status Reg I2C_STATUS. ++ */ ++#define I2C_STATUS __REG(PKUNITY_I2C_BASE + 0x0070) ++/* ++ * Tx FIFO Length Reg I2C_TXFLR. ++ */ ++#define I2C_TXFLR __REG(PKUNITY_I2C_BASE + 0x0074) ++/* ++ * Rx FIFO Length Reg I2C_RXFLR. ++ */ ++#define I2C_RXFLR __REG(PKUNITY_I2C_BASE + 0x0078) ++/* ++ * Enable Status Reg I2C_ENSTATUS. ++ */ ++#define I2C_ENSTATUS __REG(PKUNITY_I2C_BASE + 0x009C) ++ ++#define I2C_CON_MASTER FIELD(1, 1, 0) ++#define I2C_CON_SPEED_STD FIELD(1, 2, 1) ++#define I2C_CON_SPEED_FAST FIELD(2, 2, 1) ++#define I2C_CON_RESTART FIELD(1, 1, 5) ++#define I2C_CON_SLAVEDISABLE FIELD(1, 1, 6) ++ ++#define I2C_DATACMD_READ FIELD(1, 1, 8) ++#define I2C_DATACMD_WRITE FIELD(0, 1, 8) ++#define I2C_DATACMD_DAT_MASK FMASK(8, 0) ++#define I2C_DATACMD_DAT(v) FIELD((v), 8, 0) ++ ++#define I2C_ENABLE_ENABLE FIELD(1, 1, 0) ++#define I2C_ENABLE_DISABLE FIELD(0, 1, 0) ++ ++#define I2C_STATUS_RFF FIELD(1, 1, 4) ++#define I2C_STATUS_RFNE FIELD(1, 1, 3) ++#define I2C_STATUS_TFE FIELD(1, 1, 2) ++#define I2C_STATUS_TFNF FIELD(1, 1, 1) ++#define I2C_STATUS_ACTIVITY FIELD(1, 1, 0) ++ ++#define I2C_ENSTATUS_ENABLE FIELD(1, 1, 0) ++ ++#define I2C_TAR_THERMAL 0x4f ++#define I2C_TAR_SPD 0x50 ++#define I2C_TAR_PWIC 0x55 ++#define I2C_TAR_EEPROM 0x57 +diff --git a/arch/unicore32/include/mach/regs-intc.h b/arch/unicore32/include/mach/regs-intc.h +new file mode 100644 +index 000000000000..409ae4776145 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-intc.h +@@ -0,0 +1,28 @@ ++/* ++ * PKUNITY Interrupt Controller (INTC) Registers ++ */ ++/* ++ * INTC Level Reg INTC_ICLR. ++ */ ++#define INTC_ICLR __REG(PKUNITY_INTC_BASE + 0x0000) ++/* ++ * INTC Mask Reg INTC_ICMR. ++ */ ++#define INTC_ICMR __REG(PKUNITY_INTC_BASE + 0x0004) ++/* ++ * INTC Pending Reg INTC_ICPR. ++ */ ++#define INTC_ICPR __REG(PKUNITY_INTC_BASE + 0x0008) ++/* ++ * INTC IRQ Pending Reg INTC_ICIP. ++ */ ++#define INTC_ICIP __REG(PKUNITY_INTC_BASE + 0x000C) ++/* ++ * INTC REAL Pending Reg INTC_ICFP. ++ */ ++#define INTC_ICFP __REG(PKUNITY_INTC_BASE + 0x0010) ++/* ++ * INTC Control Reg INTC_ICCR. ++ */ ++#define INTC_ICCR __REG(PKUNITY_INTC_BASE + 0x0014) ++ +diff --git a/arch/unicore32/include/mach/regs-nand.h b/arch/unicore32/include/mach/regs-nand.h +new file mode 100644 +index 000000000000..0c33fe8c3090 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-nand.h +@@ -0,0 +1,79 @@ ++/* ++ * PKUnity NAND Controller Registers ++ */ ++/* ++ * ID Reg. 0 NAND_IDR0 ++ */ ++#define NAND_IDR0 __REG(PKUNITY_NAND_BASE + 0x0000) ++/* ++ * ID Reg. 1 NAND_IDR1 ++ */ ++#define NAND_IDR1 __REG(PKUNITY_NAND_BASE + 0x0004) ++/* ++ * ID Reg. 2 NAND_IDR2 ++ */ ++#define NAND_IDR2 __REG(PKUNITY_NAND_BASE + 0x0008) ++/* ++ * ID Reg. 3 NAND_IDR3 ++ */ ++#define NAND_IDR3 __REG(PKUNITY_NAND_BASE + 0x000C) ++/* ++ * Page Address Reg 0 NAND_PAR0 ++ */ ++#define NAND_PAR0 __REG(PKUNITY_NAND_BASE + 0x0010) ++/* ++ * Page Address Reg 1 NAND_PAR1 ++ */ ++#define NAND_PAR1 __REG(PKUNITY_NAND_BASE + 0x0014) ++/* ++ * Page Address Reg 2 NAND_PAR2 ++ */ ++#define NAND_PAR2 __REG(PKUNITY_NAND_BASE + 0x0018) ++/* ++ * ECC Enable Reg NAND_ECCEN ++ */ ++#define NAND_ECCEN __REG(PKUNITY_NAND_BASE + 0x001C) ++/* ++ * Buffer Reg NAND_BUF ++ */ ++#define NAND_BUF __REG(PKUNITY_NAND_BASE + 0x0020) ++/* ++ * ECC Status Reg NAND_ECCSR ++ */ ++#define NAND_ECCSR __REG(PKUNITY_NAND_BASE + 0x0024) ++/* ++ * Command Reg NAND_CMD ++ */ ++#define NAND_CMD __REG(PKUNITY_NAND_BASE + 0x0028) ++/* ++ * DMA Configure Reg NAND_DMACR ++ */ ++#define NAND_DMACR __REG(PKUNITY_NAND_BASE + 0x002C) ++/* ++ * Interrupt Reg NAND_IR ++ */ ++#define NAND_IR __REG(PKUNITY_NAND_BASE + 0x0030) ++/* ++ * Interrupt Mask Reg NAND_IMR ++ */ ++#define NAND_IMR __REG(PKUNITY_NAND_BASE + 0x0034) ++/* ++ * Chip Enable Reg NAND_CHIPEN ++ */ ++#define NAND_CHIPEN __REG(PKUNITY_NAND_BASE + 0x0038) ++/* ++ * Address Reg NAND_ADDR ++ */ ++#define NAND_ADDR __REG(PKUNITY_NAND_BASE + 0x003C) ++ ++/* ++ * Command bits NAND_CMD_CMD_MASK ++ */ ++#define NAND_CMD_CMD_MASK FMASK(4, 4) ++#define NAND_CMD_CMD_READPAGE FIELD(0x0, 4, 4) ++#define NAND_CMD_CMD_ERASEBLOCK FIELD(0x6, 4, 4) ++#define NAND_CMD_CMD_READSTATUS FIELD(0x7, 4, 4) ++#define NAND_CMD_CMD_WRITEPAGE FIELD(0x8, 4, 4) ++#define NAND_CMD_CMD_READID FIELD(0x9, 4, 4) ++#define NAND_CMD_CMD_RESET FIELD(0xf, 4, 4) ++ +diff --git a/arch/unicore32/include/mach/regs-ost.h b/arch/unicore32/include/mach/regs-ost.h +new file mode 100644 +index 000000000000..33049a827518 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-ost.h +@@ -0,0 +1,92 @@ ++/* ++ * PKUnity Operating System Timer (OST) Registers ++ */ ++/* ++ * Match Reg 0 OST_OSMR0 ++ */ ++#define OST_OSMR0 __REG(PKUNITY_OST_BASE + 0x0000) ++/* ++ * Match Reg 1 OST_OSMR1 ++ */ ++#define OST_OSMR1 __REG(PKUNITY_OST_BASE + 0x0004) ++/* ++ * Match Reg 2 OST_OSMR2 ++ */ ++#define OST_OSMR2 __REG(PKUNITY_OST_BASE + 0x0008) ++/* ++ * Match Reg 3 OST_OSMR3 ++ */ ++#define OST_OSMR3 __REG(PKUNITY_OST_BASE + 0x000C) ++/* ++ * Counter Reg OST_OSCR ++ */ ++#define OST_OSCR __REG(PKUNITY_OST_BASE + 0x0010) ++/* ++ * Status Reg OST_OSSR ++ */ ++#define OST_OSSR __REG(PKUNITY_OST_BASE + 0x0014) ++/* ++ * Watchdog Enable Reg OST_OWER ++ */ ++#define OST_OWER __REG(PKUNITY_OST_BASE + 0x0018) ++/* ++ * Interrupt Enable Reg OST_OIER ++ */ ++#define OST_OIER __REG(PKUNITY_OST_BASE + 0x001C) ++/* ++ * PWM Pulse Width Control Reg OST_PWMPWCR ++ */ ++#define OST_PWMPWCR __REG(PKUNITY_OST_BASE + 0x0080) ++/* ++ * PWM Duty Cycle Control Reg OST_PWMDCCR ++ */ ++#define OST_PWMDCCR __REG(PKUNITY_OST_BASE + 0x0084) ++/* ++ * PWM Period Control Reg OST_PWMPCR ++ */ ++#define OST_PWMPCR __REG(PKUNITY_OST_BASE + 0x0088) ++ ++/* ++ * Match detected 0 OST_OSSR_M0 ++ */ ++#define OST_OSSR_M0 FIELD(1, 1, 0) ++/* ++ * Match detected 1 OST_OSSR_M1 ++ */ ++#define OST_OSSR_M1 FIELD(1, 1, 1) ++/* ++ * Match detected 2 OST_OSSR_M2 ++ */ ++#define OST_OSSR_M2 FIELD(1, 1, 2) ++/* ++ * Match detected 3 OST_OSSR_M3 ++ */ ++#define OST_OSSR_M3 FIELD(1, 1, 3) ++ ++/* ++ * Interrupt enable 0 OST_OIER_E0 ++ */ ++#define OST_OIER_E0 FIELD(1, 1, 0) ++/* ++ * Interrupt enable 1 OST_OIER_E1 ++ */ ++#define OST_OIER_E1 FIELD(1, 1, 1) ++/* ++ * Interrupt enable 2 OST_OIER_E2 ++ */ ++#define OST_OIER_E2 FIELD(1, 1, 2) ++/* ++ * Interrupt enable 3 OST_OIER_E3 ++ */ ++#define OST_OIER_E3 FIELD(1, 1, 3) ++ ++/* ++ * Watchdog Match Enable OST_OWER_WME ++ */ ++#define OST_OWER_WME FIELD(1, 1, 0) ++ ++/* ++ * PWM Full Duty Cycle OST_PWMDCCR_FDCYCLE ++ */ ++#define OST_PWMDCCR_FDCYCLE FIELD(1, 1, 10) ++ +diff --git a/arch/unicore32/include/mach/regs-pci.h b/arch/unicore32/include/mach/regs-pci.h +new file mode 100644 +index 000000000000..e8e1f1a52fd0 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-pci.h +@@ -0,0 +1,94 @@ ++/* ++ * PKUnity AHB-PCI Bridge Registers ++ */ ++ ++/* ++ * AHB/PCI fixed physical address for pci addess configuration ++ */ ++/* ++ * PCICFG Bridge Base Reg. ++ */ ++#define PCICFG_BRIBASE __REG(PKUNITY_PCICFG_BASE + 0x0000) ++/* ++ * PCICFG Address Reg. ++ */ ++#define PCICFG_ADDR __REG(PKUNITY_PCICFG_BASE + 0x0004) ++/* ++ * PCICFG Address Reg. ++ */ ++#define PCICFG_DATA __REG(PKUNITY_PCICFG_BASE + 0x0008) ++ ++/* ++ * PCI Bridge configuration space ++ */ ++#define PCIBRI_ID __REG(PKUNITY_PCIBRI_BASE + 0x0000) ++#define PCIBRI_CMD __REG(PKUNITY_PCIBRI_BASE + 0x0004) ++#define PCIBRI_CLASS __REG(PKUNITY_PCIBRI_BASE + 0x0008) ++#define PCIBRI_LTR __REG(PKUNITY_PCIBRI_BASE + 0x000C) ++#define PCIBRI_BAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0010) ++#define PCIBRI_BAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0014) ++#define PCIBRI_BAR2 __REG(PKUNITY_PCIBRI_BASE + 0x0018) ++#define PCIBRI_BAR3 __REG(PKUNITY_PCIBRI_BASE + 0x001C) ++#define PCIBRI_BAR4 __REG(PKUNITY_PCIBRI_BASE + 0x0020) ++#define PCIBRI_BAR5 __REG(PKUNITY_PCIBRI_BASE + 0x0024) ++ ++#define PCIBRI_PCICTL0 __REG(PKUNITY_PCIBRI_BASE + 0x0100) ++#define PCIBRI_PCIBAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0104) ++#define PCIBRI_PCIAMR0 __REG(PKUNITY_PCIBRI_BASE + 0x0108) ++#define PCIBRI_PCITAR0 __REG(PKUNITY_PCIBRI_BASE + 0x010C) ++#define PCIBRI_PCICTL1 __REG(PKUNITY_PCIBRI_BASE + 0x0110) ++#define PCIBRI_PCIBAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0114) ++#define PCIBRI_PCIAMR1 __REG(PKUNITY_PCIBRI_BASE + 0x0118) ++#define PCIBRI_PCITAR1 __REG(PKUNITY_PCIBRI_BASE + 0x011C) ++#define PCIBRI_PCICTL2 __REG(PKUNITY_PCIBRI_BASE + 0x0120) ++#define PCIBRI_PCIBAR2 __REG(PKUNITY_PCIBRI_BASE + 0x0124) ++#define PCIBRI_PCIAMR2 __REG(PKUNITY_PCIBRI_BASE + 0x0128) ++#define PCIBRI_PCITAR2 __REG(PKUNITY_PCIBRI_BASE + 0x012C) ++#define PCIBRI_PCICTL3 __REG(PKUNITY_PCIBRI_BASE + 0x0130) ++#define PCIBRI_PCIBAR3 __REG(PKUNITY_PCIBRI_BASE + 0x0134) ++#define PCIBRI_PCIAMR3 __REG(PKUNITY_PCIBRI_BASE + 0x0138) ++#define PCIBRI_PCITAR3 __REG(PKUNITY_PCIBRI_BASE + 0x013C) ++#define PCIBRI_PCICTL4 __REG(PKUNITY_PCIBRI_BASE + 0x0140) ++#define PCIBRI_PCIBAR4 __REG(PKUNITY_PCIBRI_BASE + 0x0144) ++#define PCIBRI_PCIAMR4 __REG(PKUNITY_PCIBRI_BASE + 0x0148) ++#define PCIBRI_PCITAR4 __REG(PKUNITY_PCIBRI_BASE + 0x014C) ++#define PCIBRI_PCICTL5 __REG(PKUNITY_PCIBRI_BASE + 0x0150) ++#define PCIBRI_PCIBAR5 __REG(PKUNITY_PCIBRI_BASE + 0x0154) ++#define PCIBRI_PCIAMR5 __REG(PKUNITY_PCIBRI_BASE + 0x0158) ++#define PCIBRI_PCITAR5 __REG(PKUNITY_PCIBRI_BASE + 0x015C) ++ ++#define PCIBRI_AHBCTL0 __REG(PKUNITY_PCIBRI_BASE + 0x0180) ++#define PCIBRI_AHBBAR0 __REG(PKUNITY_PCIBRI_BASE + 0x0184) ++#define PCIBRI_AHBAMR0 __REG(PKUNITY_PCIBRI_BASE + 0x0188) ++#define PCIBRI_AHBTAR0 __REG(PKUNITY_PCIBRI_BASE + 0x018C) ++#define PCIBRI_AHBCTL1 __REG(PKUNITY_PCIBRI_BASE + 0x0190) ++#define PCIBRI_AHBBAR1 __REG(PKUNITY_PCIBRI_BASE + 0x0194) ++#define PCIBRI_AHBAMR1 __REG(PKUNITY_PCIBRI_BASE + 0x0198) ++#define PCIBRI_AHBTAR1 __REG(PKUNITY_PCIBRI_BASE + 0x019C) ++#define PCIBRI_AHBCTL2 __REG(PKUNITY_PCIBRI_BASE + 0x01A0) ++#define PCIBRI_AHBBAR2 __REG(PKUNITY_PCIBRI_BASE + 0x01A4) ++#define PCIBRI_AHBAMR2 __REG(PKUNITY_PCIBRI_BASE + 0x01A8) ++#define PCIBRI_AHBTAR2 __REG(PKUNITY_PCIBRI_BASE + 0x01AC) ++#define PCIBRI_AHBCTL3 __REG(PKUNITY_PCIBRI_BASE + 0x01B0) ++#define PCIBRI_AHBBAR3 __REG(PKUNITY_PCIBRI_BASE + 0x01B4) ++#define PCIBRI_AHBAMR3 __REG(PKUNITY_PCIBRI_BASE + 0x01B8) ++#define PCIBRI_AHBTAR3 __REG(PKUNITY_PCIBRI_BASE + 0x01BC) ++#define PCIBRI_AHBCTL4 __REG(PKUNITY_PCIBRI_BASE + 0x01C0) ++#define PCIBRI_AHBBAR4 __REG(PKUNITY_PCIBRI_BASE + 0x01C4) ++#define PCIBRI_AHBAMR4 __REG(PKUNITY_PCIBRI_BASE + 0x01C8) ++#define PCIBRI_AHBTAR4 __REG(PKUNITY_PCIBRI_BASE + 0x01CC) ++#define PCIBRI_AHBCTL5 __REG(PKUNITY_PCIBRI_BASE + 0x01D0) ++#define PCIBRI_AHBBAR5 __REG(PKUNITY_PCIBRI_BASE + 0x01D4) ++#define PCIBRI_AHBAMR5 __REG(PKUNITY_PCIBRI_BASE + 0x01D8) ++#define PCIBRI_AHBTAR5 __REG(PKUNITY_PCIBRI_BASE + 0x01DC) ++ ++#define PCIBRI_CTLx_AT FIELD(1, 1, 2) ++#define PCIBRI_CTLx_PREF FIELD(1, 1, 1) ++#define PCIBRI_CTLx_MRL FIELD(1, 1, 0) ++ ++#define PCIBRI_BARx_ADDR FIELD(0xFFFFFFFC, 30, 2) ++#define PCIBRI_BARx_IO FIELD(1, 1, 0) ++#define PCIBRI_BARx_MEM FIELD(0, 1, 0) ++ ++#define PCIBRI_CMD_IO FIELD(1, 1, 0) ++#define PCIBRI_CMD_MEM FIELD(1, 1, 1) +diff --git a/arch/unicore32/include/mach/regs-pm.h b/arch/unicore32/include/mach/regs-pm.h +new file mode 100644 +index 000000000000..ed2d2fc6ad0c +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-pm.h +@@ -0,0 +1,126 @@ ++/* ++ * PKUNITY Power Manager (PM) Registers ++ */ ++/* ++ * PM Control Reg PM_PMCR ++ */ ++#define PM_PMCR __REG(PKUNITY_PM_BASE + 0x0000) ++/* ++ * PM General Conf. Reg PM_PGCR ++ */ ++#define PM_PGCR __REG(PKUNITY_PM_BASE + 0x0004) ++/* ++ * PM PLL Conf. Reg PM_PPCR ++ */ ++#define PM_PPCR __REG(PKUNITY_PM_BASE + 0x0008) ++/* ++ * PM Wakeup Enable Reg PM_PWER ++ */ ++#define PM_PWER __REG(PKUNITY_PM_BASE + 0x000C) ++/* ++ * PM GPIO Sleep Status Reg PM_PGSR ++ */ ++#define PM_PGSR __REG(PKUNITY_PM_BASE + 0x0010) ++/* ++ * PM Clock Gate Reg PM_PCGR ++ */ ++#define PM_PCGR __REG(PKUNITY_PM_BASE + 0x0014) ++/* ++ * PM SYS PLL Conf. Reg PM_PLLSYSCFG ++ */ ++#define PM_PLLSYSCFG __REG(PKUNITY_PM_BASE + 0x0018) ++/* ++ * PM DDR PLL Conf. Reg PM_PLLDDRCFG ++ */ ++#define PM_PLLDDRCFG __REG(PKUNITY_PM_BASE + 0x001C) ++/* ++ * PM VGA PLL Conf. Reg PM_PLLVGACFG ++ */ ++#define PM_PLLVGACFG __REG(PKUNITY_PM_BASE + 0x0020) ++/* ++ * PM Div Conf. Reg PM_DIVCFG ++ */ ++#define PM_DIVCFG __REG(PKUNITY_PM_BASE + 0x0024) ++/* ++ * PM SYS PLL Status Reg PM_PLLSYSSTATUS ++ */ ++#define PM_PLLSYSSTATUS __REG(PKUNITY_PM_BASE + 0x0028) ++/* ++ * PM DDR PLL Status Reg PM_PLLDDRSTATUS ++ */ ++#define PM_PLLDDRSTATUS __REG(PKUNITY_PM_BASE + 0x002C) ++/* ++ * PM VGA PLL Status Reg PM_PLLVGASTATUS ++ */ ++#define PM_PLLVGASTATUS __REG(PKUNITY_PM_BASE + 0x0030) ++/* ++ * PM Div Status Reg PM_DIVSTATUS ++ */ ++#define PM_DIVSTATUS __REG(PKUNITY_PM_BASE + 0x0034) ++/* ++ * PM Software Reset Reg PM_SWRESET ++ */ ++#define PM_SWRESET __REG(PKUNITY_PM_BASE + 0x0038) ++/* ++ * PM DDR2 PAD Start Reg PM_DDR2START ++ */ ++#define PM_DDR2START __REG(PKUNITY_PM_BASE + 0x003C) ++/* ++ * PM DDR2 PAD Status Reg PM_DDR2CAL0 ++ */ ++#define PM_DDR2CAL0 __REG(PKUNITY_PM_BASE + 0x0040) ++/* ++ * PM PLL DFC Done Reg PM_PLLDFCDONE ++ */ ++#define PM_PLLDFCDONE __REG(PKUNITY_PM_BASE + 0x0044) ++ ++#define PM_PMCR_SFB FIELD(1, 1, 0) ++#define PM_PMCR_IFB FIELD(1, 1, 1) ++#define PM_PMCR_CFBSYS FIELD(1, 1, 2) ++#define PM_PMCR_CFBDDR FIELD(1, 1, 3) ++#define PM_PMCR_CFBVGA FIELD(1, 1, 4) ++#define PM_PMCR_CFBDIVBCLK FIELD(1, 1, 5) ++ ++/* ++ * GPIO 8~27 wake-up enable PM_PWER_GPIOHIGH ++ */ ++#define PM_PWER_GPIOHIGH FIELD(1, 1, 8) ++/* ++ * RTC alarm wake-up enable PM_PWER_RTC ++ */ ++#define PM_PWER_RTC FIELD(1, 1, 31) ++ ++#define PM_PCGR_BCLK64DDR FIELD(1, 1, 0) ++#define PM_PCGR_BCLK64VGA FIELD(1, 1, 1) ++#define PM_PCGR_BCLKDDR FIELD(1, 1, 2) ++#define PM_PCGR_BCLKPCI FIELD(1, 1, 4) ++#define PM_PCGR_BCLKDMAC FIELD(1, 1, 5) ++#define PM_PCGR_BCLKUMAL FIELD(1, 1, 6) ++#define PM_PCGR_BCLKUSB FIELD(1, 1, 7) ++#define PM_PCGR_BCLKMME FIELD(1, 1, 10) ++#define PM_PCGR_BCLKNAND FIELD(1, 1, 11) ++#define PM_PCGR_BCLKH264E FIELD(1, 1, 12) ++#define PM_PCGR_BCLKVGA FIELD(1, 1, 13) ++#define PM_PCGR_BCLKH264D FIELD(1, 1, 14) ++#define PM_PCGR_VECLK FIELD(1, 1, 15) ++#define PM_PCGR_HECLK FIELD(1, 1, 16) ++#define PM_PCGR_HDCLK FIELD(1, 1, 17) ++#define PM_PCGR_NANDCLK FIELD(1, 1, 18) ++#define PM_PCGR_GECLK FIELD(1, 1, 19) ++#define PM_PCGR_VGACLK FIELD(1, 1, 20) ++#define PM_PCGR_PCICLK FIELD(1, 1, 21) ++#define PM_PCGR_SATACLK FIELD(1, 1, 25) ++ ++/* ++ * [23:20]PM_DIVCFG_VGACLK(v) ++ */ ++#define PM_DIVCFG_VGACLK_MASK FMASK(4, 20) ++#define PM_DIVCFG_VGACLK(v) FIELD((v), 4, 20) ++ ++#define PM_SWRESET_USB FIELD(1, 1, 6) ++#define PM_SWRESET_VGADIV FIELD(1, 1, 26) ++#define PM_SWRESET_GEDIV FIELD(1, 1, 27) ++ ++#define PM_PLLDFCDONE_SYSDFC FIELD(1, 1, 0) ++#define PM_PLLDFCDONE_DDRDFC FIELD(1, 1, 1) ++#define PM_PLLDFCDONE_VGADFC FIELD(1, 1, 2) +diff --git a/arch/unicore32/include/mach/regs-ps2.h b/arch/unicore32/include/mach/regs-ps2.h +new file mode 100644 +index 000000000000..7da2071838ab +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-ps2.h +@@ -0,0 +1,20 @@ ++/* ++ * PKUnity PS2 Controller Registers ++ */ ++/* ++ * the same as I8042_DATA_REG PS2_DATA ++ */ ++#define PS2_DATA __REG(PKUNITY_PS2_BASE + 0x0060) ++/* ++ * the same as I8042_COMMAND_REG PS2_COMMAND ++ */ ++#define PS2_COMMAND __REG(PKUNITY_PS2_BASE + 0x0064) ++/* ++ * the same as I8042_STATUS_REG PS2_STATUS ++ */ ++#define PS2_STATUS __REG(PKUNITY_PS2_BASE + 0x0064) ++/* ++ * counter reg PS2_CNT ++ */ ++#define PS2_CNT __REG(PKUNITY_PS2_BASE + 0x0068) ++ +diff --git a/arch/unicore32/include/mach/regs-resetc.h b/arch/unicore32/include/mach/regs-resetc.h +new file mode 100644 +index 000000000000..17639898fd84 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-resetc.h +@@ -0,0 +1,34 @@ ++/* ++ * PKUnity Reset Controller (RC) Registers ++ */ ++/* ++ * Software Reset Register ++ */ ++#define RESETC_SWRR __REG(PKUNITY_RESETC_BASE + 0x0000) ++/* ++ * Reset Status Register ++ */ ++#define RESETC_RSSR __REG(PKUNITY_RESETC_BASE + 0x0004) ++ ++/* ++ * Software Reset Bit ++ */ ++#define RESETC_SWRR_SRB FIELD(1, 1, 0) ++ ++/* ++ * Hardware Reset ++ */ ++#define RESETC_RSSR_HWR FIELD(1, 1, 0) ++/* ++ * Software Reset ++ */ ++#define RESETC_RSSR_SWR FIELD(1, 1, 1) ++/* ++ * Watchdog Reset ++ */ ++#define RESETC_RSSR_WDR FIELD(1, 1, 2) ++/* ++ * Sleep Mode Reset ++ */ ++#define RESETC_RSSR_SMR FIELD(1, 1, 3) ++ +diff --git a/arch/unicore32/include/mach/regs-rtc.h b/arch/unicore32/include/mach/regs-rtc.h +new file mode 100644 +index 000000000000..155e38757186 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-rtc.h +@@ -0,0 +1,37 @@ ++/* ++ * PKUnity Real-Time Clock (RTC) control registers ++ */ ++/* ++ * RTC Alarm Reg RTC_RTAR ++ */ ++#define RTC_RTAR __REG(PKUNITY_RTC_BASE + 0x0000) ++/* ++ * RTC Count Reg RTC_RCNR ++ */ ++#define RTC_RCNR __REG(PKUNITY_RTC_BASE + 0x0004) ++/* ++ * RTC Trim Reg RTC_RTTR ++ */ ++#define RTC_RTTR __REG(PKUNITY_RTC_BASE + 0x0008) ++/* ++ * RTC Status Reg RTC_RTSR ++ */ ++#define RTC_RTSR __REG(PKUNITY_RTC_BASE + 0x0010) ++ ++/* ++ * ALarm detected RTC_RTSR_AL ++ */ ++#define RTC_RTSR_AL FIELD(1, 1, 0) ++/* ++ * 1 Hz clock detected RTC_RTSR_HZ ++ */ ++#define RTC_RTSR_HZ FIELD(1, 1, 1) ++/* ++ * ALarm interrupt Enable RTC_RTSR_ALE ++ */ ++#define RTC_RTSR_ALE FIELD(1, 1, 2) ++/* ++ * 1 Hz clock interrupt Enable RTC_RTSR_HZE ++ */ ++#define RTC_RTSR_HZE FIELD(1, 1, 3) ++ +diff --git a/arch/unicore32/include/mach/regs-sdc.h b/arch/unicore32/include/mach/regs-sdc.h +new file mode 100644 +index 000000000000..3457b88c453c +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-sdc.h +@@ -0,0 +1,156 @@ ++/* ++ * PKUnity Multi-Media Card and Security Digital Card (MMC/SD) Registers ++ */ ++/* ++ * Clock Control Reg SDC_CCR ++ */ ++#define SDC_CCR __REG(PKUNITY_SDC_BASE + 0x0000) ++/* ++ * Software Reset Reg SDC_SRR ++ */ ++#define SDC_SRR __REG(PKUNITY_SDC_BASE + 0x0004) ++/* ++ * Argument Reg SDC_ARGUMENT ++ */ ++#define SDC_ARGUMENT __REG(PKUNITY_SDC_BASE + 0x0008) ++/* ++ * Command Reg SDC_COMMAND ++ */ ++#define SDC_COMMAND __REG(PKUNITY_SDC_BASE + 0x000C) ++/* ++ * Block Size Reg SDC_BLOCKSIZE ++ */ ++#define SDC_BLOCKSIZE __REG(PKUNITY_SDC_BASE + 0x0010) ++/* ++ * Block Cound Reg SDC_BLOCKCOUNT ++ */ ++#define SDC_BLOCKCOUNT __REG(PKUNITY_SDC_BASE + 0x0014) ++/* ++ * Transfer Mode Reg SDC_TMR ++ */ ++#define SDC_TMR __REG(PKUNITY_SDC_BASE + 0x0018) ++/* ++ * Response Reg. 0 SDC_RES0 ++ */ ++#define SDC_RES0 __REG(PKUNITY_SDC_BASE + 0x001C) ++/* ++ * Response Reg. 1 SDC_RES1 ++ */ ++#define SDC_RES1 __REG(PKUNITY_SDC_BASE + 0x0020) ++/* ++ * Response Reg. 2 SDC_RES2 ++ */ ++#define SDC_RES2 __REG(PKUNITY_SDC_BASE + 0x0024) ++/* ++ * Response Reg. 3 SDC_RES3 ++ */ ++#define SDC_RES3 __REG(PKUNITY_SDC_BASE + 0x0028) ++/* ++ * Read Timeout Control Reg SDC_RTCR ++ */ ++#define SDC_RTCR __REG(PKUNITY_SDC_BASE + 0x002C) ++/* ++ * Interrupt Status Reg SDC_ISR ++ */ ++#define SDC_ISR __REG(PKUNITY_SDC_BASE + 0x0030) ++/* ++ * Interrupt Status Mask Reg SDC_ISMR ++ */ ++#define SDC_ISMR __REG(PKUNITY_SDC_BASE + 0x0034) ++/* ++ * RX FIFO SDC_RXFIFO ++ */ ++#define SDC_RXFIFO __REG(PKUNITY_SDC_BASE + 0x0038) ++/* ++ * TX FIFO SDC_TXFIFO ++ */ ++#define SDC_TXFIFO __REG(PKUNITY_SDC_BASE + 0x003C) ++ ++/* ++ * SD Clock Enable SDC_CCR_CLKEN ++ */ ++#define SDC_CCR_CLKEN FIELD(1, 1, 2) ++/* ++ * [15:8] SDC_CCR_PDIV(v) ++ */ ++#define SDC_CCR_PDIV(v) FIELD((v), 8, 8) ++ ++/* ++ * Software reset enable SDC_SRR_ENABLE ++ */ ++#define SDC_SRR_ENABLE FIELD(0, 1, 0) ++/* ++ * Software reset disable SDC_SRR_DISABLE ++ */ ++#define SDC_SRR_DISABLE FIELD(1, 1, 0) ++ ++/* ++ * Response type SDC_COMMAND_RESTYPE_MASK ++ */ ++#define SDC_COMMAND_RESTYPE_MASK FMASK(2, 0) ++/* ++ * No response SDC_COMMAND_RESTYPE_NONE ++ */ ++#define SDC_COMMAND_RESTYPE_NONE FIELD(0, 2, 0) ++/* ++ * 136-bit long response SDC_COMMAND_RESTYPE_LONG ++ */ ++#define SDC_COMMAND_RESTYPE_LONG FIELD(1, 2, 0) ++/* ++ * 48-bit short response SDC_COMMAND_RESTYPE_SHORT ++ */ ++#define SDC_COMMAND_RESTYPE_SHORT FIELD(2, 2, 0) ++/* ++ * 48-bit short and test if busy response SDC_COMMAND_RESTYPE_SHORTBUSY ++ */ ++#define SDC_COMMAND_RESTYPE_SHORTBUSY FIELD(3, 2, 0) ++/* ++ * data ready SDC_COMMAND_DATAREADY ++ */ ++#define SDC_COMMAND_DATAREADY FIELD(1, 1, 2) ++#define SDC_COMMAND_CMDEN FIELD(1, 1, 3) ++/* ++ * [10:5] SDC_COMMAND_CMDINDEX(v) ++ */ ++#define SDC_COMMAND_CMDINDEX(v) FIELD((v), 6, 5) ++ ++/* ++ * [10:0] SDC_BLOCKSIZE_BSMASK(v) ++ */ ++#define SDC_BLOCKSIZE_BSMASK(v) FIELD((v), 11, 0) ++/* ++ * [11:0] SDC_BLOCKCOUNT_BCMASK(v) ++ */ ++#define SDC_BLOCKCOUNT_BCMASK(v) FIELD((v), 12, 0) ++ ++/* ++ * Data Width 1bit SDC_TMR_WTH_1BIT ++ */ ++#define SDC_TMR_WTH_1BIT FIELD(0, 1, 0) ++/* ++ * Data Width 4bit SDC_TMR_WTH_4BIT ++ */ ++#define SDC_TMR_WTH_4BIT FIELD(1, 1, 0) ++/* ++ * Read SDC_TMR_DIR_READ ++ */ ++#define SDC_TMR_DIR_READ FIELD(0, 1, 1) ++/* ++ * Write SDC_TMR_DIR_WRITE ++ */ ++#define SDC_TMR_DIR_WRITE FIELD(1, 1, 1) ++ ++#define SDC_IR_MASK FMASK(13, 0) ++#define SDC_IR_RESTIMEOUT FIELD(1, 1, 0) ++#define SDC_IR_WRITECRC FIELD(1, 1, 1) ++#define SDC_IR_READCRC FIELD(1, 1, 2) ++#define SDC_IR_TXFIFOREAD FIELD(1, 1, 3) ++#define SDC_IR_RXFIFOWRITE FIELD(1, 1, 4) ++#define SDC_IR_READTIMEOUT FIELD(1, 1, 5) ++#define SDC_IR_DATACOMPLETE FIELD(1, 1, 6) ++#define SDC_IR_CMDCOMPLETE FIELD(1, 1, 7) ++#define SDC_IR_RXFIFOFULL FIELD(1, 1, 8) ++#define SDC_IR_RXFIFOEMPTY FIELD(1, 1, 9) ++#define SDC_IR_TXFIFOFULL FIELD(1, 1, 10) ++#define SDC_IR_TXFIFOEMPTY FIELD(1, 1, 11) ++#define SDC_IR_ENDCMDWITHRES FIELD(1, 1, 12) +diff --git a/arch/unicore32/include/mach/regs-spi.h b/arch/unicore32/include/mach/regs-spi.h +new file mode 100644 +index 000000000000..cadc713c55b9 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-spi.h +@@ -0,0 +1,98 @@ ++/* ++ * PKUnity Serial Peripheral Interface (SPI) Registers ++ */ ++/* ++ * Control reg. 0 SPI_CR0 ++ */ ++#define SPI_CR0 __REG(PKUNITY_SPI_BASE + 0x0000) ++/* ++ * Control reg. 1 SPI_CR1 ++ */ ++#define SPI_CR1 __REG(PKUNITY_SPI_BASE + 0x0004) ++/* ++ * Enable reg SPI_SSIENR ++ */ ++#define SPI_SSIENR __REG(PKUNITY_SPI_BASE + 0x0008) ++/* ++ * Status reg SPI_SR ++ */ ++#define SPI_SR __REG(PKUNITY_SPI_BASE + 0x0028) ++/* ++ * Interrupt Mask reg SPI_IMR ++ */ ++#define SPI_IMR __REG(PKUNITY_SPI_BASE + 0x002C) ++/* ++ * Interrupt Status reg SPI_ISR ++ */ ++#define SPI_ISR __REG(PKUNITY_SPI_BASE + 0x0030) ++ ++/* ++ * Enable SPI Controller SPI_SSIENR_EN ++ */ ++#define SPI_SSIENR_EN FIELD(1, 1, 0) ++ ++/* ++ * SPI Busy SPI_SR_BUSY ++ */ ++#define SPI_SR_BUSY FIELD(1, 1, 0) ++/* ++ * Transmit FIFO Not Full SPI_SR_TFNF ++ */ ++#define SPI_SR_TFNF FIELD(1, 1, 1) ++/* ++ * Transmit FIFO Empty SPI_SR_TFE ++ */ ++#define SPI_SR_TFE FIELD(1, 1, 2) ++/* ++ * Receive FIFO Not Empty SPI_SR_RFNE ++ */ ++#define SPI_SR_RFNE FIELD(1, 1, 3) ++/* ++ * Receive FIFO Full SPI_SR_RFF ++ */ ++#define SPI_SR_RFF FIELD(1, 1, 4) ++ ++/* ++ * Trans. FIFO Empty Interrupt Status SPI_ISR_TXEIS ++ */ ++#define SPI_ISR_TXEIS FIELD(1, 1, 0) ++/* ++ * Trans. FIFO Overflow Interrupt Status SPI_ISR_TXOIS ++ */ ++#define SPI_ISR_TXOIS FIELD(1, 1, 1) ++/* ++ * Receiv. FIFO Underflow Interrupt Status SPI_ISR_RXUIS ++ */ ++#define SPI_ISR_RXUIS FIELD(1, 1, 2) ++/* ++ * Receiv. FIFO Overflow Interrupt Status SPI_ISR_RXOIS ++ */ ++#define SPI_ISR_RXOIS FIELD(1, 1, 3) ++/* ++ * Receiv. FIFO Full Interrupt Status SPI_ISR_RXFIS ++ */ ++#define SPI_ISR_RXFIS FIELD(1, 1, 4) ++#define SPI_ISR_MSTIS FIELD(1, 1, 5) ++ ++/* ++ * Trans. FIFO Empty Interrupt Mask SPI_IMR_TXEIM ++ */ ++#define SPI_IMR_TXEIM FIELD(1, 1, 0) ++/* ++ * Trans. FIFO Overflow Interrupt Mask SPI_IMR_TXOIM ++ */ ++#define SPI_IMR_TXOIM FIELD(1, 1, 1) ++/* ++ * Receiv. FIFO Underflow Interrupt Mask SPI_IMR_RXUIM ++ */ ++#define SPI_IMR_RXUIM FIELD(1, 1, 2) ++/* ++ * Receiv. FIFO Overflow Interrupt Mask SPI_IMR_RXOIM ++ */ ++#define SPI_IMR_RXOIM FIELD(1, 1, 3) ++/* ++ * Receiv. FIFO Full Interrupt Mask SPI_IMR_RXFIM ++ */ ++#define SPI_IMR_RXFIM FIELD(1, 1, 4) ++#define SPI_IMR_MSTIM FIELD(1, 1, 5) ++ +diff --git a/arch/unicore32/include/mach/regs-uart.h b/arch/unicore32/include/mach/regs-uart.h +new file mode 100644 +index 000000000000..9fa6b1938b77 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-uart.h +@@ -0,0 +1,3 @@ ++/* ++ * PKUnity Universal Asynchronous Receiver/Transmitter (UART) Registers ++ */ +diff --git a/arch/unicore32/include/mach/regs-umal.h b/arch/unicore32/include/mach/regs-umal.h +new file mode 100644 +index 000000000000..2e718d1e86cc +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-umal.h +@@ -0,0 +1,229 @@ ++/* ++ * PKUnity Ultra Media Access Layer (UMAL) Ethernet MAC Registers ++ */ ++ ++/* MAC module of UMAL */ ++/* UMAL's MAC module includes G/MII interface, several additional PHY ++ * interfaces, and MAC control sub-layer, which provides support for control ++ * frames (e.g. PAUSE frames). ++ */ ++/* ++ * TX/RX reset and control UMAL_CFG1 ++ */ ++#define UMAL_CFG1 __REG(PKUNITY_UMAL_BASE + 0x0000) ++/* ++ * MAC interface mode control UMAL_CFG2 ++ */ ++#define UMAL_CFG2 __REG(PKUNITY_UMAL_BASE + 0x0004) ++/* ++ * Inter Packet/Frame Gap UMAL_IPGIFG ++ */ ++#define UMAL_IPGIFG __REG(PKUNITY_UMAL_BASE + 0x0008) ++/* ++ * Collision retry or backoff UMAL_HALFDUPLEX ++ */ ++#define UMAL_HALFDUPLEX __REG(PKUNITY_UMAL_BASE + 0x000c) ++/* ++ * Maximum Frame Length UMAL_MAXFRAME ++ */ ++#define UMAL_MAXFRAME __REG(PKUNITY_UMAL_BASE + 0x0010) ++/* ++ * Test Regsiter UMAL_TESTREG ++ */ ++#define UMAL_TESTREG __REG(PKUNITY_UMAL_BASE + 0x001c) ++/* ++ * MII Management Configure UMAL_MIICFG ++ */ ++#define UMAL_MIICFG __REG(PKUNITY_UMAL_BASE + 0x0020) ++/* ++ * MII Management Command UMAL_MIICMD ++ */ ++#define UMAL_MIICMD __REG(PKUNITY_UMAL_BASE + 0x0024) ++/* ++ * MII Management Address UMAL_MIIADDR ++ */ ++#define UMAL_MIIADDR __REG(PKUNITY_UMAL_BASE + 0x0028) ++/* ++ * MII Management Control UMAL_MIICTRL ++ */ ++#define UMAL_MIICTRL __REG(PKUNITY_UMAL_BASE + 0x002c) ++/* ++ * MII Management Status UMAL_MIISTATUS ++ */ ++#define UMAL_MIISTATUS __REG(PKUNITY_UMAL_BASE + 0x0030) ++/* ++ * MII Managment Indicator UMAL_MIIIDCT ++ */ ++#define UMAL_MIIIDCT __REG(PKUNITY_UMAL_BASE + 0x0034) ++/* ++ * Interface Control UMAL_IFCTRL ++ */ ++#define UMAL_IFCTRL __REG(PKUNITY_UMAL_BASE + 0x0038) ++/* ++ * Interface Status UMAL_IFSTATUS ++ */ ++#define UMAL_IFSTATUS __REG(PKUNITY_UMAL_BASE + 0x003c) ++/* ++ * MAC address (high 4 bytes) UMAL_STADDR1 ++ */ ++#define UMAL_STADDR1 __REG(PKUNITY_UMAL_BASE + 0x0040) ++/* ++ * MAC address (low 2 bytes) UMAL_STADDR2 ++ */ ++#define UMAL_STADDR2 __REG(PKUNITY_UMAL_BASE + 0x0044) ++ ++/* FIFO MODULE OF UMAL */ ++/* UMAL's FIFO module provides data queuing for increased system level ++ * throughput ++ */ ++#define UMAL_FIFOCFG0 __REG(PKUNITY_UMAL_BASE + 0x0048) ++#define UMAL_FIFOCFG1 __REG(PKUNITY_UMAL_BASE + 0x004c) ++#define UMAL_FIFOCFG2 __REG(PKUNITY_UMAL_BASE + 0x0050) ++#define UMAL_FIFOCFG3 __REG(PKUNITY_UMAL_BASE + 0x0054) ++#define UMAL_FIFOCFG4 __REG(PKUNITY_UMAL_BASE + 0x0058) ++#define UMAL_FIFOCFG5 __REG(PKUNITY_UMAL_BASE + 0x005c) ++#define UMAL_FIFORAM0 __REG(PKUNITY_UMAL_BASE + 0x0060) ++#define UMAL_FIFORAM1 __REG(PKUNITY_UMAL_BASE + 0x0064) ++#define UMAL_FIFORAM2 __REG(PKUNITY_UMAL_BASE + 0x0068) ++#define UMAL_FIFORAM3 __REG(PKUNITY_UMAL_BASE + 0x006c) ++#define UMAL_FIFORAM4 __REG(PKUNITY_UMAL_BASE + 0x0070) ++#define UMAL_FIFORAM5 __REG(PKUNITY_UMAL_BASE + 0x0074) ++#define UMAL_FIFORAM6 __REG(PKUNITY_UMAL_BASE + 0x0078) ++#define UMAL_FIFORAM7 __REG(PKUNITY_UMAL_BASE + 0x007c) ++ ++/* MAHBE MODUEL OF UMAL */ ++/* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master ++ * and Slave ports.Registers within the M-AHBE provide Control and Status ++ * information concerning these transfers. ++ */ ++/* ++ * Transmit Control UMAL_DMATxCtrl ++ */ ++#define UMAL_DMATxCtrl __REG(PKUNITY_UMAL_BASE + 0x0180) ++/* ++ * Pointer to TX Descripter UMAL_DMATxDescriptor ++ */ ++#define UMAL_DMATxDescriptor __REG(PKUNITY_UMAL_BASE + 0x0184) ++/* ++ * Status of Tx Packet Transfers UMAL_DMATxStatus ++ */ ++#define UMAL_DMATxStatus __REG(PKUNITY_UMAL_BASE + 0x0188) ++/* ++ * Receive Control UMAL_DMARxCtrl ++ */ ++#define UMAL_DMARxCtrl __REG(PKUNITY_UMAL_BASE + 0x018c) ++/* ++ * Pointer to Rx Descriptor UMAL_DMARxDescriptor ++ */ ++#define UMAL_DMARxDescriptor __REG(PKUNITY_UMAL_BASE + 0x0190) ++/* ++ * Status of Rx Packet Transfers UMAL_DMARxStatus ++ */ ++#define UMAL_DMARxStatus __REG(PKUNITY_UMAL_BASE + 0x0194) ++/* ++ * Interrupt Mask UMAL_DMAIntrMask ++ */ ++#define UMAL_DMAIntrMask __REG(PKUNITY_UMAL_BASE + 0x0198) ++/* ++ * Interrupts, read only UMAL_DMAInterrupt ++ */ ++#define UMAL_DMAInterrupt __REG(PKUNITY_UMAL_BASE + 0x019c) ++ ++/* ++ * Commands for UMAL_CFG1 register ++ */ ++#define UMAL_CFG1_TXENABLE FIELD(1, 1, 0) ++#define UMAL_CFG1_RXENABLE FIELD(1, 1, 2) ++#define UMAL_CFG1_TXFLOWCTL FIELD(1, 1, 4) ++#define UMAL_CFG1_RXFLOWCTL FIELD(1, 1, 5) ++#define UMAL_CFG1_CONFLPBK FIELD(1, 1, 8) ++#define UMAL_CFG1_RESET FIELD(1, 1, 31) ++#define UMAL_CFG1_CONFFLCTL (MAC_TX_FLOW_CTL | MAC_RX_FLOW_CTL) ++ ++/* ++ * Commands for UMAL_CFG2 register ++ */ ++#define UMAL_CFG2_FULLDUPLEX FIELD(1, 1, 0) ++#define UMAL_CFG2_CRCENABLE FIELD(1, 1, 1) ++#define UMAL_CFG2_PADCRC FIELD(1, 1, 2) ++#define UMAL_CFG2_LENGTHCHECK FIELD(1, 1, 4) ++#define UMAL_CFG2_MODEMASK FMASK(2, 8) ++#define UMAL_CFG2_NIBBLEMODE FIELD(1, 2, 8) ++#define UMAL_CFG2_BYTEMODE FIELD(2, 2, 8) ++#define UMAL_CFG2_PREAMBLENMASK FMASK(4, 12) ++#define UMAL_CFG2_DEFPREAMBLEN FIELD(7, 4, 12) ++#define UMAL_CFG2_FD100 (UMAL_CFG2_DEFPREAMBLEN | UMAL_CFG2_NIBBLEMODE \ ++ | UMAL_CFG2_LENGTHCHECK | UMAL_CFG2_PADCRC \ ++ | UMAL_CFG2_CRCENABLE | UMAL_CFG2_FULLDUPLEX) ++#define UMAL_CFG2_FD1000 (UMAL_CFG2_DEFPREAMBLEN | UMAL_CFG2_BYTEMODE \ ++ | UMAL_CFG2_LENGTHCHECK | UMAL_CFG2_PADCRC \ ++ | UMAL_CFG2_CRCENABLE | UMAL_CFG2_FULLDUPLEX) ++#define UMAL_CFG2_HD100 (UMAL_CFG2_DEFPREAMBLEN | UMAL_CFG2_NIBBLEMODE \ ++ | UMAL_CFG2_LENGTHCHECK | UMAL_CFG2_PADCRC \ ++ | UMAL_CFG2_CRCENABLE) ++ ++/* ++ * Command for UMAL_IFCTRL register ++ */ ++#define UMAL_IFCTRL_RESET FIELD(1, 1, 31) ++ ++/* ++ * Command for UMAL_MIICFG register ++ */ ++#define UMAL_MIICFG_RESET FIELD(1, 1, 31) ++ ++/* ++ * Command for UMAL_MIICMD register ++ */ ++#define UMAL_MIICMD_READ FIELD(1, 1, 0) ++ ++/* ++ * Command for UMAL_MIIIDCT register ++ */ ++#define UMAL_MIIIDCT_BUSY FIELD(1, 1, 0) ++#define UMAL_MIIIDCT_NOTVALID FIELD(1, 1, 2) ++ ++/* ++ * Commands for DMATxCtrl regesters ++ */ ++#define UMAL_DMA_Enable FIELD(1, 1, 0) ++ ++/* ++ * Commands for DMARxCtrl regesters ++ */ ++#define UMAL_DMAIntrMask_ENABLEHALFWORD FIELD(1, 1, 16) ++ ++/* ++ * Command for DMARxStatus ++ */ ++#define CLR_RX_BUS_ERR FIELD(1, 1, 3) ++#define CLR_RX_OVERFLOW FIELD(1, 1, 2) ++#define CLR_RX_PKT FIELD(1, 1, 0) ++ ++/* ++ * Command for DMATxStatus ++ */ ++#define CLR_TX_BUS_ERR FIELD(1, 1, 3) ++#define CLR_TX_UNDERRUN FIELD(1, 1, 1) ++#define CLR_TX_PKT FIELD(1, 1, 0) ++ ++/* ++ * Commands for DMAIntrMask and DMAInterrupt register ++ */ ++#define INT_RX_MASK FIELD(0xd, 4, 4) ++#define INT_TX_MASK FIELD(0xb, 4, 0) ++ ++#define INT_RX_BUS_ERR FIELD(1, 1, 7) ++#define INT_RX_OVERFLOW FIELD(1, 1, 6) ++#define INT_RX_PKT FIELD(1, 1, 4) ++#define INT_TX_BUS_ERR FIELD(1, 1, 3) ++#define INT_TX_UNDERRUN FIELD(1, 1, 1) ++#define INT_TX_PKT FIELD(1, 1, 0) ++ ++/* ++ * MARCOS of UMAL's descriptors ++ */ ++#define UMAL_DESC_PACKETSIZE_EMPTY FIELD(1, 1, 31) ++#define UMAL_DESC_PACKETSIZE_NONEMPTY FIELD(0, 1, 31) ++#define UMAL_DESC_PACKETSIZE_SIZEMASK FMASK(12, 0) ++ +diff --git a/arch/unicore32/include/mach/regs-unigfx.h b/arch/unicore32/include/mach/regs-unigfx.h +new file mode 100644 +index 000000000000..58bbd540a393 +--- /dev/null ++++ b/arch/unicore32/include/mach/regs-unigfx.h +@@ -0,0 +1,200 @@ ++/* ++ * PKUnity UNIGFX Registers ++ */ ++ ++#define UDE_BASE (PKUNITY_UNIGFX_BASE + 0x1400) ++#define UGE_BASE (PKUNITY_UNIGFX_BASE + 0x0000) ++ ++/* ++ * command reg for UNIGFX DE ++ */ ++/* ++ * control reg UDE_CFG ++ */ ++#define UDE_CFG __REG(UDE_BASE + 0x0000) ++/* ++ * framebuffer start address reg UDE_FSA ++ */ ++#define UDE_FSA __REG(UDE_BASE + 0x0004) ++/* ++ * line size reg UDE_LS ++ */ ++#define UDE_LS __REG(UDE_BASE + 0x0008) ++/* ++ * pitch size reg UDE_PS ++ */ ++#define UDE_PS __REG(UDE_BASE + 0x000C) ++/* ++ * horizontal active time reg UDE_HAT ++ */ ++#define UDE_HAT __REG(UDE_BASE + 0x0010) ++/* ++ * horizontal blank time reg UDE_HBT ++ */ ++#define UDE_HBT __REG(UDE_BASE + 0x0014) ++/* ++ * horizontal sync time reg UDE_HST ++ */ ++#define UDE_HST __REG(UDE_BASE + 0x0018) ++/* ++ * vertival active time reg UDE_VAT ++ */ ++#define UDE_VAT __REG(UDE_BASE + 0x001C) ++/* ++ * vertival blank time reg UDE_VBT ++ */ ++#define UDE_VBT __REG(UDE_BASE + 0x0020) ++/* ++ * vertival sync time reg UDE_VST ++ */ ++#define UDE_VST __REG(UDE_BASE + 0x0024) ++/* ++ * cursor position UDE_CXY ++ */ ++#define UDE_CXY __REG(UDE_BASE + 0x0028) ++/* ++ * cursor front color UDE_CC0 ++ */ ++#define UDE_CC0 __REG(UDE_BASE + 0x002C) ++/* ++ * cursor background color UDE_CC1 ++ */ ++#define UDE_CC1 __REG(UDE_BASE + 0x0030) ++/* ++ * video position UDE_VXY ++ */ ++#define UDE_VXY __REG(UDE_BASE + 0x0034) ++/* ++ * video start address reg UDE_VSA ++ */ ++#define UDE_VSA __REG(UDE_BASE + 0x0040) ++/* ++ * video size reg UDE_VS ++ */ ++#define UDE_VS __REG(UDE_BASE + 0x004C) ++ ++/* ++ * command reg for UNIGFX GE ++ */ ++/* ++ * src xy reg UGE_SRCXY ++ */ ++#define UGE_SRCXY __REG(UGE_BASE + 0x0000) ++/* ++ * dst xy reg UGE_DSTXY ++ */ ++#define UGE_DSTXY __REG(UGE_BASE + 0x0004) ++/* ++ * pitch reg UGE_PITCH ++ */ ++#define UGE_PITCH __REG(UGE_BASE + 0x0008) ++/* ++ * src start reg UGE_SRCSTART ++ */ ++#define UGE_SRCSTART __REG(UGE_BASE + 0x000C) ++/* ++ * dst start reg UGE_DSTSTART ++ */ ++#define UGE_DSTSTART __REG(UGE_BASE + 0x0010) ++/* ++ * width height reg UGE_WIDHEIGHT ++ */ ++#define UGE_WIDHEIGHT __REG(UGE_BASE + 0x0014) ++/* ++ * rop alpah reg UGE_ROPALPHA ++ */ ++#define UGE_ROPALPHA __REG(UGE_BASE + 0x0018) ++/* ++ * front color UGE_FCOLOR ++ */ ++#define UGE_FCOLOR __REG(UGE_BASE + 0x001C) ++/* ++ * background color UGE_BCOLOR ++ */ ++#define UGE_BCOLOR __REG(UGE_BASE + 0x0020) ++/* ++ * src color key for high value UGE_SCH ++ */ ++#define UGE_SCH __REG(UGE_BASE + 0x0024) ++/* ++ * dst color key for high value UGE_DCH ++ */ ++#define UGE_DCH __REG(UGE_BASE + 0x0028) ++/* ++ * src color key for low value UGE_SCL ++ */ ++#define UGE_SCL __REG(UGE_BASE + 0x002C) ++/* ++ * dst color key for low value UGE_DCL ++ */ ++#define UGE_DCL __REG(UGE_BASE + 0x0030) ++/* ++ * clip 0 reg UGE_CLIP0 ++ */ ++#define UGE_CLIP0 __REG(UGE_BASE + 0x0034) ++/* ++ * clip 1 reg UGE_CLIP1 ++ */ ++#define UGE_CLIP1 __REG(UGE_BASE + 0x0038) ++/* ++ * command reg UGE_COMMAND ++ */ ++#define UGE_COMMAND __REG(UGE_BASE + 0x003C) ++/* ++ * pattern 0 UGE_P0 ++ */ ++#define UGE_P0 __REG(UGE_BASE + 0x0040) ++#define UGE_P1 __REG(UGE_BASE + 0x0044) ++#define UGE_P2 __REG(UGE_BASE + 0x0048) ++#define UGE_P3 __REG(UGE_BASE + 0x004C) ++#define UGE_P4 __REG(UGE_BASE + 0x0050) ++#define UGE_P5 __REG(UGE_BASE + 0x0054) ++#define UGE_P6 __REG(UGE_BASE + 0x0058) ++#define UGE_P7 __REG(UGE_BASE + 0x005C) ++#define UGE_P8 __REG(UGE_BASE + 0x0060) ++#define UGE_P9 __REG(UGE_BASE + 0x0064) ++#define UGE_P10 __REG(UGE_BASE + 0x0068) ++#define UGE_P11 __REG(UGE_BASE + 0x006C) ++#define UGE_P12 __REG(UGE_BASE + 0x0070) ++#define UGE_P13 __REG(UGE_BASE + 0x0074) ++#define UGE_P14 __REG(UGE_BASE + 0x0078) ++#define UGE_P15 __REG(UGE_BASE + 0x007C) ++#define UGE_P16 __REG(UGE_BASE + 0x0080) ++#define UGE_P17 __REG(UGE_BASE + 0x0084) ++#define UGE_P18 __REG(UGE_BASE + 0x0088) ++#define UGE_P19 __REG(UGE_BASE + 0x008C) ++#define UGE_P20 __REG(UGE_BASE + 0x0090) ++#define UGE_P21 __REG(UGE_BASE + 0x0094) ++#define UGE_P22 __REG(UGE_BASE + 0x0098) ++#define UGE_P23 __REG(UGE_BASE + 0x009C) ++#define UGE_P24 __REG(UGE_BASE + 0x00A0) ++#define UGE_P25 __REG(UGE_BASE + 0x00A4) ++#define UGE_P26 __REG(UGE_BASE + 0x00A8) ++#define UGE_P27 __REG(UGE_BASE + 0x00AC) ++#define UGE_P28 __REG(UGE_BASE + 0x00B0) ++#define UGE_P29 __REG(UGE_BASE + 0x00B4) ++#define UGE_P30 __REG(UGE_BASE + 0x00B8) ++#define UGE_P31 __REG(UGE_BASE + 0x00BC) ++ ++#define UDE_CFG_DST_MASK FMASK(2, 8) ++#define UDE_CFG_DST8 FIELD(0x0, 2, 8) ++#define UDE_CFG_DST16 FIELD(0x1, 2, 8) ++#define UDE_CFG_DST24 FIELD(0x2, 2, 8) ++#define UDE_CFG_DST32 FIELD(0x3, 2, 8) ++ ++/* ++ * GDEN enable UDE_CFG_GDEN_ENABLE ++ */ ++#define UDE_CFG_GDEN_ENABLE FIELD(1, 1, 3) ++/* ++ * VDEN enable UDE_CFG_VDEN_ENABLE ++ */ ++#define UDE_CFG_VDEN_ENABLE FIELD(1, 1, 4) ++/* ++ * CDEN enable UDE_CFG_CDEN_ENABLE ++ */ ++#define UDE_CFG_CDEN_ENABLE FIELD(1, 1, 5) ++/* ++ * TIMEUP enable UDE_CFG_TIMEUP_ENABLE ++ */ ++#define UDE_CFG_TIMEUP_ENABLE FIELD(1, 1, 6)
commit fa7499ef77db8d535e3c609c8064e9ee50c0693c
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 19:51:18 2011 +0800
+
+ unicore32 machine related files: core files
+
+ This patch adds machine related core files, also including build infrastructure.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+index cc6a83215881..90835c959476 100644
+--- a/arch/unicore32/Kconfig
++++ b/arch/unicore32/Kconfig
+@@ -231,6 +231,31 @@ config PUV3_RTC
+ tristate "PKUnity v3 RTC Support"
+ depends on !ARCH_FPGA
+
++if PUV3_NB0916
++
++menu "PKUnity NetBook-0916 Features"
++
++config I2C_BATTERY_BQ27200
++ tristate "I2C Battery BQ27200 Support"
++ select PUV3_I2C
++ select POWER_SUPPLY
++ select BATTERY_BQ27x00
++
++config I2C_EEPROM_AT24
++ tristate "I2C EEPROMs AT24 support"
++ select PUV3_I2C
++ select MISC_DEVICES
++ select EEPROM_AT24
++
++config LCD_BACKLIGHT
++ tristate "LCD Backlight support"
++ select BACKLIGHT_LCD_SUPPORT
++ select BACKLIGHT_PWM
++
++endmenu
++
++endif
++
+ endif
+
+ source "drivers/Kconfig"
+diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
+new file mode 100644
+index 000000000000..26cc52b51e7b
+--- /dev/null
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -0,0 +1,270 @@
++/*
++ * linux/arch/unicore32/kernel/puv3-core.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/device.h>
++#include <linux/sysdev.h>
++#include <linux/amba/bus.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/cnt32_to_63.h>
++#include <linux/usb/musb.h>
++
++#include <asm/irq.h>
++#include <mach/hardware.h>
++#include <mach/pm.h>
++
++/*
++ * This is the PKUnity sched_clock implementation. This has
++ * a resolution of 271ns, and a maximum value of 32025597s (370 days).
++ *
++ * The return value is guaranteed to be monotonic in that range as
++ * long as there is always less than 582 seconds between successive
++ * calls to this function.
++ *
++ * ( * 1E9 / CLOCK_TICK_RATE ) -> about 2235/32
++ */
++unsigned long long sched_clock(void)
++{
++ unsigned long long v = cnt32_to_63(OST_OSCR);
++
++ /* original conservative method, but overflow frequently
++ * v *= NSEC_PER_SEC >> 12;
++ * do_div(v, CLOCK_TICK_RATE >> 12);
++ */
++ v = ((v & 0x7fffffffffffffffULL) * 2235) >> 5;
++
++ return v;
++}
++
++static struct resource puv3_usb_resources[] = {
++ /* order is significant! */
++ {
++ .start = PKUNITY_USB_BASE,
++ .end = PKUNITY_USB_BASE + 0x3ff,
++ .flags = IORESOURCE_MEM,
++ }, {
++ .start = IRQ_USB,
++ .flags = IORESOURCE_IRQ,
++ }, {
++ .start = IRQ_USB,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static struct musb_hdrc_config puv3_usb_config[] = {
++ {
++ .num_eps = 16,
++ .multipoint = 1,
++#ifdef CONFIG_USB_INVENTRA_DMA
++ .dma = 1,
++ .dma_channels = 8,
++#endif
++ },
++};
++
++static struct musb_hdrc_platform_data puv3_usb_plat = {
++ .mode = MUSB_HOST,
++ .min_power = 100,
++ .clock = 0,
++ .config = puv3_usb_config,
++};
++
++static struct resource puv3_mmc_resources[] = {
++ [0] = {
++ .start = PKUNITY_SDC_BASE,
++ .end = PKUNITY_SDC_BASE + 0xfff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_SDC,
++ .end = IRQ_SDC,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static struct resource puv3_rtc_resources[] = {
++ [0] = {
++ .start = PKUNITY_RTC_BASE,
++ .end = PKUNITY_RTC_BASE + 0xff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_RTCAlarm,
++ .end = IRQ_RTCAlarm,
++ .flags = IORESOURCE_IRQ,
++ },
++ [2] = {
++ .start = IRQ_RTC,
++ .end = IRQ_RTC,
++ .flags = IORESOURCE_IRQ
++ }
++};
++
++static struct resource puv3_pwm_resources[] = {
++ [0] = {
++ .start = PKUNITY_OST_BASE + 0x80,
++ .end = PKUNITY_OST_BASE + 0xff,
++ .flags = IORESOURCE_MEM,
++ },
++};
++
++static struct resource puv3_uart0_resources[] = {
++ [0] = {
++ .start = PKUNITY_UART0_BASE,
++ .end = PKUNITY_UART0_BASE + 0xff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_UART0,
++ .end = IRQ_UART0,
++ .flags = IORESOURCE_IRQ
++ }
++};
++
++static struct resource puv3_uart1_resources[] = {
++ [0] = {
++ .start = PKUNITY_UART1_BASE,
++ .end = PKUNITY_UART1_BASE + 0xff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_UART1,
++ .end = IRQ_UART1,
++ .flags = IORESOURCE_IRQ
++ }
++};
++
++static struct resource puv3_umal_resources[] = {
++ [0] = {
++ .start = PKUNITY_UMAL_BASE,
++ .end = PKUNITY_UMAL_BASE + 0x1fff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_UMAL,
++ .end = IRQ_UMAL,
++ .flags = IORESOURCE_IRQ
++ }
++};
++
++#ifdef CONFIG_PUV3_PM
++
++#define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x
++#define RESTORE(x) x = sleep_save[SLEEP_SAVE_##x]
++
++/*
++ * List of global PXA peripheral registers to preserve.
++ * More ones like CP and general purpose register values are preserved
++ * with the stack pointer in sleep.S.
++ */
++enum {
++ SLEEP_SAVE_PM_PLLDDRCFG,
++ SLEEP_SAVE_COUNT
++};
++
++
++static void puv3_cpu_pm_save(unsigned long *sleep_save)
++{
++/* SAVE(PM_PLLDDRCFG); */
++}
++
++static void puv3_cpu_pm_restore(unsigned long *sleep_save)
++{
++/* RESTORE(PM_PLLDDRCFG); */
++}
++
++static int puv3_cpu_pm_prepare(void)
++{
++ /* set resume return address */
++ PM_DIVCFG = virt_to_phys(puv3_cpu_resume);
++ return 0;
++}
++
++static void puv3_cpu_pm_enter(suspend_state_t state)
++{
++ /* Clear reset status */
++ RESETC_RSSR = RESETC_RSSR_HWR | RESETC_RSSR_WDR
++ | RESETC_RSSR_SMR | RESETC_RSSR_SWR;
++
++ switch (state) {
++/* case PM_SUSPEND_ON:
++ puv3_cpu_idle();
++ break; */
++ case PM_SUSPEND_MEM:
++ puv3_cpu_pm_prepare();
++ puv3_cpu_suspend(PM_PMCR_SFB);
++ break;
++ }
++}
++
++static int puv3_cpu_pm_valid(suspend_state_t state)
++{
++ return state == PM_SUSPEND_MEM;
++}
++
++static void puv3_cpu_pm_finish(void)
++{
++ /* ensure not to come back here if it wasn't intended */
++ /* PSPR = 0; */
++}
++
++static struct puv3_cpu_pm_fns puv3_cpu_pm_fnss = {
++ .save_count = SLEEP_SAVE_COUNT,
++ .valid = puv3_cpu_pm_valid,
++ .save = puv3_cpu_pm_save,
++ .restore = puv3_cpu_pm_restore,
++ .enter = puv3_cpu_pm_enter,
++ .prepare = puv3_cpu_pm_prepare,
++ .finish = puv3_cpu_pm_finish,
++};
++
++static void __init puv3_init_pm(void)
++{
++ puv3_cpu_pm_fns = &puv3_cpu_pm_fnss;
++}
++#else
++static inline void puv3_init_pm(void) {}
++#endif
++
++void puv3_ps2_init(void)
++{
++ struct clk *bclk32;
++
++ bclk32 = clk_get(NULL, "BUS32_CLK");
++ PS2_CNT = clk_get_rate(bclk32) / 200000; /* should > 5us */
++}
++
++void __init puv3_core_init(void)
++{
++ puv3_init_pm();
++ puv3_ps2_init();
++
++ platform_device_register_simple("PKUnity-v3-RTC", -1,
++ puv3_rtc_resources, ARRAY_SIZE(puv3_rtc_resources));
++ platform_device_register_simple("PKUnity-v3-UMAL", -1,
++ puv3_umal_resources, ARRAY_SIZE(puv3_umal_resources));
++ platform_device_register_simple("PKUnity-v3-MMC", -1,
++ puv3_mmc_resources, ARRAY_SIZE(puv3_mmc_resources));
++ platform_device_register_simple("PKUnity-v3-PWM", -1,
++ puv3_pwm_resources, ARRAY_SIZE(puv3_pwm_resources));
++ platform_device_register_simple("PKUnity-v3-UART", 0,
++ puv3_uart0_resources, ARRAY_SIZE(puv3_uart0_resources));
++ platform_device_register_simple("PKUnity-v3-UART", 1,
++ puv3_uart1_resources, ARRAY_SIZE(puv3_uart1_resources));
++ platform_device_register_simple("PKUnity-v3-AC97", -1, NULL, 0);
++ platform_device_register_resndata(&platform_bus, "musb_hdrc", -1,
++ puv3_usb_resources, ARRAY_SIZE(puv3_usb_resources),
++ &puv3_usb_plat, sizeof(puv3_usb_plat));
++}
++
+diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c
+new file mode 100644
+index 000000000000..a78e60420653
+--- /dev/null
++++ b/arch/unicore32/kernel/puv3-nb0916.c
+@@ -0,0 +1,145 @@
++/*
++ * linux/arch/unicore32/kernel/puv3-nb0916.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/device.h>
++#include <linux/sysdev.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/physmap.h>
++#include <linux/io.h>
++#include <linux/reboot.h>
++#include <linux/interrupt.h>
++#include <linux/i2c.h>
++#include <linux/pwm_backlight.h>
++#include <linux/gpio.h>
++#include <linux/gpio_keys.h>
++#include <linux/input.h>
++
++#include <mach/hardware.h>
++
++static struct physmap_flash_data physmap_flash_data = {
++ .width = 1,
++};
++
++static struct resource physmap_flash_resource = {
++ .start = 0xFFF80000,
++ .end = 0xFFFFFFFF,
++ .flags = IORESOURCE_MEM,
++};
++
++static struct resource puv3_i2c_resources[] = {
++ [0] = {
++ .start = PKUNITY_I2C_BASE,
++ .end = PKUNITY_I2C_BASE + 0xff,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = IRQ_I2C,
++ .end = IRQ_I2C,
++ .flags = IORESOURCE_IRQ,
++ }
++};
++
++static struct platform_pwm_backlight_data nb0916_backlight_data = {
++ .pwm_id = 0,
++ .max_brightness = 100,
++ .dft_brightness = 100,
++ .pwm_period_ns = 70 * 1024,
++};
++
++static struct gpio_keys_button nb0916_gpio_keys[] = {
++ {
++ .type = EV_KEY,
++ .code = KEY_POWER,
++ .gpio = GPI_SOFF_REQ,
++ .desc = "Power Button",
++ .wakeup = 1,
++ .active_low = 1,
++ },
++ {
++ .type = EV_KEY,
++ .code = BTN_TOUCH,
++ .gpio = GPI_BTN_TOUCH,
++ .desc = "Touchpad Button",
++ .wakeup = 1,
++ .active_low = 1,
++ },
++};
++
++static struct gpio_keys_platform_data nb0916_gpio_button_data = {
++ .buttons = nb0916_gpio_keys,
++ .nbuttons = ARRAY_SIZE(nb0916_gpio_keys),
++};
++
++static irqreturn_t nb0916_lcdcaseoff_handler(int irq, void *dev_id)
++{
++ if (gpio_get_value(GPI_LCD_CASE_OFF))
++ gpio_set_value(GPO_LCD_EN, 1);
++ else
++ gpio_set_value(GPO_LCD_EN, 0);
++
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t nb0916_overheat_handler(int irq, void *dev_id)
++{
++ machine_halt();
++ /* SYSTEM HALT, NO RETURN */
++ return IRQ_HANDLED;
++}
++
++static struct i2c_board_info __initdata puv3_i2c_devices[] = {
++ { I2C_BOARD_INFO("lm75", I2C_TAR_THERMAL), },
++ { I2C_BOARD_INFO("bq27200", I2C_TAR_PWIC), },
++ { I2C_BOARD_INFO("24c02", I2C_TAR_EEPROM), },
++};
++
++int __init mach_nb0916_init(void)
++{
++ i2c_register_board_info(0, puv3_i2c_devices,
++ ARRAY_SIZE(puv3_i2c_devices));
++
++ platform_device_register_simple("PKUnity-v3-I2C", -1,
++ puv3_i2c_resources, ARRAY_SIZE(puv3_i2c_resources));
++
++ platform_device_register_data(&platform_bus, "pwm-backlight", -1,
++ &nb0916_backlight_data, sizeof(nb0916_backlight_data));
++
++ platform_device_register_data(&platform_bus, "gpio-keys", -1,
++ &nb0916_gpio_button_data, sizeof(nb0916_gpio_button_data));
++
++ platform_device_register_resndata(&platform_bus, "physmap-flash", -1,
++ &physmap_flash_resource, 1,
++ &physmap_flash_data, sizeof(physmap_flash_data));
++
++ if (request_irq(gpio_to_irq(GPI_LCD_CASE_OFF),
++ &nb0916_lcdcaseoff_handler,
++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
++ "NB0916 lcd case off", NULL) < 0) {
++
++ printk(KERN_DEBUG "LCD-Case-OFF IRQ %d not available\n",
++ gpio_to_irq(GPI_LCD_CASE_OFF));
++ }
++
++ if (request_irq(gpio_to_irq(GPI_OTP_INT), &nb0916_overheat_handler,
++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
++ "NB0916 overheating protection", NULL) < 0) {
++
++ printk(KERN_DEBUG "Overheating Protection IRQ %d not available\n",
++ gpio_to_irq(GPI_OTP_INT));
++ }
++
++ return 0;
++}
++
++subsys_initcall_sync(mach_nb0916_init);
+ commit 70fac51feaf2ca50c84e102e2a2699eb19ef24bd
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:23:31 2011 +0800
+
+ unicore32 additional architecture files: boot process
+
+ This patch implements booting process, including uncompression process.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/boot/Makefile b/arch/unicore32/boot/Makefile
+new file mode 100644
+index 000000000000..79e5f88845d9
+--- /dev/null
++++ b/arch/unicore32/boot/Makefile
+@@ -0,0 +1,47 @@
++#
++# arch/unicore32/boot/Makefile
++#
++# This file is included by the global makefile so that you can add your own
++# architecture-specific flags and dependencies.
++#
++# 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) 2001~2010 GUAN Xue-tao
++#
++
++MKIMAGE := $(srctree)/scripts/mkuboot.sh
++
++targets := Image zImage uImage
++
++$(obj)/Image: vmlinux FORCE
++ $(call if_changed,objcopy)
++ @echo ' Kernel: $@ is ready'
++
++$(obj)/compressed/vmlinux: $(obj)/Image FORCE
++ $(Q)$(MAKE) $(build)=$(obj)/compressed $@
++
++$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
++ $(call if_changed,objcopy)
++ @echo ' Kernel: $@ is ready'
++
++quiet_cmd_uimage = UIMAGE $@
++ cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A unicore -O linux -T kernel \
++ -C none -a $(LOADADDR) -e $(STARTADDR) \
++ -n 'Linux-$(KERNELRELEASE)' -d $< $@
++
++$(obj)/uImage: LOADADDR=0x0
++
++$(obj)/uImage: STARTADDR=$(LOADADDR)
++
++$(obj)/uImage: $(obj)/zImage FORCE
++ $(call if_changed,uimage)
++ @echo ' Image $@ is ready'
++
++PHONY += initrd FORCE
++initrd:
++ @test "$(INITRD)" != "" || \
++ (echo You must specify INITRD; exit -1)
++
++subdir- := compressed
+diff --git a/arch/unicore32/boot/compressed/Makefile b/arch/unicore32/boot/compressed/Makefile
+new file mode 100644
+index 000000000000..95373428cb3d
+--- /dev/null
++++ b/arch/unicore32/boot/compressed/Makefile
+@@ -0,0 +1,68 @@
++#
++# linux/arch/unicore32/boot/compressed/Makefile
++#
++# create a compressed vmlinuz image from the original vmlinux
++#
++# 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) 2001~2010 GUAN Xue-tao
++#
++
++EXTRA_CFLAGS := -fpic -fno-builtin
++EXTRA_AFLAGS := -Wa,-march=all
++
++OBJS := misc.o
++
++# font.c and font.o
++CFLAGS_font.o := -Dstatic=
++$(obj)/font.c: $(srctree)/drivers/video/console/font_8x8.c
++ $(call cmd,shipped)
++
++# piggy.S and piggy.o
++suffix_$(CONFIG_KERNEL_GZIP) := gzip
++suffix_$(CONFIG_KERNEL_BZIP2) := bz2
++suffix_$(CONFIG_KERNEL_LZO) := lzo
++suffix_$(CONFIG_KERNEL_LZMA) := lzma
++
++$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
++ $(call if_changed,$(suffix_y))
++
++SEDFLAGS_piggy = s/DECOMP_SUFFIX/$(suffix_y)/
++$(obj)/piggy.S: $(obj)/piggy.S.in
++ @sed "$(SEDFLAGS_piggy)" < $< > $@
++
++$(obj)/piggy.o: $(obj)/piggy.$(suffix_y) $(obj)/piggy.S FORCE
++
++targets := vmlinux vmlinux.lds font.o font.c head.o misc.o \
++ piggy.$(suffix_y) piggy.o piggy.S \
++
++# Make sure files are removed during clean
++extra-y += piggy.gzip piggy.bz2 piggy.lzo piggy.lzma
++
++# ?
++LDFLAGS_vmlinux += -p
++# Report unresolved symbol references
++LDFLAGS_vmlinux += --no-undefined
++# Delete all temporary local symbols
++LDFLAGS_vmlinux += -X
++# Next argument is a linker script
++LDFLAGS_vmlinux += -T
++
++# For uidivmod
++$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/head.o $(obj)/piggy.o \
++ $(obj)/misc.o FORCE
++ $(call if_changed,ld)
++ @:
++
++# We now have a PIC decompressor implementation. Decompressors running
++# from RAM should not define ZTEXTADDR. Decompressors running directly
++# from ROM or Flash must define ZTEXTADDR (preferably via the config)
++ZTEXTADDR := 0
++ZBSSADDR := ALIGN(4)
++
++SEDFLAGS_lds = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
++$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/unicore32/boot/Makefile $(KCONFIG_CONFIG)
++ @sed "$(SEDFLAGS_lds)" < $< > $@
++
+diff --git a/arch/unicore32/boot/compressed/head.S b/arch/unicore32/boot/compressed/head.S
+new file mode 100644
+index 000000000000..fbd1e374c685
+--- /dev/null
++++ b/arch/unicore32/boot/compressed/head.S
+@@ -0,0 +1,204 @@
++/*
++ * linux/arch/unicore32/boot/compressed/head.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <mach/memory.h>
++
++#define csub cmpsub
++#define cand cmpand
++#define nop8 nop; nop; nop; nop; nop; nop; nop; nop
++
++ .section ".start", #alloc, #execinstr
++ .text
++start:
++ .type start,#function
++
++ /* Initialize ASR, PRIV mode and INTR off */
++ mov r0, #0xD3
++ mov.a asr, r0
++
++ adr r0, LC0
++ ldm (r1, r2, r3, r5, r6, r7, r8), [r0]+
++ ldw sp, [r0+], #28
++ sub.a r0, r0, r1 @ calculate the delta offset
++
++ /*
++ * if delta is zero, we are running at the address
++ * we were linked at.
++ */
++ beq not_relocated
++
++ /*
++ * We're running at a different address. We need to fix
++ * up various pointers:
++ * r5 - zImage base address (_start)
++ * r7 - GOT start
++ * r8 - GOT end
++ */
++ add r5, r5, r0
++ add r7, r7, r0
++ add r8, r8, r0
++
++ /*
++ * we need to fix up pointers into the BSS region.
++ * r2 - BSS start
++ * r3 - BSS end
++ * sp - stack pointer
++ */
++ add r2, r2, r0
++ add r3, r3, r0
++ add sp, sp, r0
++
++ /*
++ * Relocate all entries in the GOT table.
++ * This fixes up the C references.
++ * r7 - GOT start
++ * r8 - GOT end
++ */
++1001: ldw r1, [r7+], #0
++ add r1, r1, r0
++ stw.w r1, [r7]+, #4
++ csub.a r7, r8
++ bub 1001b
++
++not_relocated:
++ /*
++ * Clear BSS region.
++ * r2 - BSS start
++ * r3 - BSS end
++ */
++ mov r0, #0
++1002: stw.w r0, [r2]+, #4
++ csub.a r2, r3
++ bub 1002b
++
++ /*
++ * Turn on the cache.
++ */
++ mov r0, #0
++ movc p0.c5, r0, #28 @ cache invalidate all
++ nop8
++ movc p0.c6, r0, #6 @ tlb invalidate all
++ nop8
++
++ mov r0, #0x1c @ en icache and wb dcache
++ movc p0.c1, r0, #0
++ nop8
++
++ /*
++ * Set up some pointers, for starting decompressing.
++ */
++
++ mov r1, sp @ malloc space above stack
++ add r2, sp, #0x10000 @ 64k max
++
++ /*
++ * Check to see if we will overwrite ourselves.
++ * r4 = final kernel address
++ * r5 = start of this image
++ * r6 = size of decompressed image
++ * r2 = end of malloc space (and therefore this image)
++ * We basically want:
++ * r4 >= r2 -> OK
++ * r4 + image length <= r5 -> OK
++ */
++ ldw r4, =KERNEL_IMAGE_START
++ csub.a r4, r2
++ bea wont_overwrite
++ add r0, r4, r6
++ csub.a r0, r5
++ beb wont_overwrite
++
++ /*
++ * If overwrite, just print error message
++ */
++ b __error_overwrite
++
++ /*
++ * We're not in danger of overwriting ourselves.
++ * Do this the simple way.
++ */
++wont_overwrite:
++ /*
++ * decompress_kernel:
++ * r0: output_start
++ * r1: free_mem_ptr_p
++ * r2: free_mem_ptr_end_p
++ */
++ mov r0, r4
++ b.l decompress_kernel @ C functions
++
++ /*
++ * Clean and flush the cache to maintain consistency.
++ */
++ mov r0, #0
++ movc p0.c5, r0, #14 @ flush dcache
++ nop8
++ movc p0.c5, r0, #20 @ icache invalidate all
++ nop8
++
++ /*
++ * Turn off the Cache and MMU.
++ */
++ mov r0, #0 @ disable i/d cache and MMU
++ movc p0.c1, r0, #0
++ nop8
++
++ mov r0, #0 @ must be zero
++ ldw r4, =KERNEL_IMAGE_START
++ mov pc, r4 @ call kernel
++
++
++ .align 2
++ .type LC0, #object
++LC0: .word LC0 @ r1
++ .word __bss_start @ r2
++ .word _end @ r3
++ .word _start @ r5
++ .word _image_size @ r6
++ .word _got_start @ r7
++ .word _got_end @ r8
++ .word decompress_stack_end @ sp
++ .size LC0, . - LC0
++
++print_string:
++#ifdef CONFIG_DEBUG_OCD
++2001: ldb.w r1, [r0]+, #1
++ csub.a r1, #0
++ bne 2002f
++ mov pc, lr
++2002:
++ movc r2, p1.c0, #0
++ cand.a r2, #2
++ bne 2002b
++ movc p1.c1, r1, #1
++ csub.a r1, #'\n'
++ cmoveq r1, #'\r'
++ beq 2002b
++ b 2001b
++#else
++ mov pc, lr
++#endif
++
++__error_overwrite:
++ adr r0, str_error
++ b.l print_string
++2001: nop8
++ b 2001b
++str_error: .asciz "\nError: Kernel address OVERWRITE\n"
++ .align
++
++ .ltorg
++
++ .align 4
++ .section ".stack", "aw", %nobits
++decompress_stack: .space 4096
++decompress_stack_end:
+diff --git a/arch/unicore32/boot/compressed/misc.c b/arch/unicore32/boot/compressed/misc.c
+new file mode 100644
+index 000000000000..176d5bda3559
+--- /dev/null
++++ b/arch/unicore32/boot/compressed/misc.c
+@@ -0,0 +1,126 @@
++/*
++ * linux/arch/unicore32/boot/compressed/misc.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 <asm/unaligned.h>
++#include <mach/uncompress.h>
++
++/*
++ * gzip delarations
++ */
++unsigned char *output_data;
++unsigned long output_ptr;
++
++unsigned int free_mem_ptr;
++unsigned int free_mem_end_ptr;
++
++#define STATIC static
++#define STATIC_RW_DATA /* non-static please */
++
++/*
++ * arch-dependent implementations
++ */
++#ifndef ARCH_HAVE_DECOMP_ERROR
++#define arch_decomp_error(x)
++#endif
++
++#ifndef ARCH_HAVE_DECOMP_SETUP
++#define arch_decomp_setup()
++#endif
++
++#ifndef ARCH_HAVE_DECOMP_PUTS
++#define arch_decomp_puts(p)
++#endif
++
++void *memcpy(void *dest, const void *src, size_t n)
++{
++ int i = 0;
++ unsigned char *d = (unsigned char *)dest, *s = (unsigned char *)src;
++
++ for (i = n >> 3; i > 0; i--) {
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ }
++
++ if (n & 1 << 2) {
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ *d++ = *s++;
++ }
++
++ if (n & 1 << 1) {
++ *d++ = *s++;
++ *d++ = *s++;
++ }
++
++ if (n & 1)
++ *d++ = *s++;
++
++ return dest;
++}
++
++void error(char *x)
++{
++ arch_decomp_puts("\n\n");
++ arch_decomp_puts(x);
++ arch_decomp_puts("\n\n -- System halted");
++
++ arch_decomp_error(x);
++
++ for (;;)
++ ; /* Halt */
++}
++
++/* Heap size should be adjusted for different decompress method */
++#ifdef CONFIG_KERNEL_GZIP
++#include "../../../../lib/decompress_inflate.c"
++#endif
++
++#ifdef CONFIG_KERNEL_BZIP2
++#include "../../../../lib/decompress_bunzip2.c"
++#endif
++
++#ifdef CONFIG_KERNEL_LZO
++#include "../../../../lib/decompress_unlzo.c"
++#endif
++
++#ifdef CONFIG_KERNEL_LZMA
++#include "../../../../lib/decompress_unlzma.c"
++#endif
++
++unsigned long decompress_kernel(unsigned long output_start,
++ unsigned long free_mem_ptr_p,
++ unsigned long free_mem_ptr_end_p)
++{
++ unsigned char *tmp;
++
++ output_data = (unsigned char *)output_start;
++ free_mem_ptr = free_mem_ptr_p;
++ free_mem_end_ptr = free_mem_ptr_end_p;
++
++ arch_decomp_setup();
++
++ tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
++ output_ptr = get_unaligned_le32(tmp);
++
++ arch_decomp_puts("Uncompressing Linux...");
++ decompress(input_data, input_data_end - input_data, NULL, NULL,
++ output_data, NULL, error);
++ arch_decomp_puts(" done, booting the kernel.\n");
++ return output_ptr;
++}
+diff --git a/arch/unicore32/boot/compressed/piggy.S.in b/arch/unicore32/boot/compressed/piggy.S.in
+new file mode 100644
+index 000000000000..b79704d58026
+--- /dev/null
++++ b/arch/unicore32/boot/compressed/piggy.S.in
+@@ -0,0 +1,6 @@
++ .section .piggydata,#alloc
++ .globl input_data
++input_data:
++ .incbin "arch/unicore32/boot/compressed/piggy.DECOMP_SUFFIX"
++ .globl input_data_end
++input_data_end:
+diff --git a/arch/unicore32/boot/compressed/vmlinux.lds.in b/arch/unicore32/boot/compressed/vmlinux.lds.in
+new file mode 100644
+index 000000000000..d5a3ce296239
+--- /dev/null
++++ b/arch/unicore32/boot/compressed/vmlinux.lds.in
+@@ -0,0 +1,61 @@
++/*
++ * linux/arch/unicore/boot/compressed/vmlinux.lds.in
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ */
++OUTPUT_ARCH(unicore32)
++ENTRY(_start)
++SECTIONS
++{
++ /DISCARD/ : {
++ /*
++ * Discard any r/w data - this produces a link error if we have any,
++ * which is required for PIC decompression. Local data generates
++ * GOTOFF relocations, which prevents it being relocated independently
++ * of the text/got segments.
++ */
++ *(.data)
++ }
++
++ . = TEXT_START;
++ _text = .;
++
++ .text : {
++ _start = .;
++ *(.start)
++ *(.text)
++ *(.text.*)
++ *(.fixup)
++ *(.gnu.warning)
++ *(.rodata)
++ *(.rodata.*)
++ *(.piggydata)
++ . = ALIGN(4);
++ }
++
++ _etext = .;
++
++ /* Assume size of decompressed image is 4x the compressed image */
++ _image_size = (_etext - _text) * 4;
++
++ _got_start = .;
++ .got : { *(.got) }
++ _got_end = .;
++ .got.plt : { *(.got.plt) }
++ _edata = .;
++
++ . = BSS_START;
++ __bss_start = .;
++ .bss : { *(.bss) }
++ _end = .;
++
++ .stack : { *(.stack) }
++ .comment 0 : { *(.comment) }
++}
++
+diff --git a/arch/unicore32/include/mach/uncompress.h b/arch/unicore32/include/mach/uncompress.h
+new file mode 100644
+index 000000000000..142d3e7958a9
+--- /dev/null
++++ b/arch/unicore32/include/mach/uncompress.h
+@@ -0,0 +1,34 @@
++/*
++ * linux/arch/unicore32/include/mach/uncompress.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __MACH_PUV3_UNCOMPRESS_H__
++#define __MACH_PUV3_UNCOMPRESS_H__
++
++#include "hardware.h"
++#include "ocd.h"
++
++extern char input_data[];
++extern char input_data_end[];
++
++static void arch_decomp_puts(const char *ptr)
++{
++ char c;
++
++ while ((c = *ptr++) != '\0') {
++ if (c == '\n')
++ putc('\r');
++ putc(c);
++ }
++}
++#define ARCH_HAVE_DECOMP_PUTS
++
++#endif /* __MACH_PUV3_UNCOMPRESS_H__ */commit 96cf5185a95e0b304596fe19edcf8dfcd5c10699
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:23:09 2011 +0800
+
+ unicore32 additional architecture files: low-level lib: misc
+
+ This patch implements the rest low-level libraries.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/assembler.h b/arch/unicore32/include/asm/assembler.h
+new file mode 100644
+index 000000000000..8e87ed7faeba
+--- /dev/null
++++ b/arch/unicore32/include/asm/assembler.h
+@@ -0,0 +1,131 @@
++/*
++ * linux/arch/unicore32/include/asm/assembler.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Do not include any C declarations in this file - it is included by
++ * assembler source.
++ */
++#ifndef __ASSEMBLY__
++#error "Only include this from assembly code"
++#endif
++
++#include <asm/ptrace.h>
++
++/*
++ * Little Endian independent macros for shifting bytes within registers.
++ */
++#define pull >>
++#define push <<
++#define get_byte_0 << #0
++#define get_byte_1 >> #8
++#define get_byte_2 >> #16
++#define get_byte_3 >> #24
++#define put_byte_0 << #0
++#define put_byte_1 << #8
++#define put_byte_2 << #16
++#define put_byte_3 << #24
++
++#define cadd cmpadd
++#define cand cmpand
++#define csub cmpsub
++#define cxor cmpxor
++
++/*
++ * Enable and disable interrupts
++ */
++ .macro disable_irq, temp
++ mov \temp, asr
++ andn \temp, \temp, #0xFF
++ or \temp, \temp, #PSR_I_BIT | PRIV_MODE
++ mov.a asr, \temp
++ .endm
++
++ .macro enable_irq, temp
++ mov \temp, asr
++ andn \temp, \temp, #0xFF
++ or \temp, \temp, #PRIV_MODE
++ mov.a asr, \temp
++ .endm
++
++#define USER(x...) \
++9999: x; \
++ .pushsection __ex_table, "a"; \
++ .align 3; \
++ .long 9999b, 9001f; \
++ .popsection
++
++ .macro notcond, cond, nexti = .+8
++ .ifc \cond, eq
++ bne \nexti
++ .else; .ifc \cond, ne
++ beq \nexti
++ .else; .ifc \cond, ea
++ bub \nexti
++ .else; .ifc \cond, ub
++ bea \nexti
++ .else; .ifc \cond, fs
++ bns \nexti
++ .else; .ifc \cond, ns
++ bfs \nexti
++ .else; .ifc \cond, fv
++ bnv \nexti
++ .else; .ifc \cond, nv
++ bfv \nexti
++ .else; .ifc \cond, ua
++ beb \nexti
++ .else; .ifc \cond, eb
++ bua \nexti
++ .else; .ifc \cond, eg
++ bsl \nexti
++ .else; .ifc \cond, sl
++ beg \nexti
++ .else; .ifc \cond, sg
++ bel \nexti
++ .else; .ifc \cond, el
++ bsg \nexti
++ .else; .ifnc \cond, al
++ .error "Unknown cond in notcond macro argument"
++ .endif; .endif; .endif; .endif; .endif; .endif; .endif
++ .endif; .endif; .endif; .endif; .endif; .endif; .endif
++ .endif
++ .endm
++
++ .macro usracc, instr, reg, ptr, inc, cond, rept, abort
++ .rept \rept
++ notcond \cond, .+8
++9999 :
++ .if \inc == 1
++ \instr\()b.u \reg, [\ptr], #\inc
++ .elseif \inc == 4
++ \instr\()w.u \reg, [\ptr], #\inc
++ .else
++ .error "Unsupported inc macro argument"
++ .endif
++
++ .pushsection __ex_table, "a"
++ .align 3
++ .long 9999b, \abort
++ .popsection
++ .endr
++ .endm
++
++ .macro strusr, reg, ptr, inc, cond = al, rept = 1, abort = 9001f
++ usracc st, \reg, \ptr, \inc, \cond, \rept, \abort
++ .endm
++
++ .macro ldrusr, reg, ptr, inc, cond = al, rept = 1, abort = 9001f
++ usracc ld, \reg, \ptr, \inc, \cond, \rept, \abort
++ .endm
++
++ .macro nop8
++ .rept 8
++ nop
++ .endr
++ .endm
+diff --git a/arch/unicore32/include/asm/bitops.h b/arch/unicore32/include/asm/bitops.h
+new file mode 100644
+index 000000000000..1628a6328994
+--- /dev/null
++++ b/arch/unicore32/include/asm/bitops.h
+@@ -0,0 +1,47 @@
++/*
++ * linux/arch/unicore32/include/asm/bitops.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_BITOPS_H__
++#define __UNICORE_BITOPS_H__
++
++#define find_next_bit __uc32_find_next_bit
++#define find_next_zero_bit __uc32_find_next_zero_bit
++
++#define find_first_bit __uc32_find_first_bit
++#define find_first_zero_bit __uc32_find_first_zero_bit
++
++#define _ASM_GENERIC_BITOPS_FLS_H_
++#define _ASM_GENERIC_BITOPS___FLS_H_
++#define _ASM_GENERIC_BITOPS_FFS_H_
++#define _ASM_GENERIC_BITOPS___FFS_H_
++/*
++ * On UNICORE, those functions can be implemented around
++ * the cntlz instruction for much better code efficiency.
++ */
++
++static inline int fls(int x)
++{
++ int ret;
++
++ asm("cntlz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");
++ ret = 32 - ret;
++
++ return ret;
++}
++
++#define __fls(x) (fls(x) - 1)
++#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
++#define __ffs(x) (ffs(x) - 1)
++
++#include <asm-generic/bitops.h>
++
++#endif /* __UNICORE_BITOPS_H__ */
+diff --git a/arch/unicore32/include/asm/checksum.h b/arch/unicore32/include/asm/checksum.h
+new file mode 100644
+index 000000000000..f55c3f937c3e
+--- /dev/null
++++ b/arch/unicore32/include/asm/checksum.h
+@@ -0,0 +1,41 @@
++/*
++ * linux/arch/unicore32/include/asm/checksum.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * IP checksum routines
++ */
++#ifndef __UNICORE_CHECKSUM_H__
++#define __UNICORE_CHECKSUM_H__
++
++/*
++ * computes the checksum of the TCP/UDP pseudo-header
++ * returns a 16-bit checksum, already complemented
++ */
++
++static inline __wsum
++csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len,
++ unsigned short proto, __wsum sum)
++{
++ __asm__(
++ "add.a %0, %1, %2\n"
++ "addc.a %0, %0, %3\n"
++ "addc.a %0, %0, %4 << #8\n"
++ "addc.a %0, %0, %5\n"
++ "addc %0, %0, #0\n"
++ : "=&r"(sum)
++ : "r" (sum), "r" (daddr), "r" (saddr), "r" (len), "Ir" (htons(proto))
++ : "cc");
++ return sum;
++}
++#define csum_tcpudp_nofold csum_tcpudp_nofold
++
++#include <asm-generic/checksum.h>
++
++#endif
+diff --git a/arch/unicore32/include/asm/delay.h b/arch/unicore32/include/asm/delay.h
+new file mode 100644
+index 000000000000..164ae61cd6f7
+--- /dev/null
++++ b/arch/unicore32/include/asm/delay.h
+@@ -0,0 +1,52 @@
++/*
++ * linux/arch/unicore32/include/asm/delay.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Delay routines, using a pre-computed "loops_per_second" value.
++ */
++#ifndef __UNICORE_DELAY_H__
++#define __UNICORE_DELAY_H__
++
++#include <asm/param.h> /* HZ */
++
++extern void __delay(int loops);
++
++/*
++ * This function intentionally does not exist; if you see references to
++ * it, it means that you're calling udelay() with an out of range value.
++ *
++ * With currently imposed limits, this means that we support a max delay
++ * of 2000us. Further limits: HZ<=1000 and bogomips<=3355
++ */
++extern void __bad_udelay(void);
++
++/*
++ * division by multiplication: you don't have to worry about
++ * loss of precision.
++ *
++ * Use only for very small delays ( < 1 msec). Should probably use a
++ * lookup table, really, as the multiplications take much too long with
++ * short delays. This is a "reasonable" implementation, though (and the
++ * first constant multiplications gets optimized away if the delay is
++ * a constant)
++ */
++extern void __udelay(unsigned long usecs);
++extern void __const_udelay(unsigned long);
++
++#define MAX_UDELAY_MS 2
++
++#define udelay(n) \
++ (__builtin_constant_p(n) ? \
++ ((n) > (MAX_UDELAY_MS * 1000) ? __bad_udelay() : \
++ __const_udelay((n) * ((2199023U*HZ)>>11))) : \
++ __udelay(n))
++
++#endif /* __UNICORE_DELAY_H__ */
++
+diff --git a/arch/unicore32/include/asm/futex.h b/arch/unicore32/include/asm/futex.h
+new file mode 100644
+index 000000000000..07dea6170558
+--- /dev/null
++++ b/arch/unicore32/include/asm/futex.h
+@@ -0,0 +1,143 @@
++/*
++ * linux/arch/unicore32/include/asm/futex.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_FUTEX_H__
++#define __UNICORE_FUTEX_H__
++
++#ifdef __KERNEL__
++
++#include <linux/futex.h>
++#include <linux/preempt.h>
++#include <linux/uaccess.h>
++#include <linux/errno.h>
++
++#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \
++ __asm__ __volatile__( \
++ "1: ldw.u %1, [%2]\n" \
++ " " insn "\n" \
++ "2: stw.u %0, [%2]\n" \
++ " mov %0, #0\n" \
++ "3:\n" \
++ " .pushsection __ex_table,\"a\"\n" \
++ " .align 3\n" \
++ " .long 1b, 4f, 2b, 4f\n" \
++ " .popsection\n" \
++ " .pushsection .fixup,\"ax\"\n" \
++ "4: mov %0, %4\n" \
++ " b 3b\n" \
++ " .popsection" \
++ : "=&r" (ret), "=&r" (oldval) \
++ : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \
++ : "cc", "memory")
++
++static inline int
++futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
++{
++ int op = (encoded_op >> 28) & 7;
++ int cmp = (encoded_op >> 24) & 15;
++ int oparg = (encoded_op << 8) >> 20;
++ int cmparg = (encoded_op << 20) >> 20;
++ int oldval = 0, ret;
++
++ if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
++ oparg = 1 << oparg;
++
++ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
++ return -EFAULT;
++
++ pagefault_disable(); /* implies preempt_disable() */
++
++ switch (op) {
++ case FUTEX_OP_SET:
++ __futex_atomic_op("mov %0, %3", ret, oldval, uaddr, oparg);
++ break;
++ case FUTEX_OP_ADD:
++ __futex_atomic_op("add %0, %1, %3", ret, oldval, uaddr, oparg);
++ break;
++ case FUTEX_OP_OR:
++ __futex_atomic_op("or %0, %1, %3", ret, oldval, uaddr, oparg);
++ break;
++ case FUTEX_OP_ANDN:
++ __futex_atomic_op("and %0, %1, %3",
++ ret, oldval, uaddr, ~oparg);
++ break;
++ case FUTEX_OP_XOR:
++ __futex_atomic_op("xor %0, %1, %3", ret, oldval, uaddr, oparg);
++ break;
++ default:
++ ret = -ENOSYS;
++ }
++
++ pagefault_enable(); /* subsumes preempt_enable() */
++
++ if (!ret) {
++ switch (cmp) {
++ case FUTEX_OP_CMP_EQ:
++ ret = (oldval == cmparg);
++ break;
++ case FUTEX_OP_CMP_NE:
++ ret = (oldval != cmparg);
++ break;
++ case FUTEX_OP_CMP_LT:
++ ret = (oldval < cmparg);
++ break;
++ case FUTEX_OP_CMP_GE:
++ ret = (oldval >= cmparg);
++ break;
++ case FUTEX_OP_CMP_LE:
++ ret = (oldval <= cmparg);
++ break;
++ case FUTEX_OP_CMP_GT:
++ ret = (oldval > cmparg);
++ break;
++ default:
++ ret = -ENOSYS;
++ }
++ }
++ return ret;
++}
++
++static inline int
++futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
++{
++ int val;
++
++ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
++ return -EFAULT;
++
++ pagefault_disable(); /* implies preempt_disable() */
++
++ __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
++ "1: ldw.u %0, [%3]\n"
++ " cmpxor.a %0, %1\n"
++ " bne 3f\n"
++ "2: stw.u %2, [%3]\n"
++ "3:\n"
++ " .pushsection __ex_table,\"a\"\n"
++ " .align 3\n"
++ " .long 1b, 4f, 2b, 4f\n"
++ " .popsection\n"
++ " .pushsection .fixup,\"ax\"\n"
++ "4: mov %0, %4\n"
++ " b 3b\n"
++ " .popsection"
++ : "=&r" (val)
++ : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
++ : "cc", "memory");
++
++ pagefault_enable(); /* subsumes preempt_enable() */
++
++ return val;
++}
++
++#endif /* __KERNEL__ */
++#endif /* __UNICORE_FUTEX_H__ */
+diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h
+new file mode 100644
+index 000000000000..d73457c1800a
+--- /dev/null
++++ b/arch/unicore32/include/asm/io.h
+@@ -0,0 +1,52 @@
++/*
++ * linux/arch/unicore32/include/asm/io.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_IO_H__
++#define __UNICORE_IO_H__
++
++#ifdef __KERNEL__
++
++#include <asm/byteorder.h>
++#include <asm/memory.h>
++#include <asm/system.h>
++
++#include <asm-generic/io.h>
++
++/*
++ * __uc32_ioremap and __uc32_ioremap_cached takes CPU physical address.
++ */
++extern void __iomem *__uc32_ioremap(unsigned long, size_t);
++extern void __iomem *__uc32_ioremap_cached(unsigned long, size_t);
++extern void __uc32_iounmap(volatile void __iomem *addr);
++
++/*
++ * ioremap and friends.
++ *
++ * ioremap takes a PCI memory address, as specified in
++ * Documentation/IO-mapping.txt.
++ *
++ */
++#define ioremap(cookie, size) __uc32_ioremap(cookie, size)
++#define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size)
++#define iounmap(cookie) __uc32_iounmap(cookie)
++
++extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
++extern void ioport_unmap(void __iomem *addr);
++
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#undef xlate_dev_mem_ptr
++#define xlate_dev_mem_ptr(p) __va(p)
++
++#endif /* __KERNEL__ */
++#endif /* __UNICORE_IO_H__ */
+diff --git a/arch/unicore32/include/asm/mutex.h b/arch/unicore32/include/asm/mutex.h
+new file mode 100644
+index 000000000000..fab7d0e8adf6
+--- /dev/null
++++ b/arch/unicore32/include/asm/mutex.h
+@@ -0,0 +1,20 @@
++/*
++ * linux/arch/unicore32/include/asm/mutex.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * UniCore optimized mutex locking primitives
++ *
++ * Please look into asm-generic/mutex-xchg.h for a formal definition.
++ */
++#ifndef __UNICORE_MUTEX_H__
++#define __UNICORE_MUTEX_H__
++
++# include <asm-generic/mutex-xchg.h>
++#endif
+diff --git a/arch/unicore32/lib/Makefile b/arch/unicore32/lib/Makefile
+new file mode 100644
+index 000000000000..87229a558b36
+--- /dev/null
++++ b/arch/unicore32/lib/Makefile
+@@ -0,0 +1,27 @@
++#
++# linux/arch/unicore32/lib/Makefile
++#
++# Copyright (C) 2001-2010 GUAN Xue-tao
++#
++
++lib-y := backtrace.o delay.o findbit.o
++lib-y += strncpy_from_user.o strnlen_user.o
++lib-y += clear_user.o copy_page.o
++lib-y += copy_from_user.o copy_to_user.o
++
++GNU_LIBC_A := $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libc.a)
++GNU_LIBC_A_OBJS := memchr.o memcpy.o memmove.o memset.o
++GNU_LIBC_A_OBJS += strchr.o strrchr.o
++GNU_LIBC_A_OBJS += rawmemchr.o # needed by strrchr.o
++
++GNU_LIBGCC_A := $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a)
++GNU_LIBGCC_A_OBJS := _ashldi3.o _ashrdi3.o _lshrdi3.o
++GNU_LIBGCC_A_OBJS += _divsi3.o _modsi3.o _ucmpdi2.o _umodsi3.o _udivsi3.o
++
++lib-y += $(GNU_LIBC_A_OBJS) $(GNU_LIBGCC_A_OBJS)
++
++$(addprefix $(obj)/, $(GNU_LIBC_A_OBJS)):
++ $(Q)$(AR) p $(GNU_LIBC_A) $(notdir $@) > $@
++
++$(addprefix $(obj)/, $(GNU_LIBGCC_A_OBJS)):
++ $(Q)$(AR) p $(GNU_LIBGCC_A) $(notdir $@) > $@
+diff --git a/arch/unicore32/lib/delay.S b/arch/unicore32/lib/delay.S
+new file mode 100644
+index 000000000000..24664c009e78
+--- /dev/null
++++ b/arch/unicore32/lib/delay.S
+@@ -0,0 +1,51 @@
++/*
++ * linux/arch/unicore32/lib/delay.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++#include <asm/param.h>
++ .text
++
++.LC0: .word loops_per_jiffy
++.LC1: .word (2199023*HZ)>>11
++
++/*
++ * r0 <= 2000
++ * lpj <= 0x01ffffff (max. 3355 bogomips)
++ * HZ <= 1000
++ */
++
++ENTRY(__udelay)
++ ldw r2, .LC1
++ mul r0, r2, r0
++ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06
++ ldw r2, .LC0
++ ldw r2, [r2] @ max = 0x01ffffff
++ mov r0, r0 >> #14 @ max = 0x0001ffff
++ mov r2, r2 >> #10 @ max = 0x00007fff
++ mul r0, r2, r0 @ max = 2^32-1
++ mov.a r0, r0 >> #6
++ cmoveq pc, lr
++
++/*
++ * loops = r0 * HZ * loops_per_jiffy / 1000000
++ *
++ * Oh, if only we had a cycle counter...
++ */
++
++@ Delay routine
++ENTRY(__delay)
++ sub.a r0, r0, #2
++ bua __delay
++ mov pc, lr
++ENDPROC(__udelay)
++ENDPROC(__const_udelay)
++ENDPROC(__delay)
+diff --git a/arch/unicore32/lib/findbit.S b/arch/unicore32/lib/findbit.S
+new file mode 100644
+index 000000000000..c360ce905d8b
+--- /dev/null
++++ b/arch/unicore32/lib/findbit.S
+@@ -0,0 +1,98 @@
++/*
++ * linux/arch/unicore32/lib/findbit.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++ .text
++
++/*
++ * Purpose : Find a 'zero' bit
++ * Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
++ */
++__uc32_find_first_zero_bit:
++ cxor.a r1, #0
++ beq 3f
++ mov r2, #0
++1: ldb r3, [r0+], r2 >> #3
++ xor.a r3, r3, #0xff @ invert bits
++ bne .L_found @ any now set - found zero bit
++ add r2, r2, #8 @ next bit pointer
++2: csub.a r2, r1 @ any more?
++ bub 1b
++3: mov r0, r1 @ no free bits
++ mov pc, lr
++
++/*
++ * Purpose : Find next 'zero' bit
++ * Prototype: int find_next_zero_bit
++ * (void *addr, unsigned int maxbit, int offset)
++ */
++ENTRY(__uc32_find_next_zero_bit)
++ cxor.a r1, #0
++ beq 3b
++ and.a ip, r2, #7
++ beq 1b @ If new byte, goto old routine
++ ldb r3, [r0+], r2 >> #3
++ xor r3, r3, #0xff @ now looking for a 1 bit
++ mov.a r3, r3 >> ip @ shift off unused bits
++ bne .L_found
++ or r2, r2, #7 @ if zero, then no bits here
++ add r2, r2, #1 @ align bit pointer
++ b 2b @ loop for next bit
++ENDPROC(__uc32_find_next_zero_bit)
++
++/*
++ * Purpose : Find a 'one' bit
++ * Prototype: int find_first_bit
++ * (const unsigned long *addr, unsigned int maxbit);
++ */
++__uc32_find_first_bit:
++ cxor.a r1, #0
++ beq 3f
++ mov r2, #0
++1: ldb r3, [r0+], r2 >> #3
++ mov.a r3, r3
++ bne .L_found @ any now set - found zero bit
++ add r2, r2, #8 @ next bit pointer
++2: csub.a r2, r1 @ any more?
++ bub 1b
++3: mov r0, r1 @ no free bits
++ mov pc, lr
++
++/*
++ * Purpose : Find next 'one' bit
++ * Prototype: int find_next_zero_bit
++ * (void *addr, unsigned int maxbit, int offset)
++ */
++ENTRY(__uc32_find_next_bit)
++ cxor.a r1, #0
++ beq 3b
++ and.a ip, r2, #7
++ beq 1b @ If new byte, goto old routine
++ ldb r3, [r0+], r2 >> #3
++ mov.a r3, r3 >> ip @ shift off unused bits
++ bne .L_found
++ or r2, r2, #7 @ if zero, then no bits here
++ add r2, r2, #1 @ align bit pointer
++ b 2b @ loop for next bit
++ENDPROC(__uc32_find_next_bit)
++
++/*
++ * One or more bits in the LSB of r3 are assumed to be set.
++ */
++.L_found:
++ rsub r1, r3, #0
++ and r3, r3, r1
++ cntlz r3, r3
++ rsub r3, r3, #31
++ add r0, r2, r3
++ mov pc, lr
++commit 77c93b2f2388b974253af4149aa025b4751f92ad +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sat Feb 26 18:49:26 2011 +0800 + + unicore32 additional architecture files: low-level lib: uaccess + + This patch implements low-level uaccess libraries. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/arch/unicore32/include/asm/uaccess.h b/arch/unicore32/include/asm/uaccess.h +new file mode 100644 +index 000000000000..2acda503a6d9 +--- /dev/null ++++ b/arch/unicore32/include/asm/uaccess.h +@@ -0,0 +1,47 @@ ++/* ++ * linux/arch/unicore32/include/asm/uaccess.h ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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 __UNICORE_UACCESS_H__ ++#define __UNICORE_UACCESS_H__ ++ ++#include <linux/thread_info.h> ++#include <linux/errno.h> ++ ++#include <asm/memory.h> ++#include <asm/system.h> ++ ++#define __copy_from_user __copy_from_user ++#define __copy_to_user __copy_to_user ++#define __strncpy_from_user __strncpy_from_user ++#define __strnlen_user __strnlen_user ++#define __clear_user __clear_user ++ ++#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) ++#define __user_ok(addr, size) (((size) <= TASK_SIZE) \ ++ && ((addr) <= TASK_SIZE - (size))) ++#define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size))) ++ ++extern unsigned long __must_check ++__copy_from_user(void *to, const void __user *from, unsigned long n); ++extern unsigned long __must_check ++__copy_to_user(void __user *to, const void *from, unsigned long n); ++extern unsigned long __must_check ++__clear_user(void __user *addr, unsigned long n); ++extern unsigned long __must_check ++__strncpy_from_user(char *to, const char __user *from, unsigned long count); ++extern unsigned long ++__strnlen_user(const char __user *s, long n); ++ ++#include <asm-generic/uaccess.h> ++ ++extern int fixup_exception(struct pt_regs *regs); ++ ++#endif /* __UNICORE_UACCESS_H__ */ +diff --git a/arch/unicore32/lib/clear_user.S b/arch/unicore32/lib/clear_user.S +new file mode 100644 +index 000000000000..20047f7224fd +--- /dev/null ++++ b/arch/unicore32/lib/clear_user.S +@@ -0,0 +1,57 @@ ++/* ++ * linux/arch/unicore32/lib/clear_user.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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/linkage.h> ++#include <asm/assembler.h> ++ ++ .text ++ ++/* Prototype: int __clear_user(void *addr, size_t sz) ++ * Purpose : clear some user memory ++ * Params : addr - user memory address to clear ++ * : sz - number of bytes to clear ++ * Returns : number of bytes NOT cleared ++ */ ++WEAK(__clear_user) ++ stm.w (lr), [sp-] ++ stm.w (r1), [sp-] ++ mov r2, #0 ++ csub.a r1, #4 ++ bsl 2f ++ and.a ip, r0, #3 ++ beq 1f ++ csub.a ip, #2 ++ strusr r2, r0, 1 ++ strusr r2, r0, 1, el ++ strusr r2, r0, 1, sl ++ rsub ip, ip, #4 ++ sub r1, r1, ip @ 7 6 5 4 3 2 1 ++1: sub.a r1, r1, #8 @ -1 -2 -3 -4 -5 -6 -7 ++ strusr r2, r0, 4, ns, rept=2 ++ bns 1b ++ add.a r1, r1, #4 @ 3 2 1 0 -1 -2 -3 ++ strusr r2, r0, 4, ns ++2: cand.a r1, #2 @ 1x 1x 0x 0x 1x 1x 0x ++ strusr r2, r0, 1, ne, rept=2 ++ cand.a r1, #1 @ x1 x0 x1 x0 x1 x0 x1 ++ beq 3f ++USER( stb.u r2, [r0]) ++3: mov r0, #0 ++ ldm.w (r1), [sp]+ ++ ldm.w (pc), [sp]+ ++ENDPROC(__clear_user) ++ ++ .pushsection .fixup,"ax" ++ .align 0 ++9001: ldm.w (r0), [sp]+ ++ ldm.w (pc), [sp]+ ++ .popsection ++ +diff --git a/arch/unicore32/lib/copy_from_user.S b/arch/unicore32/lib/copy_from_user.S +new file mode 100644 +index 000000000000..ab0767ea5dbd +--- /dev/null ++++ b/arch/unicore32/lib/copy_from_user.S +@@ -0,0 +1,108 @@ ++/* ++ * linux/arch/unicore32/lib/copy_from_user.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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/linkage.h> ++#include <asm/assembler.h> ++ ++/* ++ * Prototype: ++ * ++ * size_t __copy_from_user(void *to, const void *from, size_t n) ++ * ++ * Purpose: ++ * ++ * copy a block to kernel memory from user memory ++ * ++ * Params: ++ * ++ * to = kernel memory ++ * from = user memory ++ * n = number of bytes to copy ++ * ++ * Return value: ++ * ++ * Number of bytes NOT copied. ++ */ ++ ++ .macro ldr1w ptr reg abort ++ ldrusr \reg, \ptr, 4, abort=\abort ++ .endm ++ ++ .macro ldr4w ptr reg1 reg2 reg3 reg4 abort ++100: ldm.w (\reg1, \reg2, \reg3, \reg4), [\ptr]+ ++ .pushsection __ex_table, "a" ++ .align 3 ++ .long 100b, \abort ++ .popsection ++ .endm ++ ++ .macro ldr8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++100: ldm.w (\reg1, \reg2, \reg3, \reg4, \reg5, \reg6, \reg7, \reg8), [\ptr]+ ++ .pushsection __ex_table, "a" ++ .align 3 ++ .long 100b, \abort ++ .popsection ++ .endm ++ ++ .macro ldr1b ptr reg cond=al abort ++ ldrusr \reg, \ptr, 1, \cond, abort=\abort ++ .endm ++ ++ .macro str1w ptr reg abort ++ stw.w \reg, [\ptr]+, #4 ++ .endm ++ ++ .macro str8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++ stm.w (\reg1, \reg2, \reg3, \reg4, \reg5, \reg6, \reg7, \reg8), [\ptr]+ ++ .endm ++ ++ .macro str1b ptr reg cond=al abort ++ .ifnc \cond, al ++ b\cond 201f ++ b 202f ++ .endif ++201: stb.w \reg, [\ptr]+, #1 ++202: ++ .endm ++ ++ .macro enter ++ mov r3, #0 ++ stm.w (r0, r2, r3), [sp-] ++ .endm ++ ++ .macro exit ++ add sp, sp, #8 ++ ldm.w (r0), [sp]+ ++ mov pc, lr ++ .endm ++ ++ .text ++ ++ENTRY(__copy_from_user) ++ ++#include "copy_template.S" ++ ++ENDPROC(__copy_from_user) ++ ++ .pushsection .fixup,"ax" ++ .align 0 ++ copy_abort_preamble ++ ldm.w (r1, r2), [sp]+ ++ sub r3, r0, r1 ++ rsub r2, r3, r2 ++ stw r2, [sp] ++ mov r1, #0 ++ b.l memset ++ ldw.w r0, [sp]+, #4 ++ copy_abort_end ++ .popsection ++ +diff --git a/arch/unicore32/lib/copy_page.S b/arch/unicore32/lib/copy_page.S +new file mode 100644 +index 000000000000..3a448d755ade +--- /dev/null ++++ b/arch/unicore32/lib/copy_page.S +@@ -0,0 +1,39 @@ ++/* ++ * linux/arch/unicore32/lib/copy_page.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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. ++ * ++ * ASM optimised string functions ++ */ ++#include <linux/linkage.h> ++#include <asm/assembler.h> ++#include <generated/asm-offsets.h> ++#include <asm/cache.h> ++ ++#define COPY_COUNT (PAGE_SZ/256) ++ ++ .text ++ .align 5 ++/* ++ * UniCore optimised copy_page routine ++ */ ++ENTRY(copy_page) ++ stm.w (r17 - r19, lr), [sp-] ++ mov r17, r0 ++ mov r18, r1 ++ mov r19, #COPY_COUNT ++1: ++ .rept 4 ++ ldm.w (r0 - r15), [r18]+ ++ stm.w (r0 - r15), [r17]+ ++ .endr ++ sub.a r19, r19, #1 ++ bne 1b ++ ldm.w (r17 - r19, pc), [sp]+ ++ENDPROC(copy_page) +diff --git a/arch/unicore32/lib/copy_template.S b/arch/unicore32/lib/copy_template.S +new file mode 100644 +index 000000000000..524287fc0120 +--- /dev/null ++++ b/arch/unicore32/lib/copy_template.S +@@ -0,0 +1,214 @@ ++/* ++ * linux/arch/unicore32/lib/copy_template.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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. ++ */ ++ ++/* ++ * Theory of operation ++ * ------------------- ++ * ++ * This file provides the core code for a forward memory copy used in ++ * the implementation of memcopy(), copy_to_user() and copy_from_user(). ++ * ++ * The including file must define the following accessor macros ++ * according to the need of the given function: ++ * ++ * ldr1w ptr reg abort ++ * ++ * This loads one word from 'ptr', stores it in 'reg' and increments ++ * 'ptr' to the next word. The 'abort' argument is used for fixup tables. ++ * ++ * ldr4w ptr reg1 reg2 reg3 reg4 abort ++ * ldr8w ptr, reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++ * ++ * This loads four or eight words starting from 'ptr', stores them ++ * in provided registers and increments 'ptr' past those words. ++ * The'abort' argument is used for fixup tables. ++ * ++ * ldr1b ptr reg cond abort ++ * ++ * Similar to ldr1w, but it loads a byte and increments 'ptr' one byte. ++ * It also must apply the condition code if provided, otherwise the ++ * "al" condition is assumed by default. ++ * ++ * str1w ptr reg abort ++ * str8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++ * str1b ptr reg cond abort ++ * ++ * Same as their ldr* counterparts, but data is stored to 'ptr' location ++ * rather than being loaded. ++ * ++ * enter ++ * ++ * Preserve the provided registers on the stack plus any additional ++ * data as needed by the implementation including this code. Called ++ * upon code entry. ++ * ++ * exit ++ * ++ * Restore registers with the values previously saved with the ++ * 'preserv' macro. Called upon code termination. ++ */ ++ ++ ++ enter ++ ++ sub.a r2, r2, #4 ++ bsl 8f ++ and.a ip, r0, #3 ++ bne 9f ++ and.a ip, r1, #3 ++ bne 10f ++ ++1: sub.a r2, r2, #(28) ++ stm.w (r5 - r8), [sp-] ++ bsl 5f ++ ++3: ++4: ldr8w r1, r3, r4, r5, r6, r7, r8, r10, r11, abort=20f ++ sub.a r2, r2, #32 ++ str8w r0, r3, r4, r5, r6, r7, r8, r10, r11, abort=20f ++ beg 3b ++ ++5: and.a ip, r2, #28 ++ rsub ip, ip, #32 ++ beq 7f ++ add pc, pc, ip @ C is always clear here ++ nop ++ ++ ldr1w r1, r3, abort=20f ++ ldr1w r1, r4, abort=20f ++ ldr1w r1, r5, abort=20f ++ ldr1w r1, r6, abort=20f ++ ldr1w r1, r7, abort=20f ++ ldr1w r1, r8, abort=20f ++ ldr1w r1, r11, abort=20f ++ ++ add pc, pc, ip ++ nop ++ ++ str1w r0, r3, abort=20f ++ str1w r0, r4, abort=20f ++ str1w r0, r5, abort=20f ++ str1w r0, r6, abort=20f ++ str1w r0, r7, abort=20f ++ str1w r0, r8, abort=20f ++ str1w r0, r11, abort=20f ++ ++7: ldm.w (r5 - r8), [sp]+ ++ ++8: mov.a r2, r2 << #31 ++ ldr1b r1, r3, ne, abort=21f ++ ldr1b r1, r4, ea, abort=21f ++ ldr1b r1, r10, ea, abort=21f ++ str1b r0, r3, ne, abort=21f ++ str1b r0, r4, ea, abort=21f ++ str1b r0, r10, ea, abort=21f ++ ++ exit ++ ++9: rsub ip, ip, #4 ++ csub.a ip, #2 ++ ldr1b r1, r3, sg, abort=21f ++ ldr1b r1, r4, eg, abort=21f ++ ldr1b r1, r11, abort=21f ++ str1b r0, r3, sg, abort=21f ++ str1b r0, r4, eg, abort=21f ++ sub.a r2, r2, ip ++ str1b r0, r11, abort=21f ++ bsl 8b ++ and.a ip, r1, #3 ++ beq 1b ++ ++10: andn r1, r1, #3 ++ csub.a ip, #2 ++ ldr1w r1, r11, abort=21f ++ beq 17f ++ bsg 18f ++ ++ ++ .macro forward_copy_shift a b ++ ++ sub.a r2, r2, #28 ++ bsl 14f ++ ++11: stm.w (r5 - r9), [sp-] ++ ++12: ++ ldr4w r1, r4, r5, r6, r7, abort=19f ++ mov r3, r11 pull #\a ++ sub.a r2, r2, #32 ++ ldr4w r1, r8, r9, r10, r11, abort=19f ++ or r3, r3, r4 push #\b ++ mov r4, r4 pull #\a ++ or r4, r4, r5 push #\b ++ mov r5, r5 pull #\a ++ or r5, r5, r6 push #\b ++ mov r6, r6 pull #\a ++ or r6, r6, r7 push #\b ++ mov r7, r7 pull #\a ++ or r7, r7, r8 push #\b ++ mov r8, r8 pull #\a ++ or r8, r8, r9 push #\b ++ mov r9, r9 pull #\a ++ or r9, r9, r10 push #\b ++ mov r10, r10 pull #\a ++ or r10, r10, r11 push #\b ++ str8w r0, r3, r4, r5, r6, r7, r8, r9, r10, , abort=19f ++ beg 12b ++ ++ ldm.w (r5 - r9), [sp]+ ++ ++14: and.a ip, r2, #28 ++ beq 16f ++ ++15: mov r3, r11 pull #\a ++ ldr1w r1, r11, abort=21f ++ sub.a ip, ip, #4 ++ or r3, r3, r11 push #\b ++ str1w r0, r3, abort=21f ++ bsg 15b ++ ++16: sub r1, r1, #(\b / 8) ++ b 8b ++ ++ .endm ++ ++ ++ forward_copy_shift a=8 b=24 ++ ++17: forward_copy_shift a=16 b=16 ++ ++18: forward_copy_shift a=24 b=8 ++ ++ ++/* ++ * Abort preamble and completion macros. ++ * If a fixup handler is required then those macros must surround it. ++ * It is assumed that the fixup code will handle the private part of ++ * the exit macro. ++ */ ++ ++ .macro copy_abort_preamble ++19: ldm.w (r5 - r9), [sp]+ ++ b 21f ++299: .word 0 @ store lr ++ @ to avoid function call in fixup ++20: ldm.w (r5 - r8), [sp]+ ++21: ++ adr r1, 299b ++ stw lr, [r1] ++ .endm ++ ++ .macro copy_abort_end ++ adr lr, 299b ++ ldw pc, [lr] ++ .endm ++ +diff --git a/arch/unicore32/lib/copy_to_user.S b/arch/unicore32/lib/copy_to_user.S +new file mode 100644 +index 000000000000..6e22151c840d +--- /dev/null ++++ b/arch/unicore32/lib/copy_to_user.S +@@ -0,0 +1,96 @@ ++/* ++ * linux/arch/unicore32/lib/copy_to_user.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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/linkage.h> ++#include <asm/assembler.h> ++ ++/* ++ * Prototype: ++ * ++ * size_t __copy_to_user(void *to, const void *from, size_t n) ++ * ++ * Purpose: ++ * ++ * copy a block to user memory from kernel memory ++ * ++ * Params: ++ * ++ * to = user memory ++ * from = kernel memory ++ * n = number of bytes to copy ++ * ++ * Return value: ++ * ++ * Number of bytes NOT copied. ++ */ ++ ++ .macro ldr1w ptr reg abort ++ ldw.w \reg, [\ptr]+, #4 ++ .endm ++ ++ .macro ldr4w ptr reg1 reg2 reg3 reg4 abort ++ ldm.w (\reg1, \reg2, \reg3, \reg4), [\ptr]+ ++ .endm ++ ++ .macro ldr8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++ ldm.w (\reg1, \reg2, \reg3, \reg4, \reg5, \reg6, \reg7, \reg8), [\ptr]+ ++ .endm ++ ++ .macro ldr1b ptr reg cond=al abort ++ notcond \cond, .+8 ++ ldb.w \reg, [\ptr]+, #1 ++ .endm ++ ++ .macro str1w ptr reg abort ++ strusr \reg, \ptr, 4, abort=\abort ++ .endm ++ ++ .macro str8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort ++100: stm.w (\reg1, \reg2, \reg3, \reg4, \reg5, \reg6, \reg7, \reg8), [\ptr]+ ++ ++ .pushsection __ex_table, "a" ++ .long 100b, \abort ++ .popsection ++ .endm ++ ++ .macro str1b ptr reg cond=al abort ++ strusr \reg, \ptr, 1, \cond, abort=\abort ++ .endm ++ ++ .macro enter ++ mov r3, #0 ++ stm.w (r0, r2, r3), [sp-] ++ .endm ++ ++ .macro exit ++ add sp, sp, #8 ++ ldm.w (r0), [sp]+ ++ mov pc, lr ++ .endm ++ ++ .text ++ ++WEAK(__copy_to_user) ++ ++#include "copy_template.S" ++ ++ENDPROC(__copy_to_user) ++ ++ .pushsection .fixup,"ax" ++ .align 0 ++ copy_abort_preamble ++ ldm.w (r1, r2, r3), [sp]+ ++ sub r0, r0, r1 ++ rsub r0, r0, r2 ++ copy_abort_end ++ .popsection ++ +diff --git a/arch/unicore32/lib/strncpy_from_user.S b/arch/unicore32/lib/strncpy_from_user.S +new file mode 100644 +index 000000000000..ff6c304d5c7e +--- /dev/null ++++ b/arch/unicore32/lib/strncpy_from_user.S +@@ -0,0 +1,45 @@ ++/* ++ * linux/arch/unicore32/lib/strncpy_from_user.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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/linkage.h> ++#include <asm/assembler.h> ++#include <asm/errno.h> ++ ++ .text ++ .align 5 ++ ++/* ++ * Copy a string from user space to kernel space. ++ * r0 = dst, r1 = src, r2 = byte length ++ * returns the number of characters copied (strlen of copied string), ++ * -EFAULT on exception, or "len" if we fill the whole buffer ++ */ ++ENTRY(__strncpy_from_user) ++ mov ip, r1 ++1: sub.a r2, r2, #1 ++ ldrusr r3, r1, 1, ns ++ bfs 2f ++ stb.w r3, [r0]+, #1 ++ cxor.a r3, #0 ++ bne 1b ++ sub r1, r1, #1 @ take NUL character out of count ++2: sub r0, r1, ip ++ mov pc, lr ++ENDPROC(__strncpy_from_user) ++ ++ .pushsection .fixup,"ax" ++ .align 0 ++9001: mov r3, #0 ++ stb r3, [r0+], #0 @ null terminate ++ mov r0, #-EFAULT ++ mov pc, lr ++ .popsection ++ +diff --git a/arch/unicore32/lib/strnlen_user.S b/arch/unicore32/lib/strnlen_user.S +new file mode 100644 +index 000000000000..75863030f21d +--- /dev/null ++++ b/arch/unicore32/lib/strnlen_user.S +@@ -0,0 +1,42 @@ ++/* ++ * linux/arch/unicore32/lib/strnlen_user.S ++ * ++ * Code specific to PKUnity SoC and UniCore ISA ++ * ++ * Copyright (C) 2001-2010 GUAN Xue-tao ++ * ++ * 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/linkage.h> ++#include <asm/assembler.h> ++#include <asm/errno.h> ++ ++ .text ++ .align 5 ++ ++/* Prototype: unsigned long __strnlen_user(const char *str, long n) ++ * Purpose : get length of a string in user memory ++ * Params : str - address of string in user memory ++ * Returns : length of string *including terminator* ++ * or zero on exception, or n + 1 if too long ++ */ ++ENTRY(__strnlen_user) ++ mov r2, r0 ++1: ++ ldrusr r3, r0, 1 ++ cxor.a r3, #0 ++ beq 2f ++ sub.a r1, r1, #1 ++ bne 1b ++ add r0, r0, #1 ++2: sub r0, r0, r2 ++ mov pc, lr ++ENDPROC(__strnlen_user) ++ ++ .pushsection .fixup,"ax" ++ .align 0 ++9001: mov r0, #0 ++ mov pc, lr ++ .popsection
commit 28bab059a23aac6bb129b307410e5b63e132a290
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:22:19 2011 +0800
+
+ unicore32 additional architecture files: low-level lib: ocd debug
+
+ This patch implements low-level debug libraries with On-Chip-Debugger hardware support.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/mach/ocd.h b/arch/unicore32/include/mach/ocd.h
+new file mode 100644
+index 000000000000..189fd71bfa34
+--- /dev/null
++++ b/arch/unicore32/include/mach/ocd.h
+@@ -0,0 +1,36 @@
++/*
++ * linux/arch/unicore32/include/mach/ocd.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __MACH_PUV3_OCD_H__
++#define __MACH_PUV3_OCD_H__
++
++#if defined(CONFIG_DEBUG_OCD)
++static inline void ocd_putc(unsigned int c)
++{
++ int status, i = 0x2000000;
++
++ do {
++ if (--i < 0)
++ return;
++
++ asm volatile ("movc %0, p1.c0, #0" : "=r" (status));
++ } while (status & 2);
++
++ asm("movc p1.c1, %0, #1" : : "r" (c));
++}
++
++#define putc(ch) ocd_putc(ch)
++#else
++#define putc(ch)
++#endif
++
++#endif
+diff --git a/arch/unicore32/kernel/debug-macro.S b/arch/unicore32/kernel/debug-macro.S
+new file mode 100644
+index 000000000000..2711d6d87d8e
+--- /dev/null
++++ b/arch/unicore32/kernel/debug-macro.S
+@@ -0,0 +1,89 @@
++/*
++ * linux/arch/unicore32/kernel/debug-macro.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Debugging macro include header
++ */
++#include <generated/asm-offsets.h>
++#include <mach/hardware.h>
++
++ .macro put_word_ocd, rd, rx=r16
++1001: movc \rx, p1.c0, #0
++ cand.a \rx, #2
++ bne 1001b
++ movc p1.c1, \rd, #1
++ .endm
++
++#ifdef CONFIG_DEBUG_OCD
++ /* debug using UniCore On-Chip-Debugger */
++ .macro addruart, rx
++ .endm
++
++ .macro senduart, rd, rx
++ put_word_ocd \rd, \rx
++ .endm
++
++ .macro busyuart, rd, rx
++ .endm
++
++ .macro waituart, rd, rx
++ .endm
++#else
++#define UART_CLK_DEFAULT 3686400 * 20
++ /* Uartclk = MCLK/ 2, The MCLK on my board is 3686400 * 40 */
++#define BAUD_RATE_DEFAULT 115200
++ /* The baud rate of the serial port */
++
++#define UART_DIVISOR_DEFAULT (UART_CLK_DEFAULT \
++ / (16 * BAUD_RATE_DEFAULT) - 1)
++
++ .macro addruart,rx
++ mrc p0, #0, \rx, c1, c0
++ tst \rx, #1 @ MMU enabled?
++ moveq \rx, #0xee000000 @ physical base address
++ movne \rx, #0x6e000000 @ virtual address
++
++ @ We probe for the active serial port here
++ @ However, now we assume UART0 is active: epip4d
++ @ We assume r1 and r2 can be clobbered.
++
++ movl r2, #UART_DIVISOR_DEFAULT
++ mov r1, #0x80
++ str r1, [\rx, #UART_LCR_OFFSET]
++ and r1, r2, #0xff00
++ mov r1, r1, lsr #8
++ str r1, [\rx, #UART_DLH_OFFSET]
++ and r1, r2, #0xff
++ str r1, [\rx, #UART_DLL_OFFSET]
++ mov r1, #0x7
++ str r1, [\rx, #UART_FCR_OFFSET]
++ mov r1, #0x3
++ str r1, [\rx, #UART_LCR_OFFSET]
++ mov r1, #0x0
++ str r1, [\rx, #UART_IER_OFFSET]
++ .endm
++
++ .macro senduart,rd,rx
++ str \rd, [\rx, #UART_THR_OFFSET]
++ .endm
++
++ .macro waituart,rd,rx
++1001: ldr \rd, [\rx, #UART_LSR_OFFSET]
++ tst \rd, #UART_LSR_THRE
++ beq 1001b
++ .endm
++
++ .macro busyuart,rd,rx
++1001: ldr \rd, [\rx, #UART_LSR_OFFSET]
++ tst \rd, #UART_LSR_TEMT
++ bne 1001b
++ .endm
++#endif
++
+diff --git a/arch/unicore32/kernel/debug.S b/arch/unicore32/kernel/debug.S
+new file mode 100644
+index 000000000000..029fd12f6ab0
+--- /dev/null
++++ b/arch/unicore32/kernel/debug.S
+@@ -0,0 +1,85 @@
++/*
++ * linux/arch/unicore32/kernel/debug.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * 32-bit debugging code
++ */
++#include <linux/linkage.h>
++#include <asm/assembler.h>
++
++ .text
++
++/*
++ * Some debugging routines (useful if you've got MM problems and
++ * printk isn't working). For DEBUGGING ONLY!!! Do not leave
++ * references to these in a production kernel!
++ */
++#include "debug-macro.S"
++
++/*
++ * Useful debugging routines
++ */
++ENTRY(printhex8)
++ mov r1, #8
++ b printhex
++ENDPROC(printhex8)
++
++ENTRY(printhex4)
++ mov r1, #4
++ b printhex
++ENDPROC(printhex4)
++
++ENTRY(printhex2)
++ mov r1, #2
++printhex: adr r2, hexbuf
++ add r3, r2, r1
++ mov r1, #0
++ stb r1, [r3]
++1: and r1, r0, #15
++ mov r0, r0 >> #4
++ csub.a r1, #10
++ beg 2f
++ add r1, r1, #'0' - 'a' + 10
++2: add r1, r1, #'a' - 10
++ stb.w r1, [r3+], #-1
++ cxor.a r3, r2
++ bne 1b
++ mov r0, r2
++ b printascii
++ENDPROC(printhex2)
++
++ .ltorg
++
++ENTRY(printascii)
++ addruart r3
++ b 2f
++1: waituart r2, r3
++ senduart r1, r3
++ busyuart r2, r3
++ cxor.a r1, #'\n'
++ cmoveq r1, #'\r'
++ beq 1b
++2: cxor.a r0, #0
++ beq 3f
++ ldb.w r1, [r0]+, #1
++ cxor.a r1, #0
++ bne 1b
++3: mov pc, lr
++ENDPROC(printascii)
++
++ENTRY(printch)
++ addruart r3
++ mov r1, r0
++ mov r0, #0
++ b 1b
++ENDPROC(printch)
++
++hexbuf: .space 16
++
+diff --git a/arch/unicore32/kernel/early_printk.c b/arch/unicore32/kernel/early_printk.c
+new file mode 100644
+index 000000000000..3922255f1fa8
+--- /dev/null
++++ b/arch/unicore32/kernel/early_printk.c
+@@ -0,0 +1,59 @@
++/*
++ * linux/arch/unicore32/kernel/early_printk.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/console.h>
++#include <linux/init.h>
++#include <linux/string.h>
++#include <mach/ocd.h>
++
++/* On-Chip-Debugger functions */
++
++static void early_ocd_write(struct console *con, const char *s, unsigned n)
++{
++ while (*s && n-- > 0) {
++ if (*s == '\n')
++ ocd_putc((int)'\r');
++ ocd_putc((int)*s);
++ s++;
++ }
++}
++
++static struct console early_ocd_console = {
++ .name = "earlyocd",
++ .write = early_ocd_write,
++ .flags = CON_PRINTBUFFER,
++ .index = -1,
++};
++
++/* Direct interface for emergencies */
++static struct console *early_console = &early_ocd_console;
++
++static int __initdata keep_early;
++
++static int __init setup_early_printk(char *buf)
++{
++ if (!buf)
++ return 0;
++
++ if (strstr(buf, "keep"))
++ keep_early = 1;
++
++ if (!strncmp(buf, "ocd", 3))
++ early_console = &early_ocd_console;
++
++ if (keep_early)
++ early_console->flags &= ~CON_BOOT;
++ else
++ early_console->flags |= CON_BOOT;
++ register_console(early_console);
++ return 0;
++}
++early_param("earlyprintk", setup_early_printk);commit 6dea1ba1c82013c108d235ec32c6d8bd9ff6b48d
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:21:56 2011 +0800
+
+ unicore32 additional architecture files: ptrace handling
+
+ This patch adds ptrace support.
+
+ Changed from previous version:
+ 1. disable arch_has_single_step and remove single-step instruction handler
+ 2. add 'Ross Biro 1/23/92' contributor information
+ 3. clean unused codes
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/ptrace.h b/arch/unicore32/include/asm/ptrace.h
+new file mode 100644
+index 000000000000..b9caf9b0997b
+--- /dev/null
++++ b/arch/unicore32/include/asm/ptrace.h
+@@ -0,0 +1,133 @@
++/*
++ * linux/arch/unicore32/include/asm/ptrace.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PTRACE_H__
++#define __UNICORE_PTRACE_H__
++
++#define PTRACE_GET_THREAD_AREA 22
++
++/*
++ * PSR bits
++ */
++#define USER_MODE 0x00000010
++#define REAL_MODE 0x00000011
++#define INTR_MODE 0x00000012
++#define PRIV_MODE 0x00000013
++#define ABRT_MODE 0x00000017
++#define EXTN_MODE 0x0000001b
++#define SUSR_MODE 0x0000001f
++#define MODE_MASK 0x0000001f
++#define PSR_R_BIT 0x00000040
++#define PSR_I_BIT 0x00000080
++#define PSR_V_BIT 0x10000000
++#define PSR_C_BIT 0x20000000
++#define PSR_Z_BIT 0x40000000
++#define PSR_S_BIT 0x80000000
++
++/*
++ * Groups of PSR bits
++ */
++#define PSR_f 0xff000000 /* Flags */
++#define PSR_c 0x000000ff /* Control */
++
++#ifndef __ASSEMBLY__
++
++/*
++ * This struct defines the way the registers are stored on the
++ * stack during a system call. Note that sizeof(struct pt_regs)
++ * has to be a multiple of 8.
++ */
++struct pt_regs {
++ unsigned long uregs[34];
++};
++
++#define UCreg_asr uregs[32]
++#define UCreg_pc uregs[31]
++#define UCreg_lr uregs[30]
++#define UCreg_sp uregs[29]
++#define UCreg_ip uregs[28]
++#define UCreg_fp uregs[27]
++#define UCreg_26 uregs[26]
++#define UCreg_25 uregs[25]
++#define UCreg_24 uregs[24]
++#define UCreg_23 uregs[23]
++#define UCreg_22 uregs[22]
++#define UCreg_21 uregs[21]
++#define UCreg_20 uregs[20]
++#define UCreg_19 uregs[19]
++#define UCreg_18 uregs[18]
++#define UCreg_17 uregs[17]
++#define UCreg_16 uregs[16]
++#define UCreg_15 uregs[15]
++#define UCreg_14 uregs[14]
++#define UCreg_13 uregs[13]
++#define UCreg_12 uregs[12]
++#define UCreg_11 uregs[11]
++#define UCreg_10 uregs[10]
++#define UCreg_09 uregs[9]
++#define UCreg_08 uregs[8]
++#define UCreg_07 uregs[7]
++#define UCreg_06 uregs[6]
++#define UCreg_05 uregs[5]
++#define UCreg_04 uregs[4]
++#define UCreg_03 uregs[3]
++#define UCreg_02 uregs[2]
++#define UCreg_01 uregs[1]
++#define UCreg_00 uregs[0]
++#define UCreg_ORIG_00 uregs[33]
++
++#ifdef __KERNEL__
++
++#define user_mode(regs) \
++ (processor_mode(regs) == USER_MODE)
++
++#define processor_mode(regs) \
++ ((regs)->UCreg_asr & MODE_MASK)
++
++#define interrupts_enabled(regs) \
++ (!((regs)->UCreg_asr & PSR_I_BIT))
++
++#define fast_interrupts_enabled(regs) \
++ (!((regs)->UCreg_asr & PSR_R_BIT))
++
++/* Are the current registers suitable for user mode?
++ * (used to maintain security in signal handlers)
++ */
++static inline int valid_user_regs(struct pt_regs *regs)
++{
++ unsigned long mode = regs->UCreg_asr & MODE_MASK;
++
++ /*
++ * Always clear the R (REAL) bits
++ */
++ regs->UCreg_asr &= ~(PSR_R_BIT);
++
++ if ((regs->UCreg_asr & PSR_I_BIT) == 0) {
++ if (mode == USER_MODE)
++ return 1;
++ }
++
++ /*
++ * Force ASR to something logical...
++ */
++ regs->UCreg_asr &= PSR_f | USER_MODE;
++
++ return 0;
++}
++
++#define instruction_pointer(regs) ((regs)->UCreg_pc)
++
++#endif /* __KERNEL__ */
++
++#endif /* __ASSEMBLY__ */
++
++#endif
++
+diff --git a/arch/unicore32/kernel/ptrace.c b/arch/unicore32/kernel/ptrace.c
+new file mode 100644
+index 000000000000..9f07c08da050
+--- /dev/null
++++ b/arch/unicore32/kernel/ptrace.c
+@@ -0,0 +1,149 @@
++/*
++ * linux/arch/unicore32/kernel/ptrace.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * By Ross Biro 1/23/92
++ *
++ * 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/ptrace.h>
++#include <linux/signal.h>
++#include <linux/uaccess.h>
++
++/*
++ * this routine will get a word off of the processes privileged stack.
++ * the offset is how far from the base addr as stored in the THREAD.
++ * this routine assumes that all the privileged stacks are in our
++ * data space.
++ */
++static inline long get_user_reg(struct task_struct *task, int offset)
++{
++ return task_pt_regs(task)->uregs[offset];
++}
++
++/*
++ * this routine will put a word on the processes privileged stack.
++ * the offset is how far from the base addr as stored in the THREAD.
++ * this routine assumes that all the privileged stacks are in our
++ * data space.
++ */
++static inline int
++put_user_reg(struct task_struct *task, int offset, long data)
++{
++ struct pt_regs newregs, *regs = task_pt_regs(task);
++ int ret = -EINVAL;
++
++ newregs = *regs;
++ newregs.uregs[offset] = data;
++
++ if (valid_user_regs(&newregs)) {
++ regs->uregs[offset] = data;
++ ret = 0;
++ }
++
++ return ret;
++}
++
++/*
++ * Called by kernel/ptrace.c when detaching..
++ */
++void ptrace_disable(struct task_struct *child)
++{
++}
++
++/*
++ * We actually access the pt_regs stored on the kernel stack.
++ */
++static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
++ unsigned long __user *ret)
++{
++ unsigned long tmp;
++
++ tmp = 0;
++ if (off < sizeof(struct pt_regs))
++ tmp = get_user_reg(tsk, off >> 2);
++
++ return put_user(tmp, ret);
++}
++
++/*
++ * We actually access the pt_regs stored on the kernel stack.
++ */
++static int ptrace_write_user(struct task_struct *tsk, unsigned long off,
++ unsigned long val)
++{
++ if (off >= sizeof(struct pt_regs))
++ return 0;
++
++ return put_user_reg(tsk, off >> 2, val);
++}
++
++long arch_ptrace(struct task_struct *child, long request,
++ unsigned long addr, unsigned long data)
++{
++ int ret;
++ unsigned long __user *datap = (unsigned long __user *) data;
++
++ switch (request) {
++ case PTRACE_PEEKUSR:
++ ret = ptrace_read_user(child, addr, datap);
++ break;
++
++ case PTRACE_POKEUSR:
++ ret = ptrace_write_user(child, addr, data);
++ break;
++
++ case PTRACE_GET_THREAD_AREA:
++ ret = put_user(task_pt_regs(child)->UCreg_16,
++ datap);
++ break;
++
++ default:
++ ret = ptrace_request(child, request, addr, data);
++ break;
++ }
++
++ return ret;
++}
++
++asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
++{
++ unsigned long ip;
++
++ if (!test_thread_flag(TIF_SYSCALL_TRACE))
++ return scno;
++ if (!(current->ptrace & PT_PTRACED))
++ return scno;
++
++ /*
++ * Save IP. IP is used to denote syscall entry/exit:
++ * IP = 0 -> entry, = 1 -> exit
++ */
++ ip = regs->UCreg_ip;
++ regs->UCreg_ip = why;
++
++ current_thread_info()->syscall = scno;
++
++ /* the 0x80 provides a way for the tracing parent to distinguish
++ between a syscall stop and SIGTRAP delivery */
++ ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
++ ? 0x80 : 0));
++ /*
++ * this isn't the same as continuing with a signal, but it will do
++ * for normal use. strace only continues with a signal if the
++ * stopping signal is not SIGTRAP. -brl
++ */
++ if (current->exit_code) {
++ send_sig(current->exit_code, current, 1);
++ current->exit_code = 0;
++ }
++ regs->UCreg_ip = ip;
++
++ return current_thread_info()->syscall;
++}commit d9bc15794d122cb7bdc9a069d22f3d3166dd31d4
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:21:31 2011 +0800
+
+ unicore32 additional architecture files: float point handling
+
+ This patch implements support for float point unit, which using UniCore-F64 FPU hardware
+ in UniCore32 ISA.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/fpstate.h b/arch/unicore32/include/asm/fpstate.h
+new file mode 100644
+index 000000000000..ba97fac6220d
+--- /dev/null
++++ b/arch/unicore32/include/asm/fpstate.h
+@@ -0,0 +1,26 @@
++/*
++ * linux/arch/unicore32/include/asm/fpstate.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_FPSTATE_H__
++#define __UNICORE_FPSTATE_H__
++
++#ifndef __ASSEMBLY__
++
++#define FP_REGS_NUMBER 33
++
++struct fp_state {
++ unsigned int regs[FP_REGS_NUMBER];
++} __attribute__((aligned(8)));
++
++#endif
++
++#endif
+diff --git a/arch/unicore32/include/asm/fpu-ucf64.h b/arch/unicore32/include/asm/fpu-ucf64.h
+new file mode 100644
+index 000000000000..16c1457882ee
+--- /dev/null
++++ b/arch/unicore32/include/asm/fpu-ucf64.h
+@@ -0,0 +1,53 @@
++/*
++ * linux/arch/unicore32/include/asm/fpu-ucf64.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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.
++ */
++#define FPSCR s31
++
++/* FPSCR bits */
++#define FPSCR_DEFAULT_NAN (1<<25)
++
++#define FPSCR_CMPINSTR_BIT (1<<31)
++
++#define FPSCR_CON (1<<29)
++#define FPSCR_TRAP (1<<27)
++
++/* RND mode */
++#define FPSCR_ROUND_NEAREST (0<<0)
++#define FPSCR_ROUND_PLUSINF (2<<0)
++#define FPSCR_ROUND_MINUSINF (3<<0)
++#define FPSCR_ROUND_TOZERO (1<<0)
++#define FPSCR_RMODE_BIT (0)
++#define FPSCR_RMODE_MASK (7 << FPSCR_RMODE_BIT)
++
++/* trap enable */
++#define FPSCR_IOE (1<<16)
++#define FPSCR_OFE (1<<14)
++#define FPSCR_UFE (1<<13)
++#define FPSCR_IXE (1<<12)
++#define FPSCR_HIE (1<<11)
++#define FPSCR_NDE (1<<10) /* non denomal */
++
++/* flags */
++#define FPSCR_IDC (1<<24)
++#define FPSCR_HIC (1<<23)
++#define FPSCR_IXC (1<<22)
++#define FPSCR_OFC (1<<21)
++#define FPSCR_UFC (1<<20)
++#define FPSCR_IOC (1<<19)
++
++/* stick bits */
++#define FPSCR_IOS (1<<9)
++#define FPSCR_OFS (1<<7)
++#define FPSCR_UFS (1<<6)
++#define FPSCR_IXS (1<<5)
++#define FPSCR_HIS (1<<4)
++#define FPSCR_NDS (1<<3) /*non denomal */
+diff --git a/arch/unicore32/kernel/fpu-ucf64.c b/arch/unicore32/kernel/fpu-ucf64.c
+new file mode 100644
+index 000000000000..282a60ac82ba
+--- /dev/null
++++ b/arch/unicore32/kernel/fpu-ucf64.c
+@@ -0,0 +1,126 @@
++/*
++ * linux/arch/unicore32/kernel/fpu-ucf64.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/signal.h>
++#include <linux/sched.h>
++#include <linux/init.h>
++
++#include <asm/fpu-ucf64.h>
++
++/*
++ * A special flag to tell the normalisation code not to normalise.
++ */
++#define F64_NAN_FLAG 0x100
++
++/*
++ * A bit pattern used to indicate the initial (unset) value of the
++ * exception mask, in case nothing handles an instruction. This
++ * doesn't include the NAN flag, which get masked out before
++ * we check for an error.
++ */
++#define F64_EXCEPTION_ERROR ((u32)-1 & ~F64_NAN_FLAG)
++
++/*
++ * Since we aren't building with -mfpu=f64, we need to code
++ * these instructions using their MRC/MCR equivalents.
++ */
++#define f64reg(_f64_) #_f64_
++
++#define cff(_f64_) ({ \
++ u32 __v; \
++ asm("cff %0, " f64reg(_f64_) "@ fmrx %0, " #_f64_ \
++ : "=r" (__v) : : "cc"); \
++ __v; \
++ })
++
++#define ctf(_f64_, _var_) \
++ asm("ctf %0, " f64reg(_f64_) "@ fmxr " #_f64_ ", %0" \
++ : : "r" (_var_) : "cc")
++
++/*
++ * Raise a SIGFPE for the current process.
++ * sicode describes the signal being raised.
++ */
++void ucf64_raise_sigfpe(unsigned int sicode, struct pt_regs *regs)
++{
++ siginfo_t info;
++
++ memset(&info, 0, sizeof(info));
++
++ info.si_signo = SIGFPE;
++ info.si_code = sicode;
++ info.si_addr = (void __user *)(instruction_pointer(regs) - 4);
++
++ /*
++ * This is the same as NWFPE, because it's not clear what
++ * this is used for
++ */
++ current->thread.error_code = 0;
++ current->thread.trap_no = 6;
++
++ send_sig_info(SIGFPE, &info, current);
++}
++
++/*
++ * Handle exceptions of UniCore-F64.
++ */
++void ucf64_exchandler(u32 inst, u32 fpexc, struct pt_regs *regs)
++{
++ u32 tmp = fpexc;
++ u32 exc = F64_EXCEPTION_ERROR & fpexc;
++
++ pr_debug("UniCore-F64: instruction %08x fpscr %08x\n",
++ inst, fpexc);
++
++ if (exc & FPSCR_CMPINSTR_BIT) {
++ if (exc & FPSCR_CON)
++ tmp |= FPSCR_CON;
++ else
++ tmp &= ~(FPSCR_CON);
++ exc &= ~(FPSCR_CMPINSTR_BIT | FPSCR_CON);
++ } else {
++ pr_debug(KERN_ERR "UniCore-F64 Error: unhandled exceptions\n");
++ pr_debug(KERN_ERR "UniCore-F64 FPSCR 0x%08x INST 0x%08x\n",
++ cff(FPSCR), inst);
++
++ ucf64_raise_sigfpe(0, regs);
++ return;
++ }
++
++ /*
++ * Update the FPSCR with the additional exception flags.
++ * Comparison instructions always return at least one of
++ * these flags set.
++ */
++ tmp &= ~(FPSCR_TRAP | FPSCR_IOS | FPSCR_OFS | FPSCR_UFS |
++ FPSCR_IXS | FPSCR_HIS | FPSCR_IOC | FPSCR_OFC |
++ FPSCR_UFC | FPSCR_IXC | FPSCR_HIC);
++
++ tmp |= exc;
++ ctf(FPSCR, tmp);
++}
++
++/*
++ * F64 support code initialisation.
++ */
++static int __init ucf64_init(void)
++{
++ ctf(FPSCR, 0x0); /* FPSCR_UFE | FPSCR_NDE perhaps better */
++
++ printk(KERN_INFO "Enable UniCore-F64 support.\n");
++
++ return 0;
++}
++
++late_initcall(ucf64_init);commit 64909882862e9bb88aa6177e3f92056f5601b3e3
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 20:23:59 2011 +0800
+
+ unicore32 additional architecture files: pm related files
+
+ This patch adds pm related files, including hibernate and sleep supports.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Acked-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/suspend.h b/arch/unicore32/include/asm/suspend.h
+new file mode 100644
+index 000000000000..88a9c0f32b21
+--- /dev/null
++++ b/arch/unicore32/include/asm/suspend.h
+@@ -0,0 +1,30 @@
++/*
++ * linux/arch/unicore32/include/asm/suspend.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_SUSPEND_H__
++#define __UNICORE_SUSPEND_H__
++
++#ifndef __ASSEMBLY__
++static inline int arch_prepare_suspend(void) { return 0; }
++
++#include <asm/ptrace.h>
++
++struct swsusp_arch_regs {
++ struct cpu_context_save cpu_context; /* cpu context */
++#ifdef CONFIG_UNICORE_FPU_F64
++ struct fp_state fpstate __attribute__((aligned(8)));
++#endif
++};
++#endif
++
++#endif /* __UNICORE_SUSPEND_H__ */
++
+diff --git a/arch/unicore32/include/mach/pm.h b/arch/unicore32/include/mach/pm.h
+new file mode 100644
+index 000000000000..4dcd34ae194c
+--- /dev/null
++++ b/arch/unicore32/include/mach/pm.h
+@@ -0,0 +1,43 @@
++/*
++ * linux/arch/unicore/include/mach/pm.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __PUV3_PM_H__
++#define __PUV3_PM_H__
++
++#include <linux/suspend.h>
++
++struct puv3_cpu_pm_fns {
++ int save_count;
++ void (*save)(unsigned long *);
++ void (*restore)(unsigned long *);
++ int (*valid)(suspend_state_t state);
++ void (*enter)(suspend_state_t state);
++ int (*prepare)(void);
++ void (*finish)(void);
++};
++
++extern struct puv3_cpu_pm_fns *puv3_cpu_pm_fns;
++
++/* sleep.S */
++extern void puv3_cpu_suspend(unsigned int);
++
++extern void puv3_cpu_resume(void);
++
++extern int puv3_pm_enter(suspend_state_t state);
++
++/* Defined in hibernate_asm.S */
++extern int restore_image(pgd_t *resume_pg_dir, struct pbe *restore_pblist);
++
++/* References to section boundaries */
++extern const void __nosave_begin, __nosave_end;
++
++extern struct pbe *restore_pblist;
++#endif
+diff --git a/arch/unicore32/kernel/clock.c b/arch/unicore32/kernel/clock.c
+new file mode 100644
+index 000000000000..80323db581fd
+--- /dev/null
++++ b/arch/unicore32/kernel/clock.c
+@@ -0,0 +1,388 @@
++/*
++ * linux/arch/unicore32/kernel/clock.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/device.h>
++#include <linux/list.h>
++#include <linux/errno.h>
++#include <linux/err.h>
++#include <linux/string.h>
++#include <linux/clk.h>
++#include <linux/mutex.h>
++#include <linux/delay.h>
++
++#include <mach/hardware.h>
++
++/*
++ * Very simple clock implementation
++ */
++struct clk {
++ struct list_head node;
++ unsigned long rate;
++ const char *name;
++};
++
++static struct clk clk_ost_clk = {
++ .name = "OST_CLK",
++ .rate = CLOCK_TICK_RATE,
++};
++
++static struct clk clk_mclk_clk = {
++ .name = "MAIN_CLK",
++};
++
++static struct clk clk_bclk32_clk = {
++ .name = "BUS32_CLK",
++};
++
++static struct clk clk_ddr_clk = {
++ .name = "DDR_CLK",
++};
++
++static struct clk clk_vga_clk = {
++ .name = "VGA_CLK",
++};
++
++static LIST_HEAD(clocks);
++static DEFINE_MUTEX(clocks_mutex);
++
++struct clk *clk_get(struct device *dev, const char *id)
++{
++ struct clk *p, *clk = ERR_PTR(-ENOENT);
++
++ mutex_lock(&clocks_mutex);
++ list_for_each_entry(p, &clocks, node) {
++ if (strcmp(id, p->name) == 0) {
++ clk = p;
++ break;
++ }
++ }
++ mutex_unlock(&clocks_mutex);
++
++ return clk;
++}
++EXPORT_SYMBOL(clk_get);
++
++void clk_put(struct clk *clk)
++{
++}
++EXPORT_SYMBOL(clk_put);
++
++int clk_enable(struct clk *clk)
++{
++ return 0;
++}
++EXPORT_SYMBOL(clk_enable);
++
++void clk_disable(struct clk *clk)
++{
++}
++EXPORT_SYMBOL(clk_disable);
++
++unsigned long clk_get_rate(struct clk *clk)
++{
++ return clk->rate;
++}
++EXPORT_SYMBOL(clk_get_rate);
++
++struct {
++ unsigned long rate;
++ unsigned long cfg;
++ unsigned long div;
++} vga_clk_table[] = {
++ {.rate = 25175000, .cfg = 0x00002001, .div = 0x9},
++ {.rate = 31500000, .cfg = 0x00002001, .div = 0x7},
++ {.rate = 40000000, .cfg = 0x00003801, .div = 0x9},
++ {.rate = 49500000, .cfg = 0x00003801, .div = 0x7},
++ {.rate = 65000000, .cfg = 0x00002c01, .div = 0x4},
++ {.rate = 78750000, .cfg = 0x00002400, .div = 0x7},
++ {.rate = 108000000, .cfg = 0x00002c01, .div = 0x2},
++ {.rate = 106500000, .cfg = 0x00003c01, .div = 0x3},
++ {.rate = 50650000, .cfg = 0x00106400, .div = 0x9},
++ {.rate = 61500000, .cfg = 0x00106400, .div = 0xa},
++ {.rate = 85500000, .cfg = 0x00002800, .div = 0x6},
++};
++
++struct {
++ unsigned long mrate;
++ unsigned long prate;
++} mclk_clk_table[] = {
++ {.mrate = 500000000, .prate = 0x00109801},
++ {.mrate = 525000000, .prate = 0x00104C00},
++ {.mrate = 550000000, .prate = 0x00105000},
++ {.mrate = 575000000, .prate = 0x00105400},
++ {.mrate = 600000000, .prate = 0x00105800},
++ {.mrate = 625000000, .prate = 0x00105C00},
++ {.mrate = 650000000, .prate = 0x00106000},
++ {.mrate = 675000000, .prate = 0x00106400},
++ {.mrate = 700000000, .prate = 0x00106800},
++ {.mrate = 725000000, .prate = 0x00106C00},
++ {.mrate = 750000000, .prate = 0x00107000},
++ {.mrate = 775000000, .prate = 0x00107400},
++ {.mrate = 800000000, .prate = 0x00107800},
++};
++
++int clk_set_rate(struct clk *clk, unsigned long rate)
++{
++ if (clk == &clk_vga_clk) {
++ unsigned long pll_vgacfg, pll_vgadiv;
++ int ret, i;
++
++ /* lookup vga_clk_table */
++ ret = -EINVAL;
++ for (i = 0; i < ARRAY_SIZE(vga_clk_table); i++) {
++ if (rate == vga_clk_table[i].rate) {
++ pll_vgacfg = vga_clk_table[i].cfg;
++ pll_vgadiv = vga_clk_table[i].div;
++ ret = 0;
++ break;
++ }
++ }
++
++ if (ret)
++ return ret;
++
++ if (PM_PLLVGACFG == pll_vgacfg)
++ return 0;
++
++ /* set pll vga cfg reg. */
++ PM_PLLVGACFG = pll_vgacfg;
++
++ PM_PMCR = PM_PMCR_CFBVGA;
++ while ((PM_PLLDFCDONE & PM_PLLDFCDONE_VGADFC)
++ != PM_PLLDFCDONE_VGADFC)
++ udelay(100); /* about 1ms */
++
++ /* set div cfg reg. */
++ PM_PCGR |= PM_PCGR_VGACLK;
++
++ PM_DIVCFG = (PM_DIVCFG & ~PM_DIVCFG_VGACLK_MASK)
++ | PM_DIVCFG_VGACLK(pll_vgadiv);
++
++ PM_SWRESET |= PM_SWRESET_VGADIV;
++ while ((PM_SWRESET & PM_SWRESET_VGADIV) == PM_SWRESET_VGADIV)
++ udelay(100); /* 65536 bclk32, about 320us */
++
++ PM_PCGR &= ~PM_PCGR_VGACLK;
++ }
++#ifdef CONFIG_CPU_FREQ
++ if (clk == &clk_mclk_clk) {
++ u32 pll_rate, divstatus = PM_DIVSTATUS;
++ int ret, i;
++
++ /* lookup mclk_clk_table */
++ ret = -EINVAL;
++ for (i = 0; i < ARRAY_SIZE(mclk_clk_table); i++) {
++ if (rate == mclk_clk_table[i].mrate) {
++ pll_rate = mclk_clk_table[i].prate;
++ clk_mclk_clk.rate = mclk_clk_table[i].mrate;
++ ret = 0;
++ break;
++ }
++ }
++
++ if (ret)
++ return ret;
++
++ if (clk_mclk_clk.rate)
++ clk_bclk32_clk.rate = clk_mclk_clk.rate
++ / (((divstatus & 0x0000f000) >> 12) + 1);
++
++ /* set pll sys cfg reg. */
++ PM_PLLSYSCFG = pll_rate;
++
++ PM_PMCR = PM_PMCR_CFBSYS;
++ while ((PM_PLLDFCDONE & PM_PLLDFCDONE_SYSDFC)
++ != PM_PLLDFCDONE_SYSDFC)
++ udelay(100);
++ /* about 1ms */
++ }
++#endif
++ return 0;
++}
++EXPORT_SYMBOL(clk_set_rate);
++
++int clk_register(struct clk *clk)
++{
++ mutex_lock(&clocks_mutex);
++ list_add(&clk->node, &clocks);
++ mutex_unlock(&clocks_mutex);
++ printk(KERN_DEFAULT "PKUnity PM: %s %lu.%02luM\n", clk->name,
++ (clk->rate)/1000000, (clk->rate)/10000 % 100);
++ return 0;
++}
++EXPORT_SYMBOL(clk_register);
++
++void clk_unregister(struct clk *clk)
++{
++ mutex_lock(&clocks_mutex);
++ list_del(&clk->node);
++ mutex_unlock(&clocks_mutex);
++}
++EXPORT_SYMBOL(clk_unregister);
++
++struct {
++ unsigned long prate;
++ unsigned long rate;
++} pllrate_table[] = {
++ {.prate = 0x00002001, .rate = 250000000},
++ {.prate = 0x00104801, .rate = 250000000},
++ {.prate = 0x00104C01, .rate = 262500000},
++ {.prate = 0x00002401, .rate = 275000000},
++ {.prate = 0x00105001, .rate = 275000000},
++ {.prate = 0x00105401, .rate = 287500000},
++ {.prate = 0x00002801, .rate = 300000000},
++ {.prate = 0x00105801, .rate = 300000000},
++ {.prate = 0x00105C01, .rate = 312500000},
++ {.prate = 0x00002C01, .rate = 325000000},
++ {.prate = 0x00106001, .rate = 325000000},
++ {.prate = 0x00106401, .rate = 337500000},
++ {.prate = 0x00003001, .rate = 350000000},
++ {.prate = 0x00106801, .rate = 350000000},
++ {.prate = 0x00106C01, .rate = 362500000},
++ {.prate = 0x00003401, .rate = 375000000},
++ {.prate = 0x00107001, .rate = 375000000},
++ {.prate = 0x00107401, .rate = 387500000},
++ {.prate = 0x00003801, .rate = 400000000},
++ {.prate = 0x00107801, .rate = 400000000},
++ {.prate = 0x00107C01, .rate = 412500000},
++ {.prate = 0x00003C01, .rate = 425000000},
++ {.prate = 0x00108001, .rate = 425000000},
++ {.prate = 0x00108401, .rate = 437500000},
++ {.prate = 0x00004001, .rate = 450000000},
++ {.prate = 0x00108801, .rate = 450000000},
++ {.prate = 0x00108C01, .rate = 462500000},
++ {.prate = 0x00004401, .rate = 475000000},
++ {.prate = 0x00109001, .rate = 475000000},
++ {.prate = 0x00109401, .rate = 487500000},
++ {.prate = 0x00004801, .rate = 500000000},
++ {.prate = 0x00109801, .rate = 500000000},
++ {.prate = 0x00104C00, .rate = 525000000},
++ {.prate = 0x00002400, .rate = 550000000},
++ {.prate = 0x00105000, .rate = 550000000},
++ {.prate = 0x00105400, .rate = 575000000},
++ {.prate = 0x00002800, .rate = 600000000},
++ {.prate = 0x00105800, .rate = 600000000},
++ {.prate = 0x00105C00, .rate = 625000000},
++ {.prate = 0x00002C00, .rate = 650000000},
++ {.prate = 0x00106000, .rate = 650000000},
++ {.prate = 0x00106400, .rate = 675000000},
++ {.prate = 0x00003000, .rate = 700000000},
++ {.prate = 0x00106800, .rate = 700000000},
++ {.prate = 0x00106C00, .rate = 725000000},
++ {.prate = 0x00003400, .rate = 750000000},
++ {.prate = 0x00107000, .rate = 750000000},
++ {.prate = 0x00107400, .rate = 775000000},
++ {.prate = 0x00003800, .rate = 800000000},
++ {.prate = 0x00107800, .rate = 800000000},
++ {.prate = 0x00107C00, .rate = 825000000},
++ {.prate = 0x00003C00, .rate = 850000000},
++ {.prate = 0x00108000, .rate = 850000000},
++ {.prate = 0x00108400, .rate = 875000000},
++ {.prate = 0x00004000, .rate = 900000000},
++ {.prate = 0x00108800, .rate = 900000000},
++ {.prate = 0x00108C00, .rate = 925000000},
++ {.prate = 0x00004400, .rate = 950000000},
++ {.prate = 0x00109000, .rate = 950000000},
++ {.prate = 0x00109400, .rate = 975000000},
++ {.prate = 0x00004800, .rate = 1000000000},
++ {.prate = 0x00109800, .rate = 1000000000},
++};
++
++struct {
++ unsigned long prate;
++ unsigned long drate;
++} pddr_table[] = {
++ {.prate = 0x00100800, .drate = 44236800},
++ {.prate = 0x00100C00, .drate = 66355200},
++ {.prate = 0x00101000, .drate = 88473600},
++ {.prate = 0x00101400, .drate = 110592000},
++ {.prate = 0x00101800, .drate = 132710400},
++ {.prate = 0x00101C01, .drate = 154828800},
++ {.prate = 0x00102001, .drate = 176947200},
++ {.prate = 0x00102401, .drate = 199065600},
++ {.prate = 0x00102801, .drate = 221184000},
++ {.prate = 0x00102C01, .drate = 243302400},
++ {.prate = 0x00103001, .drate = 265420800},
++ {.prate = 0x00103401, .drate = 287539200},
++ {.prate = 0x00103801, .drate = 309657600},
++ {.prate = 0x00103C01, .drate = 331776000},
++ {.prate = 0x00104001, .drate = 353894400},
++};
++
++static int __init clk_init(void)
++{
++#ifdef CONFIG_PUV3_PM
++ u32 pllrate, divstatus = PM_DIVSTATUS;
++ u32 pcgr_val = PM_PCGR;
++ int i;
++
++ pcgr_val |= PM_PCGR_BCLKMME | PM_PCGR_BCLKH264E | PM_PCGR_BCLKH264D
++ | PM_PCGR_HECLK | PM_PCGR_HDCLK;
++ PM_PCGR = pcgr_val;
++
++ pllrate = PM_PLLSYSSTATUS;
++
++ /* lookup pmclk_table */
++ clk_mclk_clk.rate = 0;
++ for (i = 0; i < ARRAY_SIZE(pllrate_table); i++) {
++ if (pllrate == pllrate_table[i].prate) {
++ clk_mclk_clk.rate = pllrate_table[i].rate;
++ break;
++ }
++ }
++
++ if (clk_mclk_clk.rate)
++ clk_bclk32_clk.rate = clk_mclk_clk.rate /
++ (((divstatus & 0x0000f000) >> 12) + 1);
++
++ pllrate = PM_PLLDDRSTATUS;
++
++ /* lookup pddr_table */
++ clk_ddr_clk.rate = 0;
++ for (i = 0; i < ARRAY_SIZE(pddr_table); i++) {
++ if (pllrate == pddr_table[i].prate) {
++ clk_ddr_clk.rate = pddr_table[i].drate;
++ break;
++ }
++ }
++
++ pllrate = PM_PLLVGASTATUS;
++
++ /* lookup pvga_table */
++ clk_vga_clk.rate = 0;
++ for (i = 0; i < ARRAY_SIZE(pllrate_table); i++) {
++ if (pllrate == pllrate_table[i].prate) {
++ clk_vga_clk.rate = pllrate_table[i].rate;
++ break;
++ }
++ }
++
++ if (clk_vga_clk.rate)
++ clk_vga_clk.rate = clk_vga_clk.rate /
++ (((divstatus & 0x00f00000) >> 20) + 1);
++
++ clk_register(&clk_vga_clk);
++#endif
++#ifdef CONFIG_ARCH_FPGA
++ clk_ddr_clk.rate = 33000000;
++ clk_mclk_clk.rate = 33000000;
++ clk_bclk32_clk.rate = 33000000;
++#endif
++ clk_register(&clk_ddr_clk);
++ clk_register(&clk_mclk_clk);
++ clk_register(&clk_bclk32_clk);
++ clk_register(&clk_ost_clk);
++ return 0;
++}
++core_initcall(clk_init);
+diff --git a/arch/unicore32/kernel/cpu-ucv2.c b/arch/unicore32/kernel/cpu-ucv2.c
+new file mode 100644
+index 000000000000..4a99f62584c7
+--- /dev/null
++++ b/arch/unicore32/kernel/cpu-ucv2.c
+@@ -0,0 +1,93 @@
++/*
++ * linux/arch/unicore32/kernel/cpu-ucv2.c: clock scaling for the UniCore-II
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/types.h>
++#include <linux/init.h>
++#include <linux/clk.h>
++#include <linux/cpufreq.h>
++
++#include <mach/hardware.h>
++
++static struct cpufreq_driver ucv2_driver;
++
++/* make sure that only the "userspace" governor is run
++ * -- anything else wouldn't make sense on this platform, anyway.
++ */
++int ucv2_verify_speed(struct cpufreq_policy *policy)
++{
++ if (policy->cpu)
++ return -EINVAL;
++
++ cpufreq_verify_within_limits(policy,
++ policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
++
++ return 0;
++}
++
++static unsigned int ucv2_getspeed(unsigned int cpu)
++{
++ struct clk *mclk = clk_get(NULL, "MAIN_CLK");
++
++ if (cpu)
++ return 0;
++ return clk_get_rate(mclk)/1000;
++}
++
++static int ucv2_target(struct cpufreq_policy *policy,
++ unsigned int target_freq,
++ unsigned int relation)
++{
++ unsigned int cur = ucv2_getspeed(0);
++ struct cpufreq_freqs freqs;
++ struct clk *mclk = clk_get(NULL, "MAIN_CLK");
++
++ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
++
++ if (!clk_set_rate(mclk, target_freq * 1000)) {
++ freqs.old = cur;
++ freqs.new = target_freq;
++ freqs.cpu = 0;
++ }
++
++ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
++
++ return 0;
++}
++
++static int __init ucv2_cpu_init(struct cpufreq_policy *policy)
++{
++ if (policy->cpu != 0)
++ return -EINVAL;
++ policy->cur = ucv2_getspeed(0);
++ policy->min = policy->cpuinfo.min_freq = 250000;
++ policy->max = policy->cpuinfo.max_freq = 1000000;
++ policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
++ return 0;
++}
++
++static struct cpufreq_driver ucv2_driver = {
++ .flags = CPUFREQ_STICKY,
++ .verify = ucv2_verify_speed,
++ .target = ucv2_target,
++ .get = ucv2_getspeed,
++ .init = ucv2_cpu_init,
++ .name = "UniCore-II",
++};
++
++static int __init ucv2_cpufreq_init(void)
++{
++ return cpufreq_register_driver(&ucv2_driver);
++}
++
++arch_initcall(ucv2_cpufreq_init);
+diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c
+new file mode 100644
+index 000000000000..7d0f0b7983a0
+--- /dev/null
++++ b/arch/unicore32/kernel/hibernate.c
+@@ -0,0 +1,160 @@
++/*
++ * linux/arch/unicore32/kernel/hibernate.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/gfp.h>
++#include <linux/suspend.h>
++#include <linux/bootmem.h>
++
++#include <asm/system.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++#include <asm/pgalloc.h>
++#include <asm/suspend.h>
++
++#include "mach/pm.h"
++
++/* Pointer to the temporary resume page tables */
++pgd_t *resume_pg_dir;
++
++struct swsusp_arch_regs swsusp_arch_regs_cpu0;
++
++/*
++ * Create a middle page table on a resume-safe page and put a pointer to it in
++ * the given global directory entry. This only returns the gd entry
++ * in non-PAE compilation mode, since the middle layer is folded.
++ */
++static pmd_t *resume_one_md_table_init(pgd_t *pgd)
++{
++ pud_t *pud;
++ pmd_t *pmd_table;
++
++ pud = pud_offset(pgd, 0);
++ pmd_table = pmd_offset(pud, 0);
++
++ return pmd_table;
++}
++
++/*
++ * Create a page table on a resume-safe page and place a pointer to it in
++ * a middle page directory entry.
++ */
++static pte_t *resume_one_page_table_init(pmd_t *pmd)
++{
++ if (pmd_none(*pmd)) {
++ pte_t *page_table = (pte_t *)get_safe_page(GFP_ATOMIC);
++ if (!page_table)
++ return NULL;
++
++ set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_KERNEL_TABLE));
++
++ BUG_ON(page_table != pte_offset_kernel(pmd, 0));
++
++ return page_table;
++ }
++
++ return pte_offset_kernel(pmd, 0);
++}
++
++/*
++ * This maps the physical memory to kernel virtual address space, a total
++ * of max_low_pfn pages, by creating page tables starting from address
++ * PAGE_OFFSET. The page tables are allocated out of resume-safe pages.
++ */
++static int resume_physical_mapping_init(pgd_t *pgd_base)
++{
++ unsigned long pfn;
++ pgd_t *pgd;
++ pmd_t *pmd;
++ pte_t *pte;
++ int pgd_idx, pmd_idx;
++
++ pgd_idx = pgd_index(PAGE_OFFSET);
++ pgd = pgd_base + pgd_idx;
++ pfn = 0;
++
++ for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
++ pmd = resume_one_md_table_init(pgd);
++ if (!pmd)
++ return -ENOMEM;
++
++ if (pfn >= max_low_pfn)
++ continue;
++
++ for (pmd_idx = 0; pmd_idx < PTRS_PER_PMD; pmd++, pmd_idx++) {
++ pte_t *max_pte;
++
++ if (pfn >= max_low_pfn)
++ break;
++
++ /* Map with normal page tables.
++ * NOTE: We can mark everything as executable here
++ */
++ pte = resume_one_page_table_init(pmd);
++ if (!pte)
++ return -ENOMEM;
++
++ max_pte = pte + PTRS_PER_PTE;
++ for (; pte < max_pte; pte++, pfn++) {
++ if (pfn >= max_low_pfn)
++ break;
++
++ set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));
++ }
++ }
++ }
++
++ return 0;
++}
++
++static inline void resume_init_first_level_page_table(pgd_t *pg_dir)
++{
++}
++
++int swsusp_arch_resume(void)
++{
++ int error;
++
++ resume_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);
++ if (!resume_pg_dir)
++ return -ENOMEM;
++
++ resume_init_first_level_page_table(resume_pg_dir);
++ error = resume_physical_mapping_init(resume_pg_dir);
++ if (error)
++ return error;
++
++ /* We have got enough memory and from now on we cannot recover */
++ restore_image(resume_pg_dir, restore_pblist);
++ return 0;
++}
++
++/*
++ * pfn_is_nosave - check if given pfn is in the 'nosave' section
++ */
++
++int pfn_is_nosave(unsigned long pfn)
++{
++ unsigned long begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
++ unsigned long end_pfn = PAGE_ALIGN(__pa(&__nosave_end)) >> PAGE_SHIFT;
++
++ return (pfn >= begin_pfn) && (pfn < end_pfn);
++}
++
++void save_processor_state(void)
++{
++}
++
++void restore_processor_state(void)
++{
++ local_flush_tlb_all();
++}
+diff --git a/arch/unicore32/kernel/hibernate_asm.S b/arch/unicore32/kernel/hibernate_asm.S
+new file mode 100644
+index 000000000000..cc3c65253c8c
+--- /dev/null
++++ b/arch/unicore32/kernel/hibernate_asm.S
+@@ -0,0 +1,117 @@
++/*
++ * linux/arch/unicore32/kernel/hibernate_asm.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/sys.h>
++#include <linux/errno.h>
++#include <linux/linkage.h>
++#include <generated/asm-offsets.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++#include <asm/assembler.h>
++
++@ restore_image(pgd_t *resume_pg_dir, struct pbe *restore_pblist)
++@ r0: resume_pg_dir
++@ r1: restore_pblist
++@ copy restore_pblist pages
++@ restore registers from swsusp_arch_regs_cpu0
++@
++ENTRY(restore_image)
++ sub r0, r0, #PAGE_OFFSET
++ mov r5, #0
++ movc p0.c6, r5, #6 @invalidate ITLB & DTLB
++ movc p0.c2, r0, #0
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
++
++ .p2align 4,,7
++101:
++ csub.a r1, #0
++ beq 109f
++
++ ldw r6, [r1+], #PBE_ADDRESS
++ ldw r7, [r1+], #PBE_ORIN_ADDRESS
++
++ movl ip, #128
++102: ldm.w (r8 - r15), [r6]+
++ stm.w (r8 - r15), [r7]+
++ sub.a ip, ip, #1
++ bne 102b
++
++ ldw r1, [r1+], #PBE_NEXT
++ b 101b
++
++ .p2align 4,,7
++109:
++ /* go back to the original page tables */
++ ldw r0, =swapper_pg_dir
++ sub r0, r0, #PAGE_OFFSET
++ mov r5, #0
++ movc p0.c6, r5, #6
++ movc p0.c2, r0, #0
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
++ nop
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ ldw ip, 1f
++ add ip, ip, #SWSUSP_FPSTATE
++ lfm.w (f0 - f7 ), [ip]+
++ lfm.w (f8 - f15), [ip]+
++ lfm.w (f16 - f23), [ip]+
++ lfm.w (f24 - f31), [ip]+
++ ldw r4, [ip]
++ ctf r4, s31
++#endif
++ mov r0, #0x0
++ ldw ip, 1f
++ add ip, ip, #SWSUSP_CPU
++ ldm.w (r4 - r15), [ip]+
++ ldm (r16 - r27, sp, pc), [ip]+ @ Load all regs saved previously
++
++ .align 2
++1: .long swsusp_arch_regs_cpu0
++
++
++@ swsusp_arch_suspend()
++@ - prepare pc for resume, return from function without swsusp_save on resume
++@ - save registers in swsusp_arch_regs_cpu0
++@ - call swsusp_save write suspend image
++
++ENTRY(swsusp_arch_suspend)
++ ldw ip, 1f
++ add ip, ip, #SWSUSP_CPU
++ stm.w (r4 - r15), [ip]+
++ stm.w (r16 - r27, sp, lr), [ip]+
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ ldw ip, 1f
++ add ip, ip, #SWSUSP_FPSTATE
++ sfm.w (f0 - f7 ), [ip]+
++ sfm.w (f8 - f15), [ip]+
++ sfm.w (f16 - f23), [ip]+
++ sfm.w (f24 - f31), [ip]+
++ cff r4, s31
++ stw r4, [ip]
++#endif
++ b swsusp_save @ no return
++
++1: .long swsusp_arch_regs_cpu0
+diff --git a/arch/unicore32/kernel/pm.c b/arch/unicore32/kernel/pm.c
+new file mode 100644
+index 000000000000..784bc2db3b28
+--- /dev/null
++++ b/arch/unicore32/kernel/pm.c
+@@ -0,0 +1,123 @@
++/*
++ * linux/arch/unicore32/kernel/pm.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/suspend.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/io.h>
++
++#include <mach/hardware.h>
++#include <mach/pm.h>
++
++#include "setup.h"
++
++struct puv3_cpu_pm_fns *puv3_cpu_pm_fns;
++static unsigned long *sleep_save;
++
++int puv3_pm_enter(suspend_state_t state)
++{
++ unsigned long sleep_save_checksum = 0, checksum = 0;
++ int i;
++
++ /* skip registers saving for standby */
++ if (state != PM_SUSPEND_STANDBY) {
++ puv3_cpu_pm_fns->save(sleep_save);
++ /* before sleeping, calculate and save a checksum */
++ for (i = 0; i < puv3_cpu_pm_fns->save_count - 1; i++)
++ sleep_save_checksum += sleep_save[i];
++ }
++
++ /* *** go zzz *** */
++ puv3_cpu_pm_fns->enter(state);
++ cpu_init();
++#ifdef CONFIG_INPUT_KEYBOARD
++ puv3_ps2_init();
++#endif
++#ifdef CONFIG_PCI
++ pci_puv3_preinit();
++#endif
++ if (state != PM_SUSPEND_STANDBY) {
++ /* after sleeping, validate the checksum */
++ for (i = 0; i < puv3_cpu_pm_fns->save_count - 1; i++)
++ checksum += sleep_save[i];
++
++ /* if invalid, display message and wait for a hardware reset */
++ if (checksum != sleep_save_checksum) {
++ while (1)
++ puv3_cpu_pm_fns->enter(state);
++ }
++ puv3_cpu_pm_fns->restore(sleep_save);
++ }
++
++ pr_debug("*** made it back from resume\n");
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(puv3_pm_enter);
++
++unsigned long sleep_phys_sp(void *sp)
++{
++ return virt_to_phys(sp);
++}
++
++static int puv3_pm_valid(suspend_state_t state)
++{
++ if (puv3_cpu_pm_fns)
++ return puv3_cpu_pm_fns->valid(state);
++
++ return -EINVAL;
++}
++
++static int puv3_pm_prepare(void)
++{
++ int ret = 0;
++
++ if (puv3_cpu_pm_fns && puv3_cpu_pm_fns->prepare)
++ ret = puv3_cpu_pm_fns->prepare();
++
++ return ret;
++}
++
++static void puv3_pm_finish(void)
++{
++ if (puv3_cpu_pm_fns && puv3_cpu_pm_fns->finish)
++ puv3_cpu_pm_fns->finish();
++}
++
++static struct platform_suspend_ops puv3_pm_ops = {
++ .valid = puv3_pm_valid,
++ .enter = puv3_pm_enter,
++ .prepare = puv3_pm_prepare,
++ .finish = puv3_pm_finish,
++};
++
++static int __init puv3_pm_init(void)
++{
++ if (!puv3_cpu_pm_fns) {
++ printk(KERN_ERR "no valid puv3_cpu_pm_fns defined\n");
++ return -EINVAL;
++ }
++
++ sleep_save = kmalloc(puv3_cpu_pm_fns->save_count
++ * sizeof(unsigned long), GFP_KERNEL);
++ if (!sleep_save) {
++ printk(KERN_ERR "failed to alloc memory for pm save\n");
++ return -ENOMEM;
++ }
++
++ suspend_set_ops(&puv3_pm_ops);
++ return 0;
++}
++
++device_initcall(puv3_pm_init);
+diff --git a/arch/unicore32/kernel/sleep.S b/arch/unicore32/kernel/sleep.S
+new file mode 100644
+index 000000000000..f7c3fc87f7fe
+--- /dev/null
++++ b/arch/unicore32/kernel/sleep.S
+@@ -0,0 +1,202 @@
++/*
++ * linux/arch/unicore32/kernel/sleep.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++#include <mach/hardware.h>
++
++ .text
++
++pkunity_cpu_save_cp:
++
++ @ get coprocessor registers
++
++ movc r3, p0.c7, #0 @ PID
++ movc r4, p0.c2, #0 @ translation table base addr
++ movc r5, p0.c1, #0 @ control reg
++
++
++ @ store them plus current virtual stack ptr on stack
++ mov r6, sp
++ stm.w (r3 - r6), [sp-]
++
++ mov pc, lr
++
++pkunity_cpu_save_sp:
++ @ preserve phys address of stack
++ mov r0, sp
++ stw.w lr, [sp+], #-4
++ b.l sleep_phys_sp
++ ldw r1, =sleep_save_sp
++ stw r0, [r1]
++ ldw.w pc, [sp]+, #4
++
++/*
++ * puv3_cpu_suspend()
++ *
++ * Forces CPU into sleep state.
++ *
++ * r0 = value for PWRMODE M field for desired sleep state
++ */
++
++ENTRY(puv3_cpu_suspend)
++ stm.w (r16 - r27, lr), [sp-] @ save registers on stack
++ stm.w (r4 - r15), [sp-] @ save registers on stack
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ sfm.w (f0 - f7 ), [sp-]
++ sfm.w (f8 - f15), [sp-]
++ sfm.w (f16 - f23), [sp-]
++ sfm.w (f24 - f31), [sp-]
++ cff r4, s31
++ stm.w (r4), [sp-]
++#endif
++ b.l pkunity_cpu_save_cp
++
++ b.l pkunity_cpu_save_sp
++
++ @ clean data cache
++ mov r1, #0
++ movc p0.c5, r1, #14
++ nop
++ nop
++ nop
++ nop
++
++
++
++ @ DDR2 BaseAddr
++ ldw r0, =io_p2v(PKUNITY_DDR2CTRL_BASE)
++
++ @ PM BaseAddr
++ ldw r1, =io_p2v(PKUNITY_PM_BASE)
++
++ @ set PLL_SYS_CFG reg, 275
++ movl r6, #0x00002401
++ stw r6, [r1+], #0x18
++ @ set PLL_DDR_CFG reg, 66MHz
++ movl r6, #0x00100c00
++ stw r6, [r1+], #0x1c
++
++ @ set wake up source
++ movl r8, #0x800001ff @ epip4d
++ stw r8, [r1+], #0xc
++
++ @ set PGSR
++ movl r5, #0x40000
++ stw r5, [r1+], #0x10
++
++ @ prepare DDR2 refresh settings
++ ldw r5, [r0+], #0x24
++ or r5, r5, #0x00000001
++
++ @ prepare PMCR for PLL changing
++ movl r6, #0xc
++
++ @ prepare for closing PLL
++ movl r7, #0x1
++
++ @ prepare sleep mode
++ mov r8, #0x1
++
++@ movl r0, 0x11111111
++@ put_word_ocd r0
++ b pkunity_cpu_do_suspend
++
++ .ltorg
++ .align 5
++pkunity_cpu_do_suspend:
++ b 101f
++ @ put DDR2 into self-refresh
++100: stw r5, [r0+], #0x24
++ @ change PLL
++ stw r6, [r1]
++ b 1f
++
++ .ltorg
++ .align 5
++101: b 102f
++ @ wait for PLL changing complete
++1: ldw r6, [r1+], #0x44
++ csub.a r6, #0x1
++ bne 1b
++ b 2f
++
++ .ltorg
++ .align 5
++102: b 100b
++ @ close PLL
++2: stw r7, [r1+], #0x4
++ @ enter sleep mode
++ stw r8, [r1]
++3: b 3b
++
++
++
++
++/*
++ * puv3_cpu_resume()
++ *
++ * entry point from bootloader into kernel during resume
++ *
++ * Note: Yes, part of the following code is located into the .data section.
++ * This is to allow sleep_save_sp to be accessed with a relative load
++ * while we can't rely on any MMU translation. We could have put
++ * sleep_save_sp in the .text section as well, but some setups might
++ * insist on it to be truly read-only.
++ */
++
++ .data
++ .align 5
++ENTRY(puv3_cpu_resume)
++@ movl r0, 0x20202020
++@ put_word_ocd r0
++
++ ldw r0, sleep_save_sp @ stack phys addr
++ ldw r2, =resume_after_mmu @ its absolute virtual address
++ ldm (r3 - r6), [r0]+ @ CP regs + virt stack ptr
++ mov sp, r6 @ CP regs + virt stack ptr
++
++ mov r1, #0
++ movc p0.c6, r1, #6 @ invalidate I & D TLBs
++ movc p0.c5, r1, #28 @ invalidate I & D caches, BTB
++
++ movc p0.c7, r3, #0 @ PID
++ movc p0.c2, r4, #0 @ translation table base addr
++ movc p0.c1, r5, #0 @ control reg, turn on mmu
++ nop
++ jump r2
++ nop
++ nop
++ nop
++ nop
++ nop
++
++sleep_save_sp:
++ .word 0 @ preserve stack phys ptr here
++
++ .text
++resume_after_mmu:
++@ movl r0, 0x30303030
++@ put_word_ocd r0
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ lfm.w (f0 - f7 ), [sp]+
++ lfm.w (f8 - f15), [sp]+
++ lfm.w (f16 - f23), [sp]+
++ lfm.w (f24 - f31), [sp]+
++ ldm.w (r4), [sp]+
++ ctf r4, s31
++#endif
++ ldm.w (r4 - r15), [sp]+ @ restore registers from stack
++ ldm.w (r16 - r27, pc), [sp]+ @ return to callercommit f864d2f8304e6be90b4c4e4ac615edc6fcefd4c1
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:20:01 2011 +0800
+
+ unicore32 core architecture: signals handling
+
+ This patch implements signals.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/sigcontext.h b/arch/unicore32/include/asm/sigcontext.h
+new file mode 100644
+index 000000000000..6a2d7671c052
+--- /dev/null
++++ b/arch/unicore32/include/asm/sigcontext.h
+@@ -0,0 +1,29 @@
++/*
++ * linux/arch/unicore32/include/asm/sigcontext.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_SIGCONTEXT_H__
++#define __UNICORE_SIGCONTEXT_H__
++
++#include <asm/ptrace.h>
++/*
++ * Signal context structure - contains all info to do with the state
++ * before the signal handler was invoked. Note: only add new entries
++ * to the end of the structure.
++ */
++struct sigcontext {
++ unsigned long trap_no;
++ unsigned long error_code;
++ unsigned long oldmask;
++ unsigned long fault_address;
++ struct pt_regs regs;
++};
++
++#endif
+diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
+new file mode 100644
+index 000000000000..b163fca56789
+--- /dev/null
++++ b/arch/unicore32/kernel/signal.c
+@@ -0,0 +1,494 @@
++/*
++ * linux/arch/unicore32/kernel/signal.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/errno.h>
++#include <linux/signal.h>
++#include <linux/personality.h>
++#include <linux/freezer.h>
++#include <linux/uaccess.h>
++#include <linux/tracehook.h>
++#include <linux/elf.h>
++#include <linux/unistd.h>
++
++#include <asm/cacheflush.h>
++#include <asm/ucontext.h>
++
++#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
++
++/*
++ * For UniCore syscalls, we encode the syscall number into the instruction.
++ */
++#define SWI_SYS_SIGRETURN (0xff000000) /* error number for new abi */
++#define SWI_SYS_RT_SIGRETURN (0xff000000 | (__NR_rt_sigreturn))
++#define SWI_SYS_RESTART (0xff000000 | (__NR_restart_syscall))
++
++#define KERN_SIGRETURN_CODE (KUSER_VECPAGE_BASE + 0x00000500)
++#define KERN_RESTART_CODE (KERN_SIGRETURN_CODE + sizeof(sigreturn_codes))
++
++const unsigned long sigreturn_codes[3] = {
++ SWI_SYS_SIGRETURN, SWI_SYS_RT_SIGRETURN,
++};
++
++const unsigned long syscall_restart_code[2] = {
++ SWI_SYS_RESTART, /* swi __NR_restart_syscall */
++ 0x69efc004, /* ldr pc, [sp], #4 */
++};
++
++/*
++ * Do a signal return; undo the signal stack. These are aligned to 64-bit.
++ */
++struct sigframe {
++ struct ucontext uc;
++ unsigned long retcode[2];
++};
++
++struct rt_sigframe {
++ struct siginfo info;
++ struct sigframe sig;
++};
++
++static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
++{
++ sigset_t set;
++ int err;
++
++ err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));
++ if (err == 0) {
++ sigdelsetmask(&set, ~_BLOCKABLE);
++ spin_lock_irq(¤t->sighand->siglock);
++ current->blocked = set;
++ recalc_sigpending();
++ spin_unlock_irq(¤t->sighand->siglock);
++ }
++
++ err |= __get_user(regs->UCreg_00, &sf->uc.uc_mcontext.regs.UCreg_00);
++ err |= __get_user(regs->UCreg_01, &sf->uc.uc_mcontext.regs.UCreg_01);
++ err |= __get_user(regs->UCreg_02, &sf->uc.uc_mcontext.regs.UCreg_02);
++ err |= __get_user(regs->UCreg_03, &sf->uc.uc_mcontext.regs.UCreg_03);
++ err |= __get_user(regs->UCreg_04, &sf->uc.uc_mcontext.regs.UCreg_04);
++ err |= __get_user(regs->UCreg_05, &sf->uc.uc_mcontext.regs.UCreg_05);
++ err |= __get_user(regs->UCreg_06, &sf->uc.uc_mcontext.regs.UCreg_06);
++ err |= __get_user(regs->UCreg_07, &sf->uc.uc_mcontext.regs.UCreg_07);
++ err |= __get_user(regs->UCreg_08, &sf->uc.uc_mcontext.regs.UCreg_08);
++ err |= __get_user(regs->UCreg_09, &sf->uc.uc_mcontext.regs.UCreg_09);
++ err |= __get_user(regs->UCreg_10, &sf->uc.uc_mcontext.regs.UCreg_10);
++ err |= __get_user(regs->UCreg_11, &sf->uc.uc_mcontext.regs.UCreg_11);
++ err |= __get_user(regs->UCreg_12, &sf->uc.uc_mcontext.regs.UCreg_12);
++ err |= __get_user(regs->UCreg_13, &sf->uc.uc_mcontext.regs.UCreg_13);
++ err |= __get_user(regs->UCreg_14, &sf->uc.uc_mcontext.regs.UCreg_14);
++ err |= __get_user(regs->UCreg_15, &sf->uc.uc_mcontext.regs.UCreg_15);
++ err |= __get_user(regs->UCreg_16, &sf->uc.uc_mcontext.regs.UCreg_16);
++ err |= __get_user(regs->UCreg_17, &sf->uc.uc_mcontext.regs.UCreg_17);
++ err |= __get_user(regs->UCreg_18, &sf->uc.uc_mcontext.regs.UCreg_18);
++ err |= __get_user(regs->UCreg_19, &sf->uc.uc_mcontext.regs.UCreg_19);
++ err |= __get_user(regs->UCreg_20, &sf->uc.uc_mcontext.regs.UCreg_20);
++ err |= __get_user(regs->UCreg_21, &sf->uc.uc_mcontext.regs.UCreg_21);
++ err |= __get_user(regs->UCreg_22, &sf->uc.uc_mcontext.regs.UCreg_22);
++ err |= __get_user(regs->UCreg_23, &sf->uc.uc_mcontext.regs.UCreg_23);
++ err |= __get_user(regs->UCreg_24, &sf->uc.uc_mcontext.regs.UCreg_24);
++ err |= __get_user(regs->UCreg_25, &sf->uc.uc_mcontext.regs.UCreg_25);
++ err |= __get_user(regs->UCreg_26, &sf->uc.uc_mcontext.regs.UCreg_26);
++ err |= __get_user(regs->UCreg_fp, &sf->uc.uc_mcontext.regs.UCreg_fp);
++ err |= __get_user(regs->UCreg_ip, &sf->uc.uc_mcontext.regs.UCreg_ip);
++ err |= __get_user(regs->UCreg_sp, &sf->uc.uc_mcontext.regs.UCreg_sp);
++ err |= __get_user(regs->UCreg_lr, &sf->uc.uc_mcontext.regs.UCreg_lr);
++ err |= __get_user(regs->UCreg_pc, &sf->uc.uc_mcontext.regs.UCreg_pc);
++ err |= __get_user(regs->UCreg_asr, &sf->uc.uc_mcontext.regs.UCreg_asr);
++
++ err |= !valid_user_regs(regs);
++
++ return err;
++}
++
++asmlinkage int __sys_rt_sigreturn(struct pt_regs *regs)
++{
++ struct rt_sigframe __user *frame;
++
++ /* Always make any pending restarted system calls return -EINTR */
++ current_thread_info()->restart_block.fn = do_no_restart_syscall;
++
++ /*
++ * Since we stacked the signal on a 64-bit boundary,
++ * then 'sp' should be word aligned here. If it's
++ * not, then the user is trying to mess with us.
++ */
++ if (regs->UCreg_sp & 7)
++ goto badframe;
++
++ frame = (struct rt_sigframe __user *)regs->UCreg_sp;
++
++ if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
++ goto badframe;
++
++ if (restore_sigframe(regs, &frame->sig))
++ goto badframe;
++
++ if (do_sigaltstack(&frame->sig.uc.uc_stack, NULL, regs->UCreg_sp)
++ == -EFAULT)
++ goto badframe;
++
++ return regs->UCreg_00;
++
++badframe:
++ force_sig(SIGSEGV, current);
++ return 0;
++}
++
++static int setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs,
++ sigset_t *set)
++{
++ int err = 0;
++
++ err |= __put_user(regs->UCreg_00, &sf->uc.uc_mcontext.regs.UCreg_00);
++ err |= __put_user(regs->UCreg_01, &sf->uc.uc_mcontext.regs.UCreg_01);
++ err |= __put_user(regs->UCreg_02, &sf->uc.uc_mcontext.regs.UCreg_02);
++ err |= __put_user(regs->UCreg_03, &sf->uc.uc_mcontext.regs.UCreg_03);
++ err |= __put_user(regs->UCreg_04, &sf->uc.uc_mcontext.regs.UCreg_04);
++ err |= __put_user(regs->UCreg_05, &sf->uc.uc_mcontext.regs.UCreg_05);
++ err |= __put_user(regs->UCreg_06, &sf->uc.uc_mcontext.regs.UCreg_06);
++ err |= __put_user(regs->UCreg_07, &sf->uc.uc_mcontext.regs.UCreg_07);
++ err |= __put_user(regs->UCreg_08, &sf->uc.uc_mcontext.regs.UCreg_08);
++ err |= __put_user(regs->UCreg_09, &sf->uc.uc_mcontext.regs.UCreg_09);
++ err |= __put_user(regs->UCreg_10, &sf->uc.uc_mcontext.regs.UCreg_10);
++ err |= __put_user(regs->UCreg_11, &sf->uc.uc_mcontext.regs.UCreg_11);
++ err |= __put_user(regs->UCreg_12, &sf->uc.uc_mcontext.regs.UCreg_12);
++ err |= __put_user(regs->UCreg_13, &sf->uc.uc_mcontext.regs.UCreg_13);
++ err |= __put_user(regs->UCreg_14, &sf->uc.uc_mcontext.regs.UCreg_14);
++ err |= __put_user(regs->UCreg_15, &sf->uc.uc_mcontext.regs.UCreg_15);
++ err |= __put_user(regs->UCreg_16, &sf->uc.uc_mcontext.regs.UCreg_16);
++ err |= __put_user(regs->UCreg_17, &sf->uc.uc_mcontext.regs.UCreg_17);
++ err |= __put_user(regs->UCreg_18, &sf->uc.uc_mcontext.regs.UCreg_18);
++ err |= __put_user(regs->UCreg_19, &sf->uc.uc_mcontext.regs.UCreg_19);
++ err |= __put_user(regs->UCreg_20, &sf->uc.uc_mcontext.regs.UCreg_20);
++ err |= __put_user(regs->UCreg_21, &sf->uc.uc_mcontext.regs.UCreg_21);
++ err |= __put_user(regs->UCreg_22, &sf->uc.uc_mcontext.regs.UCreg_22);
++ err |= __put_user(regs->UCreg_23, &sf->uc.uc_mcontext.regs.UCreg_23);
++ err |= __put_user(regs->UCreg_24, &sf->uc.uc_mcontext.regs.UCreg_24);
++ err |= __put_user(regs->UCreg_25, &sf->uc.uc_mcontext.regs.UCreg_25);
++ err |= __put_user(regs->UCreg_26, &sf->uc.uc_mcontext.regs.UCreg_26);
++ err |= __put_user(regs->UCreg_fp, &sf->uc.uc_mcontext.regs.UCreg_fp);
++ err |= __put_user(regs->UCreg_ip, &sf->uc.uc_mcontext.regs.UCreg_ip);
++ err |= __put_user(regs->UCreg_sp, &sf->uc.uc_mcontext.regs.UCreg_sp);
++ err |= __put_user(regs->UCreg_lr, &sf->uc.uc_mcontext.regs.UCreg_lr);
++ err |= __put_user(regs->UCreg_pc, &sf->uc.uc_mcontext.regs.UCreg_pc);
++ err |= __put_user(regs->UCreg_asr, &sf->uc.uc_mcontext.regs.UCreg_asr);
++
++ err |= __put_user(current->thread.trap_no,
++ &sf->uc.uc_mcontext.trap_no);
++ err |= __put_user(current->thread.error_code,
++ &sf->uc.uc_mcontext.error_code);
++ err |= __put_user(current->thread.address,
++ &sf->uc.uc_mcontext.fault_address);
++ err |= __put_user(set->sig[0], &sf->uc.uc_mcontext.oldmask);
++
++ err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(*set));
++
++ return err;
++}
++
++static inline void __user *get_sigframe(struct k_sigaction *ka,
++ struct pt_regs *regs, int framesize)
++{
++ unsigned long sp = regs->UCreg_sp;
++ void __user *frame;
++
++ /*
++ * This is the X/Open sanctioned signal stack switching.
++ */
++ if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
++ sp = current->sas_ss_sp + current->sas_ss_size;
++
++ /*
++ * ATPCS B01 mandates 8-byte alignment
++ */
++ frame = (void __user *)((sp - framesize) & ~7);
++
++ /*
++ * Check that we can actually write to the signal frame.
++ */
++ if (!access_ok(VERIFY_WRITE, frame, framesize))
++ frame = NULL;
++
++ return frame;
++}
++
++static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
++ unsigned long __user *rc, void __user *frame, int usig)
++{
++ unsigned long handler = (unsigned long)ka->sa.sa_handler;
++ unsigned long retcode;
++ unsigned long asr = regs->UCreg_asr & ~PSR_f;
++
++ unsigned int idx = 0;
++
++ if (ka->sa.sa_flags & SA_SIGINFO)
++ idx += 1;
++
++ if (__put_user(sigreturn_codes[idx], rc) ||
++ __put_user(sigreturn_codes[idx+1], rc+1))
++ return 1;
++
++ retcode = KERN_SIGRETURN_CODE + (idx << 2);
++
++ regs->UCreg_00 = usig;
++ regs->UCreg_sp = (unsigned long)frame;
++ regs->UCreg_lr = retcode;
++ regs->UCreg_pc = handler;
++ regs->UCreg_asr = asr;
++
++ return 0;
++}
++
++static int setup_frame(int usig, struct k_sigaction *ka,
++ sigset_t *set, struct pt_regs *regs)
++{
++ struct sigframe __user *frame = get_sigframe(ka, regs, sizeof(*frame));
++ int err = 0;
++
++ if (!frame)
++ return 1;
++
++ /*
++ * Set uc.uc_flags to a value which sc.trap_no would never have.
++ */
++ err |= __put_user(0x5ac3c35a, &frame->uc.uc_flags);
++
++ err |= setup_sigframe(frame, regs, set);
++ if (err == 0)
++ err |= setup_return(regs, ka, frame->retcode, frame, usig);
++
++ return err;
++}
++
++static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
++ sigset_t *set, struct pt_regs *regs)
++{
++ struct rt_sigframe __user *frame =
++ get_sigframe(ka, regs, sizeof(*frame));
++ stack_t stack;
++ int err = 0;
++
++ if (!frame)
++ return 1;
++
++ err |= copy_siginfo_to_user(&frame->info, info);
++
++ err |= __put_user(0, &frame->sig.uc.uc_flags);
++ err |= __put_user(NULL, &frame->sig.uc.uc_link);
++
++ memset(&stack, 0, sizeof(stack));
++ stack.ss_sp = (void __user *)current->sas_ss_sp;
++ stack.ss_flags = sas_ss_flags(regs->UCreg_sp);
++ stack.ss_size = current->sas_ss_size;
++ err |= __copy_to_user(&frame->sig.uc.uc_stack, &stack, sizeof(stack));
++
++ err |= setup_sigframe(&frame->sig, regs, set);
++ if (err == 0)
++ err |= setup_return(regs, ka, frame->sig.retcode, frame, usig);
++
++ if (err == 0) {
++ /*
++ * For realtime signals we must also set the second and third
++ * arguments for the signal handler.
++ */
++ regs->UCreg_01 = (unsigned long)&frame->info;
++ regs->UCreg_02 = (unsigned long)&frame->sig.uc;
++ }
++
++ return err;
++}
++
++static inline void setup_syscall_restart(struct pt_regs *regs)
++{
++ regs->UCreg_00 = regs->UCreg_ORIG_00;
++ regs->UCreg_pc -= 4;
++}
++
++/*
++ * OK, we're invoking a handler
++ */
++static int handle_signal(unsigned long sig, struct k_sigaction *ka,
++ siginfo_t *info, sigset_t *oldset,
++ struct pt_regs *regs, int syscall)
++{
++ struct thread_info *thread = current_thread_info();
++ struct task_struct *tsk = current;
++ int usig = sig;
++ int ret;
++
++ /*
++ * If we were from a system call, check for system call restarting...
++ */
++ if (syscall) {
++ switch (regs->UCreg_00) {
++ case -ERESTART_RESTARTBLOCK:
++ case -ERESTARTNOHAND:
++ regs->UCreg_00 = -EINTR;
++ break;
++ case -ERESTARTSYS:
++ if (!(ka->sa.sa_flags & SA_RESTART)) {
++ regs->UCreg_00 = -EINTR;
++ break;
++ }
++ /* fallthrough */
++ case -ERESTARTNOINTR:
++ setup_syscall_restart(regs);
++ }
++ }
++
++ /*
++ * translate the signal
++ */
++ if (usig < 32 && thread->exec_domain
++ && thread->exec_domain->signal_invmap)
++ usig = thread->exec_domain->signal_invmap[usig];
++
++ /*
++ * Set up the stack frame
++ */
++ if (ka->sa.sa_flags & SA_SIGINFO)
++ ret = setup_rt_frame(usig, ka, info, oldset, regs);
++ else
++ ret = setup_frame(usig, ka, oldset, regs);
++
++ /*
++ * Check that the resulting registers are actually sane.
++ */
++ ret |= !valid_user_regs(regs);
++
++ if (ret != 0) {
++ force_sigsegv(sig, tsk);
++ return ret;
++ }
++
++ /*
++ * Block the signal if we were successful.
++ */
++ spin_lock_irq(&tsk->sighand->siglock);
++ sigorsets(&tsk->blocked, &tsk->blocked,
++ &ka->sa.sa_mask);
++ if (!(ka->sa.sa_flags & SA_NODEFER))
++ sigaddset(&tsk->blocked, sig);
++ recalc_sigpending();
++ spin_unlock_irq(&tsk->sighand->siglock);
++
++ return 0;
++}
++
++/*
++ * Note that 'init' is a special process: it doesn't get signals it doesn't
++ * want to handle. Thus you cannot kill init even with a SIGKILL even by
++ * mistake.
++ *
++ * Note that we go through the signals twice: once to check the signals that
++ * the kernel can handle, and then we build all the user-level signal handling
++ * stack-frames in one go after that.
++ */
++static void do_signal(struct pt_regs *regs, int syscall)
++{
++ struct k_sigaction ka;
++ siginfo_t info;
++ int signr;
++
++ /*
++ * We want the common case to go fast, which
++ * is why we may in certain cases get here from
++ * kernel mode. Just return without doing anything
++ * if so.
++ */
++ if (!user_mode(regs))
++ return;
++
++ if (try_to_freeze())
++ goto no_signal;
++
++ signr = get_signal_to_deliver(&info, &ka, regs, NULL);
++ if (signr > 0) {
++ sigset_t *oldset;
++
++ if (test_thread_flag(TIF_RESTORE_SIGMASK))
++ oldset = ¤t->saved_sigmask;
++ else
++ oldset = ¤t->blocked;
++ if (handle_signal(signr, &ka, &info, oldset, regs, syscall)
++ == 0) {
++ /*
++ * A signal was successfully delivered; the saved
++ * sigmask will have been stored in the signal frame,
++ * and will be restored by sigreturn, so we can simply
++ * clear the TIF_RESTORE_SIGMASK flag.
++ */
++ if (test_thread_flag(TIF_RESTORE_SIGMASK))
++ clear_thread_flag(TIF_RESTORE_SIGMASK);
++ }
++ return;
++ }
++
++ no_signal:
++ /*
++ * No signal to deliver to the process - restart the syscall.
++ */
++ if (syscall) {
++ if (regs->UCreg_00 == -ERESTART_RESTARTBLOCK) {
++ u32 __user *usp;
++
++ regs->UCreg_sp -= 4;
++ usp = (u32 __user *)regs->UCreg_sp;
++
++ if (put_user(regs->UCreg_pc, usp) == 0) {
++ regs->UCreg_pc = KERN_RESTART_CODE;
++ } else {
++ regs->UCreg_sp += 4;
++ force_sigsegv(0, current);
++ }
++ }
++ if (regs->UCreg_00 == -ERESTARTNOHAND ||
++ regs->UCreg_00 == -ERESTARTSYS ||
++ regs->UCreg_00 == -ERESTARTNOINTR) {
++ setup_syscall_restart(regs);
++ }
++
++ /* If there's no signal to deliver, we just put the saved
++ * sigmask back.
++ */
++ if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
++ clear_thread_flag(TIF_RESTORE_SIGMASK);
++ sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
++ }
++ }
++}
++
++asmlinkage void do_notify_resume(struct pt_regs *regs,
++ unsigned int thread_flags, int syscall)
++{
++ if (thread_flags & _TIF_SIGPENDING)
++ do_signal(regs, syscall);
++
++ if (thread_flags & _TIF_NOTIFY_RESUME) {
++ clear_thread_flag(TIF_NOTIFY_RESUME);
++ tracehook_notify_resume(regs);
++ if (current->replacement_session_keyring)
++ key_replace_session_keyring();
++ }
++}
++
++/*
++ * Copy signal return handlers into the vector page, and
++ * set sigreturn to be a pointer to these.
++ */
++void __init early_signal_init(void)
++{
++ memcpy((void *)kuser_vecpage_to_vectors(KERN_SIGRETURN_CODE),
++ sigreturn_codes, sizeof(sigreturn_codes));
++ memcpy((void *)kuser_vecpage_to_vectors(KERN_RESTART_CODE),
++ syscall_restart_code, sizeof(syscall_restart_code));
++ /* Need not to flush icache, since early_trap_init will do it last. */
++}commit 752bcb4d02ccfd5e7a8d810424154169b4cca8ae
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:19:35 2011 +0800
+
+ unicore32 core architecture: interrupts ang gpio handling
+
+ This patch implements interrupts and gpio handling.
+ UniCore32 has 9 gpio interrupt sources.
+ And gpio device operations are also here.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/gpio.h b/arch/unicore32/include/asm/gpio.h
+new file mode 100644
+index 000000000000..3aaa41e9e413
+--- /dev/null
++++ b/arch/unicore32/include/asm/gpio.h
+@@ -0,0 +1,103 @@
++/*
++ * linux/arch/unicore32/include/asm/gpio.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_GPIO_H__
++#define __UNICORE_GPIO_H__
++
++#include <asm/irq.h>
++#include <mach/hardware.h>
++#include <asm-generic/gpio.h>
++
++#define GPI_OTP_INT 0
++#define GPI_PCI_INTA 1
++#define GPI_PCI_INTB 2
++#define GPI_PCI_INTC 3
++#define GPI_PCI_INTD 4
++#define GPI_BAT_DET 5
++#define GPI_SD_CD 6
++#define GPI_SOFF_REQ 7
++#define GPI_SD_WP 8
++#define GPI_LCD_CASE_OFF 9
++#define GPO_WIFI_EN 10
++#define GPO_HDD_LED 11
++#define GPO_VGA_EN 12
++#define GPO_LCD_EN 13
++#define GPO_LED_DATA 14
++#define GPO_LED_CLK 15
++#define GPO_CAM_PWR_EN 16
++#define GPO_LCD_VCC_EN 17
++#define GPO_SOFT_OFF 18
++#define GPO_BT_EN 19
++#define GPO_FAN_ON 20
++#define GPO_SPKR 21
++#define GPO_SET_V1 23
++#define GPO_SET_V2 24
++#define GPO_CPU_HEALTH 25
++#define GPO_LAN_SEL 26
++
++#ifdef CONFIG_PUV3_NB0916
++#define GPI_BTN_TOUCH 14
++#define GPIO_IN 0x000043ff /* 1 for input */
++#define GPIO_OUT 0x0fffbc00 /* 1 for output */
++#endif /* CONFIG_PUV3_NB0916 */
++
++#ifdef CONFIG_PUV3_SMW0919
++#define GPIO_IN 0x000003ff /* 1 for input */
++#define GPIO_OUT 0x0ffffc00 /* 1 for output */
++#endif /* CONFIG_PUV3_SMW0919 */
++
++#ifdef CONFIG_PUV3_DB0913
++#define GPIO_IN 0x000001df /* 1 for input */
++#define GPIO_OUT 0x03fee800 /* 1 for output */
++#endif /* CONFIG_PUV3_DB0913 */
++
++#define GPIO_DIR (~((GPIO_IN) | 0xf0000000))
++ /* 0 input, 1 output */
++
++static inline int gpio_get_value(unsigned gpio)
++{
++ if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))
++ return GPIO_GPLR & GPIO_GPIO(gpio);
++ else
++ return __gpio_get_value(gpio);
++}
++
++static inline void gpio_set_value(unsigned gpio, int value)
++{
++ if (__builtin_constant_p(gpio) && (gpio <= GPIO_MAX))
++ if (value)
++ GPIO_GPSR = GPIO_GPIO(gpio);
++ else
++ GPIO_GPCR = GPIO_GPIO(gpio);
++ else
++ __gpio_set_value(gpio, value);
++}
++
++#define gpio_cansleep __gpio_cansleep
++
++static inline unsigned gpio_to_irq(unsigned gpio)
++{
++ if ((gpio < IRQ_GPIOHIGH) && (FIELD(1, 1, gpio) & GPIO_GPIR))
++ return IRQ_GPIOLOW0 + gpio;
++ else
++ return IRQ_GPIO0 + gpio;
++}
++
++static inline unsigned irq_to_gpio(unsigned irq)
++{
++ if (irq < IRQ_GPIOHIGH)
++ return irq - IRQ_GPIOLOW0;
++ else
++ return irq - IRQ_GPIO0;
++}
++
++#endif /* __UNICORE_GPIO_H__ */
+diff --git a/arch/unicore32/include/asm/irq.h b/arch/unicore32/include/asm/irq.h
+new file mode 100644
+index 000000000000..ade8bb87111d
+--- /dev/null
++++ b/arch/unicore32/include/asm/irq.h
+@@ -0,0 +1,107 @@
++/*
++ * linux/arch/unicore32/include/asm/irq.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_IRQ_H__
++#define __UNICORE_IRQ_H__
++
++#include <asm-generic/irq.h>
++
++#define IRQ_GPIOLOW0 0x00
++#define IRQ_GPIOLOW1 0x01
++#define IRQ_GPIOLOW2 0x02
++#define IRQ_GPIOLOW3 0x03
++#define IRQ_GPIOLOW4 0x04
++#define IRQ_GPIOLOW5 0x05
++#define IRQ_GPIOLOW6 0x06
++#define IRQ_GPIOLOW7 0x07
++#define IRQ_GPIOHIGH 0x08
++#define IRQ_USB 0x09
++#define IRQ_SDC 0x0a
++#define IRQ_AC97 0x0b
++#define IRQ_SATA 0x0c
++#define IRQ_MME 0x0d
++#define IRQ_PCI_BRIDGE 0x0e
++#define IRQ_DDR 0x0f
++#define IRQ_SPI 0x10
++#define IRQ_UNIGFX 0x11
++#define IRQ_I2C 0x11
++#define IRQ_UART1 0x12
++#define IRQ_UART0 0x13
++#define IRQ_UMAL 0x14
++#define IRQ_NAND 0x15
++#define IRQ_PS2_KBD 0x16
++#define IRQ_PS2_AUX 0x17
++#define IRQ_DMA 0x18
++#define IRQ_DMAERR 0x19
++#define IRQ_TIMER0 0x1a
++#define IRQ_TIMER1 0x1b
++#define IRQ_TIMER2 0x1c
++#define IRQ_TIMER3 0x1d
++#define IRQ_RTC 0x1e
++#define IRQ_RTCAlarm 0x1f
++
++#define IRQ_GPIO0 0x20
++#define IRQ_GPIO1 0x21
++#define IRQ_GPIO2 0x22
++#define IRQ_GPIO3 0x23
++#define IRQ_GPIO4 0x24
++#define IRQ_GPIO5 0x25
++#define IRQ_GPIO6 0x26
++#define IRQ_GPIO7 0x27
++#define IRQ_GPIO8 0x28
++#define IRQ_GPIO9 0x29
++#define IRQ_GPIO10 0x2a
++#define IRQ_GPIO11 0x2b
++#define IRQ_GPIO12 0x2c
++#define IRQ_GPIO13 0x2d
++#define IRQ_GPIO14 0x2e
++#define IRQ_GPIO15 0x2f
++#define IRQ_GPIO16 0x30
++#define IRQ_GPIO17 0x31
++#define IRQ_GPIO18 0x32
++#define IRQ_GPIO19 0x33
++#define IRQ_GPIO20 0x34
++#define IRQ_GPIO21 0x35
++#define IRQ_GPIO22 0x36
++#define IRQ_GPIO23 0x37
++#define IRQ_GPIO24 0x38
++#define IRQ_GPIO25 0x39
++#define IRQ_GPIO26 0x3a
++#define IRQ_GPIO27 0x3b
++
++#ifdef CONFIG_ARCH_FPGA
++#define IRQ_PCIINTA IRQ_GPIOLOW2
++#define IRQ_PCIINTB IRQ_GPIOLOW1
++#define IRQ_PCIINTC IRQ_GPIOLOW0
++#define IRQ_PCIINTD IRQ_GPIOLOW6
++#endif
++
++#if defined(CONFIG_PUV3_DB0913) || defined(CONFIG_PUV3_NB0916) \
++ || defined(CONFIG_PUV3_SMW0919)
++#define IRQ_PCIINTA IRQ_GPIOLOW1
++#define IRQ_PCIINTB IRQ_GPIOLOW2
++#define IRQ_PCIINTC IRQ_GPIOLOW3
++#define IRQ_PCIINTD IRQ_GPIOLOW4
++#endif
++
++#define IRQ_SD_CD IRQ_GPIO6 /* falling or rising trigger */
++
++#ifndef __ASSEMBLY__
++struct irqaction;
++struct pt_regs;
++extern void migrate_irqs(void);
++
++extern void asm_do_IRQ(unsigned int, struct pt_regs *);
++
++#endif
++
++#endif
++
+diff --git a/arch/unicore32/include/asm/irqflags.h b/arch/unicore32/include/asm/irqflags.h
+new file mode 100644
+index 000000000000..6d8a28dfdbae
+--- /dev/null
++++ b/arch/unicore32/include/asm/irqflags.h
+@@ -0,0 +1,53 @@
++/*
++ * linux/arch/unicore32/include/asm/irqflags.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_IRQFLAGS_H__
++#define __UNICORE_IRQFLAGS_H__
++
++#ifdef __KERNEL__
++
++#include <asm/ptrace.h>
++
++#define ARCH_IRQ_DISABLED (PRIV_MODE | PSR_I_BIT)
++#define ARCH_IRQ_ENABLED (PRIV_MODE)
++
++/*
++ * Save the current interrupt enable state.
++ */
++static inline unsigned long arch_local_save_flags(void)
++{
++ unsigned long temp;
++
++ asm volatile("mov %0, asr" : "=r" (temp) : : "memory", "cc");
++
++ return temp & PSR_c;
++}
++
++/*
++ * restore saved IRQ state
++ */
++static inline void arch_local_irq_restore(unsigned long flags)
++{
++ unsigned long temp;
++
++ asm volatile(
++ "mov %0, asr\n"
++ "mov.a asr, %1\n"
++ "mov.f asr, %0"
++ : "=&r" (temp)
++ : "r" (flags)
++ : "memory", "cc");
++}
++
++#include <asm-generic/irqflags.h>
++
++#endif
++#endif
+diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c
+new file mode 100644
+index 000000000000..4cb28308bb5f
+--- /dev/null
++++ b/arch/unicore32/kernel/gpio.c
+@@ -0,0 +1,122 @@
++/*
++ * linux/arch/unicore32/kernel/gpio.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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.
++ */
++/* in FPGA, no GPIO support */
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/gpio.h>
++#include <mach/hardware.h>
++
++#ifdef CONFIG_LEDS
++#include <linux/leds.h>
++#include <linux/platform_device.h>
++
++static const struct gpio_led puv3_gpio_leds[] = {
++ { .name = "cpuhealth", .gpio = GPO_CPU_HEALTH, .active_low = 0,
++ .default_trigger = "heartbeat", },
++ { .name = "hdd_led", .gpio = GPO_HDD_LED, .active_low = 1,
++ .default_trigger = "ide-disk", },
++};
++
++static const struct gpio_led_platform_data puv3_gpio_led_data = {
++ .num_leds = ARRAY_SIZE(puv3_gpio_leds),
++ .leds = (void *) puv3_gpio_leds,
++};
++
++static struct platform_device puv3_gpio_gpio_leds = {
++ .name = "leds-gpio",
++ .id = -1,
++ .dev = {
++ .platform_data = (void *) &puv3_gpio_led_data,
++ }
++};
++
++static int __init puv3_gpio_leds_init(void)
++{
++ platform_device_register(&puv3_gpio_gpio_leds);
++ return 0;
++}
++
++device_initcall(puv3_gpio_leds_init);
++#endif
++
++static int puv3_gpio_get(struct gpio_chip *chip, unsigned offset)
++{
++ return GPIO_GPLR & GPIO_GPIO(offset);
++}
++
++static void puv3_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
++{
++ if (value)
++ GPIO_GPSR = GPIO_GPIO(offset);
++ else
++ GPIO_GPCR = GPIO_GPIO(offset);
++}
++
++static int puv3_direction_input(struct gpio_chip *chip, unsigned offset)
++{
++ unsigned long flags;
++
++ local_irq_save(flags);
++ GPIO_GPDR &= ~GPIO_GPIO(offset);
++ local_irq_restore(flags);
++ return 0;
++}
++
++static int puv3_direction_output(struct gpio_chip *chip, unsigned offset,
++ int value)
++{
++ unsigned long flags;
++
++ local_irq_save(flags);
++ puv3_gpio_set(chip, offset, value);
++ GPIO_GPDR |= GPIO_GPIO(offset);
++ local_irq_restore(flags);
++ return 0;
++}
++
++static struct gpio_chip puv3_gpio_chip = {
++ .label = "gpio",
++ .direction_input = puv3_direction_input,
++ .direction_output = puv3_direction_output,
++ .set = puv3_gpio_set,
++ .get = puv3_gpio_get,
++ .base = 0,
++ .ngpio = GPIO_MAX + 1,
++};
++
++void __init puv3_init_gpio(void)
++{
++ GPIO_GPDR = GPIO_DIR;
++#if defined(CONFIG_PUV3_NB0916) || defined(CONFIG_PUV3_SMW0919) \
++ || defined(CONFIG_PUV3_DB0913)
++ gpio_set_value(GPO_WIFI_EN, 1);
++ gpio_set_value(GPO_HDD_LED, 1);
++ gpio_set_value(GPO_VGA_EN, 1);
++ gpio_set_value(GPO_LCD_EN, 1);
++ gpio_set_value(GPO_CAM_PWR_EN, 0);
++ gpio_set_value(GPO_LCD_VCC_EN, 1);
++ gpio_set_value(GPO_SOFT_OFF, 1);
++ gpio_set_value(GPO_BT_EN, 1);
++ gpio_set_value(GPO_FAN_ON, 0);
++ gpio_set_value(GPO_SPKR, 0);
++ gpio_set_value(GPO_CPU_HEALTH, 1);
++ gpio_set_value(GPO_LAN_SEL, 1);
++/*
++ * DO NOT modify the GPO_SET_V1 and GPO_SET_V2 in kernel
++ * gpio_set_value(GPO_SET_V1, 1);
++ * gpio_set_value(GPO_SET_V2, 1);
++ */
++#endif
++ gpiochip_add(&puv3_gpio_chip);
++}
+diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
+new file mode 100644
+index 000000000000..7c211f597833
+--- /dev/null
++++ b/arch/unicore32/kernel/irq.c
+@@ -0,0 +1,426 @@
++/*
++ * linux/arch/unicore32/kernel/irq.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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_stat.h>
++#include <linux/module.h>
++#include <linux/signal.h>
++#include <linux/ioport.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/random.h>
++#include <linux/smp.h>
++#include <linux/init.h>
++#include <linux/seq_file.h>
++#include <linux/errno.h>
++#include <linux/list.h>
++#include <linux/kallsyms.h>
++#include <linux/proc_fs.h>
++#include <linux/sysdev.h>
++#include <linux/gpio.h>
++
++#include <asm/system.h>
++#include <mach/hardware.h>
++
++#include "setup.h"
++
++/*
++ * PKUnity GPIO edge detection for IRQs:
++ * IRQs are generated on Falling-Edge, Rising-Edge, or both.
++ * Use this instead of directly setting GRER/GFER.
++ */
++static int GPIO_IRQ_rising_edge;
++static int GPIO_IRQ_falling_edge;
++static int GPIO_IRQ_mask = 0;
++
++#define GPIO_MASK(irq) (1 << (irq - IRQ_GPIO0))
++
++static int puv3_gpio_type(unsigned int irq, unsigned int type)
++{
++ unsigned int mask;
++
++ if (irq < IRQ_GPIOHIGH)
++ mask = 1 << irq;
++ else
++ mask = GPIO_MASK(irq);
++
++ if (type == IRQ_TYPE_PROBE) {
++ if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
++ return 0;
++ type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
++ }
++
++ if (type & IRQ_TYPE_EDGE_RISING)
++ GPIO_IRQ_rising_edge |= mask;
++ else
++ GPIO_IRQ_rising_edge &= ~mask;
++ if (type & IRQ_TYPE_EDGE_FALLING)
++ GPIO_IRQ_falling_edge |= mask;
++ else
++ GPIO_IRQ_falling_edge &= ~mask;
++
++ GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
++ GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++
++ return 0;
++}
++
++/*
++ * GPIO IRQs must be acknowledged. This is for IRQs from 0 to 7.
++ */
++static void puv3_low_gpio_ack(unsigned int irq)
++{
++ GPIO_GEDR = (1 << irq);
++}
++
++static void puv3_low_gpio_mask(unsigned int irq)
++{
++ INTC_ICMR &= ~(1 << irq);
++}
++
++static void puv3_low_gpio_unmask(unsigned int irq)
++{
++ INTC_ICMR |= 1 << irq;
++}
++
++static int puv3_low_gpio_wake(unsigned int irq, unsigned int on)
++{
++ if (on)
++ PM_PWER |= 1 << irq;
++ else
++ PM_PWER &= ~(1 << irq);
++ return 0;
++}
++
++static struct irq_chip puv3_low_gpio_chip = {
++ .name = "GPIO-low",
++ .ack = puv3_low_gpio_ack,
++ .mask = puv3_low_gpio_mask,
++ .unmask = puv3_low_gpio_unmask,
++ .set_type = puv3_gpio_type,
++ .set_wake = puv3_low_gpio_wake,
++};
++
++/*
++ * IRQ8 (GPIO0 through 27) handler. We enter here with the
++ * irq_controller_lock held, and IRQs disabled. Decode the IRQ
++ * and call the handler.
++ */
++static void
++puv3_gpio_handler(unsigned int irq, struct irq_desc *desc)
++{
++ unsigned int mask;
++
++ mask = GPIO_GEDR;
++ do {
++ /*
++ * clear down all currently active IRQ sources.
++ * We will be processing them all.
++ */
++ GPIO_GEDR = mask;
++
++ irq = IRQ_GPIO0;
++ do {
++ if (mask & 1)
++ generic_handle_irq(irq);
++ mask >>= 1;
++ irq++;
++ } while (mask);
++ mask = GPIO_GEDR;
++ } while (mask);
++}
++
++/*
++ * GPIO0-27 edge IRQs need to be handled specially.
++ * In addition, the IRQs are all collected up into one bit in the
++ * interrupt controller registers.
++ */
++static void puv3_high_gpio_ack(unsigned int irq)
++{
++ unsigned int mask = GPIO_MASK(irq);
++
++ GPIO_GEDR = mask;
++}
++
++static void puv3_high_gpio_mask(unsigned int irq)
++{
++ unsigned int mask = GPIO_MASK(irq);
++
++ GPIO_IRQ_mask &= ~mask;
++
++ GPIO_GRER &= ~mask;
++ GPIO_GFER &= ~mask;
++}
++
++static void puv3_high_gpio_unmask(unsigned int irq)
++{
++ unsigned int mask = GPIO_MASK(irq);
++
++ GPIO_IRQ_mask |= mask;
++
++ GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
++ GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++}
++
++static int puv3_high_gpio_wake(unsigned int irq, unsigned int on)
++{
++ if (on)
++ PM_PWER |= PM_PWER_GPIOHIGH;
++ else
++ PM_PWER &= ~PM_PWER_GPIOHIGH;
++ return 0;
++}
++
++static struct irq_chip puv3_high_gpio_chip = {
++ .name = "GPIO-high",
++ .ack = puv3_high_gpio_ack,
++ .mask = puv3_high_gpio_mask,
++ .unmask = puv3_high_gpio_unmask,
++ .set_type = puv3_gpio_type,
++ .set_wake = puv3_high_gpio_wake,
++};
++
++/*
++ * We don't need to ACK IRQs on the PKUnity unless they're GPIOs
++ * this is for internal IRQs i.e. from 8 to 31.
++ */
++static void puv3_mask_irq(unsigned int irq)
++{
++ INTC_ICMR &= ~(1 << irq);
++}
++
++static void puv3_unmask_irq(unsigned int irq)
++{
++ INTC_ICMR |= (1 << irq);
++}
++
++/*
++ * Apart form GPIOs, only the RTC alarm can be a wakeup event.
++ */
++static int puv3_set_wake(unsigned int irq, unsigned int on)
++{
++ if (irq == IRQ_RTCAlarm) {
++ if (on)
++ PM_PWER |= PM_PWER_RTC;
++ else
++ PM_PWER &= ~PM_PWER_RTC;
++ return 0;
++ }
++ return -EINVAL;
++}
++
++static struct irq_chip puv3_normal_chip = {
++ .name = "PKUnity-v3",
++ .ack = puv3_mask_irq,
++ .mask = puv3_mask_irq,
++ .unmask = puv3_unmask_irq,
++ .set_wake = puv3_set_wake,
++};
++
++static struct resource irq_resource = {
++ .name = "irqs",
++ .start = PKUNITY_INTC_BASE,
++ .end = PKUNITY_INTC_BASE + 0xFFFFF,
++};
++
++static struct puv3_irq_state {
++ unsigned int saved;
++ unsigned int icmr;
++ unsigned int iclr;
++ unsigned int iccr;
++} puv3_irq_state;
++
++static int puv3_irq_suspend(struct sys_device *dev, pm_message_t state)
++{
++ struct puv3_irq_state *st = &puv3_irq_state;
++
++ st->saved = 1;
++ st->icmr = INTC_ICMR;
++ st->iclr = INTC_ICLR;
++ st->iccr = INTC_ICCR;
++
++ /*
++ * Disable all GPIO-based interrupts.
++ */
++ INTC_ICMR &= ~(0x1ff);
++
++ /*
++ * Set the appropriate edges for wakeup.
++ */
++ GPIO_GRER = PM_PWER & GPIO_IRQ_rising_edge;
++ GPIO_GFER = PM_PWER & GPIO_IRQ_falling_edge;
++
++ /*
++ * Clear any pending GPIO interrupts.
++ */
++ GPIO_GEDR = GPIO_GEDR;
++
++ return 0;
++}
++
++static int puv3_irq_resume(struct sys_device *dev)
++{
++ struct puv3_irq_state *st = &puv3_irq_state;
++
++ if (st->saved) {
++ INTC_ICCR = st->iccr;
++ INTC_ICLR = st->iclr;
++
++ GPIO_GRER = GPIO_IRQ_rising_edge & GPIO_IRQ_mask;
++ GPIO_GFER = GPIO_IRQ_falling_edge & GPIO_IRQ_mask;
++
++ INTC_ICMR = st->icmr;
++ }
++ return 0;
++}
++
++static struct sysdev_class puv3_irq_sysclass = {
++ .name = "pkunity-irq",
++ .suspend = puv3_irq_suspend,
++ .resume = puv3_irq_resume,
++};
++
++static struct sys_device puv3_irq_device = {
++ .id = 0,
++ .cls = &puv3_irq_sysclass,
++};
++
++static int __init puv3_irq_init_devicefs(void)
++{
++ sysdev_class_register(&puv3_irq_sysclass);
++ return sysdev_register(&puv3_irq_device);
++}
++
++device_initcall(puv3_irq_init_devicefs);
++
++void __init init_IRQ(void)
++{
++ unsigned int irq;
++
++ request_resource(&iomem_resource, &irq_resource);
++
++ /* disable all IRQs */
++ INTC_ICMR = 0;
++
++ /* all IRQs are IRQ, not REAL */
++ INTC_ICLR = 0;
++
++ /* clear all GPIO edge detects */
++ GPIO_GPIR = FMASK(8, 0) & ~FIELD(1, 1, GPI_SOFF_REQ);
++ GPIO_GFER = 0;
++ GPIO_GRER = 0;
++ GPIO_GEDR = 0x0FFFFFFF;
++
++ INTC_ICCR = 1;
++
++ for (irq = 0; irq < IRQ_GPIOHIGH; irq++) {
++ set_irq_chip(irq, &puv3_low_gpio_chip);
++ set_irq_handler(irq, handle_edge_irq);
++ irq_modify_status(irq,
++ IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
++ 0);
++ }
++
++ for (irq = IRQ_GPIOHIGH + 1; irq < IRQ_GPIO0; irq++) {
++ set_irq_chip(irq, &puv3_normal_chip);
++ set_irq_handler(irq, handle_level_irq);
++ irq_modify_status(irq,
++ IRQ_NOREQUEST | IRQ_NOAUTOEN,
++ IRQ_NOPROBE);
++ }
++
++ for (irq = IRQ_GPIO0; irq <= IRQ_GPIO27; irq++) {
++ set_irq_chip(irq, &puv3_high_gpio_chip);
++ set_irq_handler(irq, handle_edge_irq);
++ irq_modify_status(irq,
++ IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
++ 0);
++ }
++
++ /*
++ * Install handler for GPIO 0-27 edge detect interrupts
++ */
++ set_irq_chip(IRQ_GPIOHIGH, &puv3_normal_chip);
++ set_irq_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler);
++
++#ifdef CONFIG_PUV3_GPIO
++ puv3_init_gpio();
++#endif
++}
++
++int show_interrupts(struct seq_file *p, void *v)
++{
++ int i = *(loff_t *) v, cpu;
++ struct irq_desc *desc;
++ struct irqaction *action;
++ unsigned long flags;
++
++ if (i == 0) {
++ char cpuname[12];
++
++ seq_printf(p, " ");
++ for_each_present_cpu(cpu) {
++ sprintf(cpuname, "CPU%d", cpu);
++ seq_printf(p, " %10s", cpuname);
++ }
++ seq_putc(p, '\n');
++ }
++
++ if (i < nr_irqs) {
++ desc = irq_to_desc(i);
++ raw_spin_lock_irqsave(&desc->lock, flags);
++ action = desc->action;
++ if (!action)
++ goto unlock;
++
++ seq_printf(p, "%3d: ", i);
++ for_each_present_cpu(cpu)
++ seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));
++ seq_printf(p, " %10s", desc->chip->name ? : "-");
++ seq_printf(p, " %s", action->name);
++ for (action = action->next; action; action = action->next)
++ seq_printf(p, ", %s", action->name);
++
++ seq_putc(p, '\n');
++unlock:
++ raw_spin_unlock_irqrestore(&desc->lock, flags);
++ } else if (i == nr_irqs) {
++ seq_printf(p, "Error in interrupt!\n");
++ }
++ return 0;
++}
++
++/*
++ * do_IRQ handles all hardware IRQ's. Decoded IRQs should not
++ * come via this function. Instead, they should provide their
++ * own 'handler'
++ */
++asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
++{
++ struct pt_regs *old_regs = set_irq_regs(regs);
++
++ irq_enter();
++
++ /*
++ * Some hardware gives randomly wrong interrupts. Rather
++ * than crashing, do something sensible.
++ */
++ if (unlikely(irq >= nr_irqs)) {
++ if (printk_ratelimit())
++ printk(KERN_WARNING "Bad IRQ%u\n", irq);
++ ack_bad_irq(irq);
++ } else {
++ generic_handle_irq(irq);
++ }
++
++ irq_exit();
++ set_irq_regs(old_regs);
++}
++commit 02b2ee16cc31df2b23d6f6c68a597d947f6c10e8
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:19:03 2011 +0800
+
+ unicore32 core architecture: timer and time handling
+
+ This patch implements timer and time.
+ RTC and PWM device drivers are also here.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+
+diff --git a/arch/unicore32/include/asm/timex.h b/arch/unicore32/include/asm/timex.h
+new file mode 100644
+index 000000000000..faf16ba46544
+--- /dev/null
++++ b/arch/unicore32/include/asm/timex.h
+@@ -0,0 +1,34 @@
++/*
++ * linux/arch/unicore32/include/asm/timex.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_TIMEX_H__
++#define __UNICORE_TIMEX_H__
++
++#ifdef CONFIG_ARCH_FPGA
++
++/* in FPGA, APB clock is 33M, and OST clock is 32K, */
++/* so, 1M is selected for timer interrupt correctly */
++#define CLOCK_TICK_RATE (32*1024)
++
++#endif
++
++#if defined(CONFIG_PUV3_DB0913) \
++ || defined(CONFIG_PUV3_NB0916) \
++ || defined(CONFIG_PUV3_SMW0919)
++
++#define CLOCK_TICK_RATE (14318000)
++
++#endif
++
++#include <asm-generic/timex.h>
++
++#endif
+diff --git a/arch/unicore32/kernel/pwm.c b/arch/unicore32/kernel/pwm.c
+new file mode 100644
+index 000000000000..4615d51e3ba6
+--- /dev/null
++++ b/arch/unicore32/kernel/pwm.c
+@@ -0,0 +1,263 @@
++/*
++ * linux/arch/unicore32/kernel/pwm.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++#include <linux/err.h>
++#include <linux/clk.h>
++#include <linux/io.h>
++#include <linux/pwm.h>
++
++#include <asm/div64.h>
++#include <mach/hardware.h>
++
++struct pwm_device {
++ struct list_head node;
++ struct platform_device *pdev;
++
++ const char *label;
++ struct clk *clk;
++ int clk_enabled;
++
++ unsigned int use_count;
++ unsigned int pwm_id;
++};
++
++/*
++ * period_ns = 10^9 * (PRESCALE + 1) * (PV + 1) / PWM_CLK_RATE
++ * duty_ns = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE
++ */
++int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
++{
++ unsigned long long c;
++ unsigned long period_cycles, prescale, pv, dc;
++
++ if (pwm == NULL || period_ns == 0 || duty_ns > period_ns)
++ return -EINVAL;
++
++ c = clk_get_rate(pwm->clk);
++ c = c * period_ns;
++ do_div(c, 1000000000);
++ period_cycles = c;
++
++ if (period_cycles < 1)
++ period_cycles = 1;
++ prescale = (period_cycles - 1) / 1024;
++ pv = period_cycles / (prescale + 1) - 1;
++
++ if (prescale > 63)
++ return -EINVAL;
++
++ if (duty_ns == period_ns)
++ dc = OST_PWMDCCR_FDCYCLE;
++ else
++ dc = (pv + 1) * duty_ns / period_ns;
++
++ /* NOTE: the clock to PWM has to be enabled first
++ * before writing to the registers
++ */
++ clk_enable(pwm->clk);
++ OST_PWMPWCR = prescale;
++ OST_PWMDCCR = pv - dc;
++ OST_PWMPCR = pv;
++ clk_disable(pwm->clk);
++
++ return 0;
++}
++EXPORT_SYMBOL(pwm_config);
++
++int pwm_enable(struct pwm_device *pwm)
++{
++ int rc = 0;
++
++ if (!pwm->clk_enabled) {
++ rc = clk_enable(pwm->clk);
++ if (!rc)
++ pwm->clk_enabled = 1;
++ }
++ return rc;
++}
++EXPORT_SYMBOL(pwm_enable);
++
++void pwm_disable(struct pwm_device *pwm)
++{
++ if (pwm->clk_enabled) {
++ clk_disable(pwm->clk);
++ pwm->clk_enabled = 0;
++ }
++}
++EXPORT_SYMBOL(pwm_disable);
++
++static DEFINE_MUTEX(pwm_lock);
++static LIST_HEAD(pwm_list);
++
++struct pwm_device *pwm_request(int pwm_id, const char *label)
++{
++ struct pwm_device *pwm;
++ int found = 0;
++
++ mutex_lock(&pwm_lock);
++
++ list_for_each_entry(pwm, &pwm_list, node) {
++ if (pwm->pwm_id == pwm_id) {
++ found = 1;
++ break;
++ }
++ }
++
++ if (found) {
++ if (pwm->use_count == 0) {
++ pwm->use_count++;
++ pwm->label = label;
++ } else
++ pwm = ERR_PTR(-EBUSY);
++ } else
++ pwm = ERR_PTR(-ENOENT);
++
++ mutex_unlock(&pwm_lock);
++ return pwm;
++}
++EXPORT_SYMBOL(pwm_request);
++
++void pwm_free(struct pwm_device *pwm)
++{
++ mutex_lock(&pwm_lock);
++
++ if (pwm->use_count) {
++ pwm->use_count--;
++ pwm->label = NULL;
++ } else
++ pr_warning("PWM device already freed\n");
++
++ mutex_unlock(&pwm_lock);
++}
++EXPORT_SYMBOL(pwm_free);
++
++static inline void __add_pwm(struct pwm_device *pwm)
++{
++ mutex_lock(&pwm_lock);
++ list_add_tail(&pwm->node, &pwm_list);
++ mutex_unlock(&pwm_lock);
++}
++
++static struct pwm_device *pwm_probe(struct platform_device *pdev,
++ unsigned int pwm_id, struct pwm_device *parent_pwm)
++{
++ struct pwm_device *pwm;
++ struct resource *r;
++ int ret = 0;
++
++ pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL);
++ if (pwm == NULL) {
++ dev_err(&pdev->dev, "failed to allocate memory\n");
++ return ERR_PTR(-ENOMEM);
++ }
++
++ pwm->clk = clk_get(NULL, "OST_CLK");
++ if (IS_ERR(pwm->clk)) {
++ ret = PTR_ERR(pwm->clk);
++ goto err_free;
++ }
++ pwm->clk_enabled = 0;
++
++ pwm->use_count = 0;
++ pwm->pwm_id = pwm_id;
++ pwm->pdev = pdev;
++
++ r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (r == NULL) {
++ dev_err(&pdev->dev, "no memory resource defined\n");
++ ret = -ENODEV;
++ goto err_free_clk;
++ }
++
++ r = request_mem_region(r->start, resource_size(r), pdev->name);
++ if (r == NULL) {
++ dev_err(&pdev->dev, "failed to request memory resource\n");
++ ret = -EBUSY;
++ goto err_free_clk;
++ }
++
++ __add_pwm(pwm);
++ platform_set_drvdata(pdev, pwm);
++ return pwm;
++
++err_free_clk:
++ clk_put(pwm->clk);
++err_free:
++ kfree(pwm);
++ return ERR_PTR(ret);
++}
++
++static int __devinit puv3_pwm_probe(struct platform_device *pdev)
++{
++ struct pwm_device *pwm = pwm_probe(pdev, pdev->id, NULL);
++
++ if (IS_ERR(pwm))
++ return PTR_ERR(pwm);
++
++ return 0;
++}
++
++static int __devexit pwm_remove(struct platform_device *pdev)
++{
++ struct pwm_device *pwm;
++ struct resource *r;
++
++ pwm = platform_get_drvdata(pdev);
++ if (pwm == NULL)
++ return -ENODEV;
++
++ mutex_lock(&pwm_lock);
++ list_del(&pwm->node);
++ mutex_unlock(&pwm_lock);
++
++ r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ release_mem_region(r->start, resource_size(r));
++
++ clk_put(pwm->clk);
++ kfree(pwm);
++ return 0;
++}
++
++static struct platform_driver puv3_pwm_driver = {
++ .driver = {
++ .name = "PKUnity-v3-PWM",
++ },
++ .probe = puv3_pwm_probe,
++ .remove = __devexit_p(pwm_remove),
++};
++
++static int __init pwm_init(void)
++{
++ int ret = 0;
++
++ ret = platform_driver_register(&puv3_pwm_driver);
++ if (ret) {
++ printk(KERN_ERR "failed to register puv3_pwm_driver\n");
++ return ret;
++ }
++
++ return ret;
++}
++arch_initcall(pwm_init);
++
++static void __exit pwm_exit(void)
++{
++ platform_driver_unregister(&puv3_pwm_driver);
++}
++module_exit(pwm_exit);
++
++MODULE_LICENSE("GPL v2");
+diff --git a/arch/unicore32/kernel/rtc.c b/arch/unicore32/kernel/rtc.c
+new file mode 100644
+index 000000000000..5e4db4158589
+--- /dev/null
++++ b/arch/unicore32/kernel/rtc.c
+@@ -0,0 +1,380 @@
++/*
++ * linux/arch/unicore32/kernel/rtc.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/fs.h>
++#include <linux/string.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/interrupt.h>
++#include <linux/rtc.h>
++#include <linux/bcd.h>
++#include <linux/clk.h>
++#include <linux/log2.h>
++#include <linux/slab.h>
++#include <linux/uaccess.h>
++#include <linux/io.h>
++
++#include <asm/irq.h>
++#include <mach/hardware.h>
++
++static struct resource *puv3_rtc_mem;
++
++static int puv3_rtc_alarmno = IRQ_RTCAlarm;
++static int puv3_rtc_tickno = IRQ_RTC;
++
++static DEFINE_SPINLOCK(puv3_rtc_pie_lock);
++
++/* IRQ Handlers */
++
++static irqreturn_t puv3_rtc_alarmirq(int irq, void *id)
++{
++ struct rtc_device *rdev = id;
++
++ RTC_RTSR |= RTC_RTSR_AL;
++ rtc_update_irq(rdev, 1, RTC_AF | RTC_IRQF);
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t puv3_rtc_tickirq(int irq, void *id)
++{
++ struct rtc_device *rdev = id;
++
++ RTC_RTSR |= RTC_RTSR_HZ;
++ rtc_update_irq(rdev, 1, RTC_PF | RTC_IRQF);
++ return IRQ_HANDLED;
++}
++
++/* Update control registers */
++static void puv3_rtc_setaie(int to)
++{
++ unsigned int tmp;
++
++ pr_debug("%s: aie=%d\n", __func__, to);
++
++ tmp = RTC_RTSR & ~RTC_RTSR_ALE;
++
++ if (to)
++ tmp |= RTC_RTSR_ALE;
++
++ RTC_RTSR = tmp;
++}
++
++static int puv3_rtc_setpie(struct device *dev, int enabled)
++{
++ unsigned int tmp;
++
++ pr_debug("%s: pie=%d\n", __func__, enabled);
++
++ spin_lock_irq(&puv3_rtc_pie_lock);
++ tmp = RTC_RTSR & ~RTC_RTSR_HZE;
++
++ if (enabled)
++ tmp |= RTC_RTSR_HZE;
++
++ RTC_RTSR = tmp;
++ spin_unlock_irq(&puv3_rtc_pie_lock);
++
++ return 0;
++}
++
++static int puv3_rtc_setfreq(struct device *dev, int freq)
++{
++ return 0;
++}
++
++/* Time read/write */
++
++static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
++{
++ rtc_time_to_tm(RTC_RCNR, rtc_tm);
++
++ pr_debug("read time %02x.%02x.%02x %02x/%02x/%02x\n",
++ rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,
++ rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec);
++
++ return 0;
++}
++
++static int puv3_rtc_settime(struct device *dev, struct rtc_time *tm)
++{
++ unsigned long rtc_count = 0;
++
++ pr_debug("set time %02d.%02d.%02d %02d/%02d/%02d\n",
++ tm->tm_year, tm->tm_mon, tm->tm_mday,
++ tm->tm_hour, tm->tm_min, tm->tm_sec);
++
++ rtc_tm_to_time(tm, &rtc_count);
++ RTC_RCNR = rtc_count;
++
++ return 0;
++}
++
++static int puv3_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
++{
++ struct rtc_time *alm_tm = &alrm->time;
++
++ rtc_time_to_tm(RTC_RTAR, alm_tm);
++
++ alrm->enabled = RTC_RTSR & RTC_RTSR_ALE;
++
++ pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",
++ alrm->enabled,
++ alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
++ alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec);
++
++ return 0;
++}
++
++static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
++{
++ struct rtc_time *tm = &alrm->time;
++ unsigned long rtcalarm_count = 0;
++
++ pr_debug("puv3_rtc_setalarm: %d, %02x/%02x/%02x %02x.%02x.%02x\n",
++ alrm->enabled,
++ tm->tm_mday & 0xff, tm->tm_mon & 0xff, tm->tm_year & 0xff,
++ tm->tm_hour & 0xff, tm->tm_min & 0xff, tm->tm_sec);
++
++ rtc_tm_to_time(tm, &rtcalarm_count);
++ RTC_RTAR = rtcalarm_count;
++
++ puv3_rtc_setaie(alrm->enabled);
++
++ if (alrm->enabled)
++ enable_irq_wake(puv3_rtc_alarmno);
++ else
++ disable_irq_wake(puv3_rtc_alarmno);
++
++ return 0;
++}
++
++static int puv3_rtc_proc(struct device *dev, struct seq_file *seq)
++{
++ seq_printf(seq, "periodic_IRQ\t: %s\n",
++ (RTC_RTSR & RTC_RTSR_HZE) ? "yes" : "no");
++ return 0;
++}
++
++static int puv3_rtc_open(struct device *dev)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
++ int ret;
++
++ ret = request_irq(puv3_rtc_alarmno, puv3_rtc_alarmirq,
++ IRQF_DISABLED, "pkunity-rtc alarm", rtc_dev);
++
++ if (ret) {
++ dev_err(dev, "IRQ%d error %d\n", puv3_rtc_alarmno, ret);
++ return ret;
++ }
++
++ ret = request_irq(puv3_rtc_tickno, puv3_rtc_tickirq,
++ IRQF_DISABLED, "pkunity-rtc tick", rtc_dev);
++
++ if (ret) {
++ dev_err(dev, "IRQ%d error %d\n", puv3_rtc_tickno, ret);
++ goto tick_err;
++ }
++
++ return ret;
++
++ tick_err:
++ free_irq(puv3_rtc_alarmno, rtc_dev);
++ return ret;
++}
++
++static void puv3_rtc_release(struct device *dev)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct rtc_device *rtc_dev = platform_get_drvdata(pdev);
++
++ /* do not clear AIE here, it may be needed for wake */
++
++ puv3_rtc_setpie(dev, 0);
++ free_irq(puv3_rtc_alarmno, rtc_dev);
++ free_irq(puv3_rtc_tickno, rtc_dev);
++}
++
++static const struct rtc_class_ops puv3_rtcops = {
++ .open = puv3_rtc_open,
++ .release = puv3_rtc_release,
++ .read_time = puv3_rtc_gettime,
++ .set_time = puv3_rtc_settime,
++ .read_alarm = puv3_rtc_getalarm,
++ .set_alarm = puv3_rtc_setalarm,
++ .irq_set_freq = puv3_rtc_setfreq,
++ .irq_set_state = puv3_rtc_setpie,
++ .proc = puv3_rtc_proc,
++};
++
++static void puv3_rtc_enable(struct platform_device *pdev, int en)
++{
++ if (!en) {
++ RTC_RTSR &= ~RTC_RTSR_HZE;
++ } else {
++ /* re-enable the device, and check it is ok */
++
++ if ((RTC_RTSR & RTC_RTSR_HZE) == 0) {
++ dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
++ RTC_RTSR |= RTC_RTSR_HZE;
++ }
++ }
++}
++
++static int puv3_rtc_remove(struct platform_device *dev)
++{
++ struct rtc_device *rtc = platform_get_drvdata(dev);
++
++ platform_set_drvdata(dev, NULL);
++ rtc_device_unregister(rtc);
++
++ puv3_rtc_setpie(&dev->dev, 0);
++ puv3_rtc_setaie(0);
++
++ release_resource(puv3_rtc_mem);
++ kfree(puv3_rtc_mem);
++
++ return 0;
++}
++
++static int puv3_rtc_probe(struct platform_device *pdev)
++{
++ struct rtc_device *rtc;
++ struct resource *res;
++ int ret;
++
++ pr_debug("%s: probe=%p\n", __func__, pdev);
++
++ /* find the IRQs */
++
++ puv3_rtc_tickno = platform_get_irq(pdev, 1);
++ if (puv3_rtc_tickno < 0) {
++ dev_err(&pdev->dev, "no irq for rtc tick\n");
++ return -ENOENT;
++ }
++
++ puv3_rtc_alarmno = platform_get_irq(pdev, 0);
++ if (puv3_rtc_alarmno < 0) {
++ dev_err(&pdev->dev, "no irq for alarm\n");
++ return -ENOENT;
++ }
++
++ pr_debug("PKUnity_rtc: tick irq %d, alarm irq %d\n",
++ puv3_rtc_tickno, puv3_rtc_alarmno);
++
++ /* get the memory region */
++
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (res == NULL) {
++ dev_err(&pdev->dev, "failed to get memory region resource\n");
++ return -ENOENT;
++ }
++
++ puv3_rtc_mem = request_mem_region(res->start,
++ res->end-res->start+1,
++ pdev->name);
++
++ if (puv3_rtc_mem == NULL) {
++ dev_err(&pdev->dev, "failed to reserve memory region\n");
++ ret = -ENOENT;
++ goto err_nores;
++ }
++
++ puv3_rtc_enable(pdev, 1);
++
++ puv3_rtc_setfreq(&pdev->dev, 1);
++
++ /* register RTC and exit */
++
++ rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
++ THIS_MODULE);
++
++ if (IS_ERR(rtc)) {
++ dev_err(&pdev->dev, "cannot attach rtc\n");
++ ret = PTR_ERR(rtc);
++ goto err_nortc;
++ }
++
++ /* platform setup code should have handled this; sigh */
++ if (!device_can_wakeup(&pdev->dev))
++ device_init_wakeup(&pdev->dev, 1);
++
++ platform_set_drvdata(pdev, rtc);
++ return 0;
++
++ err_nortc:
++ puv3_rtc_enable(pdev, 0);
++ release_resource(puv3_rtc_mem);
++
++ err_nores:
++ return ret;
++}
++
++#ifdef CONFIG_PM
++
++/* RTC Power management control */
++
++static int ticnt_save;
++
++static int puv3_rtc_suspend(struct platform_device *pdev, pm_message_t state)
++{
++ /* save RTAR for anyone using periodic interrupts */
++ ticnt_save = RTC_RTAR;
++ puv3_rtc_enable(pdev, 0);
++ return 0;
++}
++
++static int puv3_rtc_resume(struct platform_device *pdev)
++{
++ puv3_rtc_enable(pdev, 1);
++ RTC_RTAR = ticnt_save;
++ return 0;
++}
++#else
++#define puv3_rtc_suspend NULL
++#define puv3_rtc_resume NULL
++#endif
++
++static struct platform_driver puv3_rtcdrv = {
++ .probe = puv3_rtc_probe,
++ .remove = __devexit_p(puv3_rtc_remove),
++ .suspend = puv3_rtc_suspend,
++ .resume = puv3_rtc_resume,
++ .driver = {
++ .name = "PKUnity-v3-RTC",
++ .owner = THIS_MODULE,
++ }
++};
++
++static char __initdata banner[] = "PKUnity-v3 RTC, (c) 2009 PKUnity Co.\n";
++
++static int __init puv3_rtc_init(void)
++{
++ printk(banner);
++ return platform_driver_register(&puv3_rtcdrv);
++}
++
++static void __exit puv3_rtc_exit(void)
++{
++ platform_driver_unregister(&puv3_rtcdrv);
++}
++
++module_init(puv3_rtc_init);
++module_exit(puv3_rtc_exit);
++
++MODULE_DESCRIPTION("RTC Driver for the PKUnity v3 chip");
++MODULE_AUTHOR("Hu Dongliang");
++MODULE_LICENSE("GPL v2");
++
+diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c
+new file mode 100644
+index 000000000000..8090d763a606
+--- /dev/null
++++ b/arch/unicore32/kernel/time.c
+@@ -0,0 +1,148 @@
++/*
++ * linux/arch/unicore32/kernel/time.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/errno.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/timex.h>
++#include <linux/clockchips.h>
++
++#include <mach/hardware.h>
++
++#define MIN_OSCR_DELTA 2
++
++static irqreturn_t puv3_ost0_interrupt(int irq, void *dev_id)
++{
++ struct clock_event_device *c = dev_id;
++
++ /* Disarm the compare/match, signal the event. */
++ OST_OIER &= ~OST_OIER_E0;
++ OST_OSSR &= ~OST_OSSR_M0;
++ c->event_handler(c);
++
++ return IRQ_HANDLED;
++}
++
++static int
++puv3_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c)
++{
++ unsigned long next, oscr;
++
++ OST_OIER |= OST_OIER_E0;
++ next = OST_OSCR + delta;
++ OST_OSMR0 = next;
++ oscr = OST_OSCR;
++
++ return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
++}
++
++static void
++puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
++{
++ switch (mode) {
++ case CLOCK_EVT_MODE_ONESHOT:
++ case CLOCK_EVT_MODE_UNUSED:
++ case CLOCK_EVT_MODE_SHUTDOWN:
++ OST_OIER &= ~OST_OIER_E0;
++ OST_OSSR &= ~OST_OSSR_M0;
++ break;
++
++ case CLOCK_EVT_MODE_RESUME:
++ case CLOCK_EVT_MODE_PERIODIC:
++ break;
++ }
++}
++
++static struct clock_event_device ckevt_puv3_osmr0 = {
++ .name = "osmr0",
++ .features = CLOCK_EVT_FEAT_ONESHOT,
++#ifdef CONFIG_ARCH_FPGA
++ .shift = 18, /* correct shift val: 16, but warn_on_slowpath */
++#else
++ .shift = 30,
++#endif
++ .rating = 200,
++ .set_next_event = puv3_osmr0_set_next_event,
++ .set_mode = puv3_osmr0_set_mode,
++};
++
++static cycle_t puv3_read_oscr(struct clocksource *cs)
++{
++ return OST_OSCR;
++}
++
++static struct clocksource cksrc_puv3_oscr = {
++ .name = "oscr",
++ .rating = 200,
++ .read = puv3_read_oscr,
++ .mask = CLOCKSOURCE_MASK(32),
++ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
++};
++
++static struct irqaction puv3_timer_irq = {
++ .name = "ost0",
++ .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
++ .handler = puv3_ost0_interrupt,
++ .dev_id = &ckevt_puv3_osmr0,
++};
++
++void __init time_init(void)
++{
++ OST_OIER = 0; /* disable any timer interrupts */
++ OST_OSSR = 0; /* clear status on all timers */
++
++ ckevt_puv3_osmr0.mult =
++ div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt_puv3_osmr0.shift);
++ ckevt_puv3_osmr0.max_delta_ns =
++ clockevent_delta2ns(0x7fffffff, &ckevt_puv3_osmr0);
++ ckevt_puv3_osmr0.min_delta_ns =
++ clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_puv3_osmr0) + 1;
++ ckevt_puv3_osmr0.cpumask = cpumask_of(0);
++
++ setup_irq(IRQ_TIMER0, &puv3_timer_irq);
++
++ clocksource_register_hz(&cksrc_puv3_oscr, CLOCK_TICK_RATE);
++ clockevents_register_device(&ckevt_puv3_osmr0);
++}
++
++#ifdef CONFIG_PM
++unsigned long osmr[4], oier;
++
++void puv3_timer_suspend(void)
++{
++ osmr[0] = OST_OSMR0;
++ osmr[1] = OST_OSMR1;
++ osmr[2] = OST_OSMR2;
++ osmr[3] = OST_OSMR3;
++ oier = OST_OIER;
++}
++
++void puv3_timer_resume(void)
++{
++ OST_OSSR = 0;
++ OST_OSMR0 = osmr[0];
++ OST_OSMR1 = osmr[1];
++ OST_OSMR2 = osmr[2];
++ OST_OSMR3 = osmr[3];
++ OST_OIER = oier;
++
++ /*
++ * OSMR0 is the system timer: make sure OSCR is sufficiently behind
++ */
++ OST_OSCR = OST_OSMR0 - LATCH;
++}
++#else
++void puv3_timer_suspend(void) { };
++void puv3_timer_resume(void) { };
++#endif
++
+ commit 10c9c10c31514564b09c153432a42ffaea3ce831
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:18:29 2011 +0800
+
+ unicore32 core architecture: mm related: consistent device DMA handling
+
+ This patch implements consistent device DMA handling of memory management.
+ DMA device operations are also here.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/cacheflush.h b/arch/unicore32/include/asm/cacheflush.h
+new file mode 100644
+index 000000000000..c0301e6c8b81
+--- /dev/null
++++ b/arch/unicore32/include/asm/cacheflush.h
+@@ -0,0 +1,211 @@
++/*
++ * linux/arch/unicore32/include/asm/cacheflush.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_CACHEFLUSH_H__
++#define __UNICORE_CACHEFLUSH_H__
++
++#include <linux/mm.h>
++
++#include <asm/shmparam.h>
++
++#define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)
++
++/*
++ * This flag is used to indicate that the page pointed to by a pte is clean
++ * and does not require cleaning before returning it to the user.
++ */
++#define PG_dcache_clean PG_arch_1
++
++/*
++ * MM Cache Management
++ * ===================
++ *
++ * The arch/unicore32/mm/cache.S files implement these methods.
++ *
++ * Start addresses are inclusive and end addresses are exclusive;
++ * start addresses should be rounded down, end addresses up.
++ *
++ * See Documentation/cachetlb.txt for more information.
++ * Please note that the implementation of these, and the required
++ * effects are cache-type (VIVT/VIPT/PIPT) specific.
++ *
++ * flush_icache_all()
++ *
++ * Unconditionally clean and invalidate the entire icache.
++ * Currently only needed for cache-v6.S and cache-v7.S, see
++ * __flush_icache_all for the generic implementation.
++ *
++ * flush_kern_all()
++ *
++ * Unconditionally clean and invalidate the entire cache.
++ *
++ * flush_user_all()
++ *
++ * Clean and invalidate all user space cache entries
++ * before a change of page tables.
++ *
++ * flush_user_range(start, end, flags)
++ *
++ * Clean and invalidate a range of cache entries in the
++ * specified address space before a change of page tables.
++ * - start - user start address (inclusive, page aligned)
++ * - end - user end address (exclusive, page aligned)
++ * - flags - vma->vm_flags field
++ *
++ * coherent_kern_range(start, end)
++ *
++ * Ensure coherency between the Icache and the Dcache in the
++ * region described by start, end. If you have non-snooping
++ * Harvard caches, you need to implement this function.
++ * - start - virtual start address
++ * - end - virtual end address
++ *
++ * coherent_user_range(start, end)
++ *
++ * Ensure coherency between the Icache and the Dcache in the
++ * region described by start, end. If you have non-snooping
++ * Harvard caches, you need to implement this function.
++ * - start - virtual start address
++ * - end - virtual end address
++ *
++ * flush_kern_dcache_area(kaddr, size)
++ *
++ * Ensure that the data held in page is written back.
++ * - kaddr - page address
++ * - size - region size
++ *
++ * DMA Cache Coherency
++ * ===================
++ *
++ * dma_flush_range(start, end)
++ *
++ * Clean and invalidate the specified virtual address range.
++ * - start - virtual start address
++ * - end - virtual end address
++ */
++
++extern void __cpuc_flush_icache_all(void);
++extern void __cpuc_flush_kern_all(void);
++extern void __cpuc_flush_user_all(void);
++extern void __cpuc_flush_user_range(unsigned long, unsigned long, unsigned int);
++extern void __cpuc_coherent_kern_range(unsigned long, unsigned long);
++extern void __cpuc_coherent_user_range(unsigned long, unsigned long);
++extern void __cpuc_flush_dcache_area(void *, size_t);
++extern void __cpuc_flush_kern_dcache_area(void *addr, size_t size);
++
++/*
++ * These are private to the dma-mapping API. Do not use directly.
++ * Their sole purpose is to ensure that data held in the cache
++ * is visible to DMA, or data written by DMA to system memory is
++ * visible to the CPU.
++ */
++extern void __cpuc_dma_clean_range(unsigned long, unsigned long);
++extern void __cpuc_dma_flush_range(unsigned long, unsigned long);
++
++/*
++ * Copy user data from/to a page which is mapped into a different
++ * processes address space. Really, we want to allow our "user
++ * space" model to handle this.
++ */
++extern void copy_to_user_page(struct vm_area_struct *, struct page *,
++ unsigned long, void *, const void *, unsigned long);
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++ do { \
++ memcpy(dst, src, len); \
++ } while (0)
++
++/*
++ * Convert calls to our calling convention.
++ */
++/* Invalidate I-cache */
++static inline void __flush_icache_all(void)
++{
++ asm("movc p0.c5, %0, #20;\n"
++ "nop; nop; nop; nop; nop; nop; nop; nop\n"
++ :
++ : "r" (0));
++}
++
++#define flush_cache_all() __cpuc_flush_kern_all()
++
++extern void flush_cache_mm(struct mm_struct *mm);
++extern void flush_cache_range(struct vm_area_struct *vma,
++ unsigned long start, unsigned long end);
++extern void flush_cache_page(struct vm_area_struct *vma,
++ unsigned long user_addr, unsigned long pfn);
++
++#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
++
++/*
++ * flush_cache_user_range is used when we want to ensure that the
++ * Harvard caches are synchronised for the user space address range.
++ * This is used for the UniCore private sys_cacheflush system call.
++ */
++#define flush_cache_user_range(vma, start, end) \
++ __cpuc_coherent_user_range((start) & PAGE_MASK, PAGE_ALIGN(end))
++
++/*
++ * Perform necessary cache operations to ensure that data previously
++ * stored within this range of addresses can be executed by the CPU.
++ */
++#define flush_icache_range(s, e) __cpuc_coherent_kern_range(s, e)
++
++/*
++ * Perform necessary cache operations to ensure that the TLB will
++ * see data written in the specified area.
++ */
++#define clean_dcache_area(start, size) cpu_dcache_clean_area(start, size)
++
++/*
++ * flush_dcache_page is used when the kernel has written to the page
++ * cache page at virtual address page->virtual.
++ *
++ * If this page isn't mapped (ie, page_mapping == NULL), or it might
++ * have userspace mappings, then we _must_ always clean + invalidate
++ * the dcache entries associated with the kernel mapping.
++ *
++ * Otherwise we can defer the operation, and clean the cache when we are
++ * about to change to user space. This is the same method as used on SPARC64.
++ * See update_mmu_cache for the user space part.
++ */
++#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
++extern void flush_dcache_page(struct page *);
++
++#define flush_dcache_mmap_lock(mapping) \
++ spin_lock_irq(&(mapping)->tree_lock)
++#define flush_dcache_mmap_unlock(mapping) \
++ spin_unlock_irq(&(mapping)->tree_lock)
++
++#define flush_icache_user_range(vma, page, addr, len) \
++ flush_dcache_page(page)
++
++/*
++ * We don't appear to need to do anything here. In fact, if we did, we'd
++ * duplicate cache flushing elsewhere performed by flush_dcache_page().
++ */
++#define flush_icache_page(vma, page) do { } while (0)
++
++/*
++ * flush_cache_vmap() is used when creating mappings (eg, via vmap,
++ * vmalloc, ioremap etc) in kernel space for pages. On non-VIPT
++ * caches, since the direct-mappings of these pages may contain cached
++ * data, we need to do a full cache flush to ensure that writebacks
++ * don't corrupt data placed into these pages via the new mappings.
++ */
++static inline void flush_cache_vmap(unsigned long start, unsigned long end)
++{
++}
++
++static inline void flush_cache_vunmap(unsigned long start, unsigned long end)
++{
++}
++
++#endif
+diff --git a/arch/unicore32/include/asm/dma-mapping.h b/arch/unicore32/include/asm/dma-mapping.h
+new file mode 100644
+index 000000000000..9258e592f414
+--- /dev/null
++++ b/arch/unicore32/include/asm/dma-mapping.h
+@@ -0,0 +1,124 @@
++/*
++ * linux/arch/unicore32/include/asm/dma-mapping.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_DMA_MAPPING_H__
++#define __UNICORE_DMA_MAPPING_H__
++
++#ifdef __KERNEL__
++
++#include <linux/mm_types.h>
++#include <linux/scatterlist.h>
++#include <linux/swiotlb.h>
++
++#include <asm-generic/dma-coherent.h>
++
++#include <asm/memory.h>
++#include <asm/cacheflush.h>
++
++extern struct dma_map_ops swiotlb_dma_map_ops;
++
++static inline struct dma_map_ops *get_dma_ops(struct device *dev)
++{
++ return &swiotlb_dma_map_ops;
++}
++
++static inline int dma_supported(struct device *dev, u64 mask)
++{
++ struct dma_map_ops *dma_ops = get_dma_ops(dev);
++
++ if (unlikely(dma_ops == NULL))
++ return 0;
++
++ return dma_ops->dma_supported(dev, mask);
++}
++
++static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
++{
++ struct dma_map_ops *dma_ops = get_dma_ops(dev);
++
++ if (dma_ops->mapping_error)
++ return dma_ops->mapping_error(dev, dma_addr);
++
++ return 0;
++}
++
++#include <asm-generic/dma-mapping-common.h>
++
++static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
++{
++ if (dev && dev->dma_mask)
++ return addr + size - 1 <= *dev->dma_mask;
++
++ return 1;
++}
++
++static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
++{
++ return paddr;
++}
++
++static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
++{
++ return daddr;
++}
++
++static inline void dma_mark_clean(void *addr, size_t size) {}
++
++static inline int dma_set_mask(struct device *dev, u64 dma_mask)
++{
++ if (!dev->dma_mask || !dma_supported(dev, dma_mask))
++ return -EIO;
++
++ *dev->dma_mask = dma_mask;
++
++ return 0;
++}
++
++static inline void *dma_alloc_coherent(struct device *dev, size_t size,
++ dma_addr_t *dma_handle, gfp_t flag)
++{
++ struct dma_map_ops *dma_ops = get_dma_ops(dev);
++
++ return dma_ops->alloc_coherent(dev, size, dma_handle, flag);
++}
++
++static inline void dma_free_coherent(struct device *dev, size_t size,
++ void *cpu_addr, dma_addr_t dma_handle)
++{
++ struct dma_map_ops *dma_ops = get_dma_ops(dev);
++
++ dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
++}
++
++#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
++#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
++
++static inline void dma_cache_sync(struct device *dev, void *vaddr,
++ size_t size, enum dma_data_direction direction)
++{
++ unsigned long start = (unsigned long)vaddr;
++ unsigned long end = start + size;
++
++ switch (direction) {
++ case DMA_NONE:
++ BUG();
++ case DMA_FROM_DEVICE:
++ case DMA_BIDIRECTIONAL: /* writeback and invalidate */
++ __cpuc_dma_flush_range(start, end);
++ break;
++ case DMA_TO_DEVICE: /* writeback only */
++ __cpuc_dma_clean_range(start, end);
++ break;
++ }
++}
++
++#endif /* __KERNEL__ */
++#endif
+diff --git a/arch/unicore32/include/asm/dma.h b/arch/unicore32/include/asm/dma.h
+new file mode 100644
+index 000000000000..38dfff9df32f
+--- /dev/null
++++ b/arch/unicore32/include/asm/dma.h
+@@ -0,0 +1,23 @@
++/*
++ * linux/arch/unicore32/include/asm/dma.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_DMA_H__
++#define __UNICORE_DMA_H__
++
++#include <asm/memory.h>
++#include <asm-generic/dma.h>
++
++#ifdef CONFIG_PCI
++extern int isa_dma_bridge_buggy;
++#endif
++
++#endif /* __UNICORE_DMA_H__ */
+diff --git a/arch/unicore32/include/asm/tlbflush.h b/arch/unicore32/include/asm/tlbflush.h
+new file mode 100644
+index 000000000000..e446ac8bb9e5
+--- /dev/null
++++ b/arch/unicore32/include/asm/tlbflush.h
+@@ -0,0 +1,195 @@
++/*
++ * linux/arch/unicore32/include/asm/tlbflush.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_TLBFLUSH_H__
++#define __UNICORE_TLBFLUSH_H__
++
++#ifndef __ASSEMBLY__
++
++#include <linux/sched.h>
++
++extern void __cpu_flush_user_tlb_range(unsigned long, unsigned long,
++ struct vm_area_struct *);
++extern void __cpu_flush_kern_tlb_range(unsigned long, unsigned long);
++
++/*
++ * TLB Management
++ * ==============
++ *
++ * The arch/unicore/mm/tlb-*.S files implement these methods.
++ *
++ * The TLB specific code is expected to perform whatever tests it
++ * needs to determine if it should invalidate the TLB for each
++ * call. Start addresses are inclusive and end addresses are
++ * exclusive; it is safe to round these addresses down.
++ *
++ * flush_tlb_all()
++ *
++ * Invalidate the entire TLB.
++ *
++ * flush_tlb_mm(mm)
++ *
++ * Invalidate all TLB entries in a particular address
++ * space.
++ * - mm - mm_struct describing address space
++ *
++ * flush_tlb_range(mm,start,end)
++ *
++ * Invalidate a range of TLB entries in the specified
++ * address space.
++ * - mm - mm_struct describing address space
++ * - start - start address (may not be aligned)
++ * - end - end address (exclusive, may not be aligned)
++ *
++ * flush_tlb_page(vaddr,vma)
++ *
++ * Invalidate the specified page in the specified address range.
++ * - vaddr - virtual address (may not be aligned)
++ * - vma - vma_struct describing address range
++ *
++ * flush_kern_tlb_page(kaddr)
++ *
++ * Invalidate the TLB entry for the specified page. The address
++ * will be in the kernels virtual memory space. Current uses
++ * only require the D-TLB to be invalidated.
++ * - kaddr - Kernel virtual memory address
++ */
++
++static inline void local_flush_tlb_all(void)
++{
++ const int zero = 0;
++
++ /* TLB invalidate all */
++ asm("movc p0.c6, %0, #6; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (zero) : "cc");
++}
++
++static inline void local_flush_tlb_mm(struct mm_struct *mm)
++{
++ const int zero = 0;
++
++ if (cpumask_test_cpu(get_cpu(), mm_cpumask(mm))) {
++ /* TLB invalidate all */
++ asm("movc p0.c6, %0, #6; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (zero) : "cc");
++ }
++ put_cpu();
++}
++
++static inline void
++local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
++{
++ if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {
++#ifndef CONFIG_CPU_TLB_SINGLE_ENTRY_DISABLE
++ /* iTLB invalidate page */
++ asm("movc p0.c6, %0, #5; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (uaddr & PAGE_MASK) : "cc");
++ /* dTLB invalidate page */
++ asm("movc p0.c6, %0, #3; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (uaddr & PAGE_MASK) : "cc");
++#else
++ /* TLB invalidate all */
++ asm("movc p0.c6, %0, #6; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (uaddr & PAGE_MASK) : "cc");
++#endif
++ }
++}
++
++static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
++{
++#ifndef CONFIG_CPU_TLB_SINGLE_ENTRY_DISABLE
++ /* iTLB invalidate page */
++ asm("movc p0.c6, %0, #5; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (kaddr & PAGE_MASK) : "cc");
++ /* dTLB invalidate page */
++ asm("movc p0.c6, %0, #3; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (kaddr & PAGE_MASK) : "cc");
++#else
++ /* TLB invalidate all */
++ asm("movc p0.c6, %0, #6; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (kaddr & PAGE_MASK) : "cc");
++#endif
++}
++
++/*
++ * flush_pmd_entry
++ *
++ * Flush a PMD entry (word aligned, or double-word aligned) to
++ * RAM if the TLB for the CPU we are running on requires this.
++ * This is typically used when we are creating PMD entries.
++ *
++ * clean_pmd_entry
++ *
++ * Clean (but don't drain the write buffer) if the CPU requires
++ * these operations. This is typically used when we are removing
++ * PMD entries.
++ */
++static inline void flush_pmd_entry(pmd_t *pmd)
++{
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ /* flush dcache line, see dcacheline_flush in proc-macros.S */
++ asm("mov r1, %0 << #20\n"
++ "ldw r2, =_stext\n"
++ "add r2, r2, r1 >> #20\n"
++ "ldw r1, [r2+], #0x0000\n"
++ "ldw r1, [r2+], #0x1000\n"
++ "ldw r1, [r2+], #0x2000\n"
++ "ldw r1, [r2+], #0x3000\n"
++ : : "r" (pmd) : "r1", "r2");
++#else
++ /* flush dcache all */
++ asm("movc p0.c5, %0, #14; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (pmd) : "cc");
++#endif
++}
++
++static inline void clean_pmd_entry(pmd_t *pmd)
++{
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ /* clean dcache line */
++ asm("movc p0.c5, %0, #11; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (__pa(pmd) & ~(L1_CACHE_BYTES - 1)) : "cc");
++#else
++ /* clean dcache all */
++ asm("movc p0.c5, %0, #10; nop; nop; nop; nop; nop; nop; nop; nop"
++ : : "r" (pmd) : "cc");
++#endif
++}
++
++/*
++ * Convert calls to our calling convention.
++ */
++#define local_flush_tlb_range(vma, start, end) \
++ __cpu_flush_user_tlb_range(start, end, vma)
++#define local_flush_tlb_kernel_range(s, e) \
++ __cpu_flush_kern_tlb_range(s, e)
++
++#define flush_tlb_all local_flush_tlb_all
++#define flush_tlb_mm local_flush_tlb_mm
++#define flush_tlb_page local_flush_tlb_page
++#define flush_tlb_kernel_page local_flush_tlb_kernel_page
++#define flush_tlb_range local_flush_tlb_range
++#define flush_tlb_kernel_range local_flush_tlb_kernel_range
++
++/*
++ * if PG_dcache_clean is not set for the page, we need to ensure that any
++ * cache entries for the kernels virtual memory range are written
++ * back to the page.
++ */
++extern void update_mmu_cache(struct vm_area_struct *vma,
++ unsigned long addr, pte_t *ptep);
++
++extern void do_bad_area(unsigned long addr, unsigned int fsr,
++ struct pt_regs *regs);
++
++#endif
++
++#endif
+diff --git a/arch/unicore32/include/mach/dma.h b/arch/unicore32/include/mach/dma.h
+new file mode 100644
+index 000000000000..3e3224a10525
+--- /dev/null
++++ b/arch/unicore32/include/mach/dma.h
+@@ -0,0 +1,41 @@
++/*
++ * linux/arch/unicore32/include/mach/dma.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __MACH_PUV3_DMA_H__
++#define __MACH_PUV3_DMA_H__
++
++/*
++ * The PKUnity has six internal DMA channels.
++ */
++#define MAX_DMA_CHANNELS 6
++
++typedef enum {
++ DMA_PRIO_HIGH = 0,
++ DMA_PRIO_MEDIUM = 1,
++ DMA_PRIO_LOW = 2
++} puv3_dma_prio;
++
++/*
++ * DMA registration
++ */
++
++extern int puv3_request_dma(char *name,
++ puv3_dma_prio prio,
++ void (*irq_handler)(int, void *),
++ void (*err_handler)(int, void *),
++ void *data);
++
++extern void puv3_free_dma(int dma_ch);
++
++#define puv3_stop_dma(ch) (DMAC_CONFIG(ch) &= ~DMAC_CONFIG_EN)
++#define puv3_resume_dma(ch) (DMAC_CONFIG(ch) |= DMAC_CONFIG_EN)
++
++#endif /* __MACH_PUV3_DMA_H__ */
+diff --git a/arch/unicore32/kernel/dma.c b/arch/unicore32/kernel/dma.c
+new file mode 100644
+index 000000000000..b8dcc2514e9a
+--- /dev/null
++++ b/arch/unicore32/kernel/dma.c
+@@ -0,0 +1,180 @@
++/*
++ * linux/arch/unicore32/kernel/dma.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
++ * Copyright (C) 2001-2010 Guan Xuetao
++ *
++ * 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/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/interrupt.h>
++#include <linux/errno.h>
++
++#include <asm/system.h>
++#include <asm/irq.h>
++#include <mach/hardware.h>
++#include <mach/dma.h>
++
++struct dma_channel {
++ char *name;
++ puv3_dma_prio prio;
++ void (*irq_handler)(int, void *);
++ void (*err_handler)(int, void *);
++ void *data;
++};
++
++static struct dma_channel dma_channels[MAX_DMA_CHANNELS];
++
++int puv3_request_dma(char *name, puv3_dma_prio prio,
++ void (*irq_handler)(int, void *),
++ void (*err_handler)(int, void *),
++ void *data)
++{
++ unsigned long flags;
++ int i, found = 0;
++
++ /* basic sanity checks */
++ if (!name)
++ return -EINVAL;
++
++ local_irq_save(flags);
++
++ do {
++ /* try grabbing a DMA channel with the requested priority */
++ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
++ if ((dma_channels[i].prio == prio) &&
++ !dma_channels[i].name) {
++ found = 1;
++ break;
++ }
++ }
++ /* if requested prio group is full, try a hier priority */
++ } while (!found && prio--);
++
++ if (found) {
++ dma_channels[i].name = name;
++ dma_channels[i].irq_handler = irq_handler;
++ dma_channels[i].err_handler = err_handler;
++ dma_channels[i].data = data;
++ } else {
++ printk(KERN_WARNING "No more available DMA channels for %s\n",
++ name);
++ i = -ENODEV;
++ }
++
++ local_irq_restore(flags);
++ return i;
++}
++EXPORT_SYMBOL(puv3_request_dma);
++
++void puv3_free_dma(int dma_ch)
++{
++ unsigned long flags;
++
++ if (!dma_channels[dma_ch].name) {
++ printk(KERN_CRIT
++ "%s: trying to free channel %d which is already freed\n",
++ __func__, dma_ch);
++ return;
++ }
++
++ local_irq_save(flags);
++ dma_channels[dma_ch].name = NULL;
++ dma_channels[dma_ch].err_handler = NULL;
++ local_irq_restore(flags);
++}
++EXPORT_SYMBOL(puv3_free_dma);
++
++static irqreturn_t dma_irq_handler(int irq, void *dev_id)
++{
++ int i, dint = DMAC_ITCSR;
++
++ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
++ if (dint & DMAC_CHANNEL(i)) {
++ struct dma_channel *channel = &dma_channels[i];
++
++ /* Clear TC interrupt of channel i */
++ DMAC_ITCCR = DMAC_CHANNEL(i);
++ DMAC_ITCCR = 0;
++
++ if (channel->name && channel->irq_handler) {
++ channel->irq_handler(i, channel->data);
++ } else {
++ /*
++ * IRQ for an unregistered DMA channel:
++ * let's clear the interrupts and disable it.
++ */
++ printk(KERN_WARNING "spurious IRQ for"
++ " DMA channel %d\n", i);
++ }
++ }
++ }
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t dma_err_handler(int irq, void *dev_id)
++{
++ int i, dint = DMAC_IESR;
++
++ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
++ if (dint & DMAC_CHANNEL(i)) {
++ struct dma_channel *channel = &dma_channels[i];
++
++ /* Clear Err interrupt of channel i */
++ DMAC_IECR = DMAC_CHANNEL(i);
++ DMAC_IECR = 0;
++
++ if (channel->name && channel->err_handler) {
++ channel->err_handler(i, channel->data);
++ } else {
++ /*
++ * IRQ for an unregistered DMA channel:
++ * let's clear the interrupts and disable it.
++ */
++ printk(KERN_WARNING "spurious IRQ for"
++ " DMA channel %d\n", i);
++ }
++ }
++ }
++ return IRQ_HANDLED;
++}
++
++int __init puv3_init_dma(void)
++{
++ int i, ret;
++
++ /* dma channel priorities on v8 processors:
++ * ch 0 - 1 <--> (0) DMA_PRIO_HIGH
++ * ch 2 - 3 <--> (1) DMA_PRIO_MEDIUM
++ * ch 4 - 5 <--> (2) DMA_PRIO_LOW
++ */
++ for (i = 0; i < MAX_DMA_CHANNELS; i++) {
++ puv3_stop_dma(i);
++ dma_channels[i].name = NULL;
++ dma_channels[i].prio = min((i & 0x7) >> 1, DMA_PRIO_LOW);
++ }
++
++ ret = request_irq(IRQ_DMA, dma_irq_handler, 0, "DMA", NULL);
++ if (ret) {
++ printk(KERN_CRIT "Can't register IRQ for DMA\n");
++ return ret;
++ }
++
++ ret = request_irq(IRQ_DMAERR, dma_err_handler, 0, "DMAERR", NULL);
++ if (ret) {
++ printk(KERN_CRIT "Can't register IRQ for DMAERR\n");
++ free_irq(IRQ_DMA, "DMA");
++ return ret;
++ }
++
++ return 0;
++}
++
++postcore_initcall(puv3_init_dma);
+diff --git a/arch/unicore32/mm/cache-ucv2.S b/arch/unicore32/mm/cache-ucv2.S
+new file mode 100644
+index 000000000000..ecaa1727f906
+--- /dev/null
++++ b/arch/unicore32/mm/cache-ucv2.S
+@@ -0,0 +1,212 @@
++/*
++ * linux/arch/unicore32/mm/cache-ucv2.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 "shell" of the UniCore-v2 processor support.
++ */
++#include <linux/linkage.h>
++#include <linux/init.h>
++#include <asm/assembler.h>
++#include <asm/page.h>
++
++#include "proc-macros.S"
++
++/*
++ * __cpuc_flush_icache_all()
++ * __cpuc_flush_kern_all()
++ * __cpuc_flush_user_all()
++ *
++ * Flush the entire cache.
++ */
++ENTRY(__cpuc_flush_icache_all)
++ /*FALLTHROUGH*/
++ENTRY(__cpuc_flush_kern_all)
++ /*FALLTHROUGH*/
++ENTRY(__cpuc_flush_user_all)
++ mov r0, #0
++ movc p0.c5, r0, #14 @ Dcache flush all
++ nop8
++
++ mov r0, #0
++ movc p0.c5, r0, #20 @ Icache invalidate all
++ nop8
++
++ mov pc, lr
++
++/*
++ * __cpuc_flush_user_range(start, end, flags)
++ *
++ * Flush a range of TLB entries in the specified address space.
++ *
++ * - start - start address (may not be aligned)
++ * - end - end address (exclusive, may not be aligned)
++ * - flags - vm_area_struct flags describing address space
++ */
++ENTRY(__cpuc_flush_user_range)
++ cxor.a r2, #0
++ beq __cpuc_dma_flush_range
++
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ andn r0, r0, #CACHE_LINESIZE - 1 @ Safety check
++ sub r1, r1, r0
++ csub.a r1, #MAX_AREA_SIZE
++ bsg 2f
++
++ andn r1, r1, #CACHE_LINESIZE - 1
++ add r1, r1, #CACHE_LINESIZE
++
++101: dcacheline_flush r0, r11, r12
++
++ add r0, r0, #CACHE_LINESIZE
++ sub.a r1, r1, #CACHE_LINESIZE
++ bns 101b
++ b 3f
++#endif
++2: mov ip, #0
++ movc p0.c5, ip, #14 @ Dcache flush all
++ nop8
++
++3: mov ip, #0
++ movc p0.c5, ip, #20 @ Icache invalidate all
++ nop8
++
++ mov pc, lr
++
++/*
++ * __cpuc_coherent_kern_range(start,end)
++ * __cpuc_coherent_user_range(start,end)
++ *
++ * Ensure that the I and D caches are coherent within specified
++ * region. This is typically used when code has been written to
++ * a memory region, and will be executed.
++ *
++ * - start - virtual start address of region
++ * - end - virtual end address of region
++ */
++ENTRY(__cpuc_coherent_kern_range)
++ /* FALLTHROUGH */
++ENTRY(__cpuc_coherent_user_range)
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ andn r0, r0, #CACHE_LINESIZE - 1 @ Safety check
++ sub r1, r1, r0
++ csub.a r1, #MAX_AREA_SIZE
++ bsg 2f
++
++ andn r1, r1, #CACHE_LINESIZE - 1
++ add r1, r1, #CACHE_LINESIZE
++
++ @ r0 va2pa r10
++ mov r9, #PAGE_SZ
++ sub r9, r9, #1 @ PAGE_MASK
++101: va2pa r0, r10, r11, r12, r13, 2f @ r10 is PA
++ b 103f
++102: cand.a r0, r9
++ beq 101b
++
++103: movc p0.c5, r10, #11 @ Dcache clean line of R10
++ nop8
++
++ add r0, r0, #CACHE_LINESIZE
++ add r10, r10, #CACHE_LINESIZE
++ sub.a r1, r1, #CACHE_LINESIZE
++ bns 102b
++ b 3f
++#endif
++2: mov ip, #0
++ movc p0.c5, ip, #10 @ Dcache clean all
++ nop8
++
++3: mov ip, #0
++ movc p0.c5, ip, #20 @ Icache invalidate all
++ nop8
++
++ mov pc, lr
++
++/*
++ * __cpuc_flush_kern_dcache_area(void *addr, size_t size)
++ *
++ * - addr - kernel address
++ * - size - region size
++ */
++ENTRY(__cpuc_flush_kern_dcache_area)
++ mov ip, #0
++ movc p0.c5, ip, #14 @ Dcache flush all
++ nop8
++ mov pc, lr
++
++/*
++ * __cpuc_dma_clean_range(start,end)
++ * - start - virtual start address of region
++ * - end - virtual end address of region
++ */
++ENTRY(__cpuc_dma_clean_range)
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ andn r0, r0, #CACHE_LINESIZE - 1
++ sub r1, r1, r0
++ andn r1, r1, #CACHE_LINESIZE - 1
++ add r1, r1, #CACHE_LINESIZE
++
++ csub.a r1, #MAX_AREA_SIZE
++ bsg 2f
++
++ @ r0 va2pa r10
++ mov r9, #PAGE_SZ
++ sub r9, r9, #1 @ PAGE_MASK
++101: va2pa r0, r10, r11, r12, r13, 2f @ r10 is PA
++ b 1f
++102: cand.a r0, r9
++ beq 101b
++
++1: movc p0.c5, r10, #11 @ Dcache clean line of R10
++ nop8
++ add r0, r0, #CACHE_LINESIZE
++ add r10, r10, #CACHE_LINESIZE
++ sub.a r1, r1, #CACHE_LINESIZE
++ bns 102b
++ mov pc, lr
++#endif
++2: mov ip, #0
++ movc p0.c5, ip, #10 @ Dcache clean all
++ nop8
++
++ mov pc, lr
++
++/*
++ * __cpuc_dma_inv_range(start,end)
++ * __cpuc_dma_flush_range(start,end)
++ * - start - virtual start address of region
++ * - end - virtual end address of region
++ */
++__cpuc_dma_inv_range:
++ /* FALLTHROUGH */
++ENTRY(__cpuc_dma_flush_range)
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ andn r0, r0, #CACHE_LINESIZE - 1
++ sub r1, r1, r0
++ andn r1, r1, #CACHE_LINESIZE - 1
++ add r1, r1, #CACHE_LINESIZE
++
++ csub.a r1, #MAX_AREA_SIZE
++ bsg 2f
++
++ @ r0 va2pa r10
++101: dcacheline_flush r0, r11, r12
++
++ add r0, r0, #CACHE_LINESIZE
++ sub.a r1, r1, #CACHE_LINESIZE
++ bns 101b
++ mov pc, lr
++#endif
++2: mov ip, #0
++ movc p0.c5, ip, #14 @ Dcache flush all
++ nop8
++
++ mov pc, lr
++
+diff --git a/arch/unicore32/mm/dma-swiotlb.c b/arch/unicore32/mm/dma-swiotlb.c
+new file mode 100644
+index 000000000000..bfa9fbb2bbb1
+--- /dev/null
++++ b/arch/unicore32/mm/dma-swiotlb.c
+@@ -0,0 +1,34 @@
++/*
++ * Contains routines needed to support swiotlb for UniCore32.
++ *
++ * Copyright (C) 2010 Guan Xuetao
++ *
++ * 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/pci.h>
++#include <linux/cache.h>
++#include <linux/module.h>
++#include <linux/dma-mapping.h>
++#include <linux/swiotlb.h>
++#include <linux/bootmem.h>
++
++#include <asm/dma.h>
++
++struct dma_map_ops swiotlb_dma_map_ops = {
++ .alloc_coherent = swiotlb_alloc_coherent,
++ .free_coherent = swiotlb_free_coherent,
++ .map_sg = swiotlb_map_sg_attrs,
++ .unmap_sg = swiotlb_unmap_sg_attrs,
++ .dma_supported = swiotlb_dma_supported,
++ .map_page = swiotlb_map_page,
++ .unmap_page = swiotlb_unmap_page,
++ .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
++ .sync_single_for_device = swiotlb_sync_single_for_device,
++ .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
++ .sync_sg_for_device = swiotlb_sync_sg_for_device,
++ .mapping_error = swiotlb_dma_mapping_error,
++};
++EXPORT_SYMBOL(swiotlb_dma_map_ops);
+diff --git a/arch/unicore32/mm/flush.c b/arch/unicore32/mm/flush.c
+new file mode 100644
+index 000000000000..93478cc8b26d
+--- /dev/null
++++ b/arch/unicore32/mm/flush.c
+@@ -0,0 +1,98 @@
++/*
++ * linux/arch/unicore32/mm/flush.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/mm.h>
++#include <linux/pagemap.h>
++
++#include <asm/cacheflush.h>
++#include <asm/system.h>
++#include <asm/tlbflush.h>
++
++void flush_cache_mm(struct mm_struct *mm)
++{
++}
++
++void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
++ unsigned long end)
++{
++ if (vma->vm_flags & VM_EXEC)
++ __flush_icache_all();
++}
++
++void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr,
++ unsigned long pfn)
++{
++}
++
++static void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
++ unsigned long uaddr, void *kaddr, unsigned long len)
++{
++ /* VIPT non-aliasing D-cache */
++ if (vma->vm_flags & VM_EXEC) {
++ unsigned long addr = (unsigned long)kaddr;
++
++ __cpuc_coherent_kern_range(addr, addr + len);
++ }
++}
++
++/*
++ * Copy user data from/to a page which is mapped into a different
++ * processes address space. Really, we want to allow our "user
++ * space" model to handle this.
++ *
++ * Note that this code needs to run on the current CPU.
++ */
++void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
++ unsigned long uaddr, void *dst, const void *src,
++ unsigned long len)
++{
++ memcpy(dst, src, len);
++ flush_ptrace_access(vma, page, uaddr, dst, len);
++}
++
++void __flush_dcache_page(struct address_space *mapping, struct page *page)
++{
++ /*
++ * Writeback any data associated with the kernel mapping of this
++ * page. This ensures that data in the physical page is mutually
++ * coherent with the kernels mapping.
++ */
++ __cpuc_flush_kern_dcache_area(page_address(page), PAGE_SIZE);
++}
++
++/*
++ * Ensure cache coherency between kernel mapping and userspace mapping
++ * of this page.
++ */
++void flush_dcache_page(struct page *page)
++{
++ struct address_space *mapping;
++
++ /*
++ * The zero page is never written to, so never has any dirty
++ * cache lines, and therefore never needs to be flushed.
++ */
++ if (page == ZERO_PAGE(0))
++ return;
++
++ mapping = page_mapping(page);
++
++ if (mapping && !mapping_mapped(mapping))
++ clear_bit(PG_dcache_clean, &page->flags);
++ else {
++ __flush_dcache_page(mapping, page);
++ if (mapping)
++ __flush_icache_all();
++ set_bit(PG_dcache_clean, &page->flags);
++ }
++}
++EXPORT_SYMBOL(flush_dcache_page);
+diff --git a/arch/unicore32/mm/tlb-ucv2.S b/arch/unicore32/mm/tlb-ucv2.S
+new file mode 100644
+index 000000000000..061d455f9a15
+--- /dev/null
++++ b/arch/unicore32/mm/tlb-ucv2.S
+@@ -0,0 +1,89 @@
++/*
++ * linux/arch/unicore32/mm/tlb-ucv2.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++#include <asm/page.h>
++#include <asm/tlbflush.h>
++#include "proc-macros.S"
++
++/*
++ * __cpu_flush_user_tlb_range(start, end, vma)
++ *
++ * Invalidate a range of TLB entries in the specified address space.
++ *
++ * - start - start address (may not be aligned)
++ * - end - end address (exclusive, may not be aligned)
++ * - vma - vma_struct describing address range
++ */
++ENTRY(__cpu_flush_user_tlb_range)
++#ifndef CONFIG_CPU_TLB_SINGLE_ENTRY_DISABLE
++ mov r0, r0 >> #PAGE_SHIFT @ align address
++ mov r0, r0 << #PAGE_SHIFT
++ vma_vm_flags r2, r2 @ get vma->vm_flags
++1:
++ movc p0.c6, r0, #3
++ nop8
++
++ cand.a r2, #VM_EXEC @ Executable area ?
++ beq 2f
++
++ movc p0.c6, r0, #5
++ nop8
++2:
++ add r0, r0, #PAGE_SZ
++ csub.a r0, r1
++ beb 1b
++#else
++ movc p0.c6, r0, #2
++ nop8
++
++ cand.a r2, #VM_EXEC @ Executable area ?
++ beq 2f
++
++ movc p0.c6, r0, #4
++ nop8
++2:
++#endif
++ mov pc, lr
++
++/*
++ * __cpu_flush_kern_tlb_range(start,end)
++ *
++ * Invalidate a range of kernel TLB entries
++ *
++ * - start - start address (may not be aligned)
++ * - end - end address (exclusive, may not be aligned)
++ */
++ENTRY(__cpu_flush_kern_tlb_range)
++#ifndef CONFIG_CPU_TLB_SINGLE_ENTRY_DISABLE
++ mov r0, r0 >> #PAGE_SHIFT @ align address
++ mov r0, r0 << #PAGE_SHIFT
++1:
++ movc p0.c6, r0, #3
++ nop8
++
++ movc p0.c6, r0, #5
++ nop8
++
++ add r0, r0, #PAGE_SZ
++ csub.a r0, r1
++ beb 1b
++#else
++ movc p0.c6, r0, #2
++ nop8
++
++ movc p0.c6, r0, #4
++ nop8
++#endif
++ mov pc, lr
++commit 56372b0b2f533c9a25bd40a0577405f6ddb7cff2
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:17:56 2011 +0800
+
+ unicore32 core architecture: mm related: fault handling
+
+ This patch implements fault handling of memory management.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/mmu.h b/arch/unicore32/include/asm/mmu.h
+new file mode 100644
+index 000000000000..66fa341dc2c6
+--- /dev/null
++++ b/arch/unicore32/include/asm/mmu.h
+@@ -0,0 +1,17 @@
++/*
++ * linux/arch/unicore32/include/asm/mmu.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_MMU_H__
++#define __UNICORE_MMU_H__
++
++typedef unsigned long mm_context_t;
++
++#endif
+diff --git a/arch/unicore32/include/asm/mmu_context.h b/arch/unicore32/include/asm/mmu_context.h
+new file mode 100644
+index 000000000000..fb5e4c658f7a
+--- /dev/null
++++ b/arch/unicore32/include/asm/mmu_context.h
+@@ -0,0 +1,87 @@
++/*
++ * linux/arch/unicore32/include/asm/mmu_context.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_MMU_CONTEXT_H__
++#define __UNICORE_MMU_CONTEXT_H__
++
++#include <linux/compiler.h>
++#include <linux/sched.h>
++#include <linux/io.h>
++
++#include <asm/cacheflush.h>
++#include <asm/cpu-single.h>
++
++#define init_new_context(tsk, mm) 0
++
++#define destroy_context(mm) do { } while (0)
++
++/*
++ * This is called when "tsk" is about to enter lazy TLB mode.
++ *
++ * mm: describes the currently active mm context
++ * tsk: task which is entering lazy tlb
++ * cpu: cpu number which is entering lazy tlb
++ *
++ * tsk->mm will be NULL
++ */
++static inline void
++enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
++{
++}
++
++/*
++ * This is the actual mm switch as far as the scheduler
++ * is concerned. No registers are touched. We avoid
++ * calling the CPU specific function when the mm hasn't
++ * actually changed.
++ */
++static inline void
++switch_mm(struct mm_struct *prev, struct mm_struct *next,
++ struct task_struct *tsk)
++{
++ unsigned int cpu = smp_processor_id();
++
++ if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next)
++ cpu_switch_mm(next->pgd, next);
++}
++
++#define deactivate_mm(tsk, mm) do { } while (0)
++#define activate_mm(prev, next) switch_mm(prev, next, NULL)
++
++/*
++ * We are inserting a "fake" vma for the user-accessible vector page so
++ * gdb and friends can get to it through ptrace and /proc/<pid>/mem.
++ * But we also want to remove it before the generic code gets to see it
++ * during process exit or the unmapping of it would cause total havoc.
++ * (the macro is used as remove_vma() is static to mm/mmap.c)
++ */
++#define arch_exit_mmap(mm) \
++do { \
++ struct vm_area_struct *high_vma = find_vma(mm, 0xffff0000); \
++ if (high_vma) { \
++ BUG_ON(high_vma->vm_next); /* it should be last */ \
++ if (high_vma->vm_prev) \
++ high_vma->vm_prev->vm_next = NULL; \
++ else \
++ mm->mmap = NULL; \
++ rb_erase(&high_vma->vm_rb, &mm->mm_rb); \
++ mm->mmap_cache = NULL; \
++ mm->map_count--; \
++ remove_vma(high_vma); \
++ } \
++} while (0)
++
++static inline void arch_dup_mmap(struct mm_struct *oldmm,
++ struct mm_struct *mm)
++{
++}
++
++#endif
+diff --git a/arch/unicore32/include/asm/pgalloc.h b/arch/unicore32/include/asm/pgalloc.h
+new file mode 100644
+index 000000000000..0213e373a895
+--- /dev/null
++++ b/arch/unicore32/include/asm/pgalloc.h
+@@ -0,0 +1,110 @@
++/*
++ * linux/arch/unicore32/include/asm/pgalloc.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PGALLOC_H__
++#define __UNICORE_PGALLOC_H__
++
++#include <asm/pgtable-hwdef.h>
++#include <asm/processor.h>
++#include <asm/cacheflush.h>
++#include <asm/tlbflush.h>
++
++#define check_pgt_cache() do { } while (0)
++
++#define _PAGE_USER_TABLE (PMD_TYPE_TABLE | PMD_PRESENT)
++#define _PAGE_KERNEL_TABLE (PMD_TYPE_TABLE | PMD_PRESENT)
++
++extern pgd_t *get_pgd_slow(struct mm_struct *mm);
++extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd);
++
++#define pgd_alloc(mm) get_pgd_slow(mm)
++#define pgd_free(mm, pgd) free_pgd_slow(mm, pgd)
++
++#define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)
++
++/*
++ * Allocate one PTE table.
++ */
++static inline pte_t *
++pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr)
++{
++ pte_t *pte;
++
++ pte = (pte_t *)__get_free_page(PGALLOC_GFP);
++ if (pte)
++ clean_dcache_area(pte, PTRS_PER_PTE * sizeof(pte_t));
++
++ return pte;
++}
++
++static inline pgtable_t
++pte_alloc_one(struct mm_struct *mm, unsigned long addr)
++{
++ struct page *pte;
++
++ pte = alloc_pages(PGALLOC_GFP, 0);
++ if (pte) {
++ if (!PageHighMem(pte)) {
++ void *page = page_address(pte);
++ clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
++ }
++ pgtable_page_ctor(pte);
++ }
++
++ return pte;
++}
++
++/*
++ * Free one PTE table.
++ */
++static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
++{
++ if (pte)
++ free_page((unsigned long)pte);
++}
++
++static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
++{
++ pgtable_page_dtor(pte);
++ __free_page(pte);
++}
++
++static inline void __pmd_populate(pmd_t *pmdp, unsigned long pmdval)
++{
++ set_pmd(pmdp, __pmd(pmdval));
++ flush_pmd_entry(pmdp);
++}
++
++/*
++ * Populate the pmdp entry with a pointer to the pte. This pmd is part
++ * of the mm address space.
++ */
++static inline void
++pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
++{
++ unsigned long pte_ptr = (unsigned long)ptep;
++
++ /*
++ * The pmd must be loaded with the physical
++ * address of the PTE table
++ */
++ __pmd_populate(pmdp, __pa(pte_ptr) | _PAGE_KERNEL_TABLE);
++}
++
++static inline void
++pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
++{
++ __pmd_populate(pmdp,
++ page_to_pfn(ptep) << PAGE_SHIFT | _PAGE_USER_TABLE);
++}
++#define pmd_pgtable(pmd) pmd_page(pmd)
++
++#endif
+diff --git a/arch/unicore32/include/asm/pgtable-hwdef.h b/arch/unicore32/include/asm/pgtable-hwdef.h
+new file mode 100644
+index 000000000000..7314e859cca0
+--- /dev/null
++++ b/arch/unicore32/include/asm/pgtable-hwdef.h
+@@ -0,0 +1,55 @@
++/*
++ * linux/arch/unicore32/include/asm/pgtable-hwdef.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PGTABLE_HWDEF_H__
++#define __UNICORE_PGTABLE_HWDEF_H__
++
++/*
++ * Hardware page table definitions.
++ *
++ * + Level 1 descriptor (PMD)
++ * - common
++ */
++#define PMD_TYPE_MASK (3 << 0)
++#define PMD_TYPE_TABLE (0 << 0)
++/*#define PMD_TYPE_LARGE (1 << 0) */
++#define PMD_TYPE_INVALID (2 << 0)
++#define PMD_TYPE_SECT (3 << 0)
++
++#define PMD_PRESENT (1 << 2)
++#define PMD_YOUNG (1 << 3)
++
++/*#define PMD_SECT_DIRTY (1 << 4) */
++#define PMD_SECT_CACHEABLE (1 << 5)
++#define PMD_SECT_EXEC (1 << 6)
++#define PMD_SECT_WRITE (1 << 7)
++#define PMD_SECT_READ (1 << 8)
++
++/*
++ * + Level 2 descriptor (PTE)
++ * - common
++ */
++#define PTE_TYPE_MASK (3 << 0)
++#define PTE_TYPE_SMALL (0 << 0)
++#define PTE_TYPE_MIDDLE (1 << 0)
++#define PTE_TYPE_LARGE (2 << 0)
++#define PTE_TYPE_INVALID (3 << 0)
++
++#define PTE_PRESENT (1 << 2)
++#define PTE_FILE (1 << 3) /* only when !PRESENT */
++#define PTE_YOUNG (1 << 3)
++#define PTE_DIRTY (1 << 4)
++#define PTE_CACHEABLE (1 << 5)
++#define PTE_EXEC (1 << 6)
++#define PTE_WRITE (1 << 7)
++#define PTE_READ (1 << 8)
++
++#endif
+diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h
+new file mode 100644
+index 000000000000..68b2f297ac97
+--- /dev/null
++++ b/arch/unicore32/include/asm/pgtable.h
+@@ -0,0 +1,317 @@
++/*
++ * linux/arch/unicore32/include/asm/pgtable.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PGTABLE_H__
++#define __UNICORE_PGTABLE_H__
++
++#include <asm-generic/pgtable-nopmd.h>
++#include <asm/cpu-single.h>
++
++#include <asm/memory.h>
++#include <asm/pgtable-hwdef.h>
++
++/*
++ * Just any arbitrary offset to the start of the vmalloc VM area: the
++ * current 8MB value just means that there will be a 8MB "hole" after the
++ * physical memory until the kernel virtual memory starts. That means that
++ * any out-of-bounds memory accesses will hopefully be caught.
++ * The vmalloc() routines leaves a hole of 4kB between each vmalloced
++ * area for the same reason. ;)
++ *
++ * Note that platforms may override VMALLOC_START, but they must provide
++ * VMALLOC_END. VMALLOC_END defines the (exclusive) limit of this space,
++ * which may not overlap IO space.
++ */
++#ifndef VMALLOC_START
++#define VMALLOC_OFFSET SZ_8M
++#define VMALLOC_START (((unsigned long)high_memory + VMALLOC_OFFSET) \
++ & ~(VMALLOC_OFFSET-1))
++#define VMALLOC_END (0xff000000UL)
++#endif
++
++#define PTRS_PER_PTE 1024
++#define PTRS_PER_PGD 1024
++
++/*
++ * PGDIR_SHIFT determines what a third-level page table entry can map
++ */
++#define PGDIR_SHIFT 22
++
++#ifndef __ASSEMBLY__
++extern void __pte_error(const char *file, int line, unsigned long val);
++extern void __pgd_error(const char *file, int line, unsigned long val);
++
++#define pte_ERROR(pte) __pte_error(__FILE__, __LINE__, pte_val(pte))
++#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd))
++#endif /* !__ASSEMBLY__ */
++
++#define PGDIR_SIZE (1UL << PGDIR_SHIFT)
++#define PGDIR_MASK (~(PGDIR_SIZE-1))
++
++/*
++ * This is the lowest virtual address we can permit any user space
++ * mapping to be mapped at. This is particularly important for
++ * non-high vector CPUs.
++ */
++#define FIRST_USER_ADDRESS PAGE_SIZE
++
++#define FIRST_USER_PGD_NR 1
++#define USER_PTRS_PER_PGD ((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)
++
++/*
++ * section address mask and size definitions.
++ */
++#define SECTION_SHIFT 22
++#define SECTION_SIZE (1UL << SECTION_SHIFT)
++#define SECTION_MASK (~(SECTION_SIZE-1))
++
++#ifndef __ASSEMBLY__
++
++/*
++ * The pgprot_* and protection_map entries will be fixed up in runtime
++ * to include the cachable bits based on memory policy, as well as any
++ * architecture dependent bits.
++ */
++#define _PTE_DEFAULT (PTE_PRESENT | PTE_YOUNG | PTE_CACHEABLE)
++
++extern pgprot_t pgprot_user;
++extern pgprot_t pgprot_kernel;
++
++#define PAGE_NONE pgprot_user
++#define PAGE_SHARED __pgprot(pgprot_val(pgprot_user | PTE_READ \
++ | PTE_WRITE)
++#define PAGE_SHARED_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
++ | PTE_WRITE \
++ | PTE_EXEC)
++#define PAGE_COPY __pgprot(pgprot_val(pgprot_user | PTE_READ)
++#define PAGE_COPY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
++ | PTE_EXEC)
++#define PAGE_READONLY __pgprot(pgprot_val(pgprot_user | PTE_READ)
++#define PAGE_READONLY_EXEC __pgprot(pgprot_val(pgprot_user | PTE_READ \
++ | PTE_EXEC)
++#define PAGE_KERNEL pgprot_kernel
++#define PAGE_KERNEL_EXEC __pgprot(pgprot_val(pgprot_kernel | PTE_EXEC))
++
++#define __PAGE_NONE __pgprot(_PTE_DEFAULT)
++#define __PAGE_SHARED __pgprot(_PTE_DEFAULT | PTE_READ \
++ | PTE_WRITE)
++#define __PAGE_SHARED_EXEC __pgprot(_PTE_DEFAULT | PTE_READ \
++ | PTE_WRITE \
++ | PTE_EXEC)
++#define __PAGE_COPY __pgprot(_PTE_DEFAULT | PTE_READ)
++#define __PAGE_COPY_EXEC __pgprot(_PTE_DEFAULT | PTE_READ \
++ | PTE_EXEC)
++#define __PAGE_READONLY __pgprot(_PTE_DEFAULT | PTE_READ)
++#define __PAGE_READONLY_EXEC __pgprot(_PTE_DEFAULT | PTE_READ \
++ | PTE_EXEC)
++
++#endif /* __ASSEMBLY__ */
++
++/*
++ * The table below defines the page protection levels that we insert into our
++ * Linux page table version. These get translated into the best that the
++ * architecture can perform. Note that on UniCore hardware:
++ * 1) We cannot do execute protection
++ * 2) If we could do execute protection, then read is implied
++ * 3) write implies read permissions
++ */
++#define __P000 __PAGE_NONE
++#define __P001 __PAGE_READONLY
++#define __P010 __PAGE_COPY
++#define __P011 __PAGE_COPY
++#define __P100 __PAGE_READONLY_EXEC
++#define __P101 __PAGE_READONLY_EXEC
++#define __P110 __PAGE_COPY_EXEC
++#define __P111 __PAGE_COPY_EXEC
++
++#define __S000 __PAGE_NONE
++#define __S001 __PAGE_READONLY
++#define __S010 __PAGE_SHARED
++#define __S011 __PAGE_SHARED
++#define __S100 __PAGE_READONLY_EXEC
++#define __S101 __PAGE_READONLY_EXEC
++#define __S110 __PAGE_SHARED_EXEC
++#define __S111 __PAGE_SHARED_EXEC
++
++#ifndef __ASSEMBLY__
++/*
++ * ZERO_PAGE is a global shared page that is always zero: used
++ * for zero-mapped memory areas etc..
++ */
++extern struct page *empty_zero_page;
++#define ZERO_PAGE(vaddr) (empty_zero_page)
++
++#define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT)
++#define pfn_pte(pfn, prot) (__pte(((pfn) << PAGE_SHIFT) \
++ | pgprot_val(prot)))
++
++#define pte_none(pte) (!pte_val(pte))
++#define pte_clear(mm, addr, ptep) set_pte(ptep, __pte(0))
++#define pte_page(pte) (pfn_to_page(pte_pfn(pte)))
++#define pte_offset_kernel(dir, addr) (pmd_page_vaddr(*(dir)) \
++ + __pte_index(addr))
++
++#define pte_offset_map(dir, addr) (pmd_page_vaddr(*(dir)) \
++ + __pte_index(addr))
++#define pte_unmap(pte) do { } while (0)
++
++#define set_pte(ptep, pte) cpu_set_pte(ptep, pte)
++
++#define set_pte_at(mm, addr, ptep, pteval) \
++ do { \
++ set_pte(ptep, pteval); \
++ } while (0)
++
++/*
++ * The following only work if pte_present() is true.
++ * Undefined behaviour if not..
++ */
++#define pte_present(pte) (pte_val(pte) & PTE_PRESENT)
++#define pte_write(pte) (pte_val(pte) & PTE_WRITE)
++#define pte_dirty(pte) (pte_val(pte) & PTE_DIRTY)
++#define pte_young(pte) (pte_val(pte) & PTE_YOUNG)
++#define pte_exec(pte) (pte_val(pte) & PTE_EXEC)
++#define pte_special(pte) (0)
++
++#define PTE_BIT_FUNC(fn, op) \
++static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
++
++PTE_BIT_FUNC(wrprotect, &= ~PTE_WRITE);
++PTE_BIT_FUNC(mkwrite, |= PTE_WRITE);
++PTE_BIT_FUNC(mkclean, &= ~PTE_DIRTY);
++PTE_BIT_FUNC(mkdirty, |= PTE_DIRTY);
++PTE_BIT_FUNC(mkold, &= ~PTE_YOUNG);
++PTE_BIT_FUNC(mkyoung, |= PTE_YOUNG);
++
++static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
++
++/*
++ * Mark the prot value as uncacheable.
++ */
++#define pgprot_noncached(prot) \
++ __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE)
++#define pgprot_writecombine(prot) \
++ __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE)
++#define pgprot_dmacoherent(prot) \
++ __pgprot(pgprot_val(prot) & ~PTE_CACHEABLE)
++
++#define pmd_none(pmd) (!pmd_val(pmd))
++#define pmd_present(pmd) (pmd_val(pmd) & PMD_PRESENT)
++#define pmd_bad(pmd) (((pmd_val(pmd) & \
++ (PMD_PRESENT | PMD_TYPE_MASK)) \
++ != (PMD_PRESENT | PMD_TYPE_TABLE)))
++
++#define set_pmd(pmdpd, pmdval) \
++ do { \
++ *(pmdpd) = pmdval; \
++ } while (0)
++
++#define pmd_clear(pmdp) \
++ do { \
++ set_pmd(pmdp, __pmd(0));\
++ clean_pmd_entry(pmdp); \
++ } while (0)
++
++#define pmd_page_vaddr(pmd) ((pte_t *)__va(pmd_val(pmd) & PAGE_MASK))
++#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd)))
++
++/*
++ * Conversion functions: convert a page and protection to a page entry,
++ * and a page entry and page directory to the page they refer to.
++ */
++#define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot)
++
++/* to find an entry in a page-table-directory */
++#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
++
++#define pgd_offset(mm, addr) ((mm)->pgd+pgd_index(addr))
++
++/* to find an entry in a kernel page-table-directory */
++#define pgd_offset_k(addr) pgd_offset(&init_mm, addr)
++
++/* Find an entry in the third-level page table.. */
++#define __pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
++
++static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
++{
++ const unsigned long mask = PTE_EXEC | PTE_WRITE | PTE_READ;
++ pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
++ return pte;
++}
++
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++
++/*
++ * Encode and decode a swap entry. Swap entries are stored in the Linux
++ * page tables as follows:
++ *
++ * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
++ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
++ * <--------------- offset --------------> <--- type --> 0 0 0 0 0
++ *
++ * This gives us up to 127 swap files and 32GB per swap file. Note that
++ * the offset field is always non-zero.
++ */
++#define __SWP_TYPE_SHIFT 5
++#define __SWP_TYPE_BITS 7
++#define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1)
++#define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)
++
++#define __swp_type(x) (((x).val >> __SWP_TYPE_SHIFT) \
++ & __SWP_TYPE_MASK)
++#define __swp_offset(x) ((x).val >> __SWP_OFFSET_SHIFT)
++#define __swp_entry(type, offset) ((swp_entry_t) { \
++ ((type) << __SWP_TYPE_SHIFT) | \
++ ((offset) << __SWP_OFFSET_SHIFT) })
++
++#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
++#define __swp_entry_to_pte(swp) ((pte_t) { (swp).val })
++
++/*
++ * It is an error for the kernel to have more swap files than we can
++ * encode in the PTEs. This ensures that we know when MAX_SWAPFILES
++ * is increased beyond what we presently support.
++ */
++#define MAX_SWAPFILES_CHECK() \
++ BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS)
++
++/*
++ * Encode and decode a file entry. File entries are stored in the Linux
++ * page tables as follows:
++ *
++ * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
++ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
++ * <----------------------- offset ----------------------> 1 0 0 0
++ */
++#define pte_file(pte) (pte_val(pte) & PTE_FILE)
++#define pte_to_pgoff(x) (pte_val(x) >> 4)
++#define pgoff_to_pte(x) __pte(((x) << 4) | PTE_FILE)
++
++#define PTE_FILE_MAX_BITS 28
++
++/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
++/* FIXME: this is not correct */
++#define kern_addr_valid(addr) (1)
++
++#include <asm-generic/pgtable.h>
++
++/*
++ * remap a physical page `pfn' of size `size' with page protection `prot'
++ * into virtual address `from'
++ */
++#define io_remap_pfn_range(vma, from, pfn, size, prot) \
++ remap_pfn_range(vma, from, pfn, size, prot)
++
++#define pgtable_cache_init() do { } while (0)
++
++#endif /* !__ASSEMBLY__ */
++
++#endif /* __UNICORE_PGTABLE_H__ */
+diff --git a/arch/unicore32/mm/alignment.c b/arch/unicore32/mm/alignment.c
+new file mode 100644
+index 000000000000..28f576d733ee
+--- /dev/null
++++ b/arch/unicore32/mm/alignment.c
+@@ -0,0 +1,523 @@
++/*
++ * linux/arch/unicore32/mm/alignment.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ */
++/*
++ * TODO:
++ * FPU ldm/stm not handling
++ */
++#include <linux/compiler.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/string.h>
++#include <linux/init.h>
++#include <linux/sched.h>
++#include <linux/uaccess.h>
++
++#include <asm/tlbflush.h>
++#include <asm/unaligned.h>
++
++#define CODING_BITS(i) (i & 0xe0000120)
++
++#define LDST_P_BIT(i) (i & (1 << 28)) /* Preindex */
++#define LDST_U_BIT(i) (i & (1 << 27)) /* Add offset */
++#define LDST_W_BIT(i) (i & (1 << 25)) /* Writeback */
++#define LDST_L_BIT(i) (i & (1 << 24)) /* Load */
++
++#define LDST_P_EQ_U(i) ((((i) ^ ((i) >> 1)) & (1 << 27)) == 0)
++
++#define LDSTH_I_BIT(i) (i & (1 << 26)) /* half-word immed */
++#define LDM_S_BIT(i) (i & (1 << 26)) /* write ASR from BSR */
++#define LDM_H_BIT(i) (i & (1 << 6)) /* select r0-r15 or r16-r31 */
++
++#define RN_BITS(i) ((i >> 19) & 31) /* Rn */
++#define RD_BITS(i) ((i >> 14) & 31) /* Rd */
++#define RM_BITS(i) (i & 31) /* Rm */
++
++#define REGMASK_BITS(i) (((i & 0x7fe00) >> 3) | (i & 0x3f))
++#define OFFSET_BITS(i) (i & 0x03fff)
++
++#define SHIFT_BITS(i) ((i >> 9) & 0x1f)
++#define SHIFT_TYPE(i) (i & 0xc0)
++#define SHIFT_LSL 0x00
++#define SHIFT_LSR 0x40
++#define SHIFT_ASR 0x80
++#define SHIFT_RORRRX 0xc0
++
++union offset_union {
++ unsigned long un;
++ signed long sn;
++};
++
++#define TYPE_ERROR 0
++#define TYPE_FAULT 1
++#define TYPE_LDST 2
++#define TYPE_DONE 3
++#define TYPE_SWAP 4
++#define TYPE_COLS 5 /* Coprocessor load/store */
++
++#define get8_unaligned_check(val, addr, err) \
++ __asm__( \
++ "1: ldb.u %1, [%2], #1\n" \
++ "2:\n" \
++ " .pushsection .fixup,\"ax\"\n" \
++ " .align 2\n" \
++ "3: mov %0, #1\n" \
++ " b 2b\n" \
++ " .popsection\n" \
++ " .pushsection __ex_table,\"a\"\n" \
++ " .align 3\n" \
++ " .long 1b, 3b\n" \
++ " .popsection\n" \
++ : "=r" (err), "=&r" (val), "=r" (addr) \
++ : "0" (err), "2" (addr))
++
++#define get8t_unaligned_check(val, addr, err) \
++ __asm__( \
++ "1: ldb.u %1, [%2], #1\n" \
++ "2:\n" \
++ " .pushsection .fixup,\"ax\"\n" \
++ " .align 2\n" \
++ "3: mov %0, #1\n" \
++ " b 2b\n" \
++ " .popsection\n" \
++ " .pushsection __ex_table,\"a\"\n" \
++ " .align 3\n" \
++ " .long 1b, 3b\n" \
++ " .popsection\n" \
++ : "=r" (err), "=&r" (val), "=r" (addr) \
++ : "0" (err), "2" (addr))
++
++#define get16_unaligned_check(val, addr) \
++ do { \
++ unsigned int err = 0, v, a = addr; \
++ get8_unaligned_check(val, a, err); \
++ get8_unaligned_check(v, a, err); \
++ val |= v << 8; \
++ if (err) \
++ goto fault; \
++ } while (0)
++
++#define put16_unaligned_check(val, addr) \
++ do { \
++ unsigned int err = 0, v = val, a = addr; \
++ __asm__( \
++ "1: stb.u %1, [%2], #1\n" \
++ " mov %1, %1 >> #8\n" \
++ "2: stb.u %1, [%2]\n" \
++ "3:\n" \
++ " .pushsection .fixup,\"ax\"\n" \
++ " .align 2\n" \
++ "4: mov %0, #1\n" \
++ " b 3b\n" \
++ " .popsection\n" \
++ " .pushsection __ex_table,\"a\"\n" \
++ " .align 3\n" \
++ " .long 1b, 4b\n" \
++ " .long 2b, 4b\n" \
++ " .popsection\n" \
++ : "=r" (err), "=&r" (v), "=&r" (a) \
++ : "0" (err), "1" (v), "2" (a)); \
++ if (err) \
++ goto fault; \
++ } while (0)
++
++#define __put32_unaligned_check(ins, val, addr) \
++ do { \
++ unsigned int err = 0, v = val, a = addr; \
++ __asm__( \
++ "1: "ins" %1, [%2], #1\n" \
++ " mov %1, %1 >> #8\n" \
++ "2: "ins" %1, [%2], #1\n" \
++ " mov %1, %1 >> #8\n" \
++ "3: "ins" %1, [%2], #1\n" \
++ " mov %1, %1 >> #8\n" \
++ "4: "ins" %1, [%2]\n" \
++ "5:\n" \
++ " .pushsection .fixup,\"ax\"\n" \
++ " .align 2\n" \
++ "6: mov %0, #1\n" \
++ " b 5b\n" \
++ " .popsection\n" \
++ " .pushsection __ex_table,\"a\"\n" \
++ " .align 3\n" \
++ " .long 1b, 6b\n" \
++ " .long 2b, 6b\n" \
++ " .long 3b, 6b\n" \
++ " .long 4b, 6b\n" \
++ " .popsection\n" \
++ : "=r" (err), "=&r" (v), "=&r" (a) \
++ : "0" (err), "1" (v), "2" (a)); \
++ if (err) \
++ goto fault; \
++ } while (0)
++
++#define get32_unaligned_check(val, addr) \
++ do { \
++ unsigned int err = 0, v, a = addr; \
++ get8_unaligned_check(val, a, err); \
++ get8_unaligned_check(v, a, err); \
++ val |= v << 8; \
++ get8_unaligned_check(v, a, err); \
++ val |= v << 16; \
++ get8_unaligned_check(v, a, err); \
++ val |= v << 24; \
++ if (err) \
++ goto fault; \
++ } while (0)
++
++#define put32_unaligned_check(val, addr) \
++ __put32_unaligned_check("stb.u", val, addr)
++
++#define get32t_unaligned_check(val, addr) \
++ do { \
++ unsigned int err = 0, v, a = addr; \
++ get8t_unaligned_check(val, a, err); \
++ get8t_unaligned_check(v, a, err); \
++ val |= v << 8; \
++ get8t_unaligned_check(v, a, err); \
++ val |= v << 16; \
++ get8t_unaligned_check(v, a, err); \
++ val |= v << 24; \
++ if (err) \
++ goto fault; \
++ } while (0)
++
++#define put32t_unaligned_check(val, addr) \
++ __put32_unaligned_check("stb.u", val, addr)
++
++static void
++do_alignment_finish_ldst(unsigned long addr, unsigned long instr,
++ struct pt_regs *regs, union offset_union offset)
++{
++ if (!LDST_U_BIT(instr))
++ offset.un = -offset.un;
++
++ if (!LDST_P_BIT(instr))
++ addr += offset.un;
++
++ if (!LDST_P_BIT(instr) || LDST_W_BIT(instr))
++ regs->uregs[RN_BITS(instr)] = addr;
++}
++
++static int
++do_alignment_ldrhstrh(unsigned long addr, unsigned long instr,
++ struct pt_regs *regs)
++{
++ unsigned int rd = RD_BITS(instr);
++
++ /* old value 0x40002120, can't judge swap instr correctly */
++ if ((instr & 0x4b003fe0) == 0x40000120)
++ goto swp;
++
++ if (LDST_L_BIT(instr)) {
++ unsigned long val;
++ get16_unaligned_check(val, addr);
++
++ /* signed half-word? */
++ if (instr & 0x80)
++ val = (signed long)((signed short)val);
++
++ regs->uregs[rd] = val;
++ } else
++ put16_unaligned_check(regs->uregs[rd], addr);
++
++ return TYPE_LDST;
++
++swp:
++ /* only handle swap word
++ * for swap byte should not active this alignment exception */
++ get32_unaligned_check(regs->uregs[RD_BITS(instr)], addr);
++ put32_unaligned_check(regs->uregs[RM_BITS(instr)], addr);
++ return TYPE_SWAP;
++
++fault:
++ return TYPE_FAULT;
++}
++
++static int
++do_alignment_ldrstr(unsigned long addr, unsigned long instr,
++ struct pt_regs *regs)
++{
++ unsigned int rd = RD_BITS(instr);
++
++ if (!LDST_P_BIT(instr) && LDST_W_BIT(instr))
++ goto trans;
++
++ if (LDST_L_BIT(instr))
++ get32_unaligned_check(regs->uregs[rd], addr);
++ else
++ put32_unaligned_check(regs->uregs[rd], addr);
++ return TYPE_LDST;
++
++trans:
++ if (LDST_L_BIT(instr))
++ get32t_unaligned_check(regs->uregs[rd], addr);
++ else
++ put32t_unaligned_check(regs->uregs[rd], addr);
++ return TYPE_LDST;
++
++fault:
++ return TYPE_FAULT;
++}
++
++/*
++ * LDM/STM alignment handler.
++ *
++ * There are 4 variants of this instruction:
++ *
++ * B = rn pointer before instruction, A = rn pointer after instruction
++ * ------ increasing address ----->
++ * | | r0 | r1 | ... | rx | |
++ * PU = 01 B A
++ * PU = 11 B A
++ * PU = 00 A B
++ * PU = 10 A B
++ */
++static int
++do_alignment_ldmstm(unsigned long addr, unsigned long instr,
++ struct pt_regs *regs)
++{
++ unsigned int rd, rn, pc_correction, reg_correction, nr_regs, regbits;
++ unsigned long eaddr, newaddr;
++
++ if (LDM_S_BIT(instr))
++ goto bad;
++
++ pc_correction = 4; /* processor implementation defined */
++
++ /* count the number of registers in the mask to be transferred */
++ nr_regs = hweight16(REGMASK_BITS(instr)) * 4;
++
++ rn = RN_BITS(instr);
++ newaddr = eaddr = regs->uregs[rn];
++
++ if (!LDST_U_BIT(instr))
++ nr_regs = -nr_regs;
++ newaddr += nr_regs;
++ if (!LDST_U_BIT(instr))
++ eaddr = newaddr;
++
++ if (LDST_P_EQ_U(instr)) /* U = P */
++ eaddr += 4;
++
++ /*
++ * This is a "hint" - we already have eaddr worked out by the
++ * processor for us.
++ */
++ if (addr != eaddr) {
++ printk(KERN_ERR "LDMSTM: PC = %08lx, instr = %08lx, "
++ "addr = %08lx, eaddr = %08lx\n",
++ instruction_pointer(regs), instr, addr, eaddr);
++ show_regs(regs);
++ }
++
++ if (LDM_H_BIT(instr))
++ reg_correction = 0x10;
++ else
++ reg_correction = 0x00;
++
++ for (regbits = REGMASK_BITS(instr), rd = 0; regbits;
++ regbits >>= 1, rd += 1)
++ if (regbits & 1) {
++ if (LDST_L_BIT(instr))
++ get32_unaligned_check(regs->
++ uregs[rd + reg_correction], eaddr);
++ else
++ put32_unaligned_check(regs->
++ uregs[rd + reg_correction], eaddr);
++ eaddr += 4;
++ }
++
++ if (LDST_W_BIT(instr))
++ regs->uregs[rn] = newaddr;
++ return TYPE_DONE;
++
++fault:
++ regs->UCreg_pc -= pc_correction;
++ return TYPE_FAULT;
++
++bad:
++ printk(KERN_ERR "Alignment trap: not handling ldm with s-bit set\n");
++ return TYPE_ERROR;
++}
++
++static int
++do_alignment(unsigned long addr, unsigned int error_code, struct pt_regs *regs)
++{
++ union offset_union offset;
++ unsigned long instr, instrptr;
++ int (*handler) (unsigned long addr, unsigned long instr,
++ struct pt_regs *regs);
++ unsigned int type;
++
++ instrptr = instruction_pointer(regs);
++ if (instrptr >= PAGE_OFFSET)
++ instr = *(unsigned long *)instrptr;
++ else {
++ __asm__ __volatile__(
++ "ldw.u %0, [%1]\n"
++ : "=&r"(instr)
++ : "r"(instrptr));
++ }
++
++ regs->UCreg_pc += 4;
++
++ switch (CODING_BITS(instr)) {
++ case 0x40000120: /* ldrh or strh */
++ if (LDSTH_I_BIT(instr))
++ offset.un = (instr & 0x3e00) >> 4 | (instr & 31);
++ else
++ offset.un = regs->uregs[RM_BITS(instr)];
++ handler = do_alignment_ldrhstrh;
++ break;
++
++ case 0x60000000: /* ldr or str immediate */
++ case 0x60000100: /* ldr or str immediate */
++ case 0x60000020: /* ldr or str immediate */
++ case 0x60000120: /* ldr or str immediate */
++ offset.un = OFFSET_BITS(instr);
++ handler = do_alignment_ldrstr;
++ break;
++
++ case 0x40000000: /* ldr or str register */
++ offset.un = regs->uregs[RM_BITS(instr)];
++ {
++ unsigned int shiftval = SHIFT_BITS(instr);
++
++ switch (SHIFT_TYPE(instr)) {
++ case SHIFT_LSL:
++ offset.un <<= shiftval;
++ break;
++
++ case SHIFT_LSR:
++ offset.un >>= shiftval;
++ break;
++
++ case SHIFT_ASR:
++ offset.sn >>= shiftval;
++ break;
++
++ case SHIFT_RORRRX:
++ if (shiftval == 0) {
++ offset.un >>= 1;
++ if (regs->UCreg_asr & PSR_C_BIT)
++ offset.un |= 1 << 31;
++ } else
++ offset.un = offset.un >> shiftval |
++ offset.un << (32 - shiftval);
++ break;
++ }
++ }
++ handler = do_alignment_ldrstr;
++ break;
++
++ case 0x80000000: /* ldm or stm */
++ case 0x80000020: /* ldm or stm */
++ handler = do_alignment_ldmstm;
++ break;
++
++ default:
++ goto bad;
++ }
++
++ type = handler(addr, instr, regs);
++
++ if (type == TYPE_ERROR || type == TYPE_FAULT)
++ goto bad_or_fault;
++
++ if (type == TYPE_LDST)
++ do_alignment_finish_ldst(addr, instr, regs, offset);
++
++ return 0;
++
++bad_or_fault:
++ if (type == TYPE_ERROR)
++ goto bad;
++ regs->UCreg_pc -= 4;
++ /*
++ * We got a fault - fix it up, or die.
++ */
++ do_bad_area(addr, error_code, regs);
++ return 0;
++
++bad:
++ /*
++ * Oops, we didn't handle the instruction.
++ * However, we must handle fpu instr firstly.
++ */
++#ifdef CONFIG_UNICORE_FPU_F64
++ /* handle co.load/store */
++#define CODING_COLS 0xc0000000
++#define COLS_OFFSET_BITS(i) (i & 0x1FF)
++#define COLS_L_BITS(i) (i & (1<<24))
++#define COLS_FN_BITS(i) ((i>>14) & 31)
++ if ((instr & 0xe0000000) == CODING_COLS) {
++ unsigned int fn = COLS_FN_BITS(instr);
++ unsigned long val = 0;
++ if (COLS_L_BITS(instr)) {
++ get32t_unaligned_check(val, addr);
++ switch (fn) {
++#define ASM_MTF(n) case n: \
++ __asm__ __volatile__("MTF %0, F" __stringify(n) \
++ : : "r"(val)); \
++ break;
++ ASM_MTF(0); ASM_MTF(1); ASM_MTF(2); ASM_MTF(3);
++ ASM_MTF(4); ASM_MTF(5); ASM_MTF(6); ASM_MTF(7);
++ ASM_MTF(8); ASM_MTF(9); ASM_MTF(10); ASM_MTF(11);
++ ASM_MTF(12); ASM_MTF(13); ASM_MTF(14); ASM_MTF(15);
++ ASM_MTF(16); ASM_MTF(17); ASM_MTF(18); ASM_MTF(19);
++ ASM_MTF(20); ASM_MTF(21); ASM_MTF(22); ASM_MTF(23);
++ ASM_MTF(24); ASM_MTF(25); ASM_MTF(26); ASM_MTF(27);
++ ASM_MTF(28); ASM_MTF(29); ASM_MTF(30); ASM_MTF(31);
++#undef ASM_MTF
++ }
++ } else {
++ switch (fn) {
++#define ASM_MFF(n) case n: \
++ __asm__ __volatile__("MFF %0, F" __stringify(n) \
++ : : "r"(val)); \
++ break;
++ ASM_MFF(0); ASM_MFF(1); ASM_MFF(2); ASM_MFF(3);
++ ASM_MFF(4); ASM_MFF(5); ASM_MFF(6); ASM_MFF(7);
++ ASM_MFF(8); ASM_MFF(9); ASM_MFF(10); ASM_MFF(11);
++ ASM_MFF(12); ASM_MFF(13); ASM_MFF(14); ASM_MFF(15);
++ ASM_MFF(16); ASM_MFF(17); ASM_MFF(18); ASM_MFF(19);
++ ASM_MFF(20); ASM_MFF(21); ASM_MFF(22); ASM_MFF(23);
++ ASM_MFF(24); ASM_MFF(25); ASM_MFF(26); ASM_MFF(27);
++ ASM_MFF(28); ASM_MFF(29); ASM_MFF(30); ASM_MFF(31);
++#undef ASM_MFF
++ }
++ put32t_unaligned_check(val, addr);
++ }
++ return TYPE_COLS;
++ }
++fault:
++ return TYPE_FAULT;
++#endif
++ printk(KERN_ERR "Alignment trap: not handling instruction "
++ "%08lx at [<%08lx>]\n", instr, instrptr);
++ return 1;
++}
++
++/*
++ * This needs to be done after sysctl_init, otherwise sys/ will be
++ * overwritten. Actually, this shouldn't be in sys/ at all since
++ * it isn't a sysctl, and it doesn't contain sysctl information.
++ */
++static int __init alignment_init(void)
++{
++ hook_fault_code(1, do_alignment, SIGBUS, BUS_ADRALN,
++ "alignment exception");
++
++ return 0;
++}
++
++fs_initcall(alignment_init);
+diff --git a/arch/unicore32/mm/extable.c b/arch/unicore32/mm/extable.c
+new file mode 100644
+index 000000000000..6564180eb285
+--- /dev/null
++++ b/arch/unicore32/mm/extable.c
+@@ -0,0 +1,24 @@
++/*
++ * linux/arch/unicore32/mm/extable.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/uaccess.h>
++
++int fixup_exception(struct pt_regs *regs)
++{
++ const struct exception_table_entry *fixup;
++
++ fixup = search_exception_tables(instruction_pointer(regs));
++ if (fixup)
++ regs->UCreg_pc = fixup->fixup;
++
++ return fixup != NULL;
++}
+diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
+new file mode 100644
+index 000000000000..283aa4b50b7a
+--- /dev/null
++++ b/arch/unicore32/mm/fault.c
+@@ -0,0 +1,479 @@
++/*
++ * linux/arch/unicore32/mm/fault.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/signal.h>
++#include <linux/mm.h>
++#include <linux/hardirq.h>
++#include <linux/init.h>
++#include <linux/kprobes.h>
++#include <linux/uaccess.h>
++#include <linux/page-flags.h>
++#include <linux/sched.h>
++#include <linux/io.h>
++
++#include <asm/system.h>
++#include <asm/pgtable.h>
++#include <asm/tlbflush.h>
++
++/*
++ * Fault status register encodings. We steal bit 31 for our own purposes.
++ */
++#define FSR_LNX_PF (1 << 31)
++
++static inline int fsr_fs(unsigned int fsr)
++{
++ /* xyabcde will be abcde+xy */
++ return (fsr & 31) + ((fsr & (3 << 5)) >> 5);
++}
++
++/*
++ * This is useful to dump out the page tables associated with
++ * 'addr' in mm 'mm'.
++ */
++void show_pte(struct mm_struct *mm, unsigned long addr)
++{
++ pgd_t *pgd;
++
++ if (!mm)
++ mm = &init_mm;
++
++ printk(KERN_ALERT "pgd = %p\n", mm->pgd);
++ pgd = pgd_offset(mm, addr);
++ printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd));
++
++ do {
++ pmd_t *pmd;
++ pte_t *pte;
++
++ if (pgd_none(*pgd))
++ break;
++
++ if (pgd_bad(*pgd)) {
++ printk("(bad)");
++ break;
++ }
++
++ pmd = pmd_offset((pud_t *) pgd, addr);
++ if (PTRS_PER_PMD != 1)
++ printk(", *pmd=%08lx", pmd_val(*pmd));
++
++ if (pmd_none(*pmd))
++ break;
++
++ if (pmd_bad(*pmd)) {
++ printk("(bad)");
++ break;
++ }
++
++ /* We must not map this if we have highmem enabled */
++ if (PageHighMem(pfn_to_page(pmd_val(*pmd) >> PAGE_SHIFT)))
++ break;
++
++ pte = pte_offset_map(pmd, addr);
++ printk(", *pte=%08lx", pte_val(*pte));
++ pte_unmap(pte);
++ } while (0);
++
++ printk("\n");
++}
++
++/*
++ * Oops. The kernel tried to access some page that wasn't present.
++ */
++static void __do_kernel_fault(struct mm_struct *mm, unsigned long addr,
++ unsigned int fsr, struct pt_regs *regs)
++{
++ /*
++ * Are we prepared to handle this kernel fault?
++ */
++ if (fixup_exception(regs))
++ return;
++
++ /*
++ * No handler, we'll have to terminate things with extreme prejudice.
++ */
++ bust_spinlocks(1);
++ printk(KERN_ALERT
++ "Unable to handle kernel %s at virtual address %08lx\n",
++ (addr < PAGE_SIZE) ? "NULL pointer dereference" :
++ "paging request", addr);
++
++ show_pte(mm, addr);
++ die("Oops", regs, fsr);
++ bust_spinlocks(0);
++ do_exit(SIGKILL);
++}
++
++/*
++ * Something tried to access memory that isn't in our memory map..
++ * User mode accesses just cause a SIGSEGV
++ */
++static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
++ unsigned int fsr, unsigned int sig, int code,
++ struct pt_regs *regs)
++{
++ struct siginfo si;
++
++ tsk->thread.address = addr;
++ tsk->thread.error_code = fsr;
++ tsk->thread.trap_no = 14;
++ si.si_signo = sig;
++ si.si_errno = 0;
++ si.si_code = code;
++ si.si_addr = (void __user *)addr;
++ force_sig_info(sig, &si, tsk);
++}
++
++void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
++{
++ struct task_struct *tsk = current;
++ struct mm_struct *mm = tsk->active_mm;
++
++ /*
++ * If we are in kernel mode at this point, we
++ * have no context to handle this fault with.
++ */
++ if (user_mode(regs))
++ __do_user_fault(tsk, addr, fsr, SIGSEGV, SEGV_MAPERR, regs);
++ else
++ __do_kernel_fault(mm, addr, fsr, regs);
++}
++
++#define VM_FAULT_BADMAP 0x010000
++#define VM_FAULT_BADACCESS 0x020000
++
++/*
++ * Check that the permissions on the VMA allow for the fault which occurred.
++ * If we encountered a write fault, we must have write permission, otherwise
++ * we allow any permission.
++ */
++static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma)
++{
++ unsigned int mask = VM_READ | VM_WRITE | VM_EXEC;
++
++ if (!(fsr ^ 0x12)) /* write? */
++ mask = VM_WRITE;
++ if (fsr & FSR_LNX_PF)
++ mask = VM_EXEC;
++
++ return vma->vm_flags & mask ? false : true;
++}
++
++static int __do_pf(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
++ struct task_struct *tsk)
++{
++ struct vm_area_struct *vma;
++ int fault;
++
++ vma = find_vma(mm, addr);
++ fault = VM_FAULT_BADMAP;
++ if (unlikely(!vma))
++ goto out;
++ if (unlikely(vma->vm_start > addr))
++ goto check_stack;
++
++ /*
++ * Ok, we have a good vm_area for this
++ * memory access, so we can handle it.
++ */
++good_area:
++ if (access_error(fsr, vma)) {
++ fault = VM_FAULT_BADACCESS;
++ goto out;
++ }
++
++ /*
++ * If for any reason at all we couldn't handle the fault, make
++ * sure we exit gracefully rather than endlessly redo the fault.
++ */
++ fault = handle_mm_fault(mm, vma, addr & PAGE_MASK,
++ (!(fsr ^ 0x12)) ? FAULT_FLAG_WRITE : 0);
++ if (unlikely(fault & VM_FAULT_ERROR))
++ return fault;
++ if (fault & VM_FAULT_MAJOR)
++ tsk->maj_flt++;
++ else
++ tsk->min_flt++;
++ return fault;
++
++check_stack:
++ if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
++ goto good_area;
++out:
++ return fault;
++}
++
++static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
++{
++ struct task_struct *tsk;
++ struct mm_struct *mm;
++ int fault, sig, code;
++
++ tsk = current;
++ mm = tsk->mm;
++
++ /*
++ * If we're in an interrupt or have no user
++ * context, we must not take the fault..
++ */
++ if (in_atomic() || !mm)
++ goto no_context;
++
++ /*
++ * As per x86, we may deadlock here. However, since the kernel only
++ * validly references user space from well defined areas of the code,
++ * we can bug out early if this is from code which shouldn't.
++ */
++ if (!down_read_trylock(&mm->mmap_sem)) {
++ if (!user_mode(regs)
++ && !search_exception_tables(regs->UCreg_pc))
++ goto no_context;
++ down_read(&mm->mmap_sem);
++ } else {
++ /*
++ * The above down_read_trylock() might have succeeded in
++ * which case, we'll have missed the might_sleep() from
++ * down_read()
++ */
++ might_sleep();
++#ifdef CONFIG_DEBUG_VM
++ if (!user_mode(regs) &&
++ !search_exception_tables(regs->UCreg_pc))
++ goto no_context;
++#endif
++ }
++
++ fault = __do_pf(mm, addr, fsr, tsk);
++ up_read(&mm->mmap_sem);
++
++ /*
++ * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
++ */
++ if (likely(!(fault &
++ (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
++ return 0;
++
++ if (fault & VM_FAULT_OOM) {
++ /*
++ * We ran out of memory, call the OOM killer, and return to
++ * userspace (which will retry the fault, or kill us if we
++ * got oom-killed)
++ */
++ pagefault_out_of_memory();
++ return 0;
++ }
++
++ /*
++ * If we are in kernel mode at this point, we
++ * have no context to handle this fault with.
++ */
++ if (!user_mode(regs))
++ goto no_context;
++
++ if (fault & VM_FAULT_SIGBUS) {
++ /*
++ * We had some memory, but were unable to
++ * successfully fix up this page fault.
++ */
++ sig = SIGBUS;
++ code = BUS_ADRERR;
++ } else {
++ /*
++ * Something tried to access memory that
++ * isn't in our memory map..
++ */
++ sig = SIGSEGV;
++ code = fault == VM_FAULT_BADACCESS ? SEGV_ACCERR : SEGV_MAPERR;
++ }
++
++ __do_user_fault(tsk, addr, fsr, sig, code, regs);
++ return 0;
++
++no_context:
++ __do_kernel_fault(mm, addr, fsr, regs);
++ return 0;
++}
++
++/*
++ * First Level Translation Fault Handler
++ *
++ * We enter here because the first level page table doesn't contain
++ * a valid entry for the address.
++ *
++ * If the address is in kernel space (>= TASK_SIZE), then we are
++ * probably faulting in the vmalloc() area.
++ *
++ * If the init_task's first level page tables contains the relevant
++ * entry, we copy the it to this task. If not, we send the process
++ * a signal, fixup the exception, or oops the kernel.
++ *
++ * NOTE! We MUST NOT take any locks for this case. We may be in an
++ * interrupt or a critical region, and should only copy the information
++ * from the master page table, nothing more.
++ */
++static int do_ifault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
++{
++ unsigned int index;
++ pgd_t *pgd, *pgd_k;
++ pmd_t *pmd, *pmd_k;
++
++ if (addr < TASK_SIZE)
++ return do_pf(addr, fsr, regs);
++
++ if (user_mode(regs))
++ goto bad_area;
++
++ index = pgd_index(addr);
++
++ pgd = cpu_get_pgd() + index;
++ pgd_k = init_mm.pgd + index;
++
++ if (pgd_none(*pgd_k))
++ goto bad_area;
++
++ pmd_k = pmd_offset((pud_t *) pgd_k, addr);
++ pmd = pmd_offset((pud_t *) pgd, addr);
++
++ if (pmd_none(*pmd_k))
++ goto bad_area;
++
++ set_pmd(pmd, *pmd_k);
++ flush_pmd_entry(pmd);
++ return 0;
++
++bad_area:
++ do_bad_area(addr, fsr, regs);
++ return 0;
++}
++
++/*
++ * This abort handler always returns "fault".
++ */
++static int do_bad(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
++{
++ return 1;
++}
++
++static int do_good(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
++{
++ unsigned int res1, res2;
++
++ printk("dabt exception but no error!\n");
++
++ __asm__ __volatile__(
++ "mff %0,f0\n"
++ "mff %1,f1\n"
++ : "=r"(res1), "=r"(res2)
++ :
++ : "memory");
++
++ printk(KERN_EMERG "r0 :%08x r1 :%08x\n", res1, res2);
++ panic("shut up\n");
++ return 0;
++}
++
++static struct fsr_info {
++ int (*fn) (unsigned long addr, unsigned int fsr, struct pt_regs *regs);
++ int sig;
++ int code;
++ const char *name;
++} fsr_info[] = {
++ /*
++ * The following are the standard Unicore-I and UniCore-II aborts.
++ */
++ { do_good, SIGBUS, 0, "no error" },
++ { do_bad, SIGBUS, BUS_ADRALN, "alignment exception" },
++ { do_bad, SIGBUS, BUS_OBJERR, "external exception" },
++ { do_bad, SIGBUS, 0, "burst operation" },
++ { do_bad, SIGBUS, 0, "unknown 00100" },
++ { do_ifault, SIGSEGV, SEGV_MAPERR, "2nd level pt non-exist"},
++ { do_bad, SIGBUS, 0, "2nd lvl large pt non-exist" },
++ { do_bad, SIGBUS, 0, "invalid pte" },
++ { do_pf, SIGSEGV, SEGV_MAPERR, "page miss" },
++ { do_bad, SIGBUS, 0, "middle page miss" },
++ { do_bad, SIGBUS, 0, "large page miss" },
++ { do_pf, SIGSEGV, SEGV_MAPERR, "super page (section) miss" },
++ { do_bad, SIGBUS, 0, "unknown 01100" },
++ { do_bad, SIGBUS, 0, "unknown 01101" },
++ { do_bad, SIGBUS, 0, "unknown 01110" },
++ { do_bad, SIGBUS, 0, "unknown 01111" },
++ { do_bad, SIGBUS, 0, "addr: up 3G or IO" },
++ { do_pf, SIGSEGV, SEGV_ACCERR, "read unreadable addr" },
++ { do_pf, SIGSEGV, SEGV_ACCERR, "write unwriteable addr"},
++ { do_pf, SIGSEGV, SEGV_ACCERR, "exec unexecutable addr"},
++ { do_bad, SIGBUS, 0, "unknown 10100" },
++ { do_bad, SIGBUS, 0, "unknown 10101" },
++ { do_bad, SIGBUS, 0, "unknown 10110" },
++ { do_bad, SIGBUS, 0, "unknown 10111" },
++ { do_bad, SIGBUS, 0, "unknown 11000" },
++ { do_bad, SIGBUS, 0, "unknown 11001" },
++ { do_bad, SIGBUS, 0, "unknown 11010" },
++ { do_bad, SIGBUS, 0, "unknown 11011" },
++ { do_bad, SIGBUS, 0, "unknown 11100" },
++ { do_bad, SIGBUS, 0, "unknown 11101" },
++ { do_bad, SIGBUS, 0, "unknown 11110" },
++ { do_bad, SIGBUS, 0, "unknown 11111" }
++};
++
++void __init hook_fault_code(int nr,
++ int (*fn) (unsigned long, unsigned int, struct pt_regs *),
++ int sig, int code, const char *name)
++{
++ if (nr < 0 || nr >= ARRAY_SIZE(fsr_info))
++ BUG();
++
++ fsr_info[nr].fn = fn;
++ fsr_info[nr].sig = sig;
++ fsr_info[nr].code = code;
++ fsr_info[nr].name = name;
++}
++
++/*
++ * Dispatch a data abort to the relevant handler.
++ */
++asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr,
++ struct pt_regs *regs)
++{
++ const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
++ struct siginfo info;
++
++ if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
++ return;
++
++ printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
++ inf->name, fsr, addr);
++
++ info.si_signo = inf->sig;
++ info.si_errno = 0;
++ info.si_code = inf->code;
++ info.si_addr = (void __user *)addr;
++ uc32_notify_die("", regs, &info, fsr, 0);
++}
++
++asmlinkage void do_PrefetchAbort(unsigned long addr,
++ unsigned int ifsr, struct pt_regs *regs)
++{
++ const struct fsr_info *inf = fsr_info + fsr_fs(ifsr);
++ struct siginfo info;
++
++ if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
++ return;
++
++ printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
++ inf->name, ifsr, addr);
++
++ info.si_signo = inf->sig;
++ info.si_errno = 0;
++ info.si_code = inf->code;
++ info.si_addr = (void __user *)addr;
++ uc32_notify_die("", regs, &info, ifsr, 0);
++}
+diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c
+new file mode 100644
+index 000000000000..7bf3d588631f
+--- /dev/null
++++ b/arch/unicore32/mm/mmu.c
+@@ -0,0 +1,533 @@
++/*
++ * linux/arch/unicore32/mm/mmu.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/mman.h>
++#include <linux/nodemask.h>
++#include <linux/memblock.h>
++#include <linux/fs.h>
++#include <linux/bootmem.h>
++#include <linux/io.h>
++
++#include <asm/cputype.h>
++#include <asm/sections.h>
++#include <asm/setup.h>
++#include <asm/sizes.h>
++#include <asm/tlb.h>
++
++#include <mach/map.h>
++
++#include "mm.h"
++
++DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
++
++/*
++ * empty_zero_page is a special page that is used for
++ * zero-initialized data and COW.
++ */
++struct page *empty_zero_page;
++EXPORT_SYMBOL(empty_zero_page);
++
++/*
++ * The pmd table for the upper-most set of pages.
++ */
++pmd_t *top_pmd;
++
++pgprot_t pgprot_user;
++EXPORT_SYMBOL(pgprot_user);
++
++pgprot_t pgprot_kernel;
++EXPORT_SYMBOL(pgprot_kernel);
++
++static int __init noalign_setup(char *__unused)
++{
++ cr_alignment &= ~CR_A;
++ cr_no_alignment &= ~CR_A;
++ set_cr(cr_alignment);
++ return 1;
++}
++__setup("noalign", noalign_setup);
++
++void adjust_cr(unsigned long mask, unsigned long set)
++{
++ unsigned long flags;
++
++ mask &= ~CR_A;
++
++ set &= mask;
++
++ local_irq_save(flags);
++
++ cr_no_alignment = (cr_no_alignment & ~mask) | set;
++ cr_alignment = (cr_alignment & ~mask) | set;
++
++ set_cr((get_cr() & ~mask) | set);
++
++ local_irq_restore(flags);
++}
++
++struct map_desc {
++ unsigned long virtual;
++ unsigned long pfn;
++ unsigned long length;
++ unsigned int type;
++};
++
++#define PROT_PTE_DEVICE (PTE_PRESENT | PTE_YOUNG | \
++ PTE_DIRTY | PTE_READ | PTE_WRITE)
++#define PROT_SECT_DEVICE (PMD_TYPE_SECT | PMD_PRESENT | \
++ PMD_SECT_READ | PMD_SECT_WRITE)
++
++static struct mem_type mem_types[] = {
++ [MT_DEVICE] = { /* Strongly ordered */
++ .prot_pte = PROT_PTE_DEVICE,
++ .prot_l1 = PMD_TYPE_TABLE | PMD_PRESENT,
++ .prot_sect = PROT_SECT_DEVICE,
++ },
++ /*
++ * MT_KUSER: pte for vecpage -- cacheable,
++ * and sect for unigfx mmap -- noncacheable
++ */
++ [MT_KUSER] = {
++ .prot_pte = PTE_PRESENT | PTE_YOUNG | PTE_DIRTY |
++ PTE_CACHEABLE | PTE_READ | PTE_EXEC,
++ .prot_l1 = PMD_TYPE_TABLE | PMD_PRESENT,
++ .prot_sect = PROT_SECT_DEVICE,
++ },
++ [MT_HIGH_VECTORS] = {
++ .prot_pte = PTE_PRESENT | PTE_YOUNG | PTE_DIRTY |
++ PTE_CACHEABLE | PTE_READ | PTE_WRITE |
++ PTE_EXEC,
++ .prot_l1 = PMD_TYPE_TABLE | PMD_PRESENT,
++ },
++ [MT_MEMORY] = {
++ .prot_pte = PTE_PRESENT | PTE_YOUNG | PTE_DIRTY |
++ PTE_WRITE | PTE_EXEC,
++ .prot_l1 = PMD_TYPE_TABLE | PMD_PRESENT,
++ .prot_sect = PMD_TYPE_SECT | PMD_PRESENT | PMD_SECT_CACHEABLE |
++ PMD_SECT_READ | PMD_SECT_WRITE | PMD_SECT_EXEC,
++ },
++ [MT_ROM] = {
++ .prot_sect = PMD_TYPE_SECT | PMD_PRESENT | PMD_SECT_CACHEABLE |
++ PMD_SECT_READ,
++ },
++};
++
++const struct mem_type *get_mem_type(unsigned int type)
++{
++ return type < ARRAY_SIZE(mem_types) ? &mem_types[type] : NULL;
++}
++EXPORT_SYMBOL(get_mem_type);
++
++/*
++ * Adjust the PMD section entries according to the CPU in use.
++ */
++static void __init build_mem_type_table(void)
++{
++ pgprot_user = __pgprot(PTE_PRESENT | PTE_YOUNG | PTE_CACHEABLE);
++ pgprot_kernel = __pgprot(PTE_PRESENT | PTE_YOUNG |
++ PTE_DIRTY | PTE_READ | PTE_WRITE |
++ PTE_EXEC | PTE_CACHEABLE);
++}
++
++#define vectors_base() (vectors_high() ? 0xffff0000 : 0)
++
++static void __init *early_alloc(unsigned long sz)
++{
++ void *ptr = __va(memblock_alloc(sz, sz));
++ memset(ptr, 0, sz);
++ return ptr;
++}
++
++static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,
++ unsigned long prot)
++{
++ if (pmd_none(*pmd)) {
++ pte_t *pte = early_alloc(PTRS_PER_PTE * sizeof(pte_t));
++ __pmd_populate(pmd, __pa(pte) | prot);
++ }
++ BUG_ON(pmd_bad(*pmd));
++ return pte_offset_kernel(pmd, addr);
++}
++
++static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
++ unsigned long end, unsigned long pfn,
++ const struct mem_type *type)
++{
++ pte_t *pte = early_pte_alloc(pmd, addr, type->prot_l1);
++ do {
++ set_pte(pte, pfn_pte(pfn, __pgprot(type->prot_pte)));
++ pfn++;
++ } while (pte++, addr += PAGE_SIZE, addr != end);
++}
++
++static void __init alloc_init_section(pgd_t *pgd, unsigned long addr,
++ unsigned long end, unsigned long phys,
++ const struct mem_type *type)
++{
++ pmd_t *pmd = pmd_offset((pud_t *)pgd, addr);
++
++ /*
++ * Try a section mapping - end, addr and phys must all be aligned
++ * to a section boundary.
++ */
++ if (((addr | end | phys) & ~SECTION_MASK) == 0) {
++ pmd_t *p = pmd;
++
++ do {
++ set_pmd(pmd, __pmd(phys | type->prot_sect));
++ phys += SECTION_SIZE;
++ } while (pmd++, addr += SECTION_SIZE, addr != end);
++
++ flush_pmd_entry(p);
++ } else {
++ /*
++ * No need to loop; pte's aren't interested in the
++ * individual L1 entries.
++ */
++ alloc_init_pte(pmd, addr, end, __phys_to_pfn(phys), type);
++ }
++}
++
++/*
++ * Create the page directory entries and any necessary
++ * page tables for the mapping specified by `md'. We
++ * are able to cope here with varying sizes and address
++ * offsets, and we take full advantage of sections.
++ */
++static void __init create_mapping(struct map_desc *md)
++{
++ unsigned long phys, addr, length, end;
++ const struct mem_type *type;
++ pgd_t *pgd;
++
++ if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) {
++ printk(KERN_WARNING "BUG: not creating mapping for "
++ "0x%08llx at 0x%08lx in user region\n",
++ __pfn_to_phys((u64)md->pfn), md->virtual);
++ return;
++ }
++
++ if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
++ md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) {
++ printk(KERN_WARNING "BUG: mapping for 0x%08llx at 0x%08lx "
++ "overlaps vmalloc space\n",
++ __pfn_to_phys((u64)md->pfn), md->virtual);
++ }
++
++ type = &mem_types[md->type];
++
++ addr = md->virtual & PAGE_MASK;
++ phys = (unsigned long)__pfn_to_phys(md->pfn);
++ length = PAGE_ALIGN(md->length + (md->virtual & ~PAGE_MASK));
++
++ if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {
++ printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not "
++ "be mapped using pages, ignoring.\n",
++ __pfn_to_phys(md->pfn), addr);
++ return;
++ }
++
++ pgd = pgd_offset_k(addr);
++ end = addr + length;
++ do {
++ unsigned long next = pgd_addr_end(addr, end);
++
++ alloc_init_section(pgd, addr, next, phys, type);
++
++ phys += next - addr;
++ addr = next;
++ } while (pgd++, addr != end);
++}
++
++static void * __initdata vmalloc_min = (void *)(VMALLOC_END - SZ_128M);
++
++/*
++ * vmalloc=size forces the vmalloc area to be exactly 'size'
++ * bytes. This can be used to increase (or decrease) the vmalloc
++ * area - the default is 128m.
++ */
++static int __init early_vmalloc(char *arg)
++{
++ unsigned long vmalloc_reserve = memparse(arg, NULL);
++
++ if (vmalloc_reserve < SZ_16M) {
++ vmalloc_reserve = SZ_16M;
++ printk(KERN_WARNING
++ "vmalloc area too small, limiting to %luMB\n",
++ vmalloc_reserve >> 20);
++ }
++
++ if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) {
++ vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M);
++ printk(KERN_WARNING
++ "vmalloc area is too big, limiting to %luMB\n",
++ vmalloc_reserve >> 20);
++ }
++
++ vmalloc_min = (void *)(VMALLOC_END - vmalloc_reserve);
++ return 0;
++}
++early_param("vmalloc", early_vmalloc);
++
++static phys_addr_t lowmem_limit __initdata = SZ_1G;
++
++static void __init sanity_check_meminfo(void)
++{
++ int i, j;
++
++ lowmem_limit = __pa(vmalloc_min - 1) + 1;
++ memblock_set_current_limit(lowmem_limit);
++
++ for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
++ struct membank *bank = &meminfo.bank[j];
++ *bank = meminfo.bank[i];
++ j++;
++ }
++ meminfo.nr_banks = j;
++}
++
++static inline void prepare_page_table(void)
++{
++ unsigned long addr;
++ phys_addr_t end;
++
++ /*
++ * Clear out all the mappings below the kernel image.
++ */
++ for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE)
++ pmd_clear(pmd_off_k(addr));
++
++ for ( ; addr < PAGE_OFFSET; addr += PGDIR_SIZE)
++ pmd_clear(pmd_off_k(addr));
++
++ /*
++ * Find the end of the first block of lowmem.
++ */
++ end = memblock.memory.regions[0].base + memblock.memory.regions[0].size;
++ if (end >= lowmem_limit)
++ end = lowmem_limit;
++
++ /*
++ * Clear out all the kernel space mappings, except for the first
++ * memory bank, up to the end of the vmalloc region.
++ */
++ for (addr = __phys_to_virt(end);
++ addr < VMALLOC_END; addr += PGDIR_SIZE)
++ pmd_clear(pmd_off_k(addr));
++}
++
++/*
++ * Reserve the special regions of memory
++ */
++void __init uc32_mm_memblock_reserve(void)
++{
++ /*
++ * Reserve the page tables. These are already in use,
++ * and can only be in node 0.
++ */
++ memblock_reserve(__pa(swapper_pg_dir), PTRS_PER_PGD * sizeof(pgd_t));
++
++#ifdef CONFIG_PUV3_UNIGFX
++ /*
++ * These should likewise go elsewhere. They pre-reserve the
++ * screen/video memory region at the 48M~64M of main system memory.
++ */
++ memblock_reserve(PKUNITY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE);
++ memblock_reserve(PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE);
++#endif
++}
++
++/*
++ * Set up device the mappings. Since we clear out the page tables for all
++ * mappings above VMALLOC_END, we will remove any debug device mappings.
++ * This means you have to be careful how you debug this function, or any
++ * called function. This means you can't use any function or debugging
++ * method which may touch any device, otherwise the kernel _will_ crash.
++ */
++static void __init devicemaps_init(void)
++{
++ struct map_desc map;
++ unsigned long addr;
++ void *vectors;
++
++ /*
++ * Allocate the vector page early.
++ */
++ vectors = early_alloc(PAGE_SIZE);
++
++ for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE)
++ pmd_clear(pmd_off_k(addr));
++
++ /*
++ * Create a mapping for UniGFX VRAM
++ */
++#ifdef CONFIG_PUV3_UNIGFX
++ map.pfn = __phys_to_pfn(PKUNITY_UNIGFX_MMAP_BASE);
++ map.virtual = KUSER_UNIGFX_BASE;
++ map.length = PKUNITY_UNIGFX_MMAP_SIZE;
++ map.type = MT_KUSER;
++ create_mapping(&map);
++#endif
++
++ /*
++ * Create a mapping for the machine vectors at the high-vectors
++ * location (0xffff0000). If we aren't using high-vectors, also
++ * create a mapping at the low-vectors virtual address.
++ */
++ map.pfn = __phys_to_pfn(virt_to_phys(vectors));
++ map.virtual = VECTORS_BASE;
++ map.length = PAGE_SIZE;
++ map.type = MT_HIGH_VECTORS;
++ create_mapping(&map);
++
++ /*
++ * Create a mapping for the kuser page at the special
++ * location (0xbfff0000) to the same vectors location.
++ */
++ map.pfn = __phys_to_pfn(virt_to_phys(vectors));
++ map.virtual = KUSER_VECPAGE_BASE;
++ map.length = PAGE_SIZE;
++ map.type = MT_KUSER;
++ create_mapping(&map);
++
++ /*
++ * Finally flush the caches and tlb to ensure that we're in a
++ * consistent state wrt the writebuffer. This also ensures that
++ * any write-allocated cache lines in the vector page are written
++ * back. After this point, we can start to touch devices again.
++ */
++ local_flush_tlb_all();
++ flush_cache_all();
++}
++
++static void __init map_lowmem(void)
++{
++ struct memblock_region *reg;
++
++ /* Map all the lowmem memory banks. */
++ for_each_memblock(memory, reg) {
++ phys_addr_t start = reg->base;
++ phys_addr_t end = start + reg->size;
++ struct map_desc map;
++
++ if (end > lowmem_limit)
++ end = lowmem_limit;
++ if (start >= end)
++ break;
++
++ map.pfn = __phys_to_pfn(start);
++ map.virtual = __phys_to_virt(start);
++ map.length = end - start;
++ map.type = MT_MEMORY;
++
++ create_mapping(&map);
++ }
++}
++
++/*
++ * paging_init() sets up the page tables, initialises the zone memory
++ * maps, and sets up the zero page, bad page and bad page tables.
++ */
++void __init paging_init(void)
++{
++ void *zero_page;
++
++ build_mem_type_table();
++ sanity_check_meminfo();
++ prepare_page_table();
++ map_lowmem();
++ devicemaps_init();
++
++ top_pmd = pmd_off_k(0xffff0000);
++
++ /* allocate the zero page. */
++ zero_page = early_alloc(PAGE_SIZE);
++
++ bootmem_init();
++
++ empty_zero_page = virt_to_page(zero_page);
++ __flush_dcache_page(NULL, empty_zero_page);
++}
++
++/*
++ * In order to soft-boot, we need to insert a 1:1 mapping in place of
++ * the user-mode pages. This will then ensure that we have predictable
++ * results when turning the mmu off
++ */
++void setup_mm_for_reboot(char mode)
++{
++ unsigned long base_pmdval;
++ pgd_t *pgd;
++ int i;
++
++ /*
++ * We need to access to user-mode page tables here. For kernel threads
++ * we don't have any user-mode mappings so we use the context that we
++ * "borrowed".
++ */
++ pgd = current->active_mm->pgd;
++
++ base_pmdval = PMD_SECT_WRITE | PMD_SECT_READ | PMD_TYPE_SECT;
++
++ for (i = 0; i < FIRST_USER_PGD_NR + USER_PTRS_PER_PGD; i++, pgd++) {
++ unsigned long pmdval = (i << PGDIR_SHIFT) | base_pmdval;
++ pmd_t *pmd;
++
++ pmd = pmd_off(pgd, i << PGDIR_SHIFT);
++ set_pmd(pmd, __pmd(pmdval));
++ flush_pmd_entry(pmd);
++ }
++
++ local_flush_tlb_all();
++}
++
++/*
++ * Take care of architecture specific things when placing a new PTE into
++ * a page table, or changing an existing PTE. Basically, there are two
++ * things that we need to take care of:
++ *
++ * 1. If PG_dcache_clean is not set for the page, we need to ensure
++ * that any cache entries for the kernels virtual memory
++ * range are written back to the page.
++ * 2. If we have multiple shared mappings of the same space in
++ * an object, we need to deal with the cache aliasing issues.
++ *
++ * Note that the pte lock will be held.
++ */
++void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
++ pte_t *ptep)
++{
++ unsigned long pfn = pte_pfn(*ptep);
++ struct address_space *mapping;
++ struct page *page;
++
++ if (!pfn_valid(pfn))
++ return;
++
++ /*
++ * The zero page is never written to, so never has any dirty
++ * cache lines, and therefore never needs to be flushed.
++ */
++ page = pfn_to_page(pfn);
++ if (page == ZERO_PAGE(0))
++ return;
++
++ mapping = page_mapping(page);
++ if (!test_and_set_bit(PG_dcache_clean, &page->flags))
++ __flush_dcache_page(mapping, page);
++ if (mapping)
++ if (vma->vm_flags & VM_EXEC)
++ __flush_icache_all();
++}
+diff --git a/arch/unicore32/mm/pgd.c b/arch/unicore32/mm/pgd.c
+new file mode 100644
+index 000000000000..632cef7cd378
+--- /dev/null
++++ b/arch/unicore32/mm/pgd.c
+@@ -0,0 +1,102 @@
++/*
++ * linux/arch/unicore32/mm/pgd.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/mm.h>
++#include <linux/gfp.h>
++#include <linux/highmem.h>
++
++#include <asm/pgalloc.h>
++#include <asm/page.h>
++#include <asm/tlbflush.h>
++
++#include "mm.h"
++
++#define FIRST_KERNEL_PGD_NR (FIRST_USER_PGD_NR + USER_PTRS_PER_PGD)
++
++/*
++ * need to get a 4k page for level 1
++ */
++pgd_t *get_pgd_slow(struct mm_struct *mm)
++{
++ pgd_t *new_pgd, *init_pgd;
++ pmd_t *new_pmd, *init_pmd;
++ pte_t *new_pte, *init_pte;
++
++ new_pgd = (pgd_t *)__get_free_pages(GFP_KERNEL, 0);
++ if (!new_pgd)
++ goto no_pgd;
++
++ memset(new_pgd, 0, FIRST_KERNEL_PGD_NR * sizeof(pgd_t));
++
++ /*
++ * Copy over the kernel and IO PGD entries
++ */
++ init_pgd = pgd_offset_k(0);
++ memcpy(new_pgd + FIRST_KERNEL_PGD_NR, init_pgd + FIRST_KERNEL_PGD_NR,
++ (PTRS_PER_PGD - FIRST_KERNEL_PGD_NR) * sizeof(pgd_t));
++
++ clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));
++
++ if (!vectors_high()) {
++ /*
++ * On UniCore, first page must always be allocated since it
++ * contains the machine vectors.
++ */
++ new_pmd = pmd_alloc(mm, (pud_t *)new_pgd, 0);
++ if (!new_pmd)
++ goto no_pmd;
++
++ new_pte = pte_alloc_map(mm, new_pmd, 0);
++ if (!new_pte)
++ goto no_pte;
++
++ init_pmd = pmd_offset((pud_t *)init_pgd, 0);
++ init_pte = pte_offset_map(init_pmd, 0);
++ set_pte(new_pte, *init_pte);
++ pte_unmap(init_pte);
++ pte_unmap(new_pte);
++ }
++
++ return new_pgd;
++
++no_pte:
++ pmd_free(mm, new_pmd);
++no_pmd:
++ free_pages((unsigned long)new_pgd, 0);
++no_pgd:
++ return NULL;
++}
++
++void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
++{
++ pmd_t *pmd;
++ pgtable_t pte;
++
++ if (!pgd)
++ return;
++
++ /* pgd is always present and good */
++ pmd = pmd_off(pgd, 0);
++ if (pmd_none(*pmd))
++ goto free;
++ if (pmd_bad(*pmd)) {
++ pmd_ERROR(*pmd);
++ pmd_clear(pmd);
++ goto free;
++ }
++
++ pte = pmd_pgtable(*pmd);
++ pmd_clear(pmd);
++ pte_free(mm, pte);
++ pmd_free(mm, pmd);
++free:
++ free_pages((unsigned long) pgd, 0);
++}commit b50f1704e9c441c58cf6dc05e72953ca30e1d4d2
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:16:59 2011 +0800
+
+ unicore32 core architecture: mm related: generic codes
+
+ This patch includes generic codes for memory management.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
+new file mode 100644
+index 000000000000..ad8f795d86ca
+--- /dev/null
++++ b/arch/unicore32/include/asm/cache.h
+@@ -0,0 +1,27 @@
++/*
++ * linux/arch/unicore32/include/asm/cache.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_CACHE_H__
++#define __UNICORE_CACHE_H__
++
++#define L1_CACHE_SHIFT (5)
++#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
++
++/*
++ * Memory returned by kmalloc() may be used for DMA, so we must make
++ * sure that all such allocations are cache aligned. Otherwise,
++ * unrelated code may cause parts of the buffer to be read into the
++ * cache before the transfer is done, causing old data to be seen by
++ * the CPU.
++ */
++#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
++
++#endif
+diff --git a/arch/unicore32/include/asm/memblock.h b/arch/unicore32/include/asm/memblock.h
+new file mode 100644
+index 000000000000..a8a5d8d0a26e
+--- /dev/null
++++ b/arch/unicore32/include/asm/memblock.h
+@@ -0,0 +1,46 @@
++/*
++ * linux/arch/unicore32/include/asm/memblock.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_MEMBLOCK_H__
++#define __UNICORE_MEMBLOCK_H__
++
++/*
++ * Memory map description
++ */
++# define NR_BANKS 8
++
++struct membank {
++ unsigned long start;
++ unsigned long size;
++ unsigned int highmem;
++};
++
++struct meminfo {
++ int nr_banks;
++ struct membank bank[NR_BANKS];
++};
++
++extern struct meminfo meminfo;
++
++#define for_each_bank(iter, mi) \
++ for (iter = 0; iter < (mi)->nr_banks; iter++)
++
++#define bank_pfn_start(bank) __phys_to_pfn((bank)->start)
++#define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size)
++#define bank_pfn_size(bank) ((bank)->size >> PAGE_SHIFT)
++#define bank_phys_start(bank) ((bank)->start)
++#define bank_phys_end(bank) ((bank)->start + (bank)->size)
++#define bank_phys_size(bank) ((bank)->size)
++
++extern void uc32_memblock_init(struct meminfo *);
++
++#endif
+diff --git a/arch/unicore32/include/asm/memory.h b/arch/unicore32/include/asm/memory.h
+new file mode 100644
+index 000000000000..5eddb997defe
+--- /dev/null
++++ b/arch/unicore32/include/asm/memory.h
+@@ -0,0 +1,123 @@
++/*
++ * linux/arch/unicore32/include/asm/memory.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Note: this file should not be included by non-asm/.h files
++ */
++#ifndef __UNICORE_MEMORY_H__
++#define __UNICORE_MEMORY_H__
++
++#include <linux/compiler.h>
++#include <linux/const.h>
++#include <asm/sizes.h>
++#include <mach/memory.h>
++
++/*
++ * Allow for constants defined here to be used from assembly code
++ * by prepending the UL suffix only with actual C code compilation.
++ */
++#define UL(x) _AC(x, UL)
++
++/*
++ * PAGE_OFFSET - the virtual address of the start of the kernel image
++ * TASK_SIZE - the maximum size of a user space task.
++ * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area
++ */
++#define PAGE_OFFSET UL(0xC0000000)
++#define TASK_SIZE (PAGE_OFFSET - UL(0x41000000))
++#define TASK_UNMAPPED_BASE (PAGE_OFFSET / 3)
++
++/*
++ * The module space lives between the addresses given by TASK_SIZE
++ * and PAGE_OFFSET - it must be within 32MB of the kernel text.
++ */
++#define MODULES_VADDR (PAGE_OFFSET - 16*1024*1024)
++#if TASK_SIZE > MODULES_VADDR
++#error Top of user space clashes with start of module space
++#endif
++
++#define MODULES_END (PAGE_OFFSET)
++
++/*
++ * Allow 16MB-aligned ioremap pages
++ */
++#define IOREMAP_MAX_ORDER 24
++
++/*
++ * Physical vs virtual RAM address space conversion. These are
++ * private definitions which should NOT be used outside memory.h
++ * files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
++ */
++#ifndef __virt_to_phys
++#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
++#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
++#endif
++
++/*
++ * Convert a physical address to a Page Frame Number and back
++ */
++#define __phys_to_pfn(paddr) ((paddr) >> PAGE_SHIFT)
++#define __pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
++
++/*
++ * Convert a page to/from a physical address
++ */
++#define page_to_phys(page) (__pfn_to_phys(page_to_pfn(page)))
++#define phys_to_page(phys) (pfn_to_page(__phys_to_pfn(phys)))
++
++#ifndef __ASSEMBLY__
++
++#ifndef arch_adjust_zones
++#define arch_adjust_zones(size, holes) do { } while (0)
++#endif
++
++/*
++ * PFNs are used to describe any physical page; this means
++ * PFN 0 == physical address 0.
++ *
++ * This is the PFN of the first RAM page in the kernel
++ * direct-mapped view. We assume this is the first page
++ * of RAM in the mem_map as well.
++ */
++#define PHYS_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT)
++
++/*
++ * Drivers should NOT use these either.
++ */
++#define __pa(x) __virt_to_phys((unsigned long)(x))
++#define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
++#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
++
++/*
++ * Conversion between a struct page and a physical address.
++ *
++ * Note: when converting an unknown physical address to a
++ * struct page, the resulting pointer must be validated
++ * using VALID_PAGE(). It must return an invalid struct page
++ * for any physical address not corresponding to a system
++ * RAM address.
++ *
++ * page_to_pfn(page) convert a struct page * to a PFN number
++ * pfn_to_page(pfn) convert a _valid_ PFN number to struct page *
++ *
++ * virt_to_page(k) convert a _valid_ virtual address to struct page *
++ * virt_addr_valid(k) indicates whether a virtual address is valid
++ */
++#define ARCH_PFN_OFFSET PHYS_PFN_OFFSET
++
++#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
++#define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && \
++ (unsigned long)(kaddr) < (unsigned long)high_memory)
++
++#endif
++
++#include <asm-generic/memory_model.h>
++
++#endif
+diff --git a/arch/unicore32/include/asm/page.h b/arch/unicore32/include/asm/page.h
+new file mode 100644
+index 000000000000..594b3226250e
+--- /dev/null
++++ b/arch/unicore32/include/asm/page.h
+@@ -0,0 +1,80 @@
++/*
++ * linux/arch/unicore32/include/asm/page.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PAGE_H__
++#define __UNICORE_PAGE_H__
++
++/* PAGE_SHIFT determines the page size */
++#define PAGE_SHIFT 12
++#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
++#define PAGE_MASK (~(PAGE_SIZE-1))
++
++#ifndef __ASSEMBLY__
++
++struct page;
++struct vm_area_struct;
++
++#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
++extern void copy_page(void *to, const void *from);
++
++#define clear_user_page(page, vaddr, pg) clear_page(page)
++#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
++
++#undef STRICT_MM_TYPECHECKS
++
++#ifdef STRICT_MM_TYPECHECKS
++/*
++ * These are used to make use of C type-checking..
++ */
++typedef struct { unsigned long pte; } pte_t;
++typedef struct { unsigned long pgd; } pgd_t;
++typedef struct { unsigned long pgprot; } pgprot_t;
++
++#define pte_val(x) ((x).pte)
++#define pgd_val(x) ((x).pgd)
++#define pgprot_val(x) ((x).pgprot)
++
++#define __pte(x) ((pte_t) { (x) })
++#define __pgd(x) ((pgd_t) { (x) })
++#define __pgprot(x) ((pgprot_t) { (x) })
++
++#else
++/*
++ * .. while these make it easier on the compiler
++ */
++typedef unsigned long pte_t;
++typedef unsigned long pgd_t;
++typedef unsigned long pgprot_t;
++
++#define pte_val(x) (x)
++#define pgd_val(x) (x)
++#define pgprot_val(x) (x)
++
++#define __pte(x) (x)
++#define __pgd(x) (x)
++#define __pgprot(x) (x)
++
++#endif /* STRICT_MM_TYPECHECKS */
++
++typedef struct page *pgtable_t;
++
++extern int pfn_valid(unsigned long);
++
++#include <asm/memory.h>
++
++#endif /* !__ASSEMBLY__ */
++
++#define VM_DATA_DEFAULT_FLAGS \
++ (VM_READ | VM_WRITE | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++
++#include <asm-generic/getorder.h>
++
++#endif
+diff --git a/arch/unicore32/include/asm/tlb.h b/arch/unicore32/include/asm/tlb.h
+new file mode 100644
+index 000000000000..02ee40e47a0d
+--- /dev/null
++++ b/arch/unicore32/include/asm/tlb.h
+@@ -0,0 +1,98 @@
++/*
++ * linux/arch/unicore32/include/asm/tlb.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_TLB_H__
++#define __UNICORE_TLB_H__
++
++#include <asm/cacheflush.h>
++#include <asm/tlbflush.h>
++#include <asm/pgalloc.h>
++
++/*
++ * TLB handling. This allows us to remove pages from the page
++ * tables, and efficiently handle the TLB issues.
++ */
++struct mmu_gather {
++ struct mm_struct *mm;
++ unsigned int fullmm;
++ unsigned long range_start;
++ unsigned long range_end;
++};
++
++DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
++
++static inline struct mmu_gather *
++tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
++{
++ struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
++
++ tlb->mm = mm;
++ tlb->fullmm = full_mm_flush;
++
++ return tlb;
++}
++
++static inline void
++tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
++{
++ if (tlb->fullmm)
++ flush_tlb_mm(tlb->mm);
++
++ /* keep the page table cache within bounds */
++ check_pgt_cache();
++
++ put_cpu_var(mmu_gathers);
++}
++
++/*
++ * Memorize the range for the TLB flush.
++ */
++static inline void
++tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long addr)
++{
++ if (!tlb->fullmm) {
++ if (addr < tlb->range_start)
++ tlb->range_start = addr;
++ if (addr + PAGE_SIZE > tlb->range_end)
++ tlb->range_end = addr + PAGE_SIZE;
++ }
++}
++
++/*
++ * In the case of tlb vma handling, we can optimise these away in the
++ * case where we're doing a full MM flush. When we're doing a munmap,
++ * the vmas are adjusted to only cover the region to be torn down.
++ */
++static inline void
++tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
++{
++ if (!tlb->fullmm) {
++ flush_cache_range(vma, vma->vm_start, vma->vm_end);
++ tlb->range_start = TASK_SIZE;
++ tlb->range_end = 0;
++ }
++}
++
++static inline void
++tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
++{
++ if (!tlb->fullmm && tlb->range_end > 0)
++ flush_tlb_range(vma, tlb->range_start, tlb->range_end);
++}
++
++#define tlb_remove_page(tlb, page) free_page_and_swap_cache(page)
++#define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep)
++#define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp)
++#define pud_free_tlb(tlb, x, addr) do { } while (0)
++
++#define tlb_migrate_finish(mm) do { } while (0)
++
++#endif
+diff --git a/arch/unicore32/include/mach/map.h b/arch/unicore32/include/mach/map.h
+new file mode 100644
+index 000000000000..55c936573741
+--- /dev/null
++++ b/arch/unicore32/include/mach/map.h
+@@ -0,0 +1,20 @@
++/*
++ * linux/arch/unicore32/include/mach/map.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Page table mapping constructs and function prototypes
++ */
++#define MT_DEVICE 0
++#define MT_DEVICE_CACHED 2
++#define MT_KUSER 7
++#define MT_HIGH_VECTORS 8
++#define MT_MEMORY 9
++#define MT_ROM 10
++
+diff --git a/arch/unicore32/include/mach/memory.h b/arch/unicore32/include/mach/memory.h
+new file mode 100644
+index 000000000000..541949dfa5b4
+--- /dev/null
++++ b/arch/unicore32/include/mach/memory.h
+@@ -0,0 +1,58 @@
++/*
++ * linux/arch/unicore32/include/mach/memory.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __MACH_PUV3_MEMORY_H__
++#define __MACH_PUV3_MEMORY_H__
++
++#include <mach/hardware.h>
++
++/* Physical DRAM offset. */
++#define PHYS_OFFSET UL(0x00000000)
++/* The base address of exception vectors. */
++#define VECTORS_BASE UL(0xffff0000)
++/* The base address of kuser area. */
++#define KUSER_BASE UL(0x80000000)
++
++#ifdef __ASSEMBLY__
++/* The byte offset of the kernel image in RAM from the start of RAM. */
++#define KERNEL_IMAGE_START 0x00408000
++#endif
++
++#if !defined(__ASSEMBLY__) && defined(CONFIG_PCI)
++
++void puv3_pci_adjust_zones(unsigned long *size, unsigned long *holes);
++
++#define arch_adjust_zones(size, holes) \
++ puv3_pci_adjust_zones(size, holes)
++
++#endif
++
++/*
++ * PCI controller in PKUnity-3 masks highest 5-bit for upstream channel,
++ * so we must limit the DMA allocation within 128M physical memory for
++ * supporting PCI devices.
++ */
++#define PCI_DMA_THRESHOLD (PHYS_OFFSET + SZ_128M - 1)
++
++#define is_pcibus_device(dev) (dev && \
++ (strncmp(dev->bus->name, "pci", 3) == 0))
++
++#define __virt_to_pcibus(x) (__virt_to_phys(x) + PKUNITY_PCIAHB_BASE)
++#define __pcibus_to_virt(x) __phys_to_virt((x) - PKUNITY_PCIAHB_BASE)
++
++/* kuser area */
++#define KUSER_VECPAGE_BASE (KUSER_BASE + UL(0x3fff0000))
++#define KUSER_UNIGFX_BASE (KUSER_BASE + PKUNITY_UNIGFX_MMAP_BASE)
++/* kuser_vecpage (0xbfff0000) is ro, and vectors page (0xffff0000) is rw */
++#define kuser_vecpage_to_vectors(x) ((x) - (KUSER_VECPAGE_BASE) \
++ + (VECTORS_BASE))
++
++#endif
+diff --git a/arch/unicore32/mm/Kconfig b/arch/unicore32/mm/Kconfig
+new file mode 100644
+index 000000000000..5f77fb3c63be
+--- /dev/null
++++ b/arch/unicore32/mm/Kconfig
+@@ -0,0 +1,50 @@
++comment "Processor Type"
++
++# Select CPU types depending on the architecture selected. This selects
++# which CPUs we support in the kernel image, and the compiler instruction
++# optimiser behaviour.
++
++config CPU_UCV2
++ def_bool y
++
++comment "Processor Features"
++
++config CPU_ICACHE_DISABLE
++ bool "Disable I-Cache (I-bit)"
++ help
++ Say Y here to disable the processor instruction cache. Unless
++ you have a reason not to or are unsure, say N.
++
++config CPU_DCACHE_DISABLE
++ bool "Disable D-Cache (D-bit)"
++ help
++ Say Y here to disable the processor data cache. Unless
++ you have a reason not to or are unsure, say N.
++
++config CPU_DCACHE_WRITETHROUGH
++ bool "Force write through D-cache"
++ help
++ Say Y here to use the data cache in writethrough mode. Unless you
++ specifically require this or are unsure, say N.
++
++config CPU_DCACHE_LINE_DISABLE
++ bool "Disable D-cache line ops"
++ default y
++ help
++ Say Y here to disable the data cache line operations.
++
++config CPU_TLB_SINGLE_ENTRY_DISABLE
++ bool "Disable TLB single entry ops"
++ default y
++ help
++ Say Y here to disable the TLB single entry operations.
++
++config SWIOTLB
++ def_bool y
++
++config IOMMU_HELPER
++ def_bool SWIOTLB
++
++config NEED_SG_DMA_LENGTH
++ def_bool SWIOTLB
++
+diff --git a/arch/unicore32/mm/Makefile b/arch/unicore32/mm/Makefile
+new file mode 100644
+index 000000000000..f3ff41039f51
+--- /dev/null
++++ b/arch/unicore32/mm/Makefile
+@@ -0,0 +1,15 @@
++#
++# Makefile for the linux unicore-specific parts of the memory manager.
++#
++
++obj-y := extable.o fault.o init.o pgd.o mmu.o
++obj-y += iomap.o flush.o ioremap.o
++
++obj-$(CONFIG_SWIOTLB) += dma-swiotlb.o
++
++obj-$(CONFIG_MODULES) += proc-syms.o
++
++obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o
++
++obj-$(CONFIG_CPU_UCV2) += cache-ucv2.o tlb-ucv2.o proc-ucv2.o
++
+diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
+new file mode 100644
+index 000000000000..3dbe3709b69d
+--- /dev/null
++++ b/arch/unicore32/mm/init.c
+@@ -0,0 +1,517 @@
++/*
++ * linux/arch/unicore32/mm/init.c
++ *
++ * Copyright (C) 2010 GUAN Xue-tao
++ *
++ * 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/errno.h>
++#include <linux/swap.h>
++#include <linux/init.h>
++#include <linux/bootmem.h>
++#include <linux/mman.h>
++#include <linux/nodemask.h>
++#include <linux/initrd.h>
++#include <linux/highmem.h>
++#include <linux/gfp.h>
++#include <linux/memblock.h>
++#include <linux/sort.h>
++#include <linux/dma-mapping.h>
++
++#include <asm/sections.h>
++#include <asm/setup.h>
++#include <asm/sizes.h>
++#include <asm/tlb.h>
++#include <mach/map.h>
++
++#include "mm.h"
++
++static unsigned long phys_initrd_start __initdata = 0x01000000;
++static unsigned long phys_initrd_size __initdata = SZ_8M;
++
++static int __init early_initrd(char *p)
++{
++ unsigned long start, size;
++ char *endp;
++
++ start = memparse(p, &endp);
++ if (*endp == ',') {
++ size = memparse(endp + 1, NULL);
++
++ phys_initrd_start = start;
++ phys_initrd_size = size;
++ }
++ return 0;
++}
++early_param("initrd", early_initrd);
++
++/*
++ * This keeps memory configuration data used by a couple memory
++ * initialization functions, as well as show_mem() for the skipping
++ * of holes in the memory map. It is populated by uc32_add_memory().
++ */
++struct meminfo meminfo;
++
++void show_mem(void)
++{
++ int free = 0, total = 0, reserved = 0;
++ int shared = 0, cached = 0, slab = 0, i;
++ struct meminfo *mi = &meminfo;
++
++ printk(KERN_DEFAULT "Mem-info:\n");
++ show_free_areas();
++
++ for_each_bank(i, mi) {
++ struct membank *bank = &mi->bank[i];
++ unsigned int pfn1, pfn2;
++ struct page *page, *end;
++
++ pfn1 = bank_pfn_start(bank);
++ pfn2 = bank_pfn_end(bank);
++
++ page = pfn_to_page(pfn1);
++ end = pfn_to_page(pfn2 - 1) + 1;
++
++ do {
++ total++;
++ if (PageReserved(page))
++ reserved++;
++ else if (PageSwapCache(page))
++ cached++;
++ else if (PageSlab(page))
++ slab++;
++ else if (!page_count(page))
++ free++;
++ else
++ shared += page_count(page) - 1;
++ page++;
++ } while (page < end);
++ }
++
++ printk(KERN_DEFAULT "%d pages of RAM\n", total);
++ printk(KERN_DEFAULT "%d free pages\n", free);
++ printk(KERN_DEFAULT "%d reserved pages\n", reserved);
++ printk(KERN_DEFAULT "%d slab pages\n", slab);
++ printk(KERN_DEFAULT "%d pages shared\n", shared);
++ printk(KERN_DEFAULT "%d pages swap cached\n", cached);
++}
++
++static void __init find_limits(unsigned long *min, unsigned long *max_low,
++ unsigned long *max_high)
++{
++ struct meminfo *mi = &meminfo;
++ int i;
++
++ *min = -1UL;
++ *max_low = *max_high = 0;
++
++ for_each_bank(i, mi) {
++ struct membank *bank = &mi->bank[i];
++ unsigned long start, end;
++
++ start = bank_pfn_start(bank);
++ end = bank_pfn_end(bank);
++
++ if (*min > start)
++ *min = start;
++ if (*max_high < end)
++ *max_high = end;
++ if (bank->highmem)
++ continue;
++ if (*max_low < end)
++ *max_low = end;
++ }
++}
++
++static void __init uc32_bootmem_init(unsigned long start_pfn,
++ unsigned long end_pfn)
++{
++ struct memblock_region *reg;
++ unsigned int boot_pages;
++ phys_addr_t bitmap;
++ pg_data_t *pgdat;
++
++ /*
++ * Allocate the bootmem bitmap page. This must be in a region
++ * of memory which has already been mapped.
++ */
++ boot_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
++ bitmap = memblock_alloc_base(boot_pages << PAGE_SHIFT, L1_CACHE_BYTES,
++ __pfn_to_phys(end_pfn));
++
++ /*
++ * Initialise the bootmem allocator, handing the
++ * memory banks over to bootmem.
++ */
++ node_set_online(0);
++ pgdat = NODE_DATA(0);
++ init_bootmem_node(pgdat, __phys_to_pfn(bitmap), start_pfn, end_pfn);
++
++ /* Free the lowmem regions from memblock into bootmem. */
++ for_each_memblock(memory, reg) {
++ unsigned long start = memblock_region_memory_base_pfn(reg);
++ unsigned long end = memblock_region_memory_end_pfn(reg);
++
++ if (end >= end_pfn)
++ end = end_pfn;
++ if (start >= end)
++ break;
++
++ free_bootmem(__pfn_to_phys(start), (end - start) << PAGE_SHIFT);
++ }
++
++ /* Reserve the lowmem memblock reserved regions in bootmem. */
++ for_each_memblock(reserved, reg) {
++ unsigned long start = memblock_region_reserved_base_pfn(reg);
++ unsigned long end = memblock_region_reserved_end_pfn(reg);
++
++ if (end >= end_pfn)
++ end = end_pfn;
++ if (start >= end)
++ break;
++
++ reserve_bootmem(__pfn_to_phys(start),
++ (end - start) << PAGE_SHIFT, BOOTMEM_DEFAULT);
++ }
++}
++
++static void __init uc32_bootmem_free(unsigned long min, unsigned long max_low,
++ unsigned long max_high)
++{
++ unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES];
++ struct memblock_region *reg;
++
++ /*
++ * initialise the zones.
++ */
++ memset(zone_size, 0, sizeof(zone_size));
++
++ /*
++ * The memory size has already been determined. If we need
++ * to do anything fancy with the allocation of this memory
++ * to the zones, now is the time to do it.
++ */
++ zone_size[0] = max_low - min;
++
++ /*
++ * Calculate the size of the holes.
++ * holes = node_size - sum(bank_sizes)
++ */
++ memcpy(zhole_size, zone_size, sizeof(zhole_size));
++ for_each_memblock(memory, reg) {
++ unsigned long start = memblock_region_memory_base_pfn(reg);
++ unsigned long end = memblock_region_memory_end_pfn(reg);
++
++ if (start < max_low) {
++ unsigned long low_end = min(end, max_low);
++ zhole_size[0] -= low_end - start;
++ }
++ }
++
++ /*
++ * Adjust the sizes according to any special requirements for
++ * this machine type.
++ */
++ arch_adjust_zones(zone_size, zhole_size);
++
++ free_area_init_node(0, zone_size, min, zhole_size);
++}
++
++int pfn_valid(unsigned long pfn)
++{
++ return memblock_is_memory(pfn << PAGE_SHIFT);
++}
++EXPORT_SYMBOL(pfn_valid);
++
++static void uc32_memory_present(void)
++{
++}
++
++static int __init meminfo_cmp(const void *_a, const void *_b)
++{
++ const struct membank *a = _a, *b = _b;
++ long cmp = bank_pfn_start(a) - bank_pfn_start(b);
++ return cmp < 0 ? -1 : cmp > 0 ? 1 : 0;
++}
++
++void __init uc32_memblock_init(struct meminfo *mi)
++{
++ int i;
++
++ sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]),
++ meminfo_cmp, NULL);
++
++ memblock_init();
++ for (i = 0; i < mi->nr_banks; i++)
++ memblock_add(mi->bank[i].start, mi->bank[i].size);
++
++ /* Register the kernel text, kernel data and initrd with memblock. */
++ memblock_reserve(__pa(_text), _end - _text);
++
++#ifdef CONFIG_BLK_DEV_INITRD
++ if (phys_initrd_size) {
++ memblock_reserve(phys_initrd_start, phys_initrd_size);
++
++ /* Now convert initrd to virtual addresses */
++ initrd_start = __phys_to_virt(phys_initrd_start);
++ initrd_end = initrd_start + phys_initrd_size;
++ }
++#endif
++
++ uc32_mm_memblock_reserve();
++
++ memblock_analyze();
++ memblock_dump_all();
++}
++
++void __init bootmem_init(void)
++{
++ unsigned long min, max_low, max_high;
++
++ max_low = max_high = 0;
++
++ find_limits(&min, &max_low, &max_high);
++
++ uc32_bootmem_init(min, max_low);
++
++#ifdef CONFIG_SWIOTLB
++ swiotlb_init(1);
++#endif
++ /*
++ * Sparsemem tries to allocate bootmem in memory_present(),
++ * so must be done after the fixed reservations
++ */
++ uc32_memory_present();
++
++ /*
++ * sparse_init() needs the bootmem allocator up and running.
++ */
++ sparse_init();
++
++ /*
++ * Now free the memory - free_area_init_node needs
++ * the sparse mem_map arrays initialized by sparse_init()
++ * for memmap_init_zone(), otherwise all PFNs are invalid.
++ */
++ uc32_bootmem_free(min, max_low, max_high);
++
++ high_memory = __va((max_low << PAGE_SHIFT) - 1) + 1;
++
++ /*
++ * This doesn't seem to be used by the Linux memory manager any
++ * more, but is used by ll_rw_block. If we can get rid of it, we
++ * also get rid of some of the stuff above as well.
++ *
++ * Note: max_low_pfn and max_pfn reflect the number of _pages_ in
++ * the system, not the maximum PFN.
++ */
++ max_low_pfn = max_low - PHYS_PFN_OFFSET;
++ max_pfn = max_high - PHYS_PFN_OFFSET;
++}
++
++static inline int free_area(unsigned long pfn, unsigned long end, char *s)
++{
++ unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
++
++ for (; pfn < end; pfn++) {
++ struct page *page = pfn_to_page(pfn);
++ ClearPageReserved(page);
++ init_page_count(page);
++ __free_page(page);
++ pages++;
++ }
++
++ if (size && s)
++ printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
++
++ return pages;
++}
++
++static inline void
++free_memmap(unsigned long start_pfn, unsigned long end_pfn)
++{
++ struct page *start_pg, *end_pg;
++ unsigned long pg, pgend;
++
++ /*
++ * Convert start_pfn/end_pfn to a struct page pointer.
++ */
++ start_pg = pfn_to_page(start_pfn - 1) + 1;
++ end_pg = pfn_to_page(end_pfn);
++
++ /*
++ * Convert to physical addresses, and
++ * round start upwards and end downwards.
++ */
++ pg = PAGE_ALIGN(__pa(start_pg));
++ pgend = __pa(end_pg) & PAGE_MASK;
++
++ /*
++ * If there are free pages between these,
++ * free the section of the memmap array.
++ */
++ if (pg < pgend)
++ free_bootmem(pg, pgend - pg);
++}
++
++/*
++ * The mem_map array can get very big. Free the unused area of the memory map.
++ */
++static void __init free_unused_memmap(struct meminfo *mi)
++{
++ unsigned long bank_start, prev_bank_end = 0;
++ unsigned int i;
++
++ /*
++ * This relies on each bank being in address order.
++ * The banks are sorted previously in bootmem_init().
++ */
++ for_each_bank(i, mi) {
++ struct membank *bank = &mi->bank[i];
++
++ bank_start = bank_pfn_start(bank);
++
++ /*
++ * If we had a previous bank, and there is a space
++ * between the current bank and the previous, free it.
++ */
++ if (prev_bank_end && prev_bank_end < bank_start)
++ free_memmap(prev_bank_end, bank_start);
++
++ /*
++ * Align up here since the VM subsystem insists that the
++ * memmap entries are valid from the bank end aligned to
++ * MAX_ORDER_NR_PAGES.
++ */
++ prev_bank_end = ALIGN(bank_pfn_end(bank), MAX_ORDER_NR_PAGES);
++ }
++}
++
++/*
++ * mem_init() marks the free areas in the mem_map and tells us how much
++ * memory is free. This is done after various parts of the system have
++ * claimed their memory after the kernel image.
++ */
++void __init mem_init(void)
++{
++ unsigned long reserved_pages, free_pages;
++ struct memblock_region *reg;
++ int i;
++
++ max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
++
++ /* this will put all unused low memory onto the freelists */
++ free_unused_memmap(&meminfo);
++
++ totalram_pages += free_all_bootmem();
++
++ reserved_pages = free_pages = 0;
++
++ for_each_bank(i, &meminfo) {
++ struct membank *bank = &meminfo.bank[i];
++ unsigned int pfn1, pfn2;
++ struct page *page, *end;
++
++ pfn1 = bank_pfn_start(bank);
++ pfn2 = bank_pfn_end(bank);
++
++ page = pfn_to_page(pfn1);
++ end = pfn_to_page(pfn2 - 1) + 1;
++
++ do {
++ if (PageReserved(page))
++ reserved_pages++;
++ else if (!page_count(page))
++ free_pages++;
++ page++;
++ } while (page < end);
++ }
++
++ /*
++ * Since our memory may not be contiguous, calculate the
++ * real number of pages we have in this system
++ */
++ printk(KERN_INFO "Memory:");
++ num_physpages = 0;
++ for_each_memblock(memory, reg) {
++ unsigned long pages = memblock_region_memory_end_pfn(reg) -
++ memblock_region_memory_base_pfn(reg);
++ num_physpages += pages;
++ printk(" %ldMB", pages >> (20 - PAGE_SHIFT));
++ }
++ printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));
++
++ printk(KERN_NOTICE "Memory: %luk/%luk available, %luk reserved, %luK highmem\n",
++ nr_free_pages() << (PAGE_SHIFT-10),
++ free_pages << (PAGE_SHIFT-10),
++ reserved_pages << (PAGE_SHIFT-10),
++ totalhigh_pages << (PAGE_SHIFT-10));
++
++ printk(KERN_NOTICE "Virtual kernel memory layout:\n"
++ " vector : 0x%08lx - 0x%08lx (%4ld kB)\n"
++ " vmalloc : 0x%08lx - 0x%08lx (%4ld MB)\n"
++ " lowmem : 0x%08lx - 0x%08lx (%4ld MB)\n"
++ " modules : 0x%08lx - 0x%08lx (%4ld MB)\n"
++ " .init : 0x%p" " - 0x%p" " (%4d kB)\n"
++ " .text : 0x%p" " - 0x%p" " (%4d kB)\n"
++ " .data : 0x%p" " - 0x%p" " (%4d kB)\n",
++
++ VECTORS_BASE, VECTORS_BASE + PAGE_SIZE,
++ DIV_ROUND_UP(PAGE_SIZE, SZ_1K),
++ VMALLOC_START, VMALLOC_END,
++ DIV_ROUND_UP((VMALLOC_END - VMALLOC_START), SZ_1M),
++ PAGE_OFFSET, (unsigned long)high_memory,
++ DIV_ROUND_UP(((unsigned long)high_memory - PAGE_OFFSET), SZ_1M),
++ MODULES_VADDR, MODULES_END,
++ DIV_ROUND_UP((MODULES_END - MODULES_VADDR), SZ_1M),
++
++ __init_begin, __init_end,
++ DIV_ROUND_UP((__init_end - __init_begin), SZ_1K),
++ _stext, _etext,
++ DIV_ROUND_UP((_etext - _stext), SZ_1K),
++ _sdata, _edata,
++ DIV_ROUND_UP((_edata - _sdata), SZ_1K));
++
++ BUILD_BUG_ON(TASK_SIZE > MODULES_VADDR);
++ BUG_ON(TASK_SIZE > MODULES_VADDR);
++
++ if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
++ /*
++ * On a machine this small we won't get
++ * anywhere without overcommit, so turn
++ * it on by default.
++ */
++ sysctl_overcommit_memory = OVERCOMMIT_ALWAYS;
++ }
++}
++
++void free_initmem(void)
++{
++ totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
++ __phys_to_pfn(__pa(__init_end)),
++ "init");
++}
++
++#ifdef CONFIG_BLK_DEV_INITRD
++
++static int keep_initrd;
++
++void free_initrd_mem(unsigned long start, unsigned long end)
++{
++ if (!keep_initrd)
++ totalram_pages += free_area(__phys_to_pfn(__pa(start)),
++ __phys_to_pfn(__pa(end)),
++ "initrd");
++}
++
++static int __init keepinitrd_setup(char *__unused)
++{
++ keep_initrd = 1;
++ return 1;
++}
++
++__setup("keepinitrd", keepinitrd_setup);
++#endif
+diff --git a/arch/unicore32/mm/iomap.c b/arch/unicore32/mm/iomap.c
+new file mode 100644
+index 000000000000..a7e1a3d2e069
+--- /dev/null
++++ b/arch/unicore32/mm/iomap.c
+@@ -0,0 +1,56 @@
++/*
++ * linux/arch/unicore32/mm/iomap.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Map IO port and PCI memory spaces so that {read,write}[bwl] can
++ * be used to access this memory.
++ */
++#include <linux/module.h>
++#include <linux/pci.h>
++#include <linux/ioport.h>
++#include <linux/io.h>
++
++#ifdef __io
++void __iomem *ioport_map(unsigned long port, unsigned int nr)
++{
++ /* we map PC lagcy 64K IO port to PCI IO space 0x80030000 */
++ return (void __iomem *) (unsigned long)
++ io_p2v((port & 0xffff) + PKUNITY_PCILIO_BASE);
++}
++EXPORT_SYMBOL(ioport_map);
++
++void ioport_unmap(void __iomem *addr)
++{
++}
++EXPORT_SYMBOL(ioport_unmap);
++#endif
++
++#ifdef CONFIG_PCI
++void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
++{
++ resource_size_t start = pci_resource_start(dev, bar);
++ resource_size_t len = pci_resource_len(dev, bar);
++ unsigned long flags = pci_resource_flags(dev, bar);
++
++ if (!len || !start)
++ return NULL;
++ if (maxlen && len > maxlen)
++ len = maxlen;
++ if (flags & IORESOURCE_IO)
++ return ioport_map(start, len);
++ if (flags & IORESOURCE_MEM) {
++ if (flags & IORESOURCE_CACHEABLE)
++ return ioremap(start, len);
++ return ioremap_nocache(start, len);
++ }
++ return NULL;
++}
++EXPORT_SYMBOL(pci_iomap);
++#endif
+diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
+new file mode 100644
+index 000000000000..b7a605597b08
+--- /dev/null
++++ b/arch/unicore32/mm/ioremap.c
+@@ -0,0 +1,261 @@
++/*
++ * linux/arch/unicore32/mm/ioremap.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ *
++ * Re-map IO memory to kernel address space so that we can access it.
++ *
++ * This allows a driver to remap an arbitrary region of bus memory into
++ * virtual space. One should *only* use readl, writel, memcpy_toio and
++ * so on with such remapped areas.
++ *
++ * Because UniCore only has a 32-bit address space we can't address the
++ * whole of the (physical) PCI space at once. PCI huge-mode addressing
++ * allows us to circumvent this restriction by splitting PCI space into
++ * two 2GB chunks and mapping only one at a time into processor memory.
++ * We use MMU protection domains to trap any attempt to access the bank
++ * that is not currently mapped. (This isn't fully implemented yet.)
++ */
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/mm.h>
++#include <linux/vmalloc.h>
++#include <linux/io.h>
++
++#include <asm/cputype.h>
++#include <asm/cacheflush.h>
++#include <asm/mmu_context.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++#include <asm/sizes.h>
++
++#include <mach/map.h>
++#include "mm.h"
++
++/*
++ * Used by ioremap() and iounmap() code to mark (super)section-mapped
++ * I/O regions in vm_struct->flags field.
++ */
++#define VM_UNICORE_SECTION_MAPPING 0x80000000
++
++int ioremap_page(unsigned long virt, unsigned long phys,
++ const struct mem_type *mtype)
++{
++ return ioremap_page_range(virt, virt + PAGE_SIZE, phys,
++ __pgprot(mtype->prot_pte));
++}
++EXPORT_SYMBOL(ioremap_page);
++
++/*
++ * Section support is unsafe on SMP - If you iounmap and ioremap a region,
++ * the other CPUs will not see this change until their next context switch.
++ * Meanwhile, (eg) if an interrupt comes in on one of those other CPUs
++ * which requires the new ioremap'd region to be referenced, the CPU will
++ * reference the _old_ region.
++ *
++ * Note that get_vm_area_caller() allocates a guard 4K page, so we need to
++ * mask the size back to 4MB aligned or we will overflow in the loop below.
++ */
++static void unmap_area_sections(unsigned long virt, unsigned long size)
++{
++ unsigned long addr = virt, end = virt + (size & ~(SZ_4M - 1));
++ pgd_t *pgd;
++
++ flush_cache_vunmap(addr, end);
++ pgd = pgd_offset_k(addr);
++ do {
++ pmd_t pmd, *pmdp = pmd_offset((pud_t *)pgd, addr);
++
++ pmd = *pmdp;
++ if (!pmd_none(pmd)) {
++ /*
++ * Clear the PMD from the page table, and
++ * increment the kvm sequence so others
++ * notice this change.
++ *
++ * Note: this is still racy on SMP machines.
++ */
++ pmd_clear(pmdp);
++
++ /*
++ * Free the page table, if there was one.
++ */
++ if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE)
++ pte_free_kernel(&init_mm, pmd_page_vaddr(pmd));
++ }
++
++ addr += PGDIR_SIZE;
++ pgd++;
++ } while (addr < end);
++
++ flush_tlb_kernel_range(virt, end);
++}
++
++static int
++remap_area_sections(unsigned long virt, unsigned long pfn,
++ size_t size, const struct mem_type *type)
++{
++ unsigned long addr = virt, end = virt + size;
++ pgd_t *pgd;
++
++ /*
++ * Remove and free any PTE-based mapping, and
++ * sync the current kernel mapping.
++ */
++ unmap_area_sections(virt, size);
++
++ pgd = pgd_offset_k(addr);
++ do {
++ pmd_t *pmd = pmd_offset((pud_t *)pgd, addr);
++
++ set_pmd(pmd, __pmd(__pfn_to_phys(pfn) | type->prot_sect));
++ pfn += SZ_4M >> PAGE_SHIFT;
++ flush_pmd_entry(pmd);
++
++ addr += PGDIR_SIZE;
++ pgd++;
++ } while (addr < end);
++
++ return 0;
++}
++
++void __iomem *__uc32_ioremap_pfn_caller(unsigned long pfn,
++ unsigned long offset, size_t size, unsigned int mtype, void *caller)
++{
++ const struct mem_type *type;
++ int err;
++ unsigned long addr;
++ struct vm_struct *area;
++
++ /*
++ * High mappings must be section aligned
++ */
++ if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SECTION_MASK))
++ return NULL;
++
++ /*
++ * Don't allow RAM to be mapped
++ */
++ if (pfn_valid(pfn)) {
++ printk(KERN_WARNING "BUG: Your driver calls ioremap() on\n"
++ "system memory. This leads to architecturally\n"
++ "unpredictable behaviour, and ioremap() will fail in\n"
++ "the next kernel release. Please fix your driver.\n");
++ WARN_ON(1);
++ }
++
++ type = get_mem_type(mtype);
++ if (!type)
++ return NULL;
++
++ /*
++ * Page align the mapping size, taking account of any offset.
++ */
++ size = PAGE_ALIGN(offset + size);
++
++ area = get_vm_area_caller(size, VM_IOREMAP, caller);
++ if (!area)
++ return NULL;
++ addr = (unsigned long)area->addr;
++
++ if (!((__pfn_to_phys(pfn) | size | addr) & ~PMD_MASK)) {
++ area->flags |= VM_UNICORE_SECTION_MAPPING;
++ err = remap_area_sections(addr, pfn, size, type);
++ } else
++ err = ioremap_page_range(addr, addr + size, __pfn_to_phys(pfn),
++ __pgprot(type->prot_pte));
++
++ if (err) {
++ vunmap((void *)addr);
++ return NULL;
++ }
++
++ flush_cache_vmap(addr, addr + size);
++ return (void __iomem *) (offset + addr);
++}
++
++void __iomem *__uc32_ioremap_caller(unsigned long phys_addr, size_t size,
++ unsigned int mtype, void *caller)
++{
++ unsigned long last_addr;
++ unsigned long offset = phys_addr & ~PAGE_MASK;
++ unsigned long pfn = __phys_to_pfn(phys_addr);
++
++ /*
++ * Don't allow wraparound or zero size
++ */
++ last_addr = phys_addr + size - 1;
++ if (!size || last_addr < phys_addr)
++ return NULL;
++
++ return __uc32_ioremap_pfn_caller(pfn, offset, size, mtype, caller);
++}
++
++/*
++ * Remap an arbitrary physical address space into the kernel virtual
++ * address space. Needed when the kernel wants to access high addresses
++ * directly.
++ *
++ * NOTE! We need to allow non-page-aligned mappings too: we will obviously
++ * have to convert them into an offset in a page-aligned mapping, but the
++ * caller shouldn't need to know that small detail.
++ */
++void __iomem *
++__uc32_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
++ unsigned int mtype)
++{
++ return __uc32_ioremap_pfn_caller(pfn, offset, size, mtype,
++ __builtin_return_address(0));
++}
++EXPORT_SYMBOL(__uc32_ioremap_pfn);
++
++void __iomem *
++__uc32_ioremap(unsigned long phys_addr, size_t size)
++{
++ return __uc32_ioremap_caller(phys_addr, size, MT_DEVICE,
++ __builtin_return_address(0));
++}
++EXPORT_SYMBOL(__uc32_ioremap);
++
++void __iomem *
++__uc32_ioremap_cached(unsigned long phys_addr, size_t size)
++{
++ return __uc32_ioremap_caller(phys_addr, size, MT_DEVICE_CACHED,
++ __builtin_return_address(0));
++}
++EXPORT_SYMBOL(__uc32_ioremap_cached);
++
++void __uc32_iounmap(volatile void __iomem *io_addr)
++{
++ void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
++ struct vm_struct **p, *tmp;
++
++ /*
++ * If this is a section based mapping we need to handle it
++ * specially as the VM subsystem does not know how to handle
++ * such a beast. We need the lock here b/c we need to clear
++ * all the mappings before the area can be reclaimed
++ * by someone else.
++ */
++ write_lock(&vmlist_lock);
++ for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
++ if ((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) {
++ if (tmp->flags & VM_UNICORE_SECTION_MAPPING) {
++ unmap_area_sections((unsigned long)tmp->addr,
++ tmp->size);
++ }
++ break;
++ }
++ }
++ write_unlock(&vmlist_lock);
++
++ vunmap(addr);
++}
++EXPORT_SYMBOL(__uc32_iounmap);
+diff --git a/arch/unicore32/mm/mm.h b/arch/unicore32/mm/mm.h
+new file mode 100644
+index 000000000000..3296bca0f1f7
+--- /dev/null
++++ b/arch/unicore32/mm/mm.h
+@@ -0,0 +1,39 @@
++/*
++ * linux/arch/unicore32/mm/mm.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ */
++/* the upper-most page table pointer */
++extern pmd_t *top_pmd;
++extern int sysctl_overcommit_memory;
++
++#define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
++
++static inline pmd_t *pmd_off(pgd_t *pgd, unsigned long virt)
++{
++ return pmd_offset((pud_t *)pgd, virt);
++}
++
++static inline pmd_t *pmd_off_k(unsigned long virt)
++{
++ return pmd_off(pgd_offset_k(virt), virt);
++}
++
++struct mem_type {
++ unsigned int prot_pte;
++ unsigned int prot_l1;
++ unsigned int prot_sect;
++};
++
++const struct mem_type *get_mem_type(unsigned int type);
++
++extern void __flush_dcache_page(struct address_space *, struct page *);
++
++void __init bootmem_init(void);
++void uc32_mm_memblock_reserve(void);commit f73670e8a55c11d47c28dca35dc4bc7dfbd4e6eb
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:16:21 2011 +0800
+
+ unicore32 core architecture: process/thread related codes
+
+ This patch implements process/thread related codes. Backtrace and stacktrace are here.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/stacktrace.h b/arch/unicore32/include/asm/stacktrace.h
+new file mode 100644
+index 000000000000..76edc65a5871
+--- /dev/null
++++ b/arch/unicore32/include/asm/stacktrace.h
+@@ -0,0 +1,31 @@
++/*
++ * linux/arch/unicore32/include/asm/stacktrace.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_STACKTRACE_H__
++#define __UNICORE_STACKTRACE_H__
++
++struct stackframe {
++ unsigned long fp;
++ unsigned long sp;
++ unsigned long lr;
++ unsigned long pc;
++};
++
++#ifdef CONFIG_FRAME_POINTER
++extern int unwind_frame(struct stackframe *frame);
++#else
++#define unwind_frame(f) (-EINVAL)
++#endif
++extern void walk_stackframe(struct stackframe *frame,
++ int (*fn)(struct stackframe *, void *), void *data);
++
++#endif /* __UNICORE_STACKTRACE_H__ */
+diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h
+new file mode 100644
+index 000000000000..c270e9e04861
+--- /dev/null
++++ b/arch/unicore32/include/asm/thread_info.h
+@@ -0,0 +1,154 @@
++/*
++ * linux/arch/unicore32/include/asm/thread_info.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_THREAD_INFO_H__
++#define __UNICORE_THREAD_INFO_H__
++
++#ifdef __KERNEL__
++
++#include <linux/compiler.h>
++#include <asm/fpstate.h>
++
++#define THREAD_SIZE_ORDER 1
++#define THREAD_SIZE 8192
++#define THREAD_START_SP (THREAD_SIZE - 8)
++
++#ifndef __ASSEMBLY__
++
++struct task_struct;
++struct exec_domain;
++
++#include <asm/types.h>
++
++typedef struct {
++ unsigned long seg;
++} mm_segment_t;
++
++struct cpu_context_save {
++ __u32 r4;
++ __u32 r5;
++ __u32 r6;
++ __u32 r7;
++ __u32 r8;
++ __u32 r9;
++ __u32 r10;
++ __u32 r11;
++ __u32 r12;
++ __u32 r13;
++ __u32 r14;
++ __u32 r15;
++ __u32 r16;
++ __u32 r17;
++ __u32 r18;
++ __u32 r19;
++ __u32 r20;
++ __u32 r21;
++ __u32 r22;
++ __u32 r23;
++ __u32 r24;
++ __u32 r25;
++ __u32 r26;
++ __u32 fp;
++ __u32 sp;
++ __u32 pc;
++};
++
++/*
++ * low level task data that entry.S needs immediate access to.
++ * __switch_to() assumes cpu_context follows immediately after cpu_domain.
++ */
++struct thread_info {
++ unsigned long flags; /* low level flags */
++ int preempt_count; /* 0 => preemptable */
++ /* <0 => bug */
++ mm_segment_t addr_limit; /* address limit */
++ struct task_struct *task; /* main task structure */
++ struct exec_domain *exec_domain; /* execution domain */
++ __u32 cpu; /* cpu */
++ struct cpu_context_save cpu_context; /* cpu context */
++ __u32 syscall; /* syscall number */
++ __u8 used_cp[16]; /* thread used copro */
++#ifdef CONFIG_UNICORE_FPU_F64
++ struct fp_state fpstate __attribute__((aligned(8)));
++#endif
++ struct restart_block restart_block;
++};
++
++#define INIT_THREAD_INFO(tsk) \
++{ \
++ .task = &tsk, \
++ .exec_domain = &default_exec_domain, \
++ .flags = 0, \
++ .preempt_count = INIT_PREEMPT_COUNT, \
++ .addr_limit = KERNEL_DS, \
++ .restart_block = { \
++ .fn = do_no_restart_syscall, \
++ }, \
++}
++
++#define init_thread_info (init_thread_union.thread_info)
++#define init_stack (init_thread_union.stack)
++
++/*
++ * how to get the thread information struct from C
++ */
++static inline struct thread_info *current_thread_info(void) __attribute_const__;
++
++static inline struct thread_info *current_thread_info(void)
++{
++ register unsigned long sp asm ("sp");
++ return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
++}
++
++#define thread_saved_pc(tsk) \
++ ((unsigned long)(task_thread_info(tsk)->cpu_context.pc))
++#define thread_saved_sp(tsk) \
++ ((unsigned long)(task_thread_info(tsk)->cpu_context.sp))
++#define thread_saved_fp(tsk) \
++ ((unsigned long)(task_thread_info(tsk)->cpu_context.fp))
++
++#endif
++
++/*
++ * We use bit 30 of the preempt_count to indicate that kernel
++ * preemption is occurring. See <asm/hardirq.h>.
++ */
++#define PREEMPT_ACTIVE 0x40000000
++
++/*
++ * thread information flags:
++ * TIF_SYSCALL_TRACE - syscall trace active
++ * TIF_SIGPENDING - signal pending
++ * TIF_NEED_RESCHED - rescheduling necessary
++ * TIF_NOTIFY_RESUME - callback before returning to user
++ */
++#define TIF_SIGPENDING 0
++#define TIF_NEED_RESCHED 1
++#define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
++#define TIF_SYSCALL_TRACE 8
++#define TIF_MEMDIE 18
++#define TIF_FREEZE 19
++#define TIF_RESTORE_SIGMASK 20
++
++#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
++#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
++#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
++#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
++#define _TIF_FREEZE (1 << TIF_FREEZE)
++#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK)
++
++/*
++ * Change these and you break ASM code in entry-common.S
++ */
++#define _TIF_WORK_MASK 0x000000ff
++
++#endif /* __KERNEL__ */
++#endif /* __UNICORE_THREAD_INFO_H__ */
+diff --git a/arch/unicore32/kernel/init_task.c b/arch/unicore32/kernel/init_task.c
+new file mode 100644
+index 000000000000..a35a1e50e4f4
+--- /dev/null
++++ b/arch/unicore32/kernel/init_task.c
+@@ -0,0 +1,44 @@
++/*
++ * linux/arch/unicore32/kernel/init_task.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/mm.h>
++#include <linux/module.h>
++#include <linux/fs.h>
++#include <linux/sched.h>
++#include <linux/init.h>
++#include <linux/init_task.h>
++#include <linux/mqueue.h>
++#include <linux/uaccess.h>
++
++#include <asm/pgtable.h>
++
++static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
++static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
++/*
++ * Initial thread structure.
++ *
++ * We need to make sure that this is 8192-byte aligned due to the
++ * way process stacks are handled. This is done by making sure
++ * the linker maps this in the .text segment right after head.S,
++ * and making head.S ensure the proper alignment.
++ *
++ * The things we do for performance..
++ */
++union thread_union init_thread_union __init_task_data = {
++ INIT_THREAD_INFO(init_task) };
++
++/*
++ * Initial task structure.
++ *
++ * All other task structs will be allocated on slabs in fork.c
++ */
++struct task_struct init_task = INIT_TASK(init_task);
++EXPORT_SYMBOL(init_task);
+diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
+new file mode 100644
+index 000000000000..8d4a273ae086
+--- /dev/null
++++ b/arch/unicore32/kernel/process.c
+@@ -0,0 +1,389 @@
++/*
++ * linux/arch/unicore32/kernel/process.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 <stdarg.h>
++
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/stddef.h>
++#include <linux/unistd.h>
++#include <linux/delay.h>
++#include <linux/reboot.h>
++#include <linux/interrupt.h>
++#include <linux/kallsyms.h>
++#include <linux/init.h>
++#include <linux/cpu.h>
++#include <linux/elfcore.h>
++#include <linux/pm.h>
++#include <linux/tick.h>
++#include <linux/utsname.h>
++#include <linux/uaccess.h>
++#include <linux/random.h>
++#include <linux/gpio.h>
++#include <linux/stacktrace.h>
++
++#include <asm/cacheflush.h>
++#include <asm/processor.h>
++#include <asm/system.h>
++#include <asm/stacktrace.h>
++
++#include "setup.h"
++
++static const char * const processor_modes[] = {
++ "UK00", "UK01", "UK02", "UK03", "UK04", "UK05", "UK06", "UK07",
++ "UK08", "UK09", "UK0A", "UK0B", "UK0C", "UK0D", "UK0E", "UK0F",
++ "USER", "REAL", "INTR", "PRIV", "UK14", "UK15", "UK16", "ABRT",
++ "UK18", "UK19", "UK1A", "EXTN", "UK1C", "UK1D", "UK1E", "SUSR"
++};
++
++/*
++ * The idle thread, has rather strange semantics for calling pm_idle,
++ * but this is what x86 does and we need to do the same, so that
++ * things like cpuidle get called in the same way.
++ */
++void cpu_idle(void)
++{
++ /* endless idle loop with no priority at all */
++ while (1) {
++ tick_nohz_stop_sched_tick(1);
++ while (!need_resched()) {
++ local_irq_disable();
++ stop_critical_timings();
++ cpu_do_idle();
++ local_irq_enable();
++ start_critical_timings();
++ }
++ tick_nohz_restart_sched_tick();
++ preempt_enable_no_resched();
++ schedule();
++ preempt_disable();
++ }
++}
++
++static char reboot_mode = 'h';
++
++int __init reboot_setup(char *str)
++{
++ reboot_mode = str[0];
++ return 1;
++}
++
++__setup("reboot=", reboot_setup);
++
++void machine_halt(void)
++{
++ gpio_set_value(GPO_SOFT_OFF, 0);
++}
++
++/*
++ * Function pointers to optional machine specific functions
++ */
++void (*pm_power_off)(void) = NULL;
++
++void machine_power_off(void)
++{
++ if (pm_power_off)
++ pm_power_off();
++ machine_halt();
++}
++
++void machine_restart(char *cmd)
++{
++ /* Disable interrupts first */
++ local_irq_disable();
++
++ /*
++ * Tell the mm system that we are going to reboot -
++ * we may need it to insert some 1:1 mappings so that
++ * soft boot works.
++ */
++ setup_mm_for_reboot(reboot_mode);
++
++ /* Clean and invalidate caches */
++ flush_cache_all();
++
++ /* Turn off caching */
++ cpu_proc_fin();
++
++ /* Push out any further dirty data, and ensure cache is empty */
++ flush_cache_all();
++
++ /*
++ * Now handle reboot code.
++ */
++ if (reboot_mode == 's') {
++ /* Jump into ROM at address 0xffff0000 */
++ cpu_reset(VECTORS_BASE);
++ } else {
++ PM_PLLSYSCFG = 0x00002001; /* cpu clk = 250M */
++ PM_PLLDDRCFG = 0x00100800; /* ddr clk = 44M */
++ PM_PLLVGACFG = 0x00002001; /* vga clk = 250M */
++
++ /* Use on-chip reset capability */
++ /* following instructions must be in one icache line */
++ __asm__ __volatile__(
++ " .align 5\n\t"
++ " stw %1, [%0]\n\t"
++ "201: ldw r0, [%0]\n\t"
++ " cmpsub.a r0, #0\n\t"
++ " bne 201b\n\t"
++ " stw %3, [%2]\n\t"
++ " nop; nop; nop\n\t"
++ /* prefetch 3 instructions at most */
++ :
++ : "r" ((unsigned long)&PM_PMCR),
++ "r" (PM_PMCR_CFBSYS | PM_PMCR_CFBDDR
++ | PM_PMCR_CFBVGA),
++ "r" ((unsigned long)&RESETC_SWRR),
++ "r" (RESETC_SWRR_SRB)
++ : "r0", "memory");
++ }
++
++ /*
++ * Whoops - the architecture was unable to reboot.
++ * Tell the user!
++ */
++ mdelay(1000);
++ printk(KERN_EMERG "Reboot failed -- System halted\n");
++ do { } while (1);
++}
++
++void __show_regs(struct pt_regs *regs)
++{
++ unsigned long flags;
++ char buf[64];
++
++ printk(KERN_DEFAULT "CPU: %d %s (%s %.*s)\n",
++ raw_smp_processor_id(), print_tainted(),
++ init_utsname()->release,
++ (int)strcspn(init_utsname()->version, " "),
++ init_utsname()->version);
++ print_symbol("PC is at %s\n", instruction_pointer(regs));
++ print_symbol("LR is at %s\n", regs->UCreg_lr);
++ printk(KERN_DEFAULT "pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
++ "sp : %08lx ip : %08lx fp : %08lx\n",
++ regs->UCreg_pc, regs->UCreg_lr, regs->UCreg_asr,
++ regs->UCreg_sp, regs->UCreg_ip, regs->UCreg_fp);
++ printk(KERN_DEFAULT "r26: %08lx r25: %08lx r24: %08lx\n",
++ regs->UCreg_26, regs->UCreg_25,
++ regs->UCreg_24);
++ printk(KERN_DEFAULT "r23: %08lx r22: %08lx r21: %08lx r20: %08lx\n",
++ regs->UCreg_23, regs->UCreg_22,
++ regs->UCreg_21, regs->UCreg_20);
++ printk(KERN_DEFAULT "r19: %08lx r18: %08lx r17: %08lx r16: %08lx\n",
++ regs->UCreg_19, regs->UCreg_18,
++ regs->UCreg_17, regs->UCreg_16);
++ printk(KERN_DEFAULT "r15: %08lx r14: %08lx r13: %08lx r12: %08lx\n",
++ regs->UCreg_15, regs->UCreg_14,
++ regs->UCreg_13, regs->UCreg_12);
++ printk(KERN_DEFAULT "r11: %08lx r10: %08lx r9 : %08lx r8 : %08lx\n",
++ regs->UCreg_11, regs->UCreg_10,
++ regs->UCreg_09, regs->UCreg_08);
++ printk(KERN_DEFAULT "r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n",
++ regs->UCreg_07, regs->UCreg_06,
++ regs->UCreg_05, regs->UCreg_04);
++ printk(KERN_DEFAULT "r3 : %08lx r2 : %08lx r1 : %08lx r0 : %08lx\n",
++ regs->UCreg_03, regs->UCreg_02,
++ regs->UCreg_01, regs->UCreg_00);
++
++ flags = regs->UCreg_asr;
++ buf[0] = flags & PSR_S_BIT ? 'S' : 's';
++ buf[1] = flags & PSR_Z_BIT ? 'Z' : 'z';
++ buf[2] = flags & PSR_C_BIT ? 'C' : 'c';
++ buf[3] = flags & PSR_V_BIT ? 'V' : 'v';
++ buf[4] = '\0';
++
++ printk(KERN_DEFAULT "Flags: %s INTR o%s REAL o%s Mode %s Segment %s\n",
++ buf, interrupts_enabled(regs) ? "n" : "ff",
++ fast_interrupts_enabled(regs) ? "n" : "ff",
++ processor_modes[processor_mode(regs)],
++ segment_eq(get_fs(), get_ds()) ? "kernel" : "user");
++ {
++ unsigned int ctrl;
++
++ buf[0] = '\0';
++ {
++ unsigned int transbase;
++ asm("movc %0, p0.c2, #0\n"
++ : "=r" (transbase));
++ snprintf(buf, sizeof(buf), " Table: %08x", transbase);
++ }
++ asm("movc %0, p0.c1, #0\n" : "=r" (ctrl));
++
++ printk(KERN_DEFAULT "Control: %08x%s\n", ctrl, buf);
++ }
++}
++
++void show_regs(struct pt_regs *regs)
++{
++ printk(KERN_DEFAULT "\n");
++ printk(KERN_DEFAULT "Pid: %d, comm: %20s\n",
++ task_pid_nr(current), current->comm);
++ __show_regs(regs);
++ __backtrace();
++}
++
++/*
++ * Free current thread data structures etc..
++ */
++void exit_thread(void)
++{
++}
++
++void flush_thread(void)
++{
++ struct thread_info *thread = current_thread_info();
++ struct task_struct *tsk = current;
++
++ memset(thread->used_cp, 0, sizeof(thread->used_cp));
++ memset(&tsk->thread.debug, 0, sizeof(struct debug_info));
++#ifdef CONFIG_UNICORE_FPU_F64
++ memset(&thread->fpstate, 0, sizeof(struct fp_state));
++#endif
++}
++
++void release_thread(struct task_struct *dead_task)
++{
++}
++
++asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
++
++int
++copy_thread(unsigned long clone_flags, unsigned long stack_start,
++ unsigned long stk_sz, struct task_struct *p, struct pt_regs *regs)
++{
++ struct thread_info *thread = task_thread_info(p);
++ struct pt_regs *childregs = task_pt_regs(p);
++
++ *childregs = *regs;
++ childregs->UCreg_00 = 0;
++ childregs->UCreg_sp = stack_start;
++
++ memset(&thread->cpu_context, 0, sizeof(struct cpu_context_save));
++ thread->cpu_context.sp = (unsigned long)childregs;
++ thread->cpu_context.pc = (unsigned long)ret_from_fork;
++
++ if (clone_flags & CLONE_SETTLS)
++ childregs->UCreg_16 = regs->UCreg_03;
++
++ return 0;
++}
++
++/*
++ * Fill in the task's elfregs structure for a core dump.
++ */
++int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs)
++{
++ elf_core_copy_regs(elfregs, task_pt_regs(t));
++ return 1;
++}
++
++/*
++ * fill in the fpe structure for a core dump...
++ */
++int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fp)
++{
++ struct thread_info *thread = current_thread_info();
++ int used_math = thread->used_cp[1] | thread->used_cp[2];
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ if (used_math)
++ memcpy(fp, &thread->fpstate, sizeof(*fp));
++#endif
++ return used_math != 0;
++}
++EXPORT_SYMBOL(dump_fpu);
++
++/*
++ * Shuffle the argument into the correct register before calling the
++ * thread function. r1 is the thread argument, r2 is the pointer to
++ * the thread function, and r3 points to the exit function.
++ */
++asm(".pushsection .text\n"
++" .align\n"
++" .type kernel_thread_helper, #function\n"
++"kernel_thread_helper:\n"
++" mov.a asr, r7\n"
++" mov r0, r4\n"
++" mov lr, r6\n"
++" mov pc, r5\n"
++" .size kernel_thread_helper, . - kernel_thread_helper\n"
++" .popsection");
++
++/*
++ * Create a kernel thread.
++ */
++pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
++{
++ struct pt_regs regs;
++
++ memset(®s, 0, sizeof(regs));
++
++ regs.UCreg_04 = (unsigned long)arg;
++ regs.UCreg_05 = (unsigned long)fn;
++ regs.UCreg_06 = (unsigned long)do_exit;
++ regs.UCreg_07 = PRIV_MODE;
++ regs.UCreg_pc = (unsigned long)kernel_thread_helper;
++ regs.UCreg_asr = regs.UCreg_07 | PSR_I_BIT;
++
++ return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL);
++}
++EXPORT_SYMBOL(kernel_thread);
++
++unsigned long get_wchan(struct task_struct *p)
++{
++ struct stackframe frame;
++ int count = 0;
++ if (!p || p == current || p->state == TASK_RUNNING)
++ return 0;
++
++ frame.fp = thread_saved_fp(p);
++ frame.sp = thread_saved_sp(p);
++ frame.lr = 0; /* recovered from the stack */
++ frame.pc = thread_saved_pc(p);
++ do {
++ int ret = unwind_frame(&frame);
++ if (ret < 0)
++ return 0;
++ if (!in_sched_functions(frame.pc))
++ return frame.pc;
++ } while ((count++) < 16);
++ return 0;
++}
++
++unsigned long arch_randomize_brk(struct mm_struct *mm)
++{
++ unsigned long range_end = mm->brk + 0x02000000;
++ return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
++}
++
++/*
++ * The vectors page is always readable from user space for the
++ * atomic helpers and the signal restart code. Let's declare a mapping
++ * for it so it is visible through ptrace and /proc/<pid>/mem.
++ */
++
++int vectors_user_mapping(void)
++{
++ struct mm_struct *mm = current->mm;
++ return install_special_mapping(mm, 0xffff0000, PAGE_SIZE,
++ VM_READ | VM_EXEC |
++ VM_MAYREAD | VM_MAYEXEC |
++ VM_ALWAYSDUMP | VM_RESERVED,
++ NULL);
++}
++
++const char *arch_vma_name(struct vm_area_struct *vma)
++{
++ return (vma->vm_start == 0xffff0000) ? "[vectors]" : NULL;
++}
+diff --git a/arch/unicore32/kernel/stacktrace.c b/arch/unicore32/kernel/stacktrace.c
+new file mode 100644
+index 000000000000..b34030bdabe3
+--- /dev/null
++++ b/arch/unicore32/kernel/stacktrace.c
+@@ -0,0 +1,131 @@
++/*
++ * linux/arch/unicore32/kernel/stacktrace.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/sched.h>
++#include <linux/stacktrace.h>
++
++#include <asm/stacktrace.h>
++
++#if defined(CONFIG_FRAME_POINTER)
++/*
++ * Unwind the current stack frame and store the new register values in the
++ * structure passed as argument. Unwinding is equivalent to a function return,
++ * hence the new PC value rather than LR should be used for backtrace.
++ *
++ * With framepointer enabled, a simple function prologue looks like this:
++ * mov ip, sp
++ * stmdb sp!, {fp, ip, lr, pc}
++ * sub fp, ip, #4
++ *
++ * A simple function epilogue looks like this:
++ * ldm sp, {fp, sp, pc}
++ *
++ * Note that with framepointer enabled, even the leaf functions have the same
++ * prologue and epilogue, therefore we can ignore the LR value in this case.
++ */
++int notrace unwind_frame(struct stackframe *frame)
++{
++ unsigned long high, low;
++ unsigned long fp = frame->fp;
++
++ /* only go to a higher address on the stack */
++ low = frame->sp;
++ high = ALIGN(low, THREAD_SIZE);
++
++ /* check current frame pointer is within bounds */
++ if (fp < (low + 12) || fp + 4 >= high)
++ return -EINVAL;
++
++ /* restore the registers from the stack frame */
++ frame->fp = *(unsigned long *)(fp - 12);
++ frame->sp = *(unsigned long *)(fp - 8);
++ frame->pc = *(unsigned long *)(fp - 4);
++
++ return 0;
++}
++#endif
++
++void notrace walk_stackframe(struct stackframe *frame,
++ int (*fn)(struct stackframe *, void *), void *data)
++{
++ while (1) {
++ int ret;
++
++ if (fn(frame, data))
++ break;
++ ret = unwind_frame(frame);
++ if (ret < 0)
++ break;
++ }
++}
++EXPORT_SYMBOL(walk_stackframe);
++
++#ifdef CONFIG_STACKTRACE
++struct stack_trace_data {
++ struct stack_trace *trace;
++ unsigned int no_sched_functions;
++ unsigned int skip;
++};
++
++static int save_trace(struct stackframe *frame, void *d)
++{
++ struct stack_trace_data *data = d;
++ struct stack_trace *trace = data->trace;
++ unsigned long addr = frame->pc;
++
++ if (data->no_sched_functions && in_sched_functions(addr))
++ return 0;
++ if (data->skip) {
++ data->skip--;
++ return 0;
++ }
++
++ trace->entries[trace->nr_entries++] = addr;
++
++ return trace->nr_entries >= trace->max_entries;
++}
++
++void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
++{
++ struct stack_trace_data data;
++ struct stackframe frame;
++
++ data.trace = trace;
++ data.skip = trace->skip;
++
++ if (tsk != current) {
++ data.no_sched_functions = 1;
++ frame.fp = thread_saved_fp(tsk);
++ frame.sp = thread_saved_sp(tsk);
++ frame.lr = 0; /* recovered from the stack */
++ frame.pc = thread_saved_pc(tsk);
++ } else {
++ register unsigned long current_sp asm("sp");
++
++ data.no_sched_functions = 0;
++ frame.fp = (unsigned long)__builtin_frame_address(0);
++ frame.sp = current_sp;
++ frame.lr = (unsigned long)__builtin_return_address(0);
++ frame.pc = (unsigned long)save_stack_trace_tsk;
++ }
++
++ walk_stackframe(&frame, save_trace, &data);
++ if (trace->nr_entries < trace->max_entries)
++ trace->entries[trace->nr_entries++] = ULONG_MAX;
++}
++
++void save_stack_trace(struct stack_trace *trace)
++{
++ save_stack_trace_tsk(current, trace);
++}
++EXPORT_SYMBOL_GPL(save_stack_trace);
++#endif
+diff --git a/arch/unicore32/lib/backtrace.S b/arch/unicore32/lib/backtrace.S
+new file mode 100644
+index 000000000000..ef01d77f2f65
+--- /dev/null
++++ b/arch/unicore32/lib/backtrace.S
+@@ -0,0 +1,163 @@
++/*
++ * linux/arch/unicore32/lib/backtrace.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++ .text
++
++@ fp is 0 or stack frame
++
++#define frame v4
++#define sv_fp v5
++#define sv_pc v6
++#define offset v8
++
++ENTRY(__backtrace)
++ mov r0, fp
++
++ENTRY(c_backtrace)
++
++#if !defined(CONFIG_FRAME_POINTER) || !defined(CONFIG_PRINTK)
++ mov pc, lr
++ENDPROC(__backtrace)
++ENDPROC(c_backtrace)
++#else
++ stm.w (v4 - v8, lr), [sp-] @ Save an extra register
++ @ so we have a location...
++ mov.a frame, r0 @ if frame pointer is zero
++ beq no_frame @ we have no stack frames
++
++1: stm.w (pc), [sp-] @ calculate offset of PC stored
++ ldw.w r0, [sp]+, #4 @ by stmfd for this CPU
++ adr r1, 1b
++ sub offset, r0, r1
++
++/*
++ * Stack frame layout:
++ * optionally saved caller registers (r4 - r10)
++ * saved fp
++ * saved sp
++ * saved lr
++ * frame => saved pc
++ * optionally saved arguments (r0 - r3)
++ * saved sp => <next word>
++ *
++ * Functions start with the following code sequence:
++ * mov ip, sp
++ * stm.w (r0 - r3), [sp-] (optional)
++ * corrected pc => stm.w sp, (..., fp, ip, lr, pc)
++ */
++for_each_frame:
++
++1001: ldw sv_pc, [frame+], #0 @ get saved pc
++1002: ldw sv_fp, [frame+], #-12 @ get saved fp
++
++ sub sv_pc, sv_pc, offset @ Correct PC for prefetching
++
++1003: ldw r2, [sv_pc+], #-4 @ if stmfd sp, {args} exists,
++ ldw r3, .Ldsi+4 @ adjust saved 'pc' back one
++ cxor.a r3, r2 >> #14 @ instruction
++ beq 201f
++ sub r0, sv_pc, #4 @ allow for mov
++ b 202f
++201:
++ sub r0, sv_pc, #8 @ allow for mov + stmia
++202:
++ ldw r1, [frame+], #-4 @ get saved lr
++ mov r2, frame
++ b.l dump_backtrace_entry
++
++ ldw r1, [sv_pc+], #-4 @ if stmfd sp, {args} exists,
++ ldw r3, .Ldsi+4
++ cxor.a r3, r1 >> #14
++ bne 1004f
++ ldw r0, [frame+], #-8 @ get sp
++ sub r0, r0, #4 @ point at the last arg
++ b.l .Ldumpstm @ dump saved registers
++
++1004: ldw r1, [sv_pc+], #0 @ if stmfd {, fp, ip, lr, pc}
++ ldw r3, .Ldsi @ instruction exists,
++ cxor.a r3, r1 >> #14
++ bne 201f
++ sub r0, frame, #16
++ b.l .Ldumpstm @ dump saved registers
++201:
++ cxor.a sv_fp, #0 @ zero saved fp means
++ beq no_frame @ no further frames
++
++ csub.a sv_fp, frame @ next frame must be
++ mov frame, sv_fp @ above the current frame
++ bua for_each_frame
++
++1006: adr r0, .Lbad
++ mov r1, frame
++ b.l printk
++no_frame: ldm.w (v4 - v8, pc), [sp]+
++ENDPROC(__backtrace)
++ENDPROC(c_backtrace)
++
++ .pushsection __ex_table,"a"
++ .align 3
++ .long 1001b, 1006b
++ .long 1002b, 1006b
++ .long 1003b, 1006b
++ .long 1004b, 1006b
++ .popsection
++
++#define instr v4
++#define reg v5
++#define stack v6
++
++.Ldumpstm: stm.w (instr, reg, stack, v7, lr), [sp-]
++ mov stack, r0
++ mov instr, r1
++ mov reg, #14
++ mov v7, #0
++1: mov r3, #1
++ csub.a reg, #8
++ bne 201f
++ sub reg, reg, #3
++201:
++ cand.a instr, r3 << reg
++ beq 2f
++ add v7, v7, #1
++ cxor.a v7, #6
++ cmoveq v7, #1
++ cmoveq r1, #'\n'
++ cmovne r1, #' '
++ ldw.w r3, [stack]+, #-4
++ mov r2, reg
++ csub.a r2, #8
++ bsl 201f
++ sub r2, r2, #3
++201:
++ cand.a instr, #0x40 @ if H is 1, high 16 regs
++ beq 201f
++ add r2, r2, #0x10 @ so r2 need add 16
++201:
++ adr r0, .Lfp
++ b.l printk
++2: sub.a reg, reg, #1
++ bns 1b
++ cxor.a v7, #0
++ beq 201f
++ adr r0, .Lcr
++ b.l printk
++201: ldm.w (instr, reg, stack, v7, pc), [sp]+
++
++.Lfp: .asciz "%cr%d:%08x"
++.Lcr: .asciz "\n"
++.Lbad: .asciz "Backtrace aborted due to bad frame pointer <%p>\n"
++ .align
++.Ldsi: .word 0x92eec000 >> 14 @ stm.w sp, (... fp, ip, lr, pc)
++ .word 0x92e10000 >> 14 @ stm.w sp, ()
++
++#endifcommit 141c943fd4b323bae2b47f67743dba96134afb1f
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:15:45 2011 +0800
+
+ unicore32 core architecture: low level entry and setup codes
+
+ This patch implements low level entry and setup codes.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/traps.h b/arch/unicore32/include/asm/traps.h
+new file mode 100644
+index 000000000000..66e17a724bfe
+--- /dev/null
++++ b/arch/unicore32/include/asm/traps.h
+@@ -0,0 +1,21 @@
++/*
++ * linux/arch/unicore32/include/asm/traps.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_TRAP_H__
++#define __UNICORE_TRAP_H__
++
++extern void __init early_trap_init(void);
++extern void dump_backtrace_entry(unsigned long where,
++ unsigned long from, unsigned long frame);
++
++extern void do_DataAbort(unsigned long addr, unsigned int fsr,
++ struct pt_regs *regs);
++#endif
+diff --git a/arch/unicore32/kernel/entry.S b/arch/unicore32/kernel/entry.S
+new file mode 100644
+index 000000000000..83698b7c8f5b
+--- /dev/null
++++ b/arch/unicore32/kernel/entry.S
+@@ -0,0 +1,824 @@
++/*
++ * linux/arch/unicore32/kernel/entry.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * Low-level vector interface routines
++ */
++#include <linux/init.h>
++#include <linux/linkage.h>
++#include <asm/assembler.h>
++#include <asm/errno.h>
++#include <asm/thread_info.h>
++#include <asm/memory.h>
++#include <asm/unistd.h>
++#include <generated/asm-offsets.h>
++#include "debug-macro.S"
++
++@
++@ Most of the stack format comes from struct pt_regs, but with
++@ the addition of 8 bytes for storing syscall args 5 and 6.
++@
++#define S_OFF 8
++
++/*
++ * The SWI code relies on the fact that R0 is at the bottom of the stack
++ * (due to slow/fast restore user regs).
++ */
++#if S_R0 != 0
++#error "Please fix"
++#endif
++
++ .macro zero_fp
++#ifdef CONFIG_FRAME_POINTER
++ mov fp, #0
++#endif
++ .endm
++
++ .macro alignment_trap, rtemp
++#ifdef CONFIG_ALIGNMENT_TRAP
++ ldw \rtemp, .LCcralign
++ ldw \rtemp, [\rtemp]
++ movc p0.c1, \rtemp, #0
++#endif
++ .endm
++
++ .macro load_user_sp_lr, rd, rtemp, offset = 0
++ mov \rtemp, asr
++ xor \rtemp, \rtemp, #(PRIV_MODE ^ SUSR_MODE)
++ mov.a asr, \rtemp @ switch to the SUSR mode
++
++ ldw sp, [\rd+], #\offset @ load sp_user
++ ldw lr, [\rd+], #\offset + 4 @ load lr_user
++
++ xor \rtemp, \rtemp, #(PRIV_MODE ^ SUSR_MODE)
++ mov.a asr, \rtemp @ switch back to the PRIV mode
++ .endm
++
++ .macro priv_exit, rpsr
++ mov.a bsr, \rpsr
++ ldm.w (r0 - r15), [sp]+
++ ldm.b (r16 - pc), [sp]+ @ load r0 - pc, asr
++ .endm
++
++ .macro restore_user_regs, fast = 0, offset = 0
++ ldw r1, [sp+], #\offset + S_PSR @ get calling asr
++ ldw lr, [sp+], #\offset + S_PC @ get pc
++ mov.a bsr, r1 @ save in bsr_priv
++ .if \fast
++ add sp, sp, #\offset + S_R1 @ r0 is syscall return value
++ ldm.w (r1 - r15), [sp]+ @ get calling r1 - r15
++ ldur (r16 - lr), [sp]+ @ get calling r16 - lr
++ .else
++ ldm.w (r0 - r15), [sp]+ @ get calling r0 - r15
++ ldur (r16 - lr), [sp]+ @ get calling r16 - lr
++ .endif
++ nop
++ add sp, sp, #S_FRAME_SIZE - S_R16
++ mov.a pc, lr @ return
++ @ and move bsr_priv into asr
++ .endm
++
++ .macro get_thread_info, rd
++ mov \rd, sp >> #13
++ mov \rd, \rd << #13
++ .endm
++
++ .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
++ ldw \base, =(io_p2v(PKUNITY_INTC_BASE))
++ ldw \irqstat, [\base+], #0xC @ INTC_ICIP
++ ldw \tmp, [\base+], #0x4 @ INTC_ICMR
++ and.a \irqstat, \irqstat, \tmp
++ beq 1001f
++ cntlz \irqnr, \irqstat
++ rsub \irqnr, \irqnr, #31
++1001: /* EQ will be set if no irqs pending */
++ .endm
++
++#ifdef CONFIG_DEBUG_LL
++ .macro printreg, reg, temp
++ adr \temp, 901f
++ stm (r0-r3), [\temp]+
++ stw lr, [\temp+], #0x10
++ mov r0, \reg
++ b.l printhex8
++ mov r0, #':'
++ b.l printch
++ mov r0, pc
++ b.l printhex8
++ adr r0, 902f
++ b.l printascii
++ adr \temp, 901f
++ ldm (r0-r3), [\temp]+
++ ldw lr, [\temp+], #0x10
++ b 903f
++901: .word 0, 0, 0, 0, 0 @ r0-r3, lr
++902: .asciz ": epip4d\n"
++ .align
++903:
++ .endm
++#endif
++
++/*
++ * These are the registers used in the syscall handler, and allow us to
++ * have in theory up to 7 arguments to a function - r0 to r6.
++ *
++ * Note that tbl == why is intentional.
++ *
++ * We must set at least "tsk" and "why" when calling ret_with_reschedule.
++ */
++scno .req r21 @ syscall number
++tbl .req r22 @ syscall table pointer
++why .req r22 @ Linux syscall (!= 0)
++tsk .req r23 @ current thread_info
++
++/*
++ * Interrupt handling. Preserves r17, r18, r19
++ */
++ .macro intr_handler
++1: get_irqnr_and_base r0, r6, r5, lr
++ beq 2f
++ mov r1, sp
++ @
++ @ routine called with r0 = irq number, r1 = struct pt_regs *
++ @
++ adr lr, 1b
++ b asm_do_IRQ
++2:
++ .endm
++
++/*
++ * PRIV mode handlers
++ */
++ .macro priv_entry
++ sub sp, sp, #(S_FRAME_SIZE - 4)
++ stm (r1 - r15), [sp]+
++ add r5, sp, #S_R15
++ stm (r16 - r28), [r5]+
++
++ ldm (r1 - r3), [r0]+
++ add r5, sp, #S_SP - 4 @ here for interlock avoidance
++ mov r4, #-1 @ "" "" "" ""
++ add r0, sp, #(S_FRAME_SIZE - 4)
++ stw.w r1, [sp+], #-4 @ save the "real" r0 copied
++ @ from the exception stack
++
++ mov r1, lr
++
++ @
++ @ We are now ready to fill in the remaining blanks on the stack:
++ @
++ @ r0 - sp_priv
++ @ r1 - lr_priv
++ @ r2 - lr_<exception>, already fixed up for correct return/restart
++ @ r3 - bsr_<exception>
++ @ r4 - orig_r0 (see pt_regs definition in ptrace.h)
++ @
++ stm (r0 - r4), [r5]+
++ .endm
++
++/*
++ * User mode handlers
++ *
++ */
++ .macro user_entry
++ sub sp, sp, #S_FRAME_SIZE
++ stm (r1 - r15), [sp+]
++ add r4, sp, #S_R16
++ stm (r16 - r28), [r4]+
++
++ ldm (r1 - r3), [r0]+
++ add r0, sp, #S_PC @ here for interlock avoidance
++ mov r4, #-1 @ "" "" "" ""
++
++ stw r1, [sp] @ save the "real" r0 copied
++ @ from the exception stack
++
++ @
++ @ We are now ready to fill in the remaining blanks on the stack:
++ @
++ @ r2 - lr_<exception>, already fixed up for correct return/restart
++ @ r3 - bsr_<exception>
++ @ r4 - orig_r0 (see pt_regs definition in ptrace.h)
++ @
++ @ Also, separately save sp_user and lr_user
++ @
++ stm (r2 - r4), [r0]+
++ stur (sp, lr), [r0-]
++
++ @
++ @ Enable the alignment trap while in kernel mode
++ @
++ alignment_trap r0
++
++ @
++ @ Clear FP to mark the first stack frame
++ @
++ zero_fp
++ .endm
++
++ .text
++
++@
++@ __invalid - generic code for failed exception
++@ (re-entrant version of handlers)
++@
++__invalid:
++ sub sp, sp, #S_FRAME_SIZE
++ stm (r1 - r15), [sp+]
++ add r1, sp, #S_R16
++ stm (r16 - r28, sp, lr), [r1]+
++
++ zero_fp
++
++ ldm (r4 - r6), [r0]+
++ add r0, sp, #S_PC @ here for interlock avoidance
++ mov r7, #-1 @ "" "" "" ""
++ stw r4, [sp] @ save preserved r0
++ stm (r5 - r7), [r0]+ @ lr_<exception>,
++ @ asr_<exception>, "old_r0"
++
++ mov r0, sp
++ mov r1, asr
++ b bad_mode
++ENDPROC(__invalid)
++
++ .align 5
++__dabt_priv:
++ priv_entry
++
++ @
++ @ get ready to re-enable interrupts if appropriate
++ @
++ mov r17, asr
++ cand.a r3, #PSR_I_BIT
++ bne 1f
++ andn r17, r17, #PSR_I_BIT
++1:
++
++ @
++ @ Call the processor-specific abort handler:
++ @
++ @ r2 - aborted context pc
++ @ r3 - aborted context asr
++ @
++ @ The abort handler must return the aborted address in r0, and
++ @ the fault status register in r1.
++ @
++ movc r1, p0.c3, #0 @ get FSR
++ movc r0, p0.c4, #0 @ get FAR
++
++ @
++ @ set desired INTR state, then call main handler
++ @
++ mov.a asr, r17
++ mov r2, sp
++ b.l do_DataAbort
++
++ @
++ @ INTRs off again before pulling preserved data off the stack
++ @
++ disable_irq r0
++
++ @
++ @ restore BSR and restart the instruction
++ @
++ ldw r2, [sp+], #S_PSR
++ priv_exit r2 @ return from exception
++ENDPROC(__dabt_priv)
++
++ .align 5
++__intr_priv:
++ priv_entry
++
++ intr_handler
++
++ mov r0, #0 @ epip4d
++ movc p0.c5, r0, #14
++ nop; nop; nop; nop; nop; nop; nop; nop
++
++ ldw r4, [sp+], #S_PSR @ irqs are already disabled
++
++ priv_exit r4 @ return from exception
++ENDPROC(__intr_priv)
++
++ .ltorg
++
++ .align 5
++__extn_priv:
++ priv_entry
++
++ mov r0, sp @ struct pt_regs *regs
++ mov r1, asr
++ b bad_mode @ not supported
++ENDPROC(__extn_priv)
++
++ .align 5
++__pabt_priv:
++ priv_entry
++
++ @
++ @ re-enable interrupts if appropriate
++ @
++ mov r17, asr
++ cand.a r3, #PSR_I_BIT
++ bne 1f
++ andn r17, r17, #PSR_I_BIT
++1:
++
++ @
++ @ set args, then call main handler
++ @
++ @ r0 - address of faulting instruction
++ @ r1 - pointer to registers on stack
++ @
++ mov r0, r2 @ pass address of aborted instruction
++ mov r1, #5
++ mov.a asr, r17
++ mov r2, sp @ regs
++ b.l do_PrefetchAbort @ call abort handler
++
++ @
++ @ INTRs off again before pulling preserved data off the stack
++ @
++ disable_irq r0
++
++ @
++ @ restore BSR and restart the instruction
++ @
++ ldw r2, [sp+], #S_PSR
++ priv_exit r2 @ return from exception
++ENDPROC(__pabt_priv)
++
++ .align 5
++.LCcralign:
++ .word cr_alignment
++
++ .align 5
++__dabt_user:
++ user_entry
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ cff ip, s31
++ cand.a ip, #0x08000000 @ FPU execption traps?
++ beq 209f
++
++ ldw ip, [sp+], #S_PC
++ add ip, ip, #4
++ stw ip, [sp+], #S_PC
++ @
++ @ fall through to the emulation code, which returns using r19 if
++ @ it has emulated the instruction, or the more conventional lr
++ @ if we are to treat this as a real extended instruction
++ @
++ @ r0 - instruction
++ @
++1: ldw.u r0, [r2]
++ adr r19, ret_from_exception
++ adr lr, 209f
++ @
++ @ fallthrough to call do_uc_f64
++ @
++/*
++ * Check whether the instruction is a co-processor instruction.
++ * If yes, we need to call the relevant co-processor handler.
++ *
++ * Note that we don't do a full check here for the co-processor
++ * instructions; all instructions with bit 27 set are well
++ * defined. The only instructions that should fault are the
++ * co-processor instructions.
++ *
++ * Emulators may wish to make use of the following registers:
++ * r0 = instruction opcode.
++ * r2 = PC
++ * r19 = normal "successful" return address
++ * r20 = this threads thread_info structure.
++ * lr = unrecognised instruction return address
++ */
++ get_thread_info r20 @ get current thread
++ and r8, r0, #0x00003c00 @ mask out CP number
++ mov r7, #1
++ stb r7, [r20+], #TI_USED_CP + 2 @ set appropriate used_cp[]
++
++ @ F64 hardware support entry point.
++ @ r0 = faulted instruction
++ @ r19 = return address
++ @ r20 = fp_state
++ enable_irq r4
++ add r20, r20, #TI_FPSTATE @ r20 = workspace
++ cff r1, s31 @ get fpu FPSCR
++ andn r2, r1, #0x08000000
++ ctf r2, s31 @ clear 27 bit
++ mov r2, sp @ nothing stacked - regdump is at TOS
++ mov lr, r19 @ setup for a return to the user code
++
++ @ Now call the C code to package up the bounce to the support code
++ @ r0 holds the trigger instruction
++ @ r1 holds the FPSCR value
++ @ r2 pointer to register dump
++ b ucf64_exchandler
++209:
++#endif
++ @
++ @ Call the processor-specific abort handler:
++ @
++ @ r2 - aborted context pc
++ @ r3 - aborted context asr
++ @
++ @ The abort handler must return the aborted address in r0, and
++ @ the fault status register in r1.
++ @
++ movc r1, p0.c3, #0 @ get FSR
++ movc r0, p0.c4, #0 @ get FAR
++
++ @
++ @ INTRs on, then call the main handler
++ @
++ enable_irq r2
++ mov r2, sp
++ adr lr, ret_from_exception
++ b do_DataAbort
++ENDPROC(__dabt_user)
++
++ .align 5
++__intr_user:
++ user_entry
++
++ get_thread_info tsk
++
++ intr_handler
++
++ mov why, #0
++ b ret_to_user
++ENDPROC(__intr_user)
++
++ .ltorg
++
++ .align 5
++__extn_user:
++ user_entry
++
++ mov r0, sp
++ mov r1, asr
++ b bad_mode
++ENDPROC(__extn_user)
++
++ .align 5
++__pabt_user:
++ user_entry
++
++ mov r0, r2 @ pass address of aborted instruction.
++ mov r1, #5
++ enable_irq r1 @ Enable interrupts
++ mov r2, sp @ regs
++ b.l do_PrefetchAbort @ call abort handler
++ /* fall through */
++/*
++ * This is the return code to user mode for abort handlers
++ */
++ENTRY(ret_from_exception)
++ get_thread_info tsk
++ mov why, #0
++ b ret_to_user
++ENDPROC(__pabt_user)
++ENDPROC(ret_from_exception)
++
++/*
++ * Register switch for UniCore V2 processors
++ * r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_info
++ * previous and next are guaranteed not to be the same.
++ */
++ENTRY(__switch_to)
++ add ip, r1, #TI_CPU_SAVE
++ stm.w (r4 - r15), [ip]+
++ stm.w (r16 - r27, sp, lr), [ip]+
++
++#ifdef CONFIG_UNICORE_FPU_F64
++ add ip, r1, #TI_FPSTATE
++ sfm.w (f0 - f7 ), [ip]+
++ sfm.w (f8 - f15), [ip]+
++ sfm.w (f16 - f23), [ip]+
++ sfm.w (f24 - f31), [ip]+
++ cff r4, s31
++ stw r4, [ip]
++
++ add ip, r2, #TI_FPSTATE
++ lfm.w (f0 - f7 ), [ip]+
++ lfm.w (f8 - f15), [ip]+
++ lfm.w (f16 - f23), [ip]+
++ lfm.w (f24 - f31), [ip]+
++ ldw r4, [ip]
++ ctf r4, s31
++#endif
++ add ip, r2, #TI_CPU_SAVE
++ ldm.w (r4 - r15), [ip]+
++ ldm (r16 - r27, sp, pc), [ip]+ @ Load all regs saved previously
++ENDPROC(__switch_to)
++
++ .align 5
++/*
++ * This is the fast syscall return path. We do as little as
++ * possible here, and this includes saving r0 back into the PRIV
++ * stack.
++ */
++ret_fast_syscall:
++ disable_irq r1 @ disable interrupts
++ ldw r1, [tsk+], #TI_FLAGS
++ cand.a r1, #_TIF_WORK_MASK
++ bne fast_work_pending
++
++ @ fast_restore_user_regs
++ restore_user_regs fast = 1, offset = S_OFF
++
++/*
++ * Ok, we need to do extra processing, enter the slow path.
++ */
++fast_work_pending:
++ stw.w r0, [sp+], #S_R0+S_OFF @ returned r0
++work_pending:
++ cand.a r1, #_TIF_NEED_RESCHED
++ bne work_resched
++ cand.a r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME
++ beq no_work_pending
++ mov r0, sp @ 'regs'
++ mov r2, why @ 'syscall'
++ cand.a r1, #_TIF_SIGPENDING @ delivering a signal?
++ cmovne why, #0 @ prevent further restarts
++ b.l do_notify_resume
++ b ret_slow_syscall @ Check work again
++
++work_resched:
++ b.l schedule
++/*
++ * "slow" syscall return path. "why" tells us if this was a real syscall.
++ */
++ENTRY(ret_to_user)
++ret_slow_syscall:
++ disable_irq r1 @ disable interrupts
++ get_thread_info tsk @ epip4d, one path error?!
++ ldw r1, [tsk+], #TI_FLAGS
++ cand.a r1, #_TIF_WORK_MASK
++ bne work_pending
++no_work_pending:
++ @ slow_restore_user_regs
++ restore_user_regs fast = 0, offset = 0
++ENDPROC(ret_to_user)
++
++/*
++ * This is how we return from a fork.
++ */
++ENTRY(ret_from_fork)
++ b.l schedule_tail
++ get_thread_info tsk
++ ldw r1, [tsk+], #TI_FLAGS @ check for syscall tracing
++ mov why, #1
++ cand.a r1, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
++ beq ret_slow_syscall
++ mov r1, sp
++ mov r0, #1 @ trace exit [IP = 1]
++ b.l syscall_trace
++ b ret_slow_syscall
++ENDPROC(ret_from_fork)
++
++/*=============================================================================
++ * SWI handler
++ *-----------------------------------------------------------------------------
++ */
++ .align 5
++ENTRY(vector_swi)
++ sub sp, sp, #S_FRAME_SIZE
++ stm (r0 - r15), [sp]+ @ Calling r0 - r15
++ add r8, sp, #S_R16
++ stm (r16 - r28), [r8]+ @ Calling r16 - r28
++ add r8, sp, #S_PC
++ stur (sp, lr), [r8-] @ Calling sp, lr
++ mov r8, bsr @ called from non-REAL mode
++ stw lr, [sp+], #S_PC @ Save calling PC
++ stw r8, [sp+], #S_PSR @ Save ASR
++ stw r0, [sp+], #S_OLD_R0 @ Save OLD_R0
++ zero_fp
++
++ /*
++ * Get the system call number.
++ */
++ sub ip, lr, #4
++ ldw.u scno, [ip] @ get SWI instruction
++
++#ifdef CONFIG_ALIGNMENT_TRAP
++ ldw ip, __cr_alignment
++ ldw ip, [ip]
++ movc p0.c1, ip, #0 @ update control register
++#endif
++ enable_irq ip
++
++ get_thread_info tsk
++ ldw tbl, =sys_call_table @ load syscall table pointer
++
++ andn scno, scno, #0xff000000 @ mask off SWI op-code
++ andn scno, scno, #0x00ff0000 @ mask off SWI op-code
++
++ stm.w (r4, r5), [sp-] @ push fifth and sixth args
++ ldw ip, [tsk+], #TI_FLAGS @ check for syscall tracing
++ cand.a ip, #_TIF_SYSCALL_TRACE @ are we tracing syscalls?
++ bne __sys_trace
++
++ csub.a scno, #__NR_syscalls @ check upper syscall limit
++ adr lr, ret_fast_syscall @ return address
++ bea 1f
++ ldw pc, [tbl+], scno << #2 @ call sys_* routine
++1:
++ add r1, sp, #S_OFF
++2: mov why, #0 @ no longer a real syscall
++ b sys_ni_syscall @ not private func
++
++ /*
++ * This is the really slow path. We're going to be doing
++ * context switches, and waiting for our parent to respond.
++ */
++__sys_trace:
++ mov r2, scno
++ add r1, sp, #S_OFF
++ mov r0, #0 @ trace entry [IP = 0]
++ b.l syscall_trace
++
++ adr lr, __sys_trace_return @ return address
++ mov scno, r0 @ syscall number (possibly new)
++ add r1, sp, #S_R0 + S_OFF @ pointer to regs
++ csub.a scno, #__NR_syscalls @ check upper syscall limit
++ bea 2b
++ ldm (r0 - r3), [r1]+ @ have to reload r0 - r3
++ ldw pc, [tbl+], scno << #2 @ call sys_* routine
++
++__sys_trace_return:
++ stw.w r0, [sp+], #S_R0 + S_OFF @ save returned r0
++ mov r2, scno
++ mov r1, sp
++ mov r0, #1 @ trace exit [IP = 1]
++ b.l syscall_trace
++ b ret_slow_syscall
++
++ .align 5
++#ifdef CONFIG_ALIGNMENT_TRAP
++ .type __cr_alignment, #object
++__cr_alignment:
++ .word cr_alignment
++#endif
++ .ltorg
++
++ENTRY(sys_execve)
++ add r3, sp, #S_OFF
++ b __sys_execve
++ENDPROC(sys_execve)
++
++ENTRY(sys_clone)
++ add ip, sp, #S_OFF
++ stw ip, [sp+], #4
++ b __sys_clone
++ENDPROC(sys_clone)
++
++ENTRY(sys_rt_sigreturn)
++ add r0, sp, #S_OFF
++ mov why, #0 @ prevent syscall restart handling
++ b __sys_rt_sigreturn
++ENDPROC(sys_rt_sigreturn)
++
++ENTRY(sys_sigaltstack)
++ ldw r2, [sp+], #S_OFF + S_SP
++ b do_sigaltstack
++ENDPROC(sys_sigaltstack)
++
++ __INIT
++
++/*
++ * Vector stubs.
++ *
++ * This code is copied to 0xffff0200 so we can use branches in the
++ * vectors, rather than ldr's. Note that this code must not
++ * exceed 0x300 bytes.
++ *
++ * Common stub entry macro:
++ * Enter in INTR mode, bsr = PRIV/USER ASR, lr = PRIV/USER PC
++ *
++ * SP points to a minimal amount of processor-private memory, the address
++ * of which is copied into r0 for the mode specific abort handler.
++ */
++ .macro vector_stub, name, mode
++ .align 5
++
++vector_\name:
++ @
++ @ Save r0, lr_<exception> (parent PC) and bsr_<exception>
++ @ (parent ASR)
++ @
++ stw r0, [sp]
++ stw lr, [sp+], #4 @ save r0, lr
++ mov lr, bsr
++ stw lr, [sp+], #8 @ save bsr
++
++ @
++ @ Prepare for PRIV mode. INTRs remain disabled.
++ @
++ mov r0, asr
++ xor r0, r0, #(\mode ^ PRIV_MODE)
++ mov.a bsr, r0
++
++ @
++ @ the branch table must immediately follow this code
++ @
++ and lr, lr, #0x03
++ add lr, lr, #1
++ mov r0, sp
++ ldw lr, [pc+], lr << #2
++ mov.a pc, lr @ branch to handler in PRIV mode
++ENDPROC(vector_\name)
++ .align 2
++ @ handler addresses follow this label
++ .endm
++
++ .globl __stubs_start
++__stubs_start:
++/*
++ * Interrupt dispatcher
++ */
++ vector_stub intr, INTR_MODE
++
++ .long __intr_user @ 0 (USER)
++ .long __invalid @ 1
++ .long __invalid @ 2
++ .long __intr_priv @ 3 (PRIV)
++
++/*
++ * Data abort dispatcher
++ * Enter in ABT mode, bsr = USER ASR, lr = USER PC
++ */
++ vector_stub dabt, ABRT_MODE
++
++ .long __dabt_user @ 0 (USER)
++ .long __invalid @ 1
++ .long __invalid @ 2 (INTR)
++ .long __dabt_priv @ 3 (PRIV)
++
++/*
++ * Prefetch abort dispatcher
++ * Enter in ABT mode, bsr = USER ASR, lr = USER PC
++ */
++ vector_stub pabt, ABRT_MODE
++
++ .long __pabt_user @ 0 (USER)
++ .long __invalid @ 1
++ .long __invalid @ 2 (INTR)
++ .long __pabt_priv @ 3 (PRIV)
++
++/*
++ * Undef instr entry dispatcher
++ * Enter in EXTN mode, bsr = PRIV/USER ASR, lr = PRIV/USER PC
++ */
++ vector_stub extn, EXTN_MODE
++
++ .long __extn_user @ 0 (USER)
++ .long __invalid @ 1
++ .long __invalid @ 2 (INTR)
++ .long __extn_priv @ 3 (PRIV)
++
++/*
++ * We group all the following data together to optimise
++ * for CPUs with separate I & D caches.
++ */
++ .align 5
++
++.LCvswi:
++ .word vector_swi
++
++ .globl __stubs_end
++__stubs_end:
++
++ .equ stubs_offset, __vectors_start + 0x200 - __stubs_start
++
++ .globl __vectors_start
++__vectors_start:
++ jepriv SYS_ERROR0
++ b vector_extn + stubs_offset
++ ldw pc, .LCvswi + stubs_offset
++ b vector_pabt + stubs_offset
++ b vector_dabt + stubs_offset
++ jepriv SYS_ERROR0
++ b vector_intr + stubs_offset
++ jepriv SYS_ERROR0
++
++ .globl __vectors_end
++__vectors_end:
++
++ .data
++
++ .globl cr_alignment
++ .globl cr_no_alignment
++cr_alignment:
++ .space 4
++cr_no_alignment:
++ .space 4
+diff --git a/arch/unicore32/kernel/head.S b/arch/unicore32/kernel/head.S
+new file mode 100644
+index 000000000000..92255f3ab6a7
+--- /dev/null
++++ b/arch/unicore32/kernel/head.S
+@@ -0,0 +1,252 @@
++/*
++ * linux/arch/unicore32/kernel/head.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <linux/init.h>
++
++#include <asm/assembler.h>
++#include <asm/ptrace.h>
++#include <generated/asm-offsets.h>
++#include <asm/memory.h>
++#include <asm/thread_info.h>
++#include <asm/system.h>
++#include <asm/pgtable-hwdef.h>
++
++#if (PHYS_OFFSET & 0x003fffff)
++#error "PHYS_OFFSET must be at an even 4MiB boundary!"
++#endif
++
++#define KERNEL_RAM_VADDR (PAGE_OFFSET + KERNEL_IMAGE_START)
++#define KERNEL_RAM_PADDR (PHYS_OFFSET + KERNEL_IMAGE_START)
++
++#define KERNEL_PGD_PADDR (KERNEL_RAM_PADDR - 0x1000)
++#define KERNEL_PGD_VADDR (KERNEL_RAM_VADDR - 0x1000)
++
++#define KERNEL_START KERNEL_RAM_VADDR
++#define KERNEL_END _end
++
++/*
++ * swapper_pg_dir is the virtual address of the initial page table.
++ * We place the page tables 4K below KERNEL_RAM_VADDR. Therefore, we must
++ * make sure that KERNEL_RAM_VADDR is correctly set. Currently, we expect
++ * the least significant 16 bits to be 0x8000, but we could probably
++ * relax this restriction to KERNEL_RAM_VADDR >= PAGE_OFFSET + 0x1000.
++ */
++#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000
++#error KERNEL_RAM_VADDR must start at 0xXXXX8000
++#endif
++
++ .globl swapper_pg_dir
++ .equ swapper_pg_dir, KERNEL_RAM_VADDR - 0x1000
++
++/*
++ * Kernel startup entry point.
++ * ---------------------------
++ *
++ * This is normally called from the decompressor code. The requirements
++ * are: MMU = off, D-cache = off, I-cache = dont care
++ *
++ * This code is mostly position independent, so if you link the kernel at
++ * 0xc0008000, you call this at __pa(0xc0008000).
++ */
++ __HEAD
++ENTRY(stext)
++ @ set asr
++ mov r0, #PRIV_MODE @ ensure priv mode
++ or r0, #PSR_R_BIT | PSR_I_BIT @ disable irqs
++ mov.a asr, r0
++
++ @ process identify
++ movc r0, p0.c0, #0 @ cpuid
++ movl r1, 0xff00ffff @ mask
++ movl r2, 0x4d000863 @ value
++ and r0, r1, r0
++ cxor.a r0, r2
++ bne __error_p @ invalid processor id
++
++ /*
++ * Clear the 4K level 1 swapper page table
++ */
++ movl r0, #KERNEL_PGD_PADDR @ page table address
++ mov r1, #0
++ add r2, r0, #0x1000
++101: stw.w r1, [r0]+, #4
++ stw.w r1, [r0]+, #4
++ stw.w r1, [r0]+, #4
++ stw.w r1, [r0]+, #4
++ cxor.a r0, r2
++ bne 101b
++
++ movl r4, #KERNEL_PGD_PADDR @ page table address
++ mov r7, #PMD_TYPE_SECT | PMD_PRESENT @ page size: section
++ or r7, r7, #PMD_SECT_CACHEABLE @ cacheable
++ or r7, r7, #PMD_SECT_READ | PMD_SECT_WRITE | PMD_SECT_EXEC
++
++ /*
++ * Create identity mapping for first 4MB of kernel to
++ * cater for the MMU enable. This identity mapping
++ * will be removed by paging_init(). We use our current program
++ * counter to determine corresponding section base address.
++ */
++ mov r6, pc
++ mov r6, r6 >> #22 @ start of kernel section
++ or r1, r7, r6 << #22 @ flags + kernel base
++ stw r1, [r4+], r6 << #2 @ identity mapping
++
++ /*
++ * Now setup the pagetables for our kernel direct
++ * mapped region.
++ */
++ add r0, r4, #(KERNEL_START & 0xff000000) >> 20
++ stw.w r1, [r0+], #(KERNEL_START & 0x00c00000) >> 20
++ movl r6, #(KERNEL_END - 1)
++ add r0, r0, #4
++ add r6, r4, r6 >> #20
++102: csub.a r0, r6
++ add r1, r1, #1 << 22
++ bua 103f
++ stw.w r1, [r0]+, #4
++ b 102b
++103:
++ /*
++ * Then map first 4MB of ram in case it contains our boot params.
++ */
++ add r0, r4, #PAGE_OFFSET >> 20
++ or r6, r7, #(PHYS_OFFSET & 0xffc00000)
++ stw r6, [r0]
++
++ ldw r15, __switch_data @ address to jump to after
++
++ /*
++ * Initialise TLB, Caches, and MMU state ready to switch the MMU
++ * on.
++ */
++ mov r0, #0
++ movc p0.c5, r0, #28 @ cache invalidate all
++ nop8
++ movc p0.c6, r0, #6 @ TLB invalidate all
++ nop8
++
++ /*
++ * ..V. .... ..TB IDAM
++ * ..1. .... ..01 1111
++ */
++ movl r0, #0x201f @ control register setting
++
++ /*
++ * Setup common bits before finally enabling the MMU. Essentially
++ * this is just loading the page table pointer and domain access
++ * registers.
++ */
++ #ifndef CONFIG_ALIGNMENT_TRAP
++ andn r0, r0, #CR_A
++ #endif
++ #ifdef CONFIG_CPU_DCACHE_DISABLE
++ andn r0, r0, #CR_D
++ #endif
++ #ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
++ andn r0, r0, #CR_B
++ #endif
++ #ifdef CONFIG_CPU_ICACHE_DISABLE
++ andn r0, r0, #CR_I
++ #endif
++
++ movc p0.c2, r4, #0 @ set pgd
++ b __turn_mmu_on
++ENDPROC(stext)
++
++/*
++ * Enable the MMU. This completely changes the stucture of the visible
++ * memory space. You will not be able to trace execution through this.
++ *
++ * r0 = cp#0 control register
++ * r15 = *virtual* address to jump to upon completion
++ */
++ .align 5
++__turn_mmu_on:
++ mov r0, r0
++ movc p0.c1, r0, #0 @ write control reg
++ nop @ fetch inst by phys addr
++ mov pc, r15
++ nop8 @ fetch inst by phys addr
++ENDPROC(__turn_mmu_on)
++
++/*
++ * Setup the initial page tables. We only setup the barest
++ * amount which are required to get the kernel running, which
++ * generally means mapping in the kernel code.
++ *
++ * r9 = cpuid
++ * r10 = procinfo
++ *
++ * Returns:
++ * r0, r3, r6, r7 corrupted
++ * r4 = physical page table address
++ */
++ .ltorg
++
++ .align 2
++ .type __switch_data, %object
++__switch_data:
++ .long __mmap_switched
++ .long __bss_start @ r6
++ .long _end @ r7
++ .long cr_alignment @ r8
++ .long init_thread_union + THREAD_START_SP @ sp
++
++/*
++ * The following fragment of code is executed with the MMU on in MMU mode,
++ * and uses absolute addresses; this is not position independent.
++ *
++ * r0 = cp#0 control register
++ */
++__mmap_switched:
++ adr r3, __switch_data + 4
++
++ ldm.w (r6, r7, r8), [r3]+
++ ldw sp, [r3]
++
++ mov fp, #0 @ Clear BSS (and zero fp)
++203: csub.a r6, r7
++ bea 204f
++ stw.w fp, [r6]+,#4
++ b 203b
++204:
++ andn r1, r0, #CR_A @ Clear 'A' bit
++ stm (r0, r1), [r8]+ @ Save control register values
++ b start_kernel
++ENDPROC(__mmap_switched)
++
++/*
++ * Exception handling. Something went wrong and we can't proceed. We
++ * ought to tell the user, but since we don't have any guarantee that
++ * we're even running on the right architecture, we do virtually nothing.
++ *
++ * If CONFIG_DEBUG_LL is set we try to print out something about the error
++ * and hope for the best (useful if bootloader fails to pass a proper
++ * machine ID for example).
++ */
++__error_p:
++#ifdef CONFIG_DEBUG_LL
++ adr r0, str_p1
++ b.l printascii
++ mov r0, r9
++ b.l printhex8
++ adr r0, str_p2
++ b.l printascii
++901: nop8
++ b 901b
++str_p1: .asciz "\nError: unrecognized processor variant (0x"
++str_p2: .asciz ").\n"
++ .align
++#endif
++ENDPROC(__error_p)
++
+diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c
+new file mode 100644
+index 000000000000..1e175a82844d
+--- /dev/null
++++ b/arch/unicore32/kernel/setup.c
+@@ -0,0 +1,360 @@
++/*
++ * linux/arch/unicore32/kernel/setup.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/kernel.h>
++#include <linux/stddef.h>
++#include <linux/ioport.h>
++#include <linux/delay.h>
++#include <linux/utsname.h>
++#include <linux/initrd.h>
++#include <linux/console.h>
++#include <linux/bootmem.h>
++#include <linux/seq_file.h>
++#include <linux/screen_info.h>
++#include <linux/init.h>
++#include <linux/root_dev.h>
++#include <linux/cpu.h>
++#include <linux/interrupt.h>
++#include <linux/smp.h>
++#include <linux/fs.h>
++#include <linux/proc_fs.h>
++#include <linux/memblock.h>
++#include <linux/elf.h>
++#include <linux/io.h>
++
++#include <asm/cputype.h>
++#include <asm/sections.h>
++#include <asm/setup.h>
++#include <asm/cacheflush.h>
++#include <asm/tlbflush.h>
++#include <asm/traps.h>
++
++#include "setup.h"
++
++#ifndef MEM_SIZE
++#define MEM_SIZE (16*1024*1024)
++#endif
++
++struct stack {
++ u32 irq[3];
++ u32 abt[3];
++ u32 und[3];
++} ____cacheline_aligned;
++
++static struct stack stacks[NR_CPUS];
++
++char elf_platform[ELF_PLATFORM_SIZE];
++EXPORT_SYMBOL(elf_platform);
++
++static char __initdata cmd_line[COMMAND_LINE_SIZE];
++
++static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
++
++/*
++ * Standard memory resources
++ */
++static struct resource mem_res[] = {
++ {
++ .name = "Video RAM",
++ .start = 0,
++ .end = 0,
++ .flags = IORESOURCE_MEM
++ },
++ {
++ .name = "Kernel text",
++ .start = 0,
++ .end = 0,
++ .flags = IORESOURCE_MEM
++ },
++ {
++ .name = "Kernel data",
++ .start = 0,
++ .end = 0,
++ .flags = IORESOURCE_MEM
++ }
++};
++
++#define video_ram mem_res[0]
++#define kernel_code mem_res[1]
++#define kernel_data mem_res[2]
++
++/*
++ * These functions re-use the assembly code in head.S, which
++ * already provide the required functionality.
++ */
++static void __init setup_processor(void)
++{
++ printk(KERN_DEFAULT "CPU: UniCore-II [%08x] revision %d, cr=%08lx\n",
++ uc32_cpuid, (int)(uc32_cpuid >> 16) & 15, cr_alignment);
++
++ sprintf(init_utsname()->machine, "puv3");
++ sprintf(elf_platform, "ucv2");
++}
++
++/*
++ * cpu_init - initialise one CPU.
++ *
++ * cpu_init sets up the per-CPU stacks.
++ */
++void cpu_init(void)
++{
++ unsigned int cpu = smp_processor_id();
++ struct stack *stk = &stacks[cpu];
++
++ /*
++ * setup stacks for re-entrant exception handlers
++ */
++ __asm__ (
++ "mov.a asr, %1\n\t"
++ "add sp, %0, %2\n\t"
++ "mov.a asr, %3\n\t"
++ "add sp, %0, %4\n\t"
++ "mov.a asr, %5\n\t"
++ "add sp, %0, %6\n\t"
++ "mov.a asr, %7"
++ :
++ : "r" (stk),
++ "r" (PSR_R_BIT | PSR_I_BIT | INTR_MODE),
++ "I" (offsetof(struct stack, irq[0])),
++ "r" (PSR_R_BIT | PSR_I_BIT | ABRT_MODE),
++ "I" (offsetof(struct stack, abt[0])),
++ "r" (PSR_R_BIT | PSR_I_BIT | EXTN_MODE),
++ "I" (offsetof(struct stack, und[0])),
++ "r" (PSR_R_BIT | PSR_I_BIT | PRIV_MODE)
++ : "r30", "cc");
++}
++
++static int __init uc32_add_memory(unsigned long start, unsigned long size)
++{
++ struct membank *bank = &meminfo.bank[meminfo.nr_banks];
++
++ if (meminfo.nr_banks >= NR_BANKS) {
++ printk(KERN_CRIT "NR_BANKS too low, "
++ "ignoring memory at %#lx\n", start);
++ return -EINVAL;
++ }
++
++ /*
++ * Ensure that start/size are aligned to a page boundary.
++ * Size is appropriately rounded down, start is rounded up.
++ */
++ size -= start & ~PAGE_MASK;
++
++ bank->start = PAGE_ALIGN(start);
++ bank->size = size & PAGE_MASK;
++
++ /*
++ * Check whether this memory region has non-zero size or
++ * invalid node number.
++ */
++ if (bank->size == 0)
++ return -EINVAL;
++
++ meminfo.nr_banks++;
++ return 0;
++}
++
++/*
++ * Pick out the memory size. We look for mem=size@start,
++ * where start and size are "size[KkMm]"
++ */
++static int __init early_mem(char *p)
++{
++ static int usermem __initdata = 1;
++ unsigned long size, start;
++ char *endp;
++
++ /*
++ * If the user specifies memory size, we
++ * blow away any automatically generated
++ * size.
++ */
++ if (usermem) {
++ usermem = 0;
++ meminfo.nr_banks = 0;
++ }
++
++ start = PHYS_OFFSET;
++ size = memparse(p, &endp);
++ if (*endp == '@')
++ start = memparse(endp + 1, NULL);
++
++ uc32_add_memory(start, size);
++
++ return 0;
++}
++early_param("mem", early_mem);
++
++static void __init
++request_standard_resources(struct meminfo *mi)
++{
++ struct resource *res;
++ int i;
++
++ kernel_code.start = virt_to_phys(_stext);
++ kernel_code.end = virt_to_phys(_etext - 1);
++ kernel_data.start = virt_to_phys(_sdata);
++ kernel_data.end = virt_to_phys(_end - 1);
++
++ for (i = 0; i < mi->nr_banks; i++) {
++ if (mi->bank[i].size == 0)
++ continue;
++
++ res = alloc_bootmem_low(sizeof(*res));
++ res->name = "System RAM";
++ res->start = mi->bank[i].start;
++ res->end = mi->bank[i].start + mi->bank[i].size - 1;
++ res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
++
++ request_resource(&iomem_resource, res);
++
++ if (kernel_code.start >= res->start &&
++ kernel_code.end <= res->end)
++ request_resource(res, &kernel_code);
++ if (kernel_data.start >= res->start &&
++ kernel_data.end <= res->end)
++ request_resource(res, &kernel_data);
++ }
++
++ video_ram.start = PKUNITY_UNIGFX_MMAP_BASE;
++ video_ram.end = PKUNITY_UNIGFX_MMAP_BASE + PKUNITY_UNIGFX_MMAP_SIZE;
++ request_resource(&iomem_resource, &video_ram);
++}
++
++static void (*init_machine)(void) __initdata;
++
++static int __init customize_machine(void)
++{
++ /* customizes platform devices, or adds new ones */
++ if (init_machine)
++ init_machine();
++ return 0;
++}
++arch_initcall(customize_machine);
++
++void __init setup_arch(char **cmdline_p)
++{
++ char *from = default_command_line;
++
++ setup_processor();
++
++ init_mm.start_code = (unsigned long) _stext;
++ init_mm.end_code = (unsigned long) _etext;
++ init_mm.end_data = (unsigned long) _edata;
++ init_mm.brk = (unsigned long) _end;
++
++ /* parse_early_param needs a boot_command_line */
++ strlcpy(boot_command_line, from, COMMAND_LINE_SIZE);
++
++ /* populate cmd_line too for later use, preserving boot_command_line */
++ strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
++ *cmdline_p = cmd_line;
++
++ parse_early_param();
++
++ uc32_memblock_init(&meminfo);
++
++ paging_init();
++ request_standard_resources(&meminfo);
++
++ cpu_init();
++
++ /*
++ * Set up various architecture-specific pointers
++ */
++ init_machine = puv3_core_init;
++
++#ifdef CONFIG_VT
++#if defined(CONFIG_VGA_CONSOLE)
++ conswitchp = &vga_con;
++#elif defined(CONFIG_DUMMY_CONSOLE)
++ conswitchp = &dummy_con;
++#endif
++#endif
++ early_trap_init();
++}
++
++static struct cpu cpuinfo_unicore;
++
++static int __init topology_init(void)
++{
++ int i;
++
++ for_each_possible_cpu(i)
++ register_cpu(&cpuinfo_unicore, i);
++
++ return 0;
++}
++subsys_initcall(topology_init);
++
++#ifdef CONFIG_HAVE_PROC_CPU
++static int __init proc_cpu_init(void)
++{
++ struct proc_dir_entry *res;
++
++ res = proc_mkdir("cpu", NULL);
++ if (!res)
++ return -ENOMEM;
++ return 0;
++}
++fs_initcall(proc_cpu_init);
++#endif
++
++static int c_show(struct seq_file *m, void *v)
++{
++ seq_printf(m, "Processor\t: UniCore-II rev %d (%s)\n",
++ (int)(uc32_cpuid >> 16) & 15, elf_platform);
++
++ seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
++ loops_per_jiffy / (500000/HZ),
++ (loops_per_jiffy / (5000/HZ)) % 100);
++
++ /* dump out the processor features */
++ seq_puts(m, "Features\t: CMOV UC-F64");
++
++ seq_printf(m, "\nCPU implementer\t: 0x%02x\n", uc32_cpuid >> 24);
++ seq_printf(m, "CPU architecture: 2\n");
++ seq_printf(m, "CPU revision\t: %d\n", (uc32_cpuid >> 16) & 15);
++
++ seq_printf(m, "Cache type\t: write-back\n"
++ "Cache clean\t: cp0 c5 ops\n"
++ "Cache lockdown\t: not support\n"
++ "Cache format\t: Harvard\n");
++
++ seq_puts(m, "\n");
++
++ seq_printf(m, "Hardware\t: PKUnity v3\n");
++
++ return 0;
++}
++
++static void *c_start(struct seq_file *m, loff_t *pos)
++{
++ return *pos < 1 ? (void *)1 : NULL;
++}
++
++static void *c_next(struct seq_file *m, void *v, loff_t *pos)
++{
++ ++*pos;
++ return NULL;
++}
++
++static void c_stop(struct seq_file *m, void *v)
++{
++}
++
++const struct seq_operations cpuinfo_op = {
++ .start = c_start,
++ .next = c_next,
++ .stop = c_stop,
++ .show = c_show
++};
+diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h
+new file mode 100644
+index 000000000000..dcd1306eb5c6
+--- /dev/null
++++ b/arch/unicore32/kernel/setup.h
+@@ -0,0 +1,30 @@
++/*
++ * linux/arch/unicore32/kernel/setup.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_KERNEL_SETUP_H__
++#define __UNICORE_KERNEL_SETUP_H__
++
++extern void paging_init(void);
++extern void puv3_core_init(void);
++
++extern void puv3_ps2_init(void);
++extern void pci_puv3_preinit(void);
++extern void __init puv3_init_gpio(void);
++
++extern void setup_mm_for_reboot(char mode);
++
++extern char __stubs_start[], __stubs_end[];
++extern char __vectors_start[], __vectors_end[];
++
++extern void kernel_thread_helper(void);
++
++extern void __init early_signal_init(void);
++#endif
+diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
+new file mode 100644
+index 000000000000..25abbb101729
+--- /dev/null
++++ b/arch/unicore32/kernel/traps.c
+@@ -0,0 +1,333 @@
++/*
++ * linux/arch/unicore32/kernel/traps.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * 'traps.c' handles hardware exceptions after we have saved some state.
++ * Mostly a debugging aid, but will probably kill the offending process.
++ */
++#include <linux/module.h>
++#include <linux/signal.h>
++#include <linux/spinlock.h>
++#include <linux/personality.h>
++#include <linux/kallsyms.h>
++#include <linux/kdebug.h>
++#include <linux/uaccess.h>
++#include <linux/delay.h>
++#include <linux/hardirq.h>
++#include <linux/init.h>
++#include <linux/uaccess.h>
++#include <linux/atomic.h>
++#include <linux/unistd.h>
++
++#include <asm/cacheflush.h>
++#include <asm/system.h>
++#include <asm/traps.h>
++
++#include "setup.h"
++
++static void dump_mem(const char *, const char *, unsigned long, unsigned long);
++
++void dump_backtrace_entry(unsigned long where,
++ unsigned long from, unsigned long frame)
++{
++#ifdef CONFIG_KALLSYMS
++ printk(KERN_DEFAULT "[<%08lx>] (%pS) from [<%08lx>] (%pS)\n",
++ where, (void *)where, from, (void *)from);
++#else
++ printk(KERN_DEFAULT "Function entered at [<%08lx>] from [<%08lx>]\n",
++ where, from);
++#endif
++}
++
++/*
++ * Stack pointers should always be within the kernels view of
++ * physical memory. If it is not there, then we can't dump
++ * out any information relating to the stack.
++ */
++static int verify_stack(unsigned long sp)
++{
++ if (sp < PAGE_OFFSET ||
++ (sp > (unsigned long)high_memory && high_memory != NULL))
++ return -EFAULT;
++
++ return 0;
++}
++
++/*
++ * Dump out the contents of some memory nicely...
++ */
++static void dump_mem(const char *lvl, const char *str, unsigned long bottom,
++ unsigned long top)
++{
++ unsigned long first;
++ mm_segment_t fs;
++ int i;
++
++ /*
++ * We need to switch to kernel mode so that we can use __get_user
++ * to safely read from kernel space. Note that we now dump the
++ * code first, just in case the backtrace kills us.
++ */
++ fs = get_fs();
++ set_fs(KERNEL_DS);
++
++ printk(KERN_DEFAULT "%s%s(0x%08lx to 0x%08lx)\n",
++ lvl, str, bottom, top);
++
++ for (first = bottom & ~31; first < top; first += 32) {
++ unsigned long p;
++ char str[sizeof(" 12345678") * 8 + 1];
++
++ memset(str, ' ', sizeof(str));
++ str[sizeof(str) - 1] = '\0';
++
++ for (p = first, i = 0; i < 8 && p < top; i++, p += 4) {
++ if (p >= bottom && p < top) {
++ unsigned long val;
++ if (__get_user(val, (unsigned long *)p) == 0)
++ sprintf(str + i * 9, " %08lx", val);
++ else
++ sprintf(str + i * 9, " ????????");
++ }
++ }
++ printk(KERN_DEFAULT "%s%04lx:%s\n", lvl, first & 0xffff, str);
++ }
++
++ set_fs(fs);
++}
++
++static void dump_instr(const char *lvl, struct pt_regs *regs)
++{
++ unsigned long addr = instruction_pointer(regs);
++ const int width = 8;
++ mm_segment_t fs;
++ char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
++ int i;
++
++ /*
++ * We need to switch to kernel mode so that we can use __get_user
++ * to safely read from kernel space. Note that we now dump the
++ * code first, just in case the backtrace kills us.
++ */
++ fs = get_fs();
++ set_fs(KERNEL_DS);
++
++ for (i = -4; i < 1; i++) {
++ unsigned int val, bad;
++
++ bad = __get_user(val, &((u32 *)addr)[i]);
++
++ if (!bad)
++ p += sprintf(p, i == 0 ? "(%0*x) " : "%0*x ",
++ width, val);
++ else {
++ p += sprintf(p, "bad PC value");
++ break;
++ }
++ }
++ printk(KERN_DEFAULT "%sCode: %s\n", lvl, str);
++
++ set_fs(fs);
++}
++
++static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
++{
++ unsigned int fp, mode;
++ int ok = 1;
++
++ printk(KERN_DEFAULT "Backtrace: ");
++
++ if (!tsk)
++ tsk = current;
++
++ if (regs) {
++ fp = regs->UCreg_fp;
++ mode = processor_mode(regs);
++ } else if (tsk != current) {
++ fp = thread_saved_fp(tsk);
++ mode = 0x10;
++ } else {
++ asm("mov %0, fp" : "=r" (fp) : : "cc");
++ mode = 0x10;
++ }
++
++ if (!fp) {
++ printk("no frame pointer");
++ ok = 0;
++ } else if (verify_stack(fp)) {
++ printk("invalid frame pointer 0x%08x", fp);
++ ok = 0;
++ } else if (fp < (unsigned long)end_of_stack(tsk))
++ printk("frame pointer underflow");
++ printk("\n");
++
++ if (ok)
++ c_backtrace(fp, mode);
++}
++
++void dump_stack(void)
++{
++ dump_backtrace(NULL, NULL);
++}
++EXPORT_SYMBOL(dump_stack);
++
++void show_stack(struct task_struct *tsk, unsigned long *sp)
++{
++ dump_backtrace(NULL, tsk);
++ barrier();
++}
++
++static int __die(const char *str, int err, struct thread_info *thread,
++ struct pt_regs *regs)
++{
++ struct task_struct *tsk = thread->task;
++ static int die_counter;
++ int ret;
++
++ printk(KERN_EMERG "Internal error: %s: %x [#%d]\n",
++ str, err, ++die_counter);
++ sysfs_printk_last_file();
++
++ /* trap and error numbers are mostly meaningless on UniCore */
++ ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, \
++ SIGSEGV);
++ if (ret == NOTIFY_STOP)
++ return ret;
++
++ print_modules();
++ __show_regs(regs);
++ printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n",
++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), thread + 1);
++
++ if (!user_mode(regs) || in_interrupt()) {
++ dump_mem(KERN_EMERG, "Stack: ", regs->UCreg_sp,
++ THREAD_SIZE + (unsigned long)task_stack_page(tsk));
++ dump_backtrace(regs, tsk);
++ dump_instr(KERN_EMERG, regs);
++ }
++
++ return ret;
++}
++
++DEFINE_SPINLOCK(die_lock);
++
++/*
++ * This function is protected against re-entrancy.
++ */
++void die(const char *str, struct pt_regs *regs, int err)
++{
++ struct thread_info *thread = current_thread_info();
++ int ret;
++
++ oops_enter();
++
++ spin_lock_irq(&die_lock);
++ console_verbose();
++ bust_spinlocks(1);
++ ret = __die(str, err, thread, regs);
++
++ bust_spinlocks(0);
++ add_taint(TAINT_DIE);
++ spin_unlock_irq(&die_lock);
++ oops_exit();
++
++ if (in_interrupt())
++ panic("Fatal exception in interrupt");
++ if (panic_on_oops)
++ panic("Fatal exception");
++ if (ret != NOTIFY_STOP)
++ do_exit(SIGSEGV);
++}
++
++void uc32_notify_die(const char *str, struct pt_regs *regs,
++ struct siginfo *info, unsigned long err, unsigned long trap)
++{
++ if (user_mode(regs)) {
++ current->thread.error_code = err;
++ current->thread.trap_no = trap;
++
++ force_sig_info(info->si_signo, info, current);
++ } else
++ die(str, regs, err);
++}
++
++/*
++ * bad_mode handles the impossible case in the vectors. If you see one of
++ * these, then it's extremely serious, and could mean you have buggy hardware.
++ * It never returns, and never tries to sync. We hope that we can at least
++ * dump out some state information...
++ */
++asmlinkage void bad_mode(struct pt_regs *regs, unsigned int reason)
++{
++ console_verbose();
++
++ printk(KERN_CRIT "Bad mode detected with reason 0x%x\n", reason);
++
++ die("Oops - bad mode", regs, 0);
++ local_irq_disable();
++ panic("bad mode");
++}
++
++void __pte_error(const char *file, int line, unsigned long val)
++{
++ printk(KERN_DEFAULT "%s:%d: bad pte %08lx.\n", file, line, val);
++}
++
++void __pmd_error(const char *file, int line, unsigned long val)
++{
++ printk(KERN_DEFAULT "%s:%d: bad pmd %08lx.\n", file, line, val);
++}
++
++void __pgd_error(const char *file, int line, unsigned long val)
++{
++ printk(KERN_DEFAULT "%s:%d: bad pgd %08lx.\n", file, line, val);
++}
++
++asmlinkage void __div0(void)
++{
++ printk(KERN_DEFAULT "Division by zero in kernel.\n");
++ dump_stack();
++}
++EXPORT_SYMBOL(__div0);
++
++void abort(void)
++{
++ BUG();
++
++ /* if that doesn't kill us, halt */
++ panic("Oops failed to kill thread");
++}
++EXPORT_SYMBOL(abort);
++
++void __init trap_init(void)
++{
++ return;
++}
++
++void __init early_trap_init(void)
++{
++ unsigned long vectors = VECTORS_BASE;
++
++ /*
++ * Copy the vectors, stubs (in entry-unicore.S)
++ * into the vector page, mapped at 0xffff0000, and ensure these
++ * are visible to the instruction stream.
++ */
++ memcpy((void *)vectors,
++ __vectors_start,
++ __vectors_end - __vectors_start);
++ memcpy((void *)vectors + 0x200,
++ __stubs_start,
++ __stubs_end - __stubs_start);
++
++ early_signal_init();
++
++ flush_icache_range(vectors, vectors + PAGE_SIZE);
++}commit 79725df5786d2fa48f582b116ea1d74193cc96ca
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:15:01 2011 +0800
+
+ unicore32 core architecture: processor and system headers
+
+ This patch includes processor and system headers. System call interface is here.
+ We used the syscall interface the same as asm-generic version.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/byteorder.h b/arch/unicore32/include/asm/byteorder.h
+new file mode 100644
+index 000000000000..ebe1b3fef3e3
+--- /dev/null
++++ b/arch/unicore32/include/asm/byteorder.h
+@@ -0,0 +1,24 @@
++/*
++ * linux/arch/unicore32/include/asm/byteorder.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * UniCore ONLY support Little Endian mode, the data bus is connected such
++ * that byte accesses appear as:
++ * 0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
++ * and word accesses (data or instruction) appear as:
++ * d0...d31
++ */
++#ifndef __UNICORE_BYTEORDER_H__
++#define __UNICORE_BYTEORDER_H__
++
++#include <linux/byteorder/little_endian.h>
++
++#endif
++
+diff --git a/arch/unicore32/include/asm/cpu-single.h b/arch/unicore32/include/asm/cpu-single.h
+new file mode 100644
+index 000000000000..0f55d1823439
+--- /dev/null
++++ b/arch/unicore32/include/asm/cpu-single.h
+@@ -0,0 +1,45 @@
++/*
++ * linux/arch/unicore32/include/asm/cpu-single.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_CPU_SINGLE_H__
++#define __UNICORE_CPU_SINGLE_H__
++
++#include <asm/page.h>
++#include <asm/memory.h>
++
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
++
++#define cpu_switch_mm(pgd, mm) cpu_do_switch_mm(virt_to_phys(pgd), mm)
++
++#define cpu_get_pgd() \
++ ({ \
++ unsigned long pg; \
++ __asm__("movc %0, p0.c2, #0" \
++ : "=r" (pg) : : "cc"); \
++ pg &= ~0x0fff; \
++ (pgd_t *)phys_to_virt(pg); \
++ })
++
++struct mm_struct;
++
++/* declare all the functions as extern */
++extern void cpu_proc_fin(void);
++extern int cpu_do_idle(void);
++extern void cpu_dcache_clean_area(void *, int);
++extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
++extern void cpu_set_pte(pte_t *ptep, pte_t pte);
++extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
++
++#endif /* __ASSEMBLY__ */
++#endif /* __KERNEL__ */
++
++#endif /* __UNICORE_CPU_SINGLE_H__ */
+diff --git a/arch/unicore32/include/asm/cputype.h b/arch/unicore32/include/asm/cputype.h
+new file mode 100644
+index 000000000000..ec1a30f98077
+--- /dev/null
++++ b/arch/unicore32/include/asm/cputype.h
+@@ -0,0 +1,33 @@
++/*
++ * linux/arch/unicore32/include/asm/cputype.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_CPUTYPE_H__
++#define __UNICORE_CPUTYPE_H__
++
++#include <linux/stringify.h>
++
++#define CPUID_CPUID 0
++#define CPUID_CACHETYPE 1
++
++#define read_cpuid(reg) \
++ ({ \
++ unsigned int __val; \
++ asm("movc %0, p0.c0, #" __stringify(reg) \
++ : "=r" (__val) \
++ : \
++ : "cc"); \
++ __val; \
++ })
++
++#define uc32_cpuid read_cpuid(CPUID_CPUID)
++#define uc32_cachetype read_cpuid(CPUID_CACHETYPE)
++
++#endif
+diff --git a/arch/unicore32/include/asm/hwcap.h b/arch/unicore32/include/asm/hwcap.h
+new file mode 100644
+index 000000000000..97bd40fdd4ac
+--- /dev/null
++++ b/arch/unicore32/include/asm/hwcap.h
+@@ -0,0 +1,32 @@
++/*
++ * linux/arch/unicore32/include/asm/hwcap.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_HWCAP_H__
++#define __UNICORE_HWCAP_H__
++
++/*
++ * HWCAP flags
++ */
++#define HWCAP_MSP 1
++#define HWCAP_UNICORE16 2
++#define HWCAP_CMOV 4
++#define HWCAP_UNICORE_F64 8
++#define HWCAP_TLS 0x80
++
++#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
++/*
++ * This yields a mask that user programs can use to figure out what
++ * instruction set this cpu supports.
++ */
++#define ELF_HWCAP (HWCAP_CMOV | HWCAP_UNICORE_F64)
++#endif
++
++#endif
+diff --git a/arch/unicore32/include/asm/processor.h b/arch/unicore32/include/asm/processor.h
+new file mode 100644
+index 000000000000..e11cb0786578
+--- /dev/null
++++ b/arch/unicore32/include/asm/processor.h
+@@ -0,0 +1,92 @@
++/*
++ * linux/arch/unicore32/include/asm/processor.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_PROCESSOR_H__
++#define __UNICORE_PROCESSOR_H__
++
++/*
++ * Default implementation of macro that returns current
++ * instruction pointer ("program counter").
++ */
++#define current_text_addr() ({ __label__ _l; _l: &&_l; })
++
++#ifdef __KERNEL__
++
++#include <asm/ptrace.h>
++#include <asm/types.h>
++
++#ifdef __KERNEL__
++#define STACK_TOP TASK_SIZE
++#define STACK_TOP_MAX TASK_SIZE
++#endif
++
++struct debug_entry {
++ u32 address;
++ u32 insn;
++};
++
++struct debug_info {
++ int nsaved;
++ struct debug_entry bp[2];
++};
++
++struct thread_struct {
++ /* fault info */
++ unsigned long address;
++ unsigned long trap_no;
++ unsigned long error_code;
++ /* debugging */
++ struct debug_info debug;
++};
++
++#define INIT_THREAD { }
++
++#define start_thread(regs, pc, sp) \
++({ \
++ unsigned long *stack = (unsigned long *)sp; \
++ set_fs(USER_DS); \
++ memset(regs->uregs, 0, sizeof(regs->uregs)); \
++ regs->UCreg_asr = USER_MODE; \
++ regs->UCreg_pc = pc & ~1; /* pc */ \
++ regs->UCreg_sp = sp; /* sp */ \
++ regs->UCreg_02 = stack[2]; /* r2 (envp) */ \
++ regs->UCreg_01 = stack[1]; /* r1 (argv) */ \
++ regs->UCreg_00 = stack[0]; /* r0 (argc) */ \
++})
++
++/* Forward declaration, a strange C thing */
++struct task_struct;
++
++/* Free all resources held by a thread. */
++extern void release_thread(struct task_struct *);
++
++/* Prepare to copy thread state - unlazy all lazy status */
++#define prepare_to_copy(tsk) do { } while (0)
++
++unsigned long get_wchan(struct task_struct *p);
++
++#define cpu_relax() barrier()
++
++/*
++ * Create a new kernel thread
++ */
++extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
++
++#define task_pt_regs(p) \
++ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
++
++#define KSTK_EIP(tsk) (task_pt_regs(tsk)->UCreg_pc)
++#define KSTK_ESP(tsk) (task_pt_regs(tsk)->UCreg_sp)
++
++#endif
++
++#endif /* __UNICORE_PROCESSOR_H__ */
+diff --git a/arch/unicore32/include/asm/system.h b/arch/unicore32/include/asm/system.h
+new file mode 100644
+index 000000000000..246b71c17fda
+--- /dev/null
++++ b/arch/unicore32/include/asm/system.h
+@@ -0,0 +1,161 @@
++/*
++ * linux/arch/unicore32/include/asm/system.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_SYSTEM_H__
++#define __UNICORE_SYSTEM_H__
++
++#ifdef __KERNEL__
++
++/*
++ * CR1 bits (CP#0 CR1)
++ */
++#define CR_M (1 << 0) /* MMU enable */
++#define CR_A (1 << 1) /* Alignment abort enable */
++#define CR_D (1 << 2) /* Dcache enable */
++#define CR_I (1 << 3) /* Icache enable */
++#define CR_B (1 << 4) /* Dcache write mechanism: write back */
++#define CR_T (1 << 5) /* Burst enable */
++#define CR_V (1 << 13) /* Vectors relocated to 0xffff0000 */
++
++#ifndef __ASSEMBLY__
++
++#include <linux/linkage.h>
++#include <linux/irqflags.h>
++
++struct thread_info;
++struct task_struct;
++
++struct pt_regs;
++
++void die(const char *msg, struct pt_regs *regs, int err);
++
++struct siginfo;
++void uc32_notify_die(const char *str, struct pt_regs *regs,
++ struct siginfo *info, unsigned long err, unsigned long trap);
++
++void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
++ struct pt_regs *),
++ int sig, int code, const char *name);
++
++#define xchg(ptr, x) \
++ ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
++
++extern asmlinkage void __backtrace(void);
++extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
++
++struct mm_struct;
++extern void show_pte(struct mm_struct *mm, unsigned long addr);
++extern void __show_regs(struct pt_regs *);
++
++extern int cpu_architecture(void);
++extern void cpu_init(void);
++
++#define vectors_high() (cr_alignment & CR_V)
++
++#define isb() __asm__ __volatile__ ("" : : : "memory")
++#define dsb() __asm__ __volatile__ ("" : : : "memory")
++#define dmb() __asm__ __volatile__ ("" : : : "memory")
++
++#define mb() barrier()
++#define rmb() barrier()
++#define wmb() barrier()
++#define smp_mb() barrier()
++#define smp_rmb() barrier()
++#define smp_wmb() barrier()
++#define read_barrier_depends() do { } while (0)
++#define smp_read_barrier_depends() do { } while (0)
++
++#define set_mb(var, value) do { var = value; smp_mb(); } while (0)
++#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
++
++extern unsigned long cr_no_alignment; /* defined in entry-unicore.S */
++extern unsigned long cr_alignment; /* defined in entry-unicore.S */
++
++static inline unsigned int get_cr(void)
++{
++ unsigned int val;
++ asm("movc %0, p0.c1, #0" : "=r" (val) : : "cc");
++ return val;
++}
++
++static inline void set_cr(unsigned int val)
++{
++ asm volatile("movc p0.c1, %0, #0 @set CR"
++ : : "r" (val) : "cc");
++ isb();
++}
++
++extern void adjust_cr(unsigned long mask, unsigned long set);
++
++/*
++ * switch_to(prev, next) should switch from task `prev' to `next'
++ * `prev' will never be the same as `next'. schedule() itself
++ * contains the memory barrier to tell GCC not to cache `current'.
++ */
++extern struct task_struct *__switch_to(struct task_struct *,
++ struct thread_info *, struct thread_info *);
++extern void panic(const char *fmt, ...);
++
++#define switch_to(prev, next, last) \
++do { \
++ last = __switch_to(prev, \
++ task_thread_info(prev), task_thread_info(next)); \
++} while (0)
++
++static inline unsigned long
++__xchg(unsigned long x, volatile void *ptr, int size)
++{
++ unsigned long ret;
++
++ switch (size) {
++ case 1:
++ asm volatile("@ __xchg1\n"
++ " swapb %0, %1, [%2]"
++ : "=&r" (ret)
++ : "r" (x), "r" (ptr)
++ : "memory", "cc");
++ break;
++ case 4:
++ asm volatile("@ __xchg4\n"
++ " swapw %0, %1, [%2]"
++ : "=&r" (ret)
++ : "r" (x), "r" (ptr)
++ : "memory", "cc");
++ break;
++ default:
++ panic("xchg: bad data size: ptr 0x%p, size %d\n",
++ ptr, size);
++ }
++
++ return ret;
++}
++
++#include <asm-generic/cmpxchg-local.h>
++
++/*
++ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
++ * them available.
++ */
++#define cmpxchg_local(ptr, o, n) \
++ ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), \
++ (unsigned long)(o), (unsigned long)(n), sizeof(*(ptr))))
++#define cmpxchg64_local(ptr, o, n) \
++ __cmpxchg64_local_generic((ptr), (o), (n))
++
++#include <asm-generic/cmpxchg.h>
++
++#endif /* __ASSEMBLY__ */
++
++#define arch_align_stack(x) (x)
++
++#endif /* __KERNEL__ */
++
++#endif
+diff --git a/arch/unicore32/include/asm/unistd.h b/arch/unicore32/include/asm/unistd.h
+new file mode 100644
+index 000000000000..9b2428019961
+--- /dev/null
++++ b/arch/unicore32/include/asm/unistd.h
+@@ -0,0 +1,18 @@
++/*
++ * linux/arch/unicore32/include/asm/unistd.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ */
++#if !defined(__UNICORE_UNISTD_H__) || defined(__SYSCALL)
++#define __UNICORE_UNISTD_H__
++
++/* Use the standard ABI for syscalls. */
++#include <asm-generic/unistd.h>
++
++#endif /* __UNICORE_UNISTD_H__ */
+diff --git a/arch/unicore32/kernel/sys.c b/arch/unicore32/kernel/sys.c
+new file mode 100644
+index 000000000000..3afe60a39ac9
+--- /dev/null
++++ b/arch/unicore32/kernel/sys.c
+@@ -0,0 +1,126 @@
++/*
++ * linux/arch/unicore32/kernel/sys.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/errno.h>
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/mm.h>
++#include <linux/sem.h>
++#include <linux/msg.h>
++#include <linux/shm.h>
++#include <linux/stat.h>
++#include <linux/syscalls.h>
++#include <linux/mman.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/ipc.h>
++#include <linux/uaccess.h>
++
++#include <asm/syscalls.h>
++#include <asm/cacheflush.h>
++
++/* Clone a task - this clones the calling program thread.
++ * This is called indirectly via a small wrapper
++ */
++asmlinkage long __sys_clone(unsigned long clone_flags, unsigned long newsp,
++ void __user *parent_tid, void __user *child_tid,
++ struct pt_regs *regs)
++{
++ if (!newsp)
++ newsp = regs->UCreg_sp;
++
++ return do_fork(clone_flags, newsp, regs, 0,
++ parent_tid, child_tid);
++}
++
++/* sys_execve() executes a new program.
++ * This is called indirectly via a small wrapper
++ */
++asmlinkage long __sys_execve(const char __user *filename,
++ const char __user *const __user *argv,
++ const char __user *const __user *envp,
++ struct pt_regs *regs)
++{
++ int error;
++ char *fn;
++
++ fn = getname(filename);
++ error = PTR_ERR(fn);
++ if (IS_ERR(fn))
++ goto out;
++ error = do_execve(fn, argv, envp, regs);
++ putname(fn);
++out:
++ return error;
++}
++
++int kernel_execve(const char *filename,
++ const char *const argv[],
++ const char *const envp[])
++{
++ struct pt_regs regs;
++ int ret;
++
++ memset(®s, 0, sizeof(struct pt_regs));
++ ret = do_execve(filename,
++ (const char __user *const __user *)argv,
++ (const char __user *const __user *)envp, ®s);
++ if (ret < 0)
++ goto out;
++
++ /*
++ * Save argc to the register structure for userspace.
++ */
++ regs.UCreg_00 = ret;
++
++ /*
++ * We were successful. We won't be returning to our caller, but
++ * instead to user space by manipulating the kernel stack.
++ */
++ asm("add r0, %0, %1\n\t"
++ "mov r1, %2\n\t"
++ "mov r2, %3\n\t"
++ "mov r22, #0\n\t" /* not a syscall */
++ "mov r23, %0\n\t" /* thread structure */
++ "b.l memmove\n\t" /* copy regs to top of stack */
++ "mov sp, r0\n\t" /* reposition stack pointer */
++ "b ret_to_user"
++ :
++ : "r" (current_thread_info()),
++ "Ir" (THREAD_START_SP - sizeof(regs)),
++ "r" (®s),
++ "Ir" (sizeof(regs))
++ : "r0", "r1", "r2", "r3", "ip", "lr", "memory");
++
++ out:
++ return ret;
++}
++EXPORT_SYMBOL(kernel_execve);
++
++/* Note: used by the compat code even in 64-bit Linux. */
++SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
++ unsigned long, prot, unsigned long, flags,
++ unsigned long, fd, unsigned long, off_4k)
++{
++ return sys_mmap_pgoff(addr, len, prot, flags, fd,
++ off_4k);
++}
++
++/* Provide the actual syscall number to call mapping. */
++#undef __SYSCALL
++#define __SYSCALL(nr, call) [nr] = (call),
++
++/* Note that we don't include <linux/unistd.h> but <asm/unistd.h> */
++void *sys_call_table[__NR_syscalls] = {
++ [0 ... __NR_syscalls-1] = sys_ni_syscall,
++#include <asm/unistd.h>
++};
+diff --git a/arch/unicore32/mm/proc-macros.S b/arch/unicore32/mm/proc-macros.S
+new file mode 100644
+index 000000000000..51560d68c894
+--- /dev/null
++++ b/arch/unicore32/mm/proc-macros.S
+@@ -0,0 +1,145 @@
++/*
++ * linux/arch/unicore32/mm/proc-macros.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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.
++ *
++ * We need constants.h for:
++ * VMA_VM_MM
++ * VMA_VM_FLAGS
++ * VM_EXEC
++ */
++#include <generated/asm-offsets.h>
++#include <asm/thread_info.h>
++#include <asm/memory.h>
++
++/*
++ * the cache line sizes of the I and D cache are the same
++ */
++#define CACHE_LINESIZE 32
++
++/*
++ * This is the maximum size of an area which will be invalidated
++ * using the single invalidate entry instructions. Anything larger
++ * than this, and we go for the whole cache.
++ *
++ * This value should be chosen such that we choose the cheapest
++ * alternative.
++ */
++#ifdef CONFIG_CPU_UCV2
++#define MAX_AREA_SIZE 0x800 /* 64 cache line */
++#endif
++
++/*
++ * vma_vm_mm - get mm pointer from vma pointer (vma->vm_mm)
++ */
++ .macro vma_vm_mm, rd, rn
++ ldw \rd, [\rn+], #VMA_VM_MM
++ .endm
++
++/*
++ * vma_vm_flags - get vma->vm_flags
++ */
++ .macro vma_vm_flags, rd, rn
++ ldw \rd, [\rn+], #VMA_VM_FLAGS
++ .endm
++
++ .macro tsk_mm, rd, rn
++ ldw \rd, [\rn+], #TI_TASK
++ ldw \rd, [\rd+], #TSK_ACTIVE_MM
++ .endm
++
++/*
++ * act_mm - get current->active_mm
++ */
++ .macro act_mm, rd
++ andn \rd, sp, #8128
++ andn \rd, \rd, #63
++ ldw \rd, [\rd+], #TI_TASK
++ ldw \rd, [\rd+], #TSK_ACTIVE_MM
++ .endm
++
++/*
++ * mmid - get context id from mm pointer (mm->context.id)
++ */
++ .macro mmid, rd, rn
++ ldw \rd, [\rn+], #MM_CONTEXT_ID
++ .endm
++
++/*
++ * mask_asid - mask the ASID from the context ID
++ */
++ .macro asid, rd, rn
++ and \rd, \rn, #255
++ .endm
++
++ .macro crval, clear, mmuset, ucset
++ .word \clear
++ .word \mmuset
++ .endm
++
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++/*
++ * va2pa va, pa, tbl, msk, off, err
++ * This macro is used to translate virtual address to its physical address.
++ *
++ * va: virtual address
++ * pa: physical address, result is stored in this register
++ * tbl, msk, off: temp registers, will be destroyed
++ * err: jump to error label if the physical address not exist
++ * NOTE: all regs must be different
++ */
++ .macro va2pa, va, pa, tbl, msk, off, err=990f
++ movc \pa, p0.c2, #0
++ mov \off, \va >> #22 @ off <- index of 1st page table
++ adr \tbl, 910f @ tbl <- table of 1st page table
++900: @ ---- handle 1, 2 page table
++ add \pa, \pa, #PAGE_OFFSET @ pa <- virt addr of page table
++ ldw \pa, [\pa+], \off << #2 @ pa <- the content of pt
++ cand.a \pa, #4 @ test exist bit
++ beq \err @ if not exist
++ and \off, \pa, #3 @ off <- the last 2 bits
++ add \tbl, \tbl, \off << #3 @ cmove table pointer
++ ldw \msk, [\tbl+], #0 @ get the mask
++ ldw pc, [\tbl+], #4
++930: @ ---- handle 2nd page table
++ and \pa, \pa, \msk @ pa <- phys addr of 2nd pt
++ mov \off, \va << #10
++ cntlo \tbl, \msk @ use tbl as temp reg
++ mov \off, \off >> \tbl
++ mov \off, \off >> #2 @ off <- index of 2nd pt
++ adr \tbl, 920f @ tbl <- table of 2nd pt
++ b 900b
++910: @ 1st level page table
++ .word 0xfffff000, 930b @ second level page table
++ .word 0xfffffc00, 930b @ second level large page table
++ .word 0x00000000, \err @ invalid
++ .word 0xffc00000, 980f @ super page
++
++920: @ 2nd level page table
++ .word 0xfffff000, 980f @ page
++ .word 0xffffc000, 980f @ middle page
++ .word 0xffff0000, 980f @ large page
++ .word 0x00000000, \err @ invalid
++980:
++ andn \tbl, \va, \msk
++ and \pa, \pa, \msk
++ or \pa, \pa, \tbl
++990:
++ .endm
++#endif
++
++ .macro dcacheline_flush, addr, t1, t2
++ mov \t1, \addr << #20
++ ldw \t2, =_stext @ _stext must ALIGN(4096)
++ add \t2, \t2, \t1 >> #20
++ ldw \t1, [\t2+], #0x0000
++ ldw \t1, [\t2+], #0x1000
++ ldw \t1, [\t2+], #0x2000
++ ldw \t1, [\t2+], #0x3000
++ .endm
+diff --git a/arch/unicore32/mm/proc-ucv2.S b/arch/unicore32/mm/proc-ucv2.S
+new file mode 100644
+index 000000000000..9d296092e362
+--- /dev/null
++++ b/arch/unicore32/mm/proc-ucv2.S
+@@ -0,0 +1,134 @@
++/*
++ * linux/arch/unicore32/mm/proc-ucv2.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/linkage.h>
++#include <asm/assembler.h>
++#include <asm/hwcap.h>
++#include <asm/pgtable-hwdef.h>
++#include <asm/pgtable.h>
++
++#include "proc-macros.S"
++
++ENTRY(cpu_proc_fin)
++ stm.w (lr), [sp-]
++ mov ip, #PSR_R_BIT | PSR_I_BIT | PRIV_MODE
++ mov.a asr, ip
++ b.l __cpuc_flush_kern_all
++ ldm.w (pc), [sp]+
++
++/*
++ * cpu_reset(loc)
++ *
++ * Perform a soft reset of the system. Put the CPU into the
++ * same state as it would be if it had been reset, and branch
++ * to what would be the reset vector.
++ *
++ * - loc - location to jump to for soft reset
++ */
++ .align 5
++ENTRY(cpu_reset)
++ mov ip, #0
++ movc p0.c5, ip, #28 @ Cache invalidate all
++ nop8
++
++ movc p0.c6, ip, #6 @ TLB invalidate all
++ nop8
++
++ movc ip, p0.c1, #0 @ ctrl register
++ or ip, ip, #0x2000 @ vector base address
++ andn ip, ip, #0x000f @ ............idam
++ movc p0.c1, ip, #0 @ disable caches and mmu
++ nop
++ mov pc, r0 @ jump to loc
++ nop8
++
++/*
++ * cpu_do_idle()
++ *
++ * Idle the processor (eg, wait for interrupt).
++ *
++ * IRQs are already disabled.
++ */
++ENTRY(cpu_do_idle)
++ mov r0, #0 @ PCI address
++ .rept 8
++ ldw r1, [r0]
++ .endr
++ mov pc, lr
++
++ENTRY(cpu_dcache_clean_area)
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ csub.a r1, #MAX_AREA_SIZE
++ bsg 101f
++ mov r9, #PAGE_SZ
++ sub r9, r9, #1 @ PAGE_MASK
++1: va2pa r0, r10, r11, r12, r13 @ r10 is PA
++ b 3f
++2: cand.a r0, r9
++ beq 1b
++3: movc p0.c5, r10, #11 @ clean D entry
++ nop8
++ add r0, r0, #CACHE_LINESIZE
++ add r10, r10, #CACHE_LINESIZE
++ sub.a r1, r1, #CACHE_LINESIZE
++ bua 2b
++ mov pc, lr
++#endif
++101: mov ip, #0
++ movc p0.c5, ip, #10 @ Dcache clean all
++ nop8
++
++ mov pc, lr
++
++/*
++ * cpu_do_switch_mm(pgd_phys)
++ *
++ * Set the translation table base pointer to be pgd_phys
++ *
++ * - pgd_phys - physical address of new pgd
++ *
++ * It is assumed that:
++ * - we are not using split page tables
++ */
++ .align 5
++ENTRY(cpu_do_switch_mm)
++ movc p0.c2, r0, #0 @ update page table ptr
++ nop8
++
++ movc p0.c6, ip, #6 @ TLB invalidate all
++ nop8
++
++ mov pc, lr
++
++/*
++ * cpu_set_pte(ptep, pte)
++ *
++ * Set a level 2 translation table entry.
++ *
++ * - ptep - pointer to level 2 translation table entry
++ * - pte - PTE value to store
++ */
++ .align 5
++ENTRY(cpu_set_pte)
++ stw r1, [r0]
++#ifndef CONFIG_CPU_DCACHE_LINE_DISABLE
++ sub r2, r0, #PAGE_OFFSET
++ movc p0.c5, r2, #11 @ Dcache clean line
++ nop8
++#else
++ mov ip, #0
++ movc p0.c5, ip, #10 @ Dcache clean all
++ nop8
++ @dcacheline_flush r0, r2, ip
++#endif
++ mov pc, lr
++commit 87c1a3fb7c07322dfd63a63dd6d42339ad52ddee
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:13:50 2011 +0800
+
+ unicore32 core architecture: generic elf and ksyms stuff
+
+ This patch includes some generic stuff including elf and ksyms.
+ Because all one-line asm-generic headers are auto-generated by ASM_GENERIC_HEADERS
+ in arch/unicore32/Makefile, so the rest seems very little.
+ ELF handling functions and module handling functions are also here.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/include/asm/elf.h b/arch/unicore32/include/asm/elf.h
+new file mode 100644
+index 000000000000..829042d07722
+--- /dev/null
++++ b/arch/unicore32/include/asm/elf.h
+@@ -0,0 +1,94 @@
++/*
++ * linux/arch/unicore32/include/asm/elf.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_ELF_H__
++#define __UNICORE_ELF_H__
++
++#include <asm/hwcap.h>
++
++/*
++ * ELF register definitions..
++ */
++#include <asm/ptrace.h>
++
++typedef unsigned long elf_greg_t;
++typedef unsigned long elf_freg_t[3];
++
++#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
++typedef elf_greg_t elf_gregset_t[ELF_NGREG];
++
++typedef struct fp_state elf_fpregset_t;
++
++#define EM_UNICORE 110
++
++#define R_UNICORE_NONE 0
++#define R_UNICORE_PC24 1
++#define R_UNICORE_ABS32 2
++#define R_UNICORE_CALL 28
++#define R_UNICORE_JUMP24 29
++
++/*
++ * These are used to set parameters in the core dumps.
++ */
++#define ELF_CLASS ELFCLASS32
++#define ELF_DATA ELFDATA2LSB
++#define ELF_ARCH EM_UNICORE
++
++/*
++ * This yields a string that ld.so will use to load implementation
++ * specific libraries for optimization. This is more specific in
++ * intent than poking at uname or /proc/cpuinfo.
++ *
++ */
++#define ELF_PLATFORM_SIZE 8
++#define ELF_PLATFORM (elf_platform)
++
++extern char elf_platform[];
++
++struct elf32_hdr;
++
++/*
++ * This is used to ensure we don't load something for the wrong architecture.
++ */
++extern int elf_check_arch(const struct elf32_hdr *);
++#define elf_check_arch elf_check_arch
++
++struct task_struct;
++int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
++#define ELF_CORE_COPY_TASK_REGS dump_task_regs
++
++#define ELF_EXEC_PAGESIZE 4096
++
++/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
++ use of this is to invoke "./ld.so someprog" to test out a new version of
++ the loader. We need to make sure that it is out of the way of the program
++ that it will "exec", and that there is sufficient room for the brk. */
++
++#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
++
++/* When the program starts, a1 contains a pointer to a function to be
++ registered with atexit, as per the SVR4 ABI. A value of 0 means we
++ have no such handler. */
++#define ELF_PLAT_INIT(_r, load_addr) {(_r)->UCreg_00 = 0; }
++
++extern void elf_set_personality(const struct elf32_hdr *);
++#define SET_PERSONALITY(ex) elf_set_personality(&(ex))
++
++struct mm_struct;
++extern unsigned long arch_randomize_brk(struct mm_struct *mm);
++#define arch_randomize_brk arch_randomize_brk
++
++extern int vectors_user_mapping(void);
++#define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
++
++#endif
+diff --git a/arch/unicore32/include/asm/string.h b/arch/unicore32/include/asm/string.h
+new file mode 100644
+index 000000000000..55264c84369a
+--- /dev/null
++++ b/arch/unicore32/include/asm/string.h
+@@ -0,0 +1,38 @@
++/*
++ * linux/arch/unicore32/include/asm/string.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_STRING_H__
++#define __UNICORE_STRING_H__
++
++/*
++ * We don't do inline string functions, since the
++ * optimised inline asm versions are not small.
++ */
++
++#define __HAVE_ARCH_STRRCHR
++extern char *strrchr(const char *s, int c);
++
++#define __HAVE_ARCH_STRCHR
++extern char *strchr(const char *s, int c);
++
++#define __HAVE_ARCH_MEMCPY
++extern void *memcpy(void *, const void *, __kernel_size_t);
++
++#define __HAVE_ARCH_MEMMOVE
++extern void *memmove(void *, const void *, __kernel_size_t);
++
++#define __HAVE_ARCH_MEMCHR
++extern void *memchr(const void *, int, __kernel_size_t);
++
++#define __HAVE_ARCH_MEMSET
++extern void *memset(void *, int, __kernel_size_t);
++
++#endif
+diff --git a/arch/unicore32/kernel/asm-offsets.c b/arch/unicore32/kernel/asm-offsets.c
+new file mode 100644
+index 000000000000..ffcbe7536ca7
+--- /dev/null
++++ b/arch/unicore32/kernel/asm-offsets.c
+@@ -0,0 +1,112 @@
++/*
++ * linux/arch/unicore32/kernel/asm-offsets.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * Generate definitions needed by assembly language modules.
++ * This code generates raw asm output which is post-processed to extract
++ * and format the required data.
++ *
++ * 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/sched.h>
++#include <linux/mm.h>
++#include <linux/dma-mapping.h>
++#include <linux/kbuild.h>
++#include <linux/suspend.h>
++#include <linux/thread_info.h>
++#include <asm/memory.h>
++#include <asm/suspend.h>
++
++/*
++ * GCC 3.0, 3.1: general bad code generation.
++ * GCC 3.2.0: incorrect function argument offset calculation.
++ * GCC 3.2.x: miscompiles NEW_AUX_ENT in fs/binfmt_elf.c
++ * (http://gcc.gnu.org/PR8896) and incorrect structure
++ * initialisation in fs/jffs2/erase.c
++ */
++#if (__GNUC__ < 4)
++#error Your compiler should upgrade to uc4
++#error Known good compilers: 4.2.2
++#endif
++
++int main(void)
++{
++ DEFINE(TSK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
++ BLANK();
++ DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
++ DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
++ DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
++ DEFINE(TI_TASK, offsetof(struct thread_info, task));
++ DEFINE(TI_EXEC_DOMAIN, offsetof(struct thread_info, exec_domain));
++ DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
++ DEFINE(TI_CPU_SAVE, offsetof(struct thread_info, cpu_context));
++ DEFINE(TI_USED_CP, offsetof(struct thread_info, used_cp));
++#ifdef CONFIG_UNICORE_FPU_F64
++ DEFINE(TI_FPSTATE, offsetof(struct thread_info, fpstate));
++#endif
++ BLANK();
++ DEFINE(S_R0, offsetof(struct pt_regs, UCreg_00));
++ DEFINE(S_R1, offsetof(struct pt_regs, UCreg_01));
++ DEFINE(S_R2, offsetof(struct pt_regs, UCreg_02));
++ DEFINE(S_R3, offsetof(struct pt_regs, UCreg_03));
++ DEFINE(S_R4, offsetof(struct pt_regs, UCreg_04));
++ DEFINE(S_R5, offsetof(struct pt_regs, UCreg_05));
++ DEFINE(S_R6, offsetof(struct pt_regs, UCreg_06));
++ DEFINE(S_R7, offsetof(struct pt_regs, UCreg_07));
++ DEFINE(S_R8, offsetof(struct pt_regs, UCreg_08));
++ DEFINE(S_R9, offsetof(struct pt_regs, UCreg_09));
++ DEFINE(S_R10, offsetof(struct pt_regs, UCreg_10));
++ DEFINE(S_R11, offsetof(struct pt_regs, UCreg_11));
++ DEFINE(S_R12, offsetof(struct pt_regs, UCreg_12));
++ DEFINE(S_R13, offsetof(struct pt_regs, UCreg_13));
++ DEFINE(S_R14, offsetof(struct pt_regs, UCreg_14));
++ DEFINE(S_R15, offsetof(struct pt_regs, UCreg_15));
++ DEFINE(S_R16, offsetof(struct pt_regs, UCreg_16));
++ DEFINE(S_R17, offsetof(struct pt_regs, UCreg_17));
++ DEFINE(S_R18, offsetof(struct pt_regs, UCreg_18));
++ DEFINE(S_R19, offsetof(struct pt_regs, UCreg_19));
++ DEFINE(S_R20, offsetof(struct pt_regs, UCreg_20));
++ DEFINE(S_R21, offsetof(struct pt_regs, UCreg_21));
++ DEFINE(S_R22, offsetof(struct pt_regs, UCreg_22));
++ DEFINE(S_R23, offsetof(struct pt_regs, UCreg_23));
++ DEFINE(S_R24, offsetof(struct pt_regs, UCreg_24));
++ DEFINE(S_R25, offsetof(struct pt_regs, UCreg_25));
++ DEFINE(S_R26, offsetof(struct pt_regs, UCreg_26));
++ DEFINE(S_FP, offsetof(struct pt_regs, UCreg_fp));
++ DEFINE(S_IP, offsetof(struct pt_regs, UCreg_ip));
++ DEFINE(S_SP, offsetof(struct pt_regs, UCreg_sp));
++ DEFINE(S_LR, offsetof(struct pt_regs, UCreg_lr));
++ DEFINE(S_PC, offsetof(struct pt_regs, UCreg_pc));
++ DEFINE(S_PSR, offsetof(struct pt_regs, UCreg_asr));
++ DEFINE(S_OLD_R0, offsetof(struct pt_regs, UCreg_ORIG_00));
++ DEFINE(S_FRAME_SIZE, sizeof(struct pt_regs));
++ BLANK();
++ DEFINE(VMA_VM_MM, offsetof(struct vm_area_struct, vm_mm));
++ DEFINE(VMA_VM_FLAGS, offsetof(struct vm_area_struct, vm_flags));
++ BLANK();
++ DEFINE(VM_EXEC, VM_EXEC);
++ BLANK();
++ DEFINE(PAGE_SZ, PAGE_SIZE);
++ BLANK();
++ DEFINE(SYS_ERROR0, 0x9f0000);
++ BLANK();
++ DEFINE(PBE_ADDRESS, offsetof(struct pbe, address));
++ DEFINE(PBE_ORIN_ADDRESS, offsetof(struct pbe, orig_address));
++ DEFINE(PBE_NEXT, offsetof(struct pbe, next));
++ DEFINE(SWSUSP_CPU, offsetof(struct swsusp_arch_regs, \
++ cpu_context));
++#ifdef CONFIG_UNICORE_FPU_F64
++ DEFINE(SWSUSP_FPSTATE, offsetof(struct swsusp_arch_regs, \
++ fpstate));
++#endif
++ BLANK();
++ DEFINE(DMA_BIDIRECTIONAL, DMA_BIDIRECTIONAL);
++ DEFINE(DMA_TO_DEVICE, DMA_TO_DEVICE);
++ DEFINE(DMA_FROM_DEVICE, DMA_FROM_DEVICE);
++ return 0;
++}
+diff --git a/arch/unicore32/kernel/elf.c b/arch/unicore32/kernel/elf.c
+new file mode 100644
+index 000000000000..0a176734fefa
+--- /dev/null
++++ b/arch/unicore32/kernel/elf.c
+@@ -0,0 +1,38 @@
++/*
++ * linux/arch/unicore32/kernel/elf.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/sched.h>
++#include <linux/personality.h>
++#include <linux/binfmts.h>
++#include <linux/elf.h>
++
++int elf_check_arch(const struct elf32_hdr *x)
++{
++ /* Make sure it's an UniCore executable */
++ if (x->e_machine != EM_UNICORE)
++ return 0;
++
++ /* Make sure the entry address is reasonable */
++ if (x->e_entry & 3)
++ return 0;
++
++ return 1;
++}
++EXPORT_SYMBOL(elf_check_arch);
++
++void elf_set_personality(const struct elf32_hdr *x)
++{
++ unsigned int personality = PER_LINUX;
++
++ set_personality(personality);
++}
++EXPORT_SYMBOL(elf_set_personality);
+diff --git a/arch/unicore32/kernel/ksyms.c b/arch/unicore32/kernel/ksyms.c
+new file mode 100644
+index 000000000000..a8970809428a
+--- /dev/null
++++ b/arch/unicore32/kernel/ksyms.c
+@@ -0,0 +1,99 @@
++/*
++ * linux/arch/unicore32/kernel/ksyms.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/sched.h>
++#include <linux/string.h>
++#include <linux/cryptohash.h>
++#include <linux/delay.h>
++#include <linux/in6.h>
++#include <linux/syscalls.h>
++#include <linux/uaccess.h>
++#include <linux/io.h>
++
++#include <asm/checksum.h>
++#include <asm/system.h>
++
++#include "ksyms.h"
++
++EXPORT_SYMBOL(__uc32_find_next_zero_bit);
++EXPORT_SYMBOL(__uc32_find_next_bit);
++
++EXPORT_SYMBOL(__backtrace);
++
++ /* platform dependent support */
++EXPORT_SYMBOL(__udelay);
++EXPORT_SYMBOL(__const_udelay);
++
++ /* networking */
++EXPORT_SYMBOL(csum_partial);
++EXPORT_SYMBOL(csum_partial_copy_from_user);
++EXPORT_SYMBOL(csum_partial_copy_nocheck);
++EXPORT_SYMBOL(__csum_ipv6_magic);
++
++ /* io */
++#ifndef __raw_readsb
++EXPORT_SYMBOL(__raw_readsb);
++#endif
++#ifndef __raw_readsw
++EXPORT_SYMBOL(__raw_readsw);
++#endif
++#ifndef __raw_readsl
++EXPORT_SYMBOL(__raw_readsl);
++#endif
++#ifndef __raw_writesb
++EXPORT_SYMBOL(__raw_writesb);
++#endif
++#ifndef __raw_writesw
++EXPORT_SYMBOL(__raw_writesw);
++#endif
++#ifndef __raw_writesl
++EXPORT_SYMBOL(__raw_writesl);
++#endif
++
++ /* string / mem functions */
++EXPORT_SYMBOL(strchr);
++EXPORT_SYMBOL(strrchr);
++EXPORT_SYMBOL(memset);
++EXPORT_SYMBOL(memcpy);
++EXPORT_SYMBOL(memmove);
++EXPORT_SYMBOL(memchr);
++
++ /* user mem (segment) */
++EXPORT_SYMBOL(__strnlen_user);
++EXPORT_SYMBOL(__strncpy_from_user);
++
++EXPORT_SYMBOL(copy_page);
++
++EXPORT_SYMBOL(__copy_from_user);
++EXPORT_SYMBOL(__copy_to_user);
++EXPORT_SYMBOL(__clear_user);
++
++EXPORT_SYMBOL(__get_user_1);
++EXPORT_SYMBOL(__get_user_2);
++EXPORT_SYMBOL(__get_user_4);
++
++EXPORT_SYMBOL(__put_user_1);
++EXPORT_SYMBOL(__put_user_2);
++EXPORT_SYMBOL(__put_user_4);
++EXPORT_SYMBOL(__put_user_8);
++
++EXPORT_SYMBOL(__ashldi3);
++EXPORT_SYMBOL(__ashrdi3);
++EXPORT_SYMBOL(__divsi3);
++EXPORT_SYMBOL(__lshrdi3);
++EXPORT_SYMBOL(__modsi3);
++EXPORT_SYMBOL(__muldi3);
++EXPORT_SYMBOL(__ucmpdi2);
++EXPORT_SYMBOL(__udivsi3);
++EXPORT_SYMBOL(__umodsi3);
++EXPORT_SYMBOL(__bswapsi2);
++
+diff --git a/arch/unicore32/kernel/ksyms.h b/arch/unicore32/kernel/ksyms.h
+new file mode 100644
+index 000000000000..185cdc712d03
+--- /dev/null
++++ b/arch/unicore32/kernel/ksyms.h
+@@ -0,0 +1,15 @@
++/*
++ * libgcc functions - functions that are used internally by the
++ * compiler... (prototypes are not correct though, but that
++ * doesn't really matter since they're not versioned).
++ */
++extern void __ashldi3(void);
++extern void __ashrdi3(void);
++extern void __divsi3(void);
++extern void __lshrdi3(void);
++extern void __modsi3(void);
++extern void __muldi3(void);
++extern void __ucmpdi2(void);
++extern void __udivsi3(void);
++extern void __umodsi3(void);
++extern void __bswapsi2(void);
+diff --git a/arch/unicore32/kernel/module.c b/arch/unicore32/kernel/module.c
+new file mode 100644
+index 000000000000..3e5a38d71a1e
+--- /dev/null
++++ b/arch/unicore32/kernel/module.c
+@@ -0,0 +1,152 @@
++/*
++ * linux/arch/unicore32/kernel/module.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/moduleloader.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/elf.h>
++#include <linux/vmalloc.h>
++#include <linux/fs.h>
++#include <linux/string.h>
++#include <linux/gfp.h>
++
++#include <asm/pgtable.h>
++#include <asm/sections.h>
++
++void *module_alloc(unsigned long size)
++{
++ struct vm_struct *area;
++
++ size = PAGE_ALIGN(size);
++ if (!size)
++ return NULL;
++
++ area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);
++ if (!area)
++ return NULL;
++
++ return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC);
++}
++
++void module_free(struct module *module, void *region)
++{
++ vfree(region);
++}
++
++int module_frob_arch_sections(Elf_Ehdr *hdr,
++ Elf_Shdr *sechdrs,
++ char *secstrings,
++ struct module *mod)
++{
++ return 0;
++}
++
++int
++apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
++ unsigned int relindex, struct module *module)
++{
++ Elf32_Shdr *symsec = sechdrs + symindex;
++ Elf32_Shdr *relsec = sechdrs + relindex;
++ Elf32_Shdr *dstsec = sechdrs + relsec->sh_info;
++ Elf32_Rel *rel = (void *)relsec->sh_addr;
++ unsigned int i;
++
++ for (i = 0; i < relsec->sh_size / sizeof(Elf32_Rel); i++, rel++) {
++ unsigned long loc;
++ Elf32_Sym *sym;
++ s32 offset;
++
++ offset = ELF32_R_SYM(rel->r_info);
++ if (offset < 0 || offset >
++ (symsec->sh_size / sizeof(Elf32_Sym))) {
++ printk(KERN_ERR "%s: bad relocation, "
++ "section %d reloc %d\n",
++ module->name, relindex, i);
++ return -ENOEXEC;
++ }
++
++ sym = ((Elf32_Sym *)symsec->sh_addr) + offset;
++
++ if (rel->r_offset < 0 || rel->r_offset >
++ dstsec->sh_size - sizeof(u32)) {
++ printk(KERN_ERR "%s: out of bounds relocation, "
++ "section %d reloc %d offset %d size %d\n",
++ module->name, relindex, i, rel->r_offset,
++ dstsec->sh_size);
++ return -ENOEXEC;
++ }
++
++ loc = dstsec->sh_addr + rel->r_offset;
++
++ switch (ELF32_R_TYPE(rel->r_info)) {
++ case R_UNICORE_NONE:
++ /* ignore */
++ break;
++
++ case R_UNICORE_ABS32:
++ *(u32 *)loc += sym->st_value;
++ break;
++
++ case R_UNICORE_PC24:
++ case R_UNICORE_CALL:
++ case R_UNICORE_JUMP24:
++ offset = (*(u32 *)loc & 0x00ffffff) << 2;
++ if (offset & 0x02000000)
++ offset -= 0x04000000;
++
++ offset += sym->st_value - loc;
++ if (offset & 3 ||
++ offset <= (s32)0xfe000000 ||
++ offset >= (s32)0x02000000) {
++ printk(KERN_ERR
++ "%s: relocation out of range, section "
++ "%d reloc %d sym '%s'\n", module->name,
++ relindex, i, strtab + sym->st_name);
++ return -ENOEXEC;
++ }
++
++ offset >>= 2;
++
++ *(u32 *)loc &= 0xff000000;
++ *(u32 *)loc |= offset & 0x00ffffff;
++ break;
++
++ default:
++ printk(KERN_ERR "%s: unknown relocation: %u\n",
++ module->name, ELF32_R_TYPE(rel->r_info));
++ return -ENOEXEC;
++ }
++ }
++ return 0;
++}
++
++int
++apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
++ unsigned int symindex, unsigned int relsec,
++ struct module *module)
++{
++ printk(KERN_ERR "module %s: ADD RELOCATION unsupported\n",
++ module->name);
++ return -ENOEXEC;
++}
++
++int
++module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
++ struct module *module)
++{
++ return 0;
++}
++
++void
++module_arch_cleanup(struct module *mod)
++{
++}
+diff --git a/arch/unicore32/mm/proc-syms.c b/arch/unicore32/mm/proc-syms.c
+new file mode 100644
+index 000000000000..f30071e3665d
+--- /dev/null
++++ b/arch/unicore32/mm/proc-syms.c
+@@ -0,0 +1,23 @@
++/*
++ * linux/arch/unicore32/mm/proc-syms.c
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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/module.h>
++#include <linux/mm.h>
++
++#include <asm/cacheflush.h>
++#include <asm/tlbflush.h>
++#include <asm/page.h>
++
++EXPORT_SYMBOL(cpu_dcache_clean_area);
++EXPORT_SYMBOL(cpu_set_pte);
++
++EXPORT_SYMBOL(__cpuc_dma_flush_range);
++EXPORT_SYMBOL(__cpuc_dma_clean_range);commit 790edb61c0d87d1f1daafcaaa8f7c66b7b82bdad
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Feb 26 18:24:56 2011 +0800
+
+ unicore32 core architecture: build infrastructure
+
+ This patch implements build infrastructure.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/arch/unicore32/.gitignore b/arch/unicore32/.gitignore
+new file mode 100644
+index 000000000000..947e99c2a957
+--- /dev/null
++++ b/arch/unicore32/.gitignore
+@@ -0,0 +1,21 @@
++#
++# Generated include files
++#
++include/generated
++#
++# Generated ld script file
++#
++kernel/vmlinux.lds
++#
++# Generated images in boot
++#
++boot/Image
++boot/zImage
++boot/uImage
++#
++# Generated files in boot/compressed
++#
++boot/compressed/piggy.S
++boot/compressed/piggy.gzip
++boot/compressed/vmlinux
++boot/compressed/vmlinux.lds
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+new file mode 100644
+index 000000000000..cc6a83215881
+--- /dev/null
++++ b/arch/unicore32/Kconfig
+@@ -0,0 +1,246 @@
++config UNICORE32
++ def_bool y
++ select HAVE_MEMBLOCK
++ select HAVE_GENERIC_DMA_COHERENT
++ select HAVE_GENERIC_HARDIRQS
++ select HAVE_DMA_ATTRS
++ select HAVE_KERNEL_GZIP
++ select HAVE_KERNEL_BZIP2
++ select HAVE_KERNEL_LZO
++ select HAVE_KERNEL_LZMA
++ select GENERIC_FIND_FIRST_BIT
++ select GENERIC_IRQ_PROBE
++ select ARCH_WANT_FRAME_POINTERS
++ help
++ UniCore-32 is 32-bit Instruction Set Architecture,
++ including a series of low-power-consumption RISC chip
++ designs licensed by PKUnity Ltd.
++ Please see web page at <http://www.pkunity.com/>.
++
++config HAVE_PWM
++ bool
++
++config GENERIC_GPIO
++ def_bool y
++
++config GENERIC_CLOCKEVENTS
++ bool
++
++config GENERIC_CSUM
++ def_bool y
++
++config NO_IOPORT
++ bool
++
++config STACKTRACE_SUPPORT
++ def_bool y
++
++config HAVE_LATENCYTOP_SUPPORT
++ def_bool y
++
++config LOCKDEP_SUPPORT
++ def_bool y
++
++config RWSEM_GENERIC_SPINLOCK
++ def_bool y
++
++config RWSEM_XCHGADD_ALGORITHM
++ bool
++
++config ARCH_HAS_ILOG2_U32
++ bool
++
++config ARCH_HAS_ILOG2_U64
++ bool
++
++config ARCH_HAS_CPUFREQ
++ bool
++
++config GENERIC_HWEIGHT
++ def_bool y
++
++config GENERIC_CALIBRATE_DELAY
++ def_bool y
++
++config ARCH_MAY_HAVE_PC_FDC
++ bool
++
++config NEED_DMA_MAP_STATE
++ def_bool y
++
++source "init/Kconfig"
++
++source "kernel/Kconfig.freezer"
++
++menu "System Type"
++
++config MMU
++ def_bool y
++
++config ARCH_FPGA
++ bool
++
++config ARCH_PUV3
++ def_bool y
++ select CPU_UCV2
++ select GENERIC_CLOCKEVENTS
++ select HAVE_CLK
++ select ARCH_REQUIRE_GPIOLIB
++ select ARCH_HAS_CPUFREQ
++
++# CONFIGs for ARCH_PUV3
++
++if ARCH_PUV3
++
++choice
++ prompt "Board Selection"
++ default PUV3_DB0913
++
++config PUV3_FPGA_DLX200
++ select ARCH_FPGA
++ bool "FPGA board"
++
++config PUV3_DB0913
++ bool "DEBUG board (0913)"
++
++config PUV3_NB0916
++ bool "NetBook board (0916)"
++ select HAVE_PWM
++
++config PUV3_SMW0919
++ bool "Security Mini-Workstation board (0919)"
++
++endchoice
++
++config PUV3_PM
++ def_bool y if !ARCH_FPGA
++
++endif
++
++source "arch/unicore32/mm/Kconfig"
++
++comment "Floating poing support"
++
++config UNICORE_FPU_F64
++ def_bool y if !ARCH_FPGA
++
++endmenu
++
++menu "Bus support"
++
++config PCI
++ bool "PCI Support"
++ help
++ Find out whether you have a PCI motherboard. PCI is the name of a
++ bus system, i.e. the way the CPU talks to the other stuff inside
++ your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
++ VESA. If you have PCI, say Y, otherwise N.
++
++source "drivers/pci/Kconfig"
++
++source "drivers/pcmcia/Kconfig"
++
++endmenu
++
++menu "Kernel Features"
++
++source "kernel/time/Kconfig"
++
++source "kernel/Kconfig.preempt"
++
++source "kernel/Kconfig.hz"
++
++source "mm/Kconfig"
++
++config LEDS
++ def_bool y
++ depends on GENERIC_GPIO
++
++config ALIGNMENT_TRAP
++ def_bool y
++ help
++ Unicore processors can not fetch/store information which is not
++ naturally aligned on the bus, i.e., a 4 byte fetch must start at an
++ address divisible by 4. On 32-bit Unicore processors, these non-aligned
++ fetch/store instructions will be emulated in software if you say
++ here, which has a severe performance impact. This is necessary for
++ correct operation of some network protocols. With an IP-only
++ configuration it is safe to say N, otherwise say Y.
++
++endmenu
++
++menu "Boot options"
++
++config CMDLINE
++ string "Default kernel command string"
++ default ""
++
++config CMDLINE_FORCE
++ bool "Always use the default kernel command string"
++ depends on CMDLINE != ""
++ help
++ Always use the default kernel command string, even if the boot
++ loader passes other arguments to the kernel.
++ This is useful if you cannot or don't want to change the
++ command-line options your boot loader passes to the kernel.
++
++ If unsure, say N.
++
++endmenu
++
++menu "Userspace binary formats"
++
++source "fs/Kconfig.binfmt"
++
++endmenu
++
++menu "Power management options"
++
++source "kernel/power/Kconfig"
++
++if ARCH_HAS_CPUFREQ
++source "drivers/cpufreq/Kconfig"
++endif
++
++config ARCH_SUSPEND_POSSIBLE
++ def_bool y if !ARCH_FPGA
++
++config ARCH_HIBERNATION_POSSIBLE
++ def_bool y if !ARCH_FPGA
++
++endmenu
++
++source "net/Kconfig"
++
++if ARCH_PUV3
++
++config PUV3_GPIO
++ bool
++ depends on !ARCH_FPGA
++ select GENERIC_GPIO
++ select GPIO_SYSFS if EXPERIMENTAL
++ default y
++
++config PUV3_PWM
++ tristate
++ default BACKLIGHT_PWM
++ help
++ Enable support for NB0916 PWM controllers
++
++config PUV3_RTC
++ tristate "PKUnity v3 RTC Support"
++ depends on !ARCH_FPGA
++
++endif
++
++source "drivers/Kconfig"
++
++source "fs/Kconfig"
++
++source "arch/unicore32/Kconfig.debug"
++
++source "security/Kconfig"
++
++source "crypto/Kconfig"
++
++source "lib/Kconfig"
+diff --git a/arch/unicore32/Kconfig.debug b/arch/unicore32/Kconfig.debug
+new file mode 100644
+index 000000000000..3140151ede45
+--- /dev/null
++++ b/arch/unicore32/Kconfig.debug
+@@ -0,0 +1,68 @@
++menu "Kernel hacking"
++
++source "lib/Kconfig.debug"
++
++config STRICT_DEVMEM
++ bool "Filter access to /dev/mem"
++ depends on MMU
++ ---help---
++ If this option is disabled, you allow userspace (root) access to all
++ of memory, including kernel and userspace memory. Accidental
++ access to this is obviously disastrous, but specific access can
++ be used by people debugging the kernel.
++
++ If this option is switched on, the /dev/mem file only allows
++ userspace access to memory mapped peripherals.
++
++ If in doubt, say Y.
++
++config EARLY_PRINTK
++ def_bool DEBUG_OCD
++ help
++ Write kernel log output directly into the ocd or to a serial port.
++
++ This is useful for kernel debugging when your machine crashes very
++ early before the console code is initialized. For normal operation
++ it is not recommended because it looks ugly and doesn't cooperate
++ with klogd/syslogd or the X server. You should normally N here,
++ unless you want to debug such a crash.
++
++config DEBUG_STACK_USAGE
++ bool "Enable stack utilization instrumentation"
++ depends on DEBUG_KERNEL
++ help
++ Enables the display of the minimum amount of free stack which each
++ task has ever had available in the sysrq-T output.
++
++# These options are only for real kernel hackers who want to get their hands dirty.
++config DEBUG_LL
++ bool "Kernel low-level debugging functions"
++ depends on DEBUG_KERNEL
++ help
++ Say Y here to include definitions of printascii, printch, printhex
++ in the kernel. This is helpful if you are debugging code that
++ executes before the console is initialized.
++
++config DEBUG_OCD
++ bool "Kernel low-level debugging via On-Chip-Debugger"
++ depends on DEBUG_LL
++ default y
++ help
++ Say Y here if you want the debug print routines to direct their
++ output to the UniCore On-Chip-Debugger channel using CP #1.
++
++config DEBUG_OCD_BREAKPOINT
++ bool "Breakpoint support via On-Chip-Debugger"
++ depends on DEBUG_OCD
++
++config DEBUG_UART
++ int "Kernel low-level debugging messages via serial port"
++ depends on DEBUG_LL
++ range 0 1
++ default "0"
++ help
++ Choice for UART for kernel low-level using PKUnity UARTS,
++ should be between zero and one. The port must have been
++ initialised by the boot-loader before use.
++
++endmenu
+diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile
+new file mode 100644
+index 000000000000..e08d6d370a8a
+--- /dev/null
++++ b/arch/unicore32/Makefile
+@@ -0,0 +1,95 @@
++#
++# arch/unicore32/Makefile
++#
++# This file is included by the global makefile so that you can add your own
++# architecture-specific flags and dependencies.
++#
++# 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) 2002~2010 by Guan Xue-tao
++#
++ifneq ($(SUBARCH),$(ARCH))
++ ifeq ($(CROSS_COMPILE),)
++ CROSS_COMPILE := $(call cc-cross-prefix, unicore32-linux-)
++ endif
++endif
++
++LDFLAGS_vmlinux := -p --no-undefined -X
++
++OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment -S
++
++# Never generate .eh_frame
++KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm)
++
++# Never use hard float in kernel
++KBUILD_CFLAGS += -msoft-float
++
++ifeq ($(CONFIG_FRAME_POINTER),y)
++KBUILD_CFLAGS += -mno-sched-prolog
++endif
++
++CHECKFLAGS += -D__unicore32__
++
++head-y := arch/unicore32/kernel/head.o
++head-y += arch/unicore32/kernel/init_task.o
++
++core-y += arch/unicore32/kernel/
++core-y += arch/unicore32/mm/
++
++libs-y += arch/unicore32/lib/
++
++ASM_GENERATED_DIR := $(srctree)/arch/unicore32/include/generated
++LINUXINCLUDE += -I$(ASM_GENERATED_DIR)
++
++ASM_GENERIC_HEADERS := atomic.h auxvec.h
++ASM_GENERIC_HEADERS += bitsperlong.h bug.h bugs.h
++ASM_GENERIC_HEADERS += cputime.h current.h
++ASM_GENERIC_HEADERS += device.h div64.h
++ASM_GENERIC_HEADERS += emergency-restart.h errno.h
++ASM_GENERIC_HEADERS += fb.h fcntl.h ftrace.h
++ASM_GENERIC_HEADERS += hardirq.h hw_irq.h
++ASM_GENERIC_HEADERS += ioctl.h ioctls.h ipcbuf.h irq_regs.h
++ASM_GENERIC_HEADERS += kdebug.h kmap_types.h
++ASM_GENERIC_HEADERS += local.h
++ASM_GENERIC_HEADERS += mman.h module.h msgbuf.h
++ASM_GENERIC_HEADERS += param.h parport.h percpu.h poll.h posix_types.h
++ASM_GENERIC_HEADERS += resource.h
++ASM_GENERIC_HEADERS += scatterlist.h sections.h segment.h sembuf.h serial.h
++ASM_GENERIC_HEADERS += setup.h shmbuf.h shmparam.h
++ASM_GENERIC_HEADERS += siginfo.h signal.h sizes.h
++ASM_GENERIC_HEADERS += socket.h sockios.h stat.h statfs.h swab.h syscalls.h
++ASM_GENERIC_HEADERS += termbits.h termios.h topology.h types.h
++ASM_GENERIC_HEADERS += ucontext.h unaligned.h user.h
++ASM_GENERIC_HEADERS += vga.h
++ASM_GENERIC_HEADERS += xor.h
++
++archprepare:
++ifneq ($(ASM_GENERATED_DIR), $(wildcard $(ASM_GENERATED_DIR)))
++ $(Q)mkdir -p $(ASM_GENERATED_DIR)/asm
++ $(Q)$(foreach a, $(ASM_GENERIC_HEADERS), \
++ echo '#include <asm-generic/$a>' \
++ > $(ASM_GENERATED_DIR)/asm/$a; )
++endif
++
++boot := arch/unicore32/boot
++
++# Default target when executing plain make
++KBUILD_IMAGE := zImage
++
++all: $(KBUILD_IMAGE)
++
++zImage Image uImage: vmlinux
++ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
++
++MRPROPER_DIRS += $(ASM_GENERATED_DIR)
++
++archclean:
++ $(Q)$(MAKE) $(clean)=$(boot)
++
++define archhelp
++ echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
++ echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
++ echo ' uImage - U-Boot wrapped zImage'
++endef
+diff --git a/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/debug_defconfig
+new file mode 100644
+index 000000000000..3647f68147da
+--- /dev/null
++++ b/arch/unicore32/configs/debug_defconfig
+@@ -0,0 +1,210 @@
++### General setup
++CONFIG_EXPERIMENTAL=y
++CONFIG_LOCALVERSION="-debug"
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_POSIX_MQUEUE=y
++CONFIG_HOTPLUG=y
++# Initial RAM filesystem and RAM disk (initramfs/initrd) support
++#CONFIG_BLK_DEV_INITRD=y
++#CONFIG_INITRAMFS_SOURCE="arch/unicore/ramfs/ramfs_config"
++
++### Enable loadable module support
++CONFIG_MODULES=n
++CONFIG_MODULE_UNLOAD=y
++
++### System Type
++CONFIG_ARCH_PUV3=y
++# Board Selection
++CONFIG_PUV3_NB0916=y
++# Processor Features
++CONFIG_CPU_DCACHE_LINE_DISABLE=y
++CONFIG_CPU_TLB_SINGLE_ENTRY_DISABLE=n
++
++### Bus support
++CONFIG_PCI=y
++CONFIG_PCI_LEGACY=n
++
++### Boot options
++# for debug, adding: earlyprintk=ocd,keep initcall_debug
++# others support: test_suspend=mem root=/dev/sda
++# hibernate support: resume=/dev/sda3
++CONFIG_CMDLINE="earlyprintk=ocd,keep ignore_loglevel"
++# TODO: mem=512M video=unifb:1024x600-16@75
++# for nfs: root=/dev/nfs rw nfsroot=192.168.10.88:/home/udb/nfs/,rsize=1024,wsize=1024
++# ip=192.168.10.83:192.168.10.88:192.168.10.1:255.255.255.0::eth0:off
++CONFIG_CMDLINE_FORCE=y
++
++### Power management options
++CONFIG_PM=y
++CONFIG_HIBERNATION=y
++CONFIG_PM_STD_PARTITION="/dev/sda3"
++CONFIG_CPU_FREQ=n
++CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
++
++### Networking support
++CONFIG_NET=y
++# Networking options
++CONFIG_PACKET=m
++CONFIG_UNIX=m
++# TCP/IP networking
++CONFIG_INET=y
++CONFIG_IP_MULTICAST=y
++CONFIG_IP_PNP=y
++CONFIG_IPV6=n
++# Wireless
++CONFIG_WIRELESS=y
++CONFIG_WIRELESS_EXT=y
++CONFIG_MAC80211=m
++
++### PKUnity SoC Features
++CONFIG_USB_WLAN_HED_AQ3=n
++CONFIG_USB_CMMB_INNOFIDEI=n
++CONFIG_I2C_BATTERY_BQ27200=n
++CONFIG_I2C_EEPROM_AT24=n
++CONFIG_LCD_BACKLIGHT=n
++
++CONFIG_PUV3_RTC=y
++CONFIG_PUV3_UMAL=y
++CONFIG_PUV3_UNIGFX=y
++CONFIG_PUV3_MUSB=n
++CONFIG_PUV3_AC97=n
++CONFIG_PUV3_NAND=n
++CONFIG_PUV3_MMC=n
++CONFIG_PUV3_UART=n
++
++### Device Drivers
++# Memory Technology Device (MTD) support
++CONFIG_MTD=m
++CONFIG_MTD_UBI=m
++CONFIG_MTD_PARTITIONS=y
++CONFIG_MTD_CHAR=m
++CONFIG_MTD_BLKDEVS=m
++# RAM/ROM/Flash chip drivers
++CONFIG_MTD_CFI=m
++CONFIG_MTD_JEDECPROBE=m
++CONFIG_MTD_CFI_AMDSTD=m
++# Mapping drivers for chip access
++CONFIG_MTD_PHYSMAP=m
++
++# Block devices
++CONFIG_BLK_DEV_LOOP=m
++
++# SCSI device support
++CONFIG_SCSI=y
++CONFIG_BLK_DEV_SD=y
++CONFIG_BLK_DEV_SR=m
++CONFIG_CHR_DEV_SG=m
++
++# Serial ATA (prod) and Parallel ATA (experimental) drivers
++CONFIG_ATA=y
++CONFIG_SATA_VIA=y
++
++# Network device support
++CONFIG_NETDEVICES=y
++CONFIG_NET_ETHERNET=y
++CONFIG_NETDEV_1000=y
++# Wireless LAN
++CONFIG_WLAN_80211=n
++CONFIG_RT2X00=n
++CONFIG_RT73USB=n
++
++# Input device support
++CONFIG_INPUT_EVDEV=m
++# Keyboards
++CONFIG_KEYBOARD_GPIO=m
++
++# Hardware Monitoring support
++#CONFIG_SENSORS_LM75=m
++# Generic Thermal sysfs driver
++#CONFIG_THERMAL=m
++#CONFIG_THERMAL_HWMON=y
++
++# Multimedia support
++CONFIG_MEDIA_SUPPORT=n
++CONFIG_VIDEO_DEV=n
++CONFIG_USB_VIDEO_CLASS=n
++
++# Graphics support
++# Console display driver support
++CONFIG_VGA_CONSOLE=n
++CONFIG_FRAMEBUFFER_CONSOLE=y
++CONFIG_FONTS=y
++CONFIG_FONT_8x8=y
++CONFIG_FONT_8x16=y
++# Bootup logo
++CONFIG_LOGO=n
++
++# Sound card support
++CONFIG_SOUND=m
++# Advanced Linux Sound Architecture
++CONFIG_SND=m
++CONFIG_SND_MIXER_OSS=m
++CONFIG_SND_PCM_OSS=m
++
++# USB support
++CONFIG_USB_ARCH_HAS_HCD=n
++CONFIG_USB=n
++CONFIG_USB_DEVICEFS=n
++CONFIG_USB_PRINTER=n
++CONFIG_USB_STORAGE=n
++# Inventra Highspeed Dual Role Controller
++CONFIG_USB_MUSB_HDRC=n
++
++# LED Support
++CONFIG_NEW_LEDS=y
++CONFIG_LEDS_CLASS=y
++CONFIG_LEDS_GPIO=y
++# LED Triggers
++CONFIG_LEDS_TRIGGERS=y
++CONFIG_LEDS_TRIGGER_TIMER=y
++CONFIG_LEDS_TRIGGER_IDE_DISK=y
++CONFIG_LEDS_TRIGGER_HEARTBEAT=y
++
++# Real Time Clock
++CONFIG_RTC_LIB=m
++CONFIG_RTC_CLASS=m
++
++### File systems
++CONFIG_EXT2_FS=m
++CONFIG_EXT3_FS=y
++CONFIG_EXT4_FS=y
++CONFIG_FUSE_FS=m
++# CD-ROM/DVD Filesystems
++CONFIG_ISO9660_FS=m
++CONFIG_JOLIET=y
++CONFIG_UDF_FS=m
++# DOS/FAT/NT Filesystems
++CONFIG_VFAT_FS=m
++# Pseudo filesystems
++CONFIG_PROC_FS=y
++CONFIG_SYSFS=y
++CONFIG_TMPFS=y
++# Miscellaneous filesystems
++CONFIG_MISC_FILESYSTEMS=y
++CONFIG_JFFS2_FS=m
++CONFIG_UBIFS_FS=m
++# Network File Systems
++CONFIG_NETWORK_FILESYSTEMS=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V3=y
++CONFIG_ROOT_NFS=y
++# Partition Types
++CONFIG_PARTITION_ADVANCED=y
++CONFIG_MSDOS_PARTITION=y
++# Native language support
++CONFIG_NLS=y
++CONFIG_NLS_CODEPAGE_437=m
++CONFIG_NLS_CODEPAGE_936=m
++CONFIG_NLS_ISO8859_1=m
++CONFIG_NLS_UTF8=m
++
++### Kernel hacking
++CONFIG_FRAME_WARN=8096
++CONFIG_MAGIC_SYSRQ=y
++CONFIG_DEBUG_KERNEL=y
++CONFIG_PROVE_LOCKING=n
++CONFIG_DEBUG_BUGVERBOSE=y
++CONFIG_FRAME_POINTER=y
++CONFIG_DEBUG_LL=y
++
+diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
+new file mode 100644
+index 000000000000..b200fdaca44d
+--- /dev/null
++++ b/arch/unicore32/include/asm/Kbuild
+@@ -0,0 +1,2 @@
++include include/asm-generic/Kbuild.asm
++
+diff --git a/arch/unicore32/include/asm/linkage.h b/arch/unicore32/include/asm/linkage.h
+new file mode 100644
+index 000000000000..d1618bd35b67
+--- /dev/null
++++ b/arch/unicore32/include/asm/linkage.h
+@@ -0,0 +1,22 @@
++/*
++ * linux/arch/unicore32/include/asm/linkage.h
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 __UNICORE_LINKAGE_H__
++#define __UNICORE_LINKAGE_H__
++
++#define __ALIGN .align 0
++#define __ALIGN_STR ".align 0"
++
++#define ENDPROC(name) \
++ .type name, %function; \
++ END(name)
++
++#endif
+diff --git a/arch/unicore32/kernel/Makefile b/arch/unicore32/kernel/Makefile
+new file mode 100644
+index 000000000000..ec23a2fb2f50
+--- /dev/null
++++ b/arch/unicore32/kernel/Makefile
+@@ -0,0 +1,33 @@
++#
++# Makefile for the linux kernel.
++#
++
++# Object file lists.
++obj-y := dma.o elf.o entry.o process.o ptrace.o
++obj-y += setup.o signal.o sys.o stacktrace.o traps.o
++
++obj-$(CONFIG_MODULES) += ksyms.o module.o
++obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
++
++obj-$(CONFIG_CPU_FREQ) += cpu-ucv2.o
++obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o
++
++# obj-y for architecture PKUnity v3
++obj-$(CONFIG_ARCH_PUV3) += clock.o irq.o time.o
++
++obj-$(CONFIG_PUV3_GPIO) += gpio.o
++obj-$(CONFIG_PUV3_RTC) += rtc.o
++obj-$(CONFIG_PUV3_PWM) += pwm.o
++obj-$(CONFIG_PUV3_PM) += pm.o sleep.o
++obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate_asm.o
++
++obj-$(CONFIG_PCI) += pci.o
++
++# obj-y for specific machines
++obj-$(CONFIG_ARCH_PUV3) += puv3-core.o
++obj-$(CONFIG_PUV3_NB0916) += puv3-nb0916.o
++
++head-y := head.o
++obj-$(CONFIG_DEBUG_LL) += debug.o
++
++extra-y := $(head-y) init_task.o vmlinux.lds
+diff --git a/arch/unicore32/kernel/vmlinux.lds.S b/arch/unicore32/kernel/vmlinux.lds.S
+new file mode 100644
+index 000000000000..0b4eb89729e7
+--- /dev/null
++++ b/arch/unicore32/kernel/vmlinux.lds.S
+@@ -0,0 +1,61 @@
++/*
++ * linux/arch/unicore32/kernel/vmlinux.lds.S
++ *
++ * Code specific to PKUnity SoC and UniCore ISA
++ *
++ * Copyright (C) 2001-2010 GUAN Xue-tao
++ *
++ * 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 <asm-generic/vmlinux.lds.h>
++#include <asm/thread_info.h>
++#include <asm/memory.h>
++#include <asm/page.h>
++
++OUTPUT_ARCH(unicore32)
++ENTRY(stext)
++
++jiffies = jiffies_64;
++
++SECTIONS
++{
++ . = PAGE_OFFSET + KERNEL_IMAGE_START;
++
++ _text = .;
++ __init_begin = .;
++ HEAD_TEXT_SECTION
++ INIT_TEXT_SECTION(PAGE_SIZE)
++ INIT_DATA_SECTION(16)
++ PERCPU(PAGE_SIZE)
++ __init_end = .;
++
++ _stext = .;
++ .text : { /* Real text segment */
++ TEXT_TEXT
++ SCHED_TEXT
++ LOCK_TEXT
++
++ *(.fixup)
++ *(.gnu.warning)
++ }
++ _etext = .;
++
++ _sdata = .;
++ RO_DATA_SECTION(PAGE_SIZE)
++ RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
++ _edata = .;
++
++ EXCEPTION_TABLE(32)
++ NOTES
++
++ BSS_SECTION(0, 0, 0)
++ _end = .;
++
++ STABS_DEBUG
++ DWARF_DEBUG
++
++ DISCARDS /* Exit code and data */
++}commit 7f509a9ef7af0d6ac852d49eb87ed2b9857821cc
+Author: GuanXuetao <gxt@mprc.pku.edu.cn>
+Date: Sat Jan 15 18:08:09 2011 +0800
+
+ asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h
+
+ This patch changes the implementation of strnlen_user in include/asm-generic/uaccess.h.
+ Originally, it calls strlen() function directly, which may not correctly handle the access of
+ user space in most mmu-enabled architectures.
+ New __strnlen_user is added for using as an architecture specific function.
+
+ Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+ Reviewed-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
+index b218b8513d04..ac68c999b6c2 100644
+--- a/include/asm-generic/uaccess.h
++++ b/include/asm-generic/uaccess.h
+@@ -288,14 +288,16 @@ strncpy_from_user(char *dst, const char __user *src, long count)
+ *
+ * Return 0 on exception, a value greater than N if too long
+ */
+-#ifndef strnlen_user
++#ifndef __strnlen_user
++#define __strnlen_user strnlen
++#endif
++
+ static inline long strnlen_user(const char __user *src, long n)
+ {
+ if (!access_ok(VERIFY_READ, src, 1))
+ return 0;
+- return strlen((void * __force)src) + 1;
++ return __strnlen_user(src, n);
+ }
+-#endif
+
+ static inline long strlen_user(const char __user *src)
+ {commit 38f5bf84bd588a82890f5ab32cba3317555a73e1 +Author: GuanXuetao <gxt@mprc.pku.edu.cn> +Date: Sat Jan 15 18:07:08 2011 +0800 + + asm-generic headers: add ftrace.h + + This patch adds ftrace.h into asm-generic headers. + The file content could be empty in most architectures. + + Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> + Acked-by: Arnd Bergmann <arnd@arndb.de> + +diff --git a/include/asm-generic/ftrace.h b/include/asm-generic/ftrace.h +new file mode 100644 +index 000000000000..51abba9ea7ad +--- /dev/null ++++ b/include/asm-generic/ftrace.h +@@ -0,0 +1,16 @@ ++/* ++ * linux/include/asm-generic/ftrace.h ++ * ++ * 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 __ASM_GENERIC_FTRACE_H__ ++#define __ASM_GENERIC_FTRACE_H__ ++ ++/* ++ * Not all architectures need their own ftrace.h, the most ++ * common definitions are already in linux/ftrace.h. ++ */ ++ ++#endif /* __ASM_GENERIC_FTRACE_H__ */+
commit 3b79954fd00d540677c97a560622b73f3a1f4e28
+Author: Zihao Wang <wzhd@ustc.edu>
+Date: Sun Apr 24 16:41:20 2022 +0800
+
+ ALSA: hda/realtek: Add quirk for Yoga Duet 7 13ITL6 speakers
+
+ Lenovo Yoga Duet 7 13ITL6 has Realtek ALC287 and built-in
+ speakers do not work out of the box. The fix developed for
+ Yoga 7i 14ITL5 also enables speaker output for this model.
+
+ Signed-off-by: Zihao Wang <wzhd@ustc.edu>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/20220424084120.74125-1-wzhd@ustc.edu
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
+index c65d3dbc6cc9..cf531c1efa13 100644
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -9247,6 +9247,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+ SND_PCI_QUIRK(0x17aa, 0x3813, "Legion 7i 15IMHG05", ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS),
+ SND_PCI_QUIRK(0x17aa, 0x3818, "Lenovo C940", ALC298_FIXUP_LENOVO_SPK_VOLUME),
+ SND_PCI_QUIRK(0x17aa, 0x3819, "Lenovo 13s Gen2 ITL", ALC287_FIXUP_13S_GEN2_SPEAKERS),
++ SND_PCI_QUIRK(0x17aa, 0x3820, "Yoga Duet 7 13ITL6", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),
+ SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),
+ SND_PCI_QUIRK(0x17aa, 0x3827, "Ideapad S740", ALC285_FIXUP_IDEAPAD_S740_COEF),
+ SND_PCI_QUIRK(0x17aa, 0x3834, "Lenovo IdeaPad Slim 9i 14ITL5", ALC287_FIXUP_YOGA7_14ITL_SPEAKERS),commit aadb22ba2f656581b2f733deb3a467c48cc618f6
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Apr 6 21:04:43 2022 +0200
+
+ drbd: Fix five use after free bugs in get_initial_state
+
+ In get_initial_state, it calls notify_initial_state_done(skb,..) if
+ cb->args[5]==1. If genlmsg_put() failed in notify_initial_state_done(),
+ the skb will be freed by nlmsg_free(skb).
+ Then get_initial_state will goto out and the freed skb will be used by
+ return value skb->len, which is a uaf bug.
+
+ What's worse, the same problem goes even further: skb can also be
+ freed in the notify_*_state_change -> notify_*_state calls below.
+ Thus 4 additional uaf bugs happened.
+
+ My patch lets the problem callee functions: notify_initial_state_done
+ and notify_*_state_change return an error code if errors happen.
+ So that the error codes could be propagated and the uaf bugs can be avoid.
+
+ v2 reports a compilation warning. This v3 fixed this warning and built
+ successfully in my local environment with no additional warnings.
+ v2: https://lore.kernel.org/patchwork/patch/1435218/
+
+ Fixes: a29728463b254 ("drbd: Backport the "events2" command")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
+ Signed-off-by: Jens Axboe <axboe@kernel.dk>
+
+diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
+index 4b55e864a0a3..4d3efaa20b7b 100644
+--- a/drivers/block/drbd/drbd_int.h
++++ b/drivers/block/drbd/drbd_int.h
+@@ -1638,22 +1638,22 @@ struct sib_info {
+ };
+ void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib);
+
+-extern void notify_resource_state(struct sk_buff *,
++extern int notify_resource_state(struct sk_buff *,
+ unsigned int,
+ struct drbd_resource *,
+ struct resource_info *,
+ enum drbd_notification_type);
+-extern void notify_device_state(struct sk_buff *,
++extern int notify_device_state(struct sk_buff *,
+ unsigned int,
+ struct drbd_device *,
+ struct device_info *,
+ enum drbd_notification_type);
+-extern void notify_connection_state(struct sk_buff *,
++extern int notify_connection_state(struct sk_buff *,
+ unsigned int,
+ struct drbd_connection *,
+ struct connection_info *,
+ enum drbd_notification_type);
+-extern void notify_peer_device_state(struct sk_buff *,
++extern int notify_peer_device_state(struct sk_buff *,
+ unsigned int,
+ struct drbd_peer_device *,
+ struct peer_device_info *,
+diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
+index 02030c9c4d3b..b7216c186ba4 100644
+--- a/drivers/block/drbd/drbd_nl.c
++++ b/drivers/block/drbd/drbd_nl.c
+@@ -4549,7 +4549,7 @@ static int nla_put_notification_header(struct sk_buff *msg,
+ return drbd_notification_header_to_skb(msg, &nh, true);
+ }
+
+-void notify_resource_state(struct sk_buff *skb,
++int notify_resource_state(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_resource *resource,
+ struct resource_info *resource_info,
+@@ -4591,16 +4591,17 @@ void notify_resource_state(struct sk_buff *skb,
+ if (err && err != -ESRCH)
+ goto failed;
+ }
+- return;
++ return 0;
+
+ nla_put_failure:
+ nlmsg_free(skb);
+ failed:
+ drbd_err(resource, "Error %d while broadcasting event. Event seq:%u\n",
+ err, seq);
++ return err;
+ }
+
+-void notify_device_state(struct sk_buff *skb,
++int notify_device_state(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_device *device,
+ struct device_info *device_info,
+@@ -4640,16 +4641,17 @@ void notify_device_state(struct sk_buff *skb,
+ if (err && err != -ESRCH)
+ goto failed;
+ }
+- return;
++ return 0;
+
+ nla_put_failure:
+ nlmsg_free(skb);
+ failed:
+ drbd_err(device, "Error %d while broadcasting event. Event seq:%u\n",
+ err, seq);
++ return err;
+ }
+
+-void notify_connection_state(struct sk_buff *skb,
++int notify_connection_state(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_connection *connection,
+ struct connection_info *connection_info,
+@@ -4689,16 +4691,17 @@ void notify_connection_state(struct sk_buff *skb,
+ if (err && err != -ESRCH)
+ goto failed;
+ }
+- return;
++ return 0;
+
+ nla_put_failure:
+ nlmsg_free(skb);
+ failed:
+ drbd_err(connection, "Error %d while broadcasting event. Event seq:%u\n",
+ err, seq);
++ return err;
+ }
+
+-void notify_peer_device_state(struct sk_buff *skb,
++int notify_peer_device_state(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_peer_device *peer_device,
+ struct peer_device_info *peer_device_info,
+@@ -4739,13 +4742,14 @@ void notify_peer_device_state(struct sk_buff *skb,
+ if (err && err != -ESRCH)
+ goto failed;
+ }
+- return;
++ return 0;
+
+ nla_put_failure:
+ nlmsg_free(skb);
+ failed:
+ drbd_err(peer_device, "Error %d while broadcasting event. Event seq:%u\n",
+ err, seq);
++ return err;
+ }
+
+ void notify_helper(enum drbd_notification_type type,
+@@ -4796,7 +4800,7 @@ void notify_helper(enum drbd_notification_type type,
+ err, seq);
+ }
+
+-static void notify_initial_state_done(struct sk_buff *skb, unsigned int seq)
++static int notify_initial_state_done(struct sk_buff *skb, unsigned int seq)
+ {
+ struct drbd_genlmsghdr *dh;
+ int err;
+@@ -4810,11 +4814,12 @@ static void notify_initial_state_done(struct sk_buff *skb, unsigned int seq)
+ if (nla_put_notification_header(skb, NOTIFY_EXISTS))
+ goto nla_put_failure;
+ genlmsg_end(skb, dh);
+- return;
++ return 0;
+
+ nla_put_failure:
+ nlmsg_free(skb);
+ pr_err("Error %d sending event. Event seq:%u\n", err, seq);
++ return err;
+ }
+
+ static void free_state_changes(struct list_head *list)
+@@ -4841,6 +4846,7 @@ static int get_initial_state(struct sk_buff *skb, struct netlink_callback *cb)
+ unsigned int seq = cb->args[2];
+ unsigned int n;
+ enum drbd_notification_type flags = 0;
++ int err = 0;
+
+ /* There is no need for taking notification_mutex here: it doesn't
+ matter if the initial state events mix with later state chage
+@@ -4849,32 +4855,32 @@ static int get_initial_state(struct sk_buff *skb, struct netlink_callback *cb)
+
+ cb->args[5]--;
+ if (cb->args[5] == 1) {
+- notify_initial_state_done(skb, seq);
++ err = notify_initial_state_done(skb, seq);
+ goto out;
+ }
+ n = cb->args[4]++;
+ if (cb->args[4] < cb->args[3])
+ flags |= NOTIFY_CONTINUES;
+ if (n < 1) {
+- notify_resource_state_change(skb, seq, state_change->resource,
++ err = notify_resource_state_change(skb, seq, state_change->resource,
+ NOTIFY_EXISTS | flags);
+ goto next;
+ }
+ n--;
+ if (n < state_change->n_connections) {
+- notify_connection_state_change(skb, seq, &state_change->connections[n],
++ err = notify_connection_state_change(skb, seq, &state_change->connections[n],
+ NOTIFY_EXISTS | flags);
+ goto next;
+ }
+ n -= state_change->n_connections;
+ if (n < state_change->n_devices) {
+- notify_device_state_change(skb, seq, &state_change->devices[n],
++ err = notify_device_state_change(skb, seq, &state_change->devices[n],
+ NOTIFY_EXISTS | flags);
+ goto next;
+ }
+ n -= state_change->n_devices;
+ if (n < state_change->n_devices * state_change->n_connections) {
+- notify_peer_device_state_change(skb, seq, &state_change->peer_devices[n],
++ err = notify_peer_device_state_change(skb, seq, &state_change->peer_devices[n],
+ NOTIFY_EXISTS | flags);
+ goto next;
+ }
+@@ -4889,7 +4895,10 @@ static int get_initial_state(struct sk_buff *skb, struct netlink_callback *cb)
+ cb->args[4] = 0;
+ }
+ out:
+- return skb->len;
++ if (err)
++ return err;
++ else
++ return skb->len;
+ }
+
+ int drbd_adm_get_initial_state(struct sk_buff *skb, struct netlink_callback *cb)
+diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
+index b8a27818ab3f..4ee11aef6672 100644
+--- a/drivers/block/drbd/drbd_state.c
++++ b/drivers/block/drbd/drbd_state.c
+@@ -1537,7 +1537,7 @@ int drbd_bitmap_io_from_worker(struct drbd_device *device,
+ return rv;
+ }
+
+-void notify_resource_state_change(struct sk_buff *skb,
++int notify_resource_state_change(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_resource_state_change *resource_state_change,
+ enum drbd_notification_type type)
+@@ -1550,10 +1550,10 @@ void notify_resource_state_change(struct sk_buff *skb,
+ .res_susp_fen = resource_state_change->susp_fen[NEW],
+ };
+
+- notify_resource_state(skb, seq, resource, &resource_info, type);
++ return notify_resource_state(skb, seq, resource, &resource_info, type);
+ }
+
+-void notify_connection_state_change(struct sk_buff *skb,
++int notify_connection_state_change(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_connection_state_change *connection_state_change,
+ enum drbd_notification_type type)
+@@ -1564,10 +1564,10 @@ void notify_connection_state_change(struct sk_buff *skb,
+ .conn_role = connection_state_change->peer_role[NEW],
+ };
+
+- notify_connection_state(skb, seq, connection, &connection_info, type);
++ return notify_connection_state(skb, seq, connection, &connection_info, type);
+ }
+
+-void notify_device_state_change(struct sk_buff *skb,
++int notify_device_state_change(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_device_state_change *device_state_change,
+ enum drbd_notification_type type)
+@@ -1577,10 +1577,10 @@ void notify_device_state_change(struct sk_buff *skb,
+ .dev_disk_state = device_state_change->disk_state[NEW],
+ };
+
+- notify_device_state(skb, seq, device, &device_info, type);
++ return notify_device_state(skb, seq, device, &device_info, type);
+ }
+
+-void notify_peer_device_state_change(struct sk_buff *skb,
++int notify_peer_device_state_change(struct sk_buff *skb,
+ unsigned int seq,
+ struct drbd_peer_device_state_change *p,
+ enum drbd_notification_type type)
+@@ -1594,7 +1594,7 @@ void notify_peer_device_state_change(struct sk_buff *skb,
+ .peer_resync_susp_dependency = p->resync_susp_dependency[NEW],
+ };
+
+- notify_peer_device_state(skb, seq, peer_device, &peer_device_info, type);
++ return notify_peer_device_state(skb, seq, peer_device, &peer_device_info, type);
+ }
+
+ static void broadcast_state_change(struct drbd_state_change *state_change)
+@@ -1602,7 +1602,7 @@ static void broadcast_state_change(struct drbd_state_change *state_change)
+ struct drbd_resource_state_change *resource_state_change = &state_change->resource[0];
+ bool resource_state_has_changed;
+ unsigned int n_device, n_connection, n_peer_device, n_peer_devices;
+- void (*last_func)(struct sk_buff *, unsigned int, void *,
++ int (*last_func)(struct sk_buff *, unsigned int, void *,
+ enum drbd_notification_type) = NULL;
+ void *last_arg = NULL;
+
+diff --git a/drivers/block/drbd/drbd_state_change.h b/drivers/block/drbd/drbd_state_change.h
+index ba80f612d6ab..d5b0479bc9a6 100644
+--- a/drivers/block/drbd/drbd_state_change.h
++++ b/drivers/block/drbd/drbd_state_change.h
+@@ -44,19 +44,19 @@ extern struct drbd_state_change *remember_old_state(struct drbd_resource *, gfp_
+ extern void copy_old_to_new_state_change(struct drbd_state_change *);
+ extern void forget_state_change(struct drbd_state_change *);
+
+-extern void notify_resource_state_change(struct sk_buff *,
++extern int notify_resource_state_change(struct sk_buff *,
+ unsigned int,
+ struct drbd_resource_state_change *,
+ enum drbd_notification_type type);
+-extern void notify_connection_state_change(struct sk_buff *,
++extern int notify_connection_state_change(struct sk_buff *,
+ unsigned int,
+ struct drbd_connection_state_change *,
+ enum drbd_notification_type type);
+-extern void notify_device_state_change(struct sk_buff *,
++extern int notify_device_state_change(struct sk_buff *,
+ unsigned int,
+ struct drbd_device_state_change *,
+ enum drbd_notification_type type);
+-extern void notify_peer_device_state_change(struct sk_buff *,
++extern int notify_peer_device_state_change(struct sk_buff *,
+ unsigned int,
+ struct drbd_peer_device_state_change *,
+ enum drbd_notification_type type);commit f27456693b960ce4022d40b943808b3362ce80f9 +Author: zhuxinran <zhuran@mail.ustc.edu.cn> +Date: Thu Dec 16 14:14:39 2021 +0800 + + 9p/trans_virtio: Fix typo in the comment for p9_virtio_create() + + couldlook ==> could look + + Link: https://lkml.kernel.org/r/20211216061439.4186-1-zhuran@mail.ustc.edu.cn + Signed-off-by: zhuxinran <zhuran@mail.ustc.edu.cn> + Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> + +diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c +index bd5a89c4960d..f7dc561ca516 100644 +--- a/net/9p/trans_virtio.c ++++ b/net/9p/trans_virtio.c +@@ -648,7 +648,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) + * @args: args passed from sys_mount() for per-transport options (unused) + * + * This sets up a transport channel for 9p communication. Right now +- * we only match the first available channel, but eventually we couldlook up ++ * we only match the first available channel, but eventually we could look up + * alternate channels by matching devname versus a virtio_config entry. + * We use a simple reference count mechanism to ensure that only a single + * mount has a channel open at a time.
commit f973795a8d19cbf3d03807704eb7c6ff65788d5a
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Fri Apr 2 22:47:55 2021 -0700
+
+ wireless: iwlwifi: Fix a double free in iwl_txq_dyn_alloc_dma
+
+ In iwl_txq_dyn_alloc_dma, txq->tfds is freed at first time by:
+ iwl_txq_alloc()->goto err_free_tfds->dma_free_coherent(). But
+ it forgot to set txq->tfds to NULL.
+
+ Then the txq->tfds is freed again in iwl_txq_dyn_alloc_dma by:
+ goto error->iwl_txq_gen2_free_memory()->dma_free_coherent().
+
+ My patch sets txq->tfds to NULL after the first free to avoid the
+ double free.
+
+ Fixes: 0cd1ad2d7fd41 ("iwlwifi: move all bus-independent TX functions to common code")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Link: https://lore.kernel.org/r/20210403054755.4781-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
+index 451b06069350..0f3526b0c5b0 100644
+--- a/drivers/net/wireless/intel/iwlwifi/queue/tx.c
++++ b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
+@@ -1072,6 +1072,7 @@ int iwl_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,
+ return 0;
+ err_free_tfds:
+ dma_free_coherent(trans->dev, tfd_sz, txq->tfds, txq->dma_addr);
++ txq->tfds = NULL;
+ error:
+ if (txq->entries && cmd_queue)
+ for (i = 0; i < slots_num; i++)commit 7dd0c9e547b6924e18712b6b51aa3cba1896ee2c +Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn> +Date: Sun May 9 10:24:02 2021 +0200 + + media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release + + A use after free bug caused by the dangling pointer + filp->privitate_data in v4l2_fh_release. + See https://lore.kernel.org/patchwork/patch/1419058/. + + My patch sets the dangling pointer to NULL to provide + robust. + + Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn> + Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> + Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> + +diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c +index 684574f58e82..90eec79ee995 100644 +--- a/drivers/media/v4l2-core/v4l2-fh.c ++++ b/drivers/media/v4l2-core/v4l2-fh.c +@@ -96,6 +96,7 @@ int v4l2_fh_release(struct file *filp) + v4l2_fh_del(fh); + v4l2_fh_exit(fh); + kfree(fh); ++ filp->private_data = NULL; + } + return 0; + }
commit 01fe904c9afd26e79c1f73aa0ca2e3d785e5e319
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Sun May 9 10:12:31 2021 +0200
+
+ media: exynos4-is: Fix a use after free in isp_video_release
+
+ In isp_video_release, file->private_data is freed via
+ _vb2_fop_release()->v4l2_fh_release(). But the freed
+ file->private_data is still used in v4l2_fh_is_singular_file()
+ ->v4l2_fh_is_singular(file->private_data), which is a use
+ after free bug.
+
+ My patch uses a variable 'is_singular_file' to avoid the uaf.
+ v3: https://lore.kernel.org/patchwork/patch/1419058/
+
+ Fixes: 34947b8aebe3f ("[media] exynos4-is: Add the FIMC-IS ISP capture DMA driver")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+
+diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
+index 8d9dc597deaa..83688a7982f7 100644
+--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
++++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
+@@ -305,17 +305,20 @@ static int isp_video_release(struct file *file)
+ struct fimc_is_video *ivc = &isp->video_capture;
+ struct media_entity *entity = &ivc->ve.vdev.entity;
+ struct media_device *mdev = entity->graph_obj.mdev;
++ bool is_singular_file;
+
+ mutex_lock(&isp->video_lock);
+
+- if (v4l2_fh_is_singular_file(file) && ivc->streaming) {
++ is_singular_file = v4l2_fh_is_singular_file(file);
++
++ if (is_singular_file && ivc->streaming) {
+ media_pipeline_stop(entity);
+ ivc->streaming = 0;
+ }
+
+ _vb2_fop_release(file, NULL);
+
+- if (v4l2_fh_is_singular_file(file)) {
++ if (is_singular_file) {
+ fimc_pipeline_call(&ivc->ve, close);
+
+ mutex_lock(&mdev->graph_mutex);commit 9272e5d0028d45a3b45b58c9255e6e0df53f7ad9
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon May 24 02:32:05 2021 -0700
+
+ ipack/carriers/tpci200: Fix a double free in tpci200_pci_probe
+
+ In the out_err_bus_register error branch of tpci200_pci_probe,
+ tpci200->info->cfg_regs is freed by tpci200_uninstall()->
+ tpci200_unregister()->pci_iounmap(..,tpci200->info->cfg_regs)
+ in the first time.
+
+ But later, iounmap() is called to free tpci200->info->cfg_regs
+ again.
+
+ My patch sets tpci200->info->cfg_regs to NULL after tpci200_uninstall()
+ to avoid the double free.
+
+ Fixes: cea2f7cdff2af ("Staging: ipack/bridges/tpci200: Use the TPCI200 in big endian mode")
+ Cc: stable <stable@vger.kernel.org>
+ Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Link: https://lore.kernel.org/r/20210524093205.8333-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
+index ec71063fff76..e1822e87ec3d 100644
+--- a/drivers/ipack/carriers/tpci200.c
++++ b/drivers/ipack/carriers/tpci200.c
+@@ -596,8 +596,11 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
+
+ out_err_bus_register:
+ tpci200_uninstall(tpci200);
++ /* tpci200->info->cfg_regs is unmapped in tpci200_uninstall */
++ tpci200->info->cfg_regs = NULL;
+ out_err_install:
+- iounmap(tpci200->info->cfg_regs);
++ if (tpci200->info->cfg_regs)
++ iounmap(tpci200->info->cfg_regs);
+ out_err_ioremap:
+ pci_release_region(pdev, TPCI200_CFG_MEM_BAR);
+ out_err_pci_request:commit 8f3e136ff378a2b22dbc0ca2a6e58022e6df36d2
+Author: Jisheng Zhang <jszhang3@mail.ustc.edu.cn>
+Date: Fri May 7 22:19:59 2021 +0800
+
+ riscv: mm: Remove setup_zero_page()
+
+ The empty_zero_page sits at .bss..page_aligned section, so will be
+ cleared to zero during clearing bss, we don't need to clear it again.
+
+ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
+ Reviewed-by: Anup Patel <anup@brainfault.org>
+ Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
+
+diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
+index 4faf8bd157ea..11b61bea0c4d 100644
+--- a/arch/riscv/mm/init.c
++++ b/arch/riscv/mm/init.c
+@@ -67,11 +67,6 @@ static void __init zone_sizes_init(void)
+ free_area_init(max_zone_pfns);
+ }
+
+-static void __init setup_zero_page(void)
+-{
+- memset((void *)empty_zero_page, 0, PAGE_SIZE);
+-}
+-
+ #if defined(CONFIG_MMU) && defined(CONFIG_DEBUG_VM)
+ static inline void print_mlk(char *name, unsigned long b, unsigned long t)
+ {
+@@ -867,7 +862,6 @@ RESERVEDMEM_OF_DECLARE(elfcorehdr, "linux,elfcorehdr", elfcore_hdr_setup);
+ void __init paging_init(void)
+ {
+ setup_vm_final();
+- setup_zero_page();
+ }
+
+ void __init misc_mem_init(void)commit 7272b591c4cb9327c43443f67b8fbae7657dd9ae
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 10:06:20 2021 -0700
+
+ misc/libmasm/module: Fix two use after free in ibmasm_init_one
+
+ In ibmasm_init_one, it calls ibmasm_init_remote_input_dev().
+ Inside ibmasm_init_remote_input_dev, mouse_dev and keybd_dev are
+ allocated by input_allocate_device(), and assigned to
+ sp->remote.mouse_dev and sp->remote.keybd_dev respectively.
+
+ In the err_free_devices error branch of ibmasm_init_one,
+ mouse_dev and keybd_dev are freed by input_free_device(), and return
+ error. Then the execution runs into error_send_message error branch
+ of ibmasm_init_one, where ibmasm_free_remote_input_dev(sp) is called
+ to unregister the freed sp->remote.mouse_dev and sp->remote.keybd_dev.
+
+ My patch add a "error_init_remote" label to handle the error of
+ ibmasm_init_remote_input_dev(), to avoid the uaf bugs.
+
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Link: https://lore.kernel.org/r/20210426170620.10546-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
+index 4edad6c445d3..dc8a06c06c63 100644
+--- a/drivers/misc/ibmasm/module.c
++++ b/drivers/misc/ibmasm/module.c
+@@ -111,7 +111,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ result = ibmasm_init_remote_input_dev(sp);
+ if (result) {
+ dev_err(sp->dev, "Failed to initialize remote queue\n");
+- goto error_send_message;
++ goto error_init_remote;
+ }
+
+ result = ibmasm_send_driver_vpd(sp);
+@@ -131,8 +131,9 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ return 0;
+
+ error_send_message:
+- disable_sp_interrupts(sp->base_address);
+ ibmasm_free_remote_input_dev(sp);
++error_init_remote:
++ disable_sp_interrupts(sp->base_address);
+ free_irq(sp->irq, (void *)sp);
+ error_request_irq:
+ iounmap(sp->base_address);commit ea995218dddba171fecd05496c69617c5ef3c5b8
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 05:43:40 2021 -0700
+
+ drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp
+
+ Our code analyzer reported a double free bug.
+
+ In gen8_preallocate_top_level_pdp, pde and pde->pt.base are allocated
+ via alloc_pd(vm) with one reference. If pin_pt_dma() failed, pde->pt.base
+ is freed by i915_gem_object_put() with a reference dropped. Then free_pd
+ calls free_px() defined in intel_ppgtt.c, which calls i915_gem_object_put()
+ to put pde->pt.base again.
+
+ As pde->pt.base is protected by refcount, so the second put will not free
+ pde->pt.base actually. But, maybe it is better to remove the first put?
+
+ Fixes: 82adf901138cc ("drm/i915/gt: Shrink i915_page_directory's slab bucket")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Matthew Auld <matthew.auld@intel.com>
+ Signed-off-by: Matthew Auld <matthew.auld@intel.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20210426124340.4238-1-lyl2019@mail.ustc.edu.cn
+ (cherry picked from commit ac69496fe65cca0611d5917b7d232730ff605bc7)
+ Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+index 176c19633412..74bf6fc8461f 100644
+--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
++++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+@@ -641,7 +641,6 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)
+
+ err = pin_pt_dma(vm, pde->pt.base);
+ if (err) {
+- i915_gem_object_put(pde->pt.base);
+ free_pd(vm, pde);
+ return err;
+ }
+ commit cf01fb9985e8deb25ccf0ea54d916b8871ae0e62
+Author: Chris Salls <salls@cs.ucsb.edu>
+Date: Fri Apr 7 23:48:11 2017 -0700
+
+ mm/mempolicy.c: fix error handling in set_mempolicy and mbind.
+
+ In the case that compat_get_bitmap fails we do not want to copy the
+ bitmap to the user as it will contain uninitialized stack data and leak
+ sensitive data.
+
+ Signed-off-by: Chris Salls <salls@cs.ucsb.edu>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/mempolicy.c b/mm/mempolicy.c
+index 75b2745bac41..37d0b334bfe9 100644
+--- a/mm/mempolicy.c
++++ b/mm/mempolicy.c
+@@ -1529,7 +1529,6 @@ COMPAT_SYSCALL_DEFINE5(get_mempolicy, int __user *, policy,
+ COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask,
+ compat_ulong_t, maxnode)
+ {
+- long err = 0;
+ unsigned long __user *nm = NULL;
+ unsigned long nr_bits, alloc_size;
+ DECLARE_BITMAP(bm, MAX_NUMNODES);
+@@ -1538,14 +1537,13 @@ COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask,
+ alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8;
+
+ if (nmask) {
+- err = compat_get_bitmap(bm, nmask, nr_bits);
++ if (compat_get_bitmap(bm, nmask, nr_bits))
++ return -EFAULT;
+ nm = compat_alloc_user_space(alloc_size);
+- err |= copy_to_user(nm, bm, alloc_size);
++ if (copy_to_user(nm, bm, alloc_size))
++ return -EFAULT;
+ }
+
+- if (err)
+- return -EFAULT;
+-
+ return sys_set_mempolicy(mode, nm, nr_bits+1);
+ }
+
+@@ -1553,7 +1551,6 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len,
+ compat_ulong_t, mode, compat_ulong_t __user *, nmask,
+ compat_ulong_t, maxnode, compat_ulong_t, flags)
+ {
+- long err = 0;
+ unsigned long __user *nm = NULL;
+ unsigned long nr_bits, alloc_size;
+ nodemask_t bm;
+@@ -1562,14 +1559,13 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len,
+ alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8;
+
+ if (nmask) {
+- err = compat_get_bitmap(nodes_addr(bm), nmask, nr_bits);
++ if (compat_get_bitmap(nodes_addr(bm), nmask, nr_bits))
++ return -EFAULT;
+ nm = compat_alloc_user_space(alloc_size);
+- err |= copy_to_user(nm, nodes_addr(bm), alloc_size);
++ if (copy_to_user(nm, nodes_addr(bm), alloc_size))
++ return -EFAULT;
+ }
+
+- if (err)
+- return -EFAULT;
+-
+ return sys_mbind(start, len, mode, nm, nr_bits+1, flags);
+ }
+
+ commit 9c7fe83530a351845719acf1dda0587e8c743588 +Author: Daniel DeFreez <dcdefreez@ucdavis.edu> +Date: Tue Apr 19 19:57:45 2016 -0400 + + GFS2: Add calls to gfs2_holder_uninit in two error handlers + + This patch fixes two locations that do not call gfs2_holder_uninit + if gfs2_glock_nq returns an error. + + Signed-off-by: Daniel DeFreez <dcdefreez@ucdavis.edu> + Signed-off-by: Bob Peterson <rpeterso@redhat.com> + +diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c +index aa016e4b8bec..58dd0061134b 100644 +--- a/fs/gfs2/aops.c ++++ b/fs/gfs2/aops.c +@@ -1063,7 +1063,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, + gfs2_holder_init(ip->i_gl, LM_ST_DEFERRED, 0, &gh); + rv = gfs2_glock_nq(&gh); + if (rv) +- return rv; ++ goto out_uninit; + rv = gfs2_ok_for_dio(ip, offset); + if (rv != 1) + goto out; /* dio not valid, fall back to buffered i/o */ +@@ -1102,6 +1102,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, + offset, gfs2_get_block_direct, NULL, NULL, 0); + out: + gfs2_glock_dq(&gh); ++out_uninit: + gfs2_holder_uninit(&gh); + return rv; + } +diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c +index fd9a10e4518d..f33fd92e5f49 100644 +--- a/fs/gfs2/file.c ++++ b/fs/gfs2/file.c +@@ -160,7 +160,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) + gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh); + error = gfs2_glock_nq(&gh); + if (error) +- return error; ++ goto out_uninit; + + fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_diskflags); + if (!S_ISDIR(inode->i_mode) && ip->i_diskflags & GFS2_DIF_JDATA) +@@ -169,6 +169,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) + error = -EFAULT; + + gfs2_glock_dq(&gh); ++out_uninit: + gfs2_holder_uninit(&gh); + return error; + }+
commit 0ad2a8365975d6794d79a4e4dde60fcc036692c7
+Author: Beshay, Joseph <jdb109120@utdallas.edu>
+Date: Mon Apr 6 18:00:56 2015 +0000
+
+ netem: Fixes byte backlog accounting for the first of two chained netem instances
+
+ Fixes byte backlog accounting for the first of two chained netem instances.
+ Bytes backlog reported now corresponds to the number of queued packets.
+
+ When two netem instances are chained, for instance to apply rate and queue
+ limitation followed by packet delay, the number of backlogged bytes reported
+ by the first netem instance is wrong. It reports the sum of bytes in the queues
+ of the first and second netem. The first netem reports the correct number of
+ backlogged packets but not bytes. This is shown in the example below.
+
+ Consider a chain of two netem schedulers created using the following commands:
+
+ $ tc -s qdisc replace dev veth2 root handle 1:0 netem rate 10000kbit limit 100
+ $ tc -s qdisc add dev veth2 parent 1:0 handle 2: netem delay 50ms
+
+ Start an iperf session to send packets out on the specified interface and
+ monitor the backlog using tc:
+
+ $ tc -s qdisc show dev veth2
+
+ Output using unpatched netem:
+ qdisc netem 1: root refcnt 2 limit 100 rate 10000Kbit
+ Sent 98422639 bytes 65434 pkt (dropped 123, overlimits 0 requeues 0)
+ backlog 172694b 73p requeues 0
+ qdisc netem 2: parent 1: limit 1000 delay 50.0ms
+ Sent 98422639 bytes 65434 pkt (dropped 0, overlimits 0 requeues 0)
+ backlog 63588b 42p requeues 0
+
+ The interface used to produce this output has an MTU of 1500. The output for
+ backlogged bytes behind netem 1 is 172694b. This value is not correct. Consider
+ the total number of sent bytes and packets. By dividing the number of sent
+ bytes by the number of sent packets, we get an average packet size of ~=1504.
+ If we divide the number of backlogged bytes by packets, we get ~=2365. This is
+ due to the first netem incorrectly counting the 63588b which are in netem 2's
+ queue as being in its own queue. To verify this is the case, we subtract them
+ from the reported value and divide by the number of packets as follows:
+ 172694 - 63588 = 109106 bytes actualled backlogged in netem 1
+ 109106 / 73 packets ~= 1494 bytes (which matches our MTU)
+
+ The root cause is that the byte accounting is not done at the
+ same time with packet accounting. The solution is to update the backlog value
+ every time the packet queue is updated.
+
+ Signed-off-by: Joseph D Beshay <joseph.beshay@utdallas.edu>
+ Acked-by: Hagen Paul Pfeifer <hagen@jauu.net>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
+index 179f1c8c0d8b..956ead2cab9a 100644
+--- a/net/sched/sch_netem.c
++++ b/net/sched/sch_netem.c
+@@ -560,8 +560,8 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
+ tfifo_dequeue:
+ skb = __skb_dequeue(&sch->q);
+ if (skb) {
+-deliver:
+ qdisc_qstats_backlog_dec(sch, skb);
++deliver:
+ qdisc_unthrottled(sch);
+ qdisc_bstats_update(sch, skb);
+ return skb;
+@@ -578,6 +578,7 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
+ rb_erase(p, &q->t_root);
+
+ sch->q.qlen--;
++ qdisc_qstats_backlog_dec(sch, skb);
+ skb->next = NULL;
+ skb->prev = NULL;
+ skb->tstamp = netem_skb_cb(skb)->tstamp_save;
+ commit 121c7ad4ef3f3a9e697c4b8b78d74e4d6847d9e4
+Author: kaoudis <kaoudis@colorado.edu>
+Date: Wed Jan 14 21:01:58 2015 -0700
+
+ NVMe: within nvme_free_queues(), delete RCU sychro/deferred free
+
+ Converting from to blk-queue got rid of the driver's RCU
+ locking-on-queue, so removing unnecessary RCU locking-on-queue
+ artefacts.
+
+ Reviewed-by: Keith Busch <keith.busch@intel.com>
+
+ Signed-off-by: Kelly Nicole Kaoudis <kaoudis@colorado.edu>
+ Signed-off-by: Jens Axboe <axboe@fb.com>
+
+diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
+index f7d083bb3bd5..f4aa64160838 100644
+--- a/drivers/block/nvme-core.c
++++ b/drivers/block/nvme-core.c
+@@ -1108,21 +1108,14 @@ static void nvme_free_queue(struct nvme_queue *nvmeq)
+
+ static void nvme_free_queues(struct nvme_dev *dev, int lowest)
+ {
+- LLIST_HEAD(q_list);
+- struct nvme_queue *nvmeq, *next;
+- struct llist_node *entry;
+ int i;
+
+ for (i = dev->queue_count - 1; i >= lowest; i--) {
+ struct nvme_queue *nvmeq = dev->queues[i];
+- llist_add(&nvmeq->node, &q_list);
+ dev->queue_count--;
+ dev->queues[i] = NULL;
+- }
+- synchronize_rcu();
+- entry = llist_del_all(&q_list);
+- llist_for_each_entry_safe(nvmeq, next, entry, node)
+ nvme_free_queue(nvmeq);
++ }
+ }
+
+ /**
+ commit 10b6ee4a87811a110cb01eaca01eb04da6801baf
+Author: Giacomo Comes <comes@naic.edu>
+Date: Thu Apr 3 14:13:55 2014 -0400
+
+ Skip intel_crt_init for Dell XPS 8700
+
+ The Dell XPS 8700 has a onboard Display port and HDMI port and no VGA port.
+ The call intel_crt_init freeze the machine, so skip such call.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73559
+ Signed-off-by: Giacomo Comes <comes at naic.edu>
+ Cc: stable@vger.kernel.org
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
+index 4b4e8f0f9621..aa5a3dc43342 100644
+--- a/drivers/gpu/drm/i915/intel_crt.c
++++ b/drivers/gpu/drm/i915/intel_crt.c
+@@ -804,6 +804,14 @@ static const struct dmi_system_id intel_no_crt[] = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
+ },
+ },
++ {
++ .callback = intel_no_crt_dmi_callback,
++ .ident = "DELL XPS 8700",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++ DMI_MATCH(DMI_PRODUCT_NAME, "XPS 8700"),
++ },
++ },
+ { }
+ };
+
+ commit eec0d0dc4e16c0c412db337acc36f95411ef946e
+Author: Garrick He <ghe@calpoly.edu>
+Date: Fri Feb 1 01:45:16 2013 -0800
+
+ Staging: wlan-ng: Fix tab coding style issue in hfa384x.h
+
+ Fix all 'please, no space before tabs' warning found by checkpatch.pl
+
+ Signed-off-by: Garrick He <garrickhe@gmail.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
+index 5631ad0a7237..04c04336ee75 100644
+--- a/drivers/staging/wlan-ng/hfa384x.h
++++ b/drivers/staging/wlan-ng/hfa384x.h
+@@ -81,8 +81,8 @@
+ #define HFA384x_WEPFLAGS_EXCLUDE ((u16)BIT(1))
+ #define HFA384x_WEPFLAGS_DISABLE_TXCRYPT ((u16)BIT(4))
+ #define HFA384x_WEPFLAGS_DISABLE_RXCRYPT ((u16)BIT(7))
+-#define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3)
+-#define HFA384x_PORTSTATUS_DISABLED ((u16)1)
++#define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3)
++#define HFA384x_PORTSTATUS_DISABLED ((u16)1)
+ #define HFA384x_RATEBIT_1 ((u16)1)
+ #define HFA384x_RATEBIT_2 ((u16)2)
+ #define HFA384x_RATEBIT_5dot5 ((u16)4)
+@@ -164,7 +164,7 @@
+ #define HFA384x_CMDCODE_DOWNLD ((u16)0x22)
+
+ /*--- Debugging Commands -----------------------------*/
+-#define HFA384x_CMDCODE_MONITOR ((u16)(0x38))
++#define HFA384x_CMDCODE_MONITOR ((u16)(0x38))
+ #define HFA384x_MONITOR_ENABLE ((u16)(0x0b))
+ #define HFA384x_MONITOR_DISABLE ((u16)(0x0f))
+
+@@ -275,15 +275,15 @@ API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)
+ #define HFA384x_RID_CNFAUTHENTICATION ((u16)0xFC2A)
+ #define HFA384x_RID_CNFROAMINGMODE ((u16)0xFC2D)
+ #define HFA384x_RID_CNFAPBCNint ((u16)0xFC33)
+-#define HFA384x_RID_CNFDBMADJUST ((u16)0xFC46)
+-#define HFA384x_RID_CNFWPADATA ((u16)0xFC48)
++#define HFA384x_RID_CNFDBMADJUST ((u16)0xFC46)
++#define HFA384x_RID_CNFWPADATA ((u16)0xFC48)
+ #define HFA384x_RID_CNFBASICRATES ((u16)0xFCB3)
+ #define HFA384x_RID_CNFSUPPRATES ((u16)0xFCB4)
+ #define HFA384x_RID_CNFPASSIVESCANCTRL ((u16)0xFCBA)
+-#define HFA384x_RID_TXPOWERMAX ((u16)0xFCBE)
++#define HFA384x_RID_TXPOWERMAX ((u16)0xFCBE)
+ #define HFA384x_RID_JOINREQUEST ((u16)0xFCE2)
+ #define HFA384x_RID_AUTHENTICATESTA ((u16)0xFCE3)
+-#define HFA384x_RID_HOSTSCAN ((u16)0xFCE5)
++#define HFA384x_RID_HOSTSCAN ((u16)0xFCE5)
+
+ #define HFA384x_RID_CNFWEPDEFAULTKEY_LEN ((u16)6)
+ #define HFA384x_RID_CNFWEP128DEFAULTKEY_LEN ((u16)14)
+@@ -311,7 +311,7 @@ PD Record codes
+ #define HFA384x_PDR_HFA3861_IFRF ((u16)0x0204)
+ #define HFA384x_PDR_HFA3861_CHCALSP ((u16)0x0300)
+ #define HFA384x_PDR_HFA3861_CHCALI ((u16)0x0301)
+-#define HFA384x_PDR_MAX_TX_POWER ((u16)0x0302)
++#define HFA384x_PDR_MAX_TX_POWER ((u16)0x0302)
+ #define HFA384x_PDR_MASTER_CHAN_LIST ((u16)0x0303)
+ #define HFA384x_PDR_3842_NIC_CONFIG ((u16)0x0400)
+ #define HFA384x_PDR_USB_ID ((u16)0x0401)
+@@ -322,10 +322,10 @@ PD Record codes
+ #define HFA384x_PDR_USB_POWER_TYPE ((u16)0x0407)
+ #define HFA384x_PDR_USB_MAX_POWER ((u16)0x0409)
+ #define HFA384x_PDR_USB_MANUFACTURER ((u16)0x0410)
+-#define HFA384x_PDR_USB_PRODUCT ((u16)0x0411)
+-#define HFA384x_PDR_ANT_DIVERSITY ((u16)0x0412)
+-#define HFA384x_PDR_HFO_DELAY ((u16)0x0413)
+-#define HFA384x_PDR_SCALE_THRESH ((u16)0x0414)
++#define HFA384x_PDR_USB_PRODUCT ((u16)0x0411)
++#define HFA384x_PDR_ANT_DIVERSITY ((u16)0x0412)
++#define HFA384x_PDR_HFO_DELAY ((u16)0x0413)
++#define HFA384x_PDR_SCALE_THRESH ((u16)0x0414)
+
+ #define HFA384x_PDR_HFA3861_MANF_TESTSP ((u16)0x0900)
+ #define HFA384x_PDR_HFA3861_MANF_TESTI ((u16)0x0901)
+@@ -383,7 +383,7 @@ typedef struct hfa384x_caplevel {
+ /*-- Configuration Record: cnfAuthentication --*/
+ #define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001
+ #define HFA384x_CNFAUTHENTICATION_SHAREDKEY 0x0002
+-#define HFA384x_CNFAUTHENTICATION_LEAP 0x0004
++#define HFA384x_CNFAUTHENTICATION_LEAP 0x0004
+
+ /*--------------------------------------------------------------------
+ Configuration Record Structures:
+@@ -575,8 +575,8 @@ Information Types
+ #define HFA384x_IT_AUTHREQ ((u16)0xF202UL)
+ #define HFA384x_IT_PSUSERCNT ((u16)0xF203UL)
+ #define HFA384x_IT_KEYIDCHANGED ((u16)0xF204UL)
+-#define HFA384x_IT_ASSOCREQ ((u16)0xF205UL)
+-#define HFA384x_IT_MICFAILURE ((u16)0xF206UL)
++#define HFA384x_IT_ASSOCREQ ((u16)0xF205UL)
++#define HFA384x_IT_MICFAILURE ((u16)0xF206UL)
+
+ /*--------------------------------------------------------------------
+ Information Frames Structures
+ commit a8ffa0be04d04b01e2a7fd116bc3763940753643
+Author: Stefan Hubner <s.hubner@tilburguniversity.edu>
+Date: Thu Dec 13 22:45:00 2012 +0100
+
+ usb: serial: keyspan: fixed coding style issues
+
+ fixed coding style issues.
+
+ Signed-off-by: Stefan Hubner <s.hubner@tilburguniversity.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
+index 97bc49f68efd..3d95637f3d68 100644
+--- a/drivers/usb/serial/keyspan.c
++++ b/drivers/usb/serial/keyspan.c
+@@ -298,7 +298,7 @@ static void usa26_indat_callback(struct urb *urb)
+ endpoint = usb_pipeendpoint(urb->pipe);
+
+ if (status) {
+- dev_dbg(&urb->dev->dev,"%s - nonzero status: %x on endpoint %d.\n",
++ dev_dbg(&urb->dev->dev, "%s - nonzero status: %x on endpoint %d.\n",
+ __func__, status, endpoint);
+ return;
+ }
+@@ -532,7 +532,7 @@ static void usa28_instat_callback(struct urb *urb)
+
+ /*
+ dev_dbg(&urb->dev->dev,
+- "%s %x %x %x %x %x %x %x %x %x %x %x %x", __func__,
++ "%s %x %x %x %x %x %x %x %x %x %x %x %x", __func__,
+ data[0], data[1], data[2], data[3], data[4], data[5],
+ data[6], data[7], data[8], data[9], data[10], data[11]);
+ */
+ commit 2f66fd36a2be8e97a0ea774ba186adf24882cd10
+Author: Otto Estuardo Solares Cabrera <solca@galileo.edu>
+Date: Fri Aug 24 08:04:58 2012 +0000
+
+ e1000: add byte queue limits
+
+ Signed-off-by: Otto Estuardo Solares Cabrera <solca@galileo.edu>
+ Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+ Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+
+diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
+index 0ae2fcfa5124..3a8368e42ede 100644
+--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
++++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
+@@ -2014,6 +2014,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
+ e1000_unmap_and_free_tx_resource(adapter, buffer_info);
+ }
+
++ netdev_reset_queue(adapter->netdev);
+ size = sizeof(struct e1000_buffer) * tx_ring->count;
+ memset(tx_ring->buffer_info, 0, size);
+
+@@ -3262,6 +3263,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
+ nr_frags, mss);
+
+ if (count) {
++ netdev_sent_queue(netdev, skb->len);
+ skb_tx_timestamp(skb);
+
+ e1000_tx_queue(adapter, tx_ring, tx_flags, count);
+@@ -3849,6 +3851,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+ unsigned int i, eop;
+ unsigned int count = 0;
+ unsigned int total_tx_bytes=0, total_tx_packets=0;
++ unsigned int bytes_compl = 0, pkts_compl = 0;
+
+ i = tx_ring->next_to_clean;
+ eop = tx_ring->buffer_info[i].next_to_watch;
+@@ -3866,6 +3869,11 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+ if (cleaned) {
+ total_tx_packets += buffer_info->segs;
+ total_tx_bytes += buffer_info->bytecount;
++ if (buffer_info->skb) {
++ bytes_compl += buffer_info->skb->len;
++ pkts_compl++;
++ }
++
+ }
+ e1000_unmap_and_free_tx_resource(adapter, buffer_info);
+ tx_desc->upper.data = 0;
+@@ -3879,6 +3887,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
+
+ tx_ring->next_to_clean = i;
+
++ netdev_completed_queue(netdev, pkts_compl, bytes_compl);
++
+ #define TX_WAKE_THRESHOLD 32
+ if (unlikely(count && netif_carrier_ok(netdev) &&
+ E1000_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD)) {
+ commit 065e60964e293227e4feb0c1f7e27e609316ed9a
+Author: Adam Cozzette <acozzette@cs.hmc.edu>
+Date: Wed Aug 24 12:22:37 2011 -0600
+
+ ums_realtek: do not use stack memory for DMA
+
+ This patch changes rts51x_read_mem, rts51x_write_mem, and rts51x_read_status to
+ allocate temporary buffers with kmalloc. This way stack addresses are not used
+ for DMA when these functions call rts51x_bulk_transport.
+
+ Signed-off-by: Adam Cozzette <acozzette@cs.hmc.edu>
+ Cc: stable <stable@kernel.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
+index 34adc4b42ceb..232167ad4781 100644
+--- a/drivers/usb/storage/realtek_cr.c
++++ b/drivers/usb/storage/realtek_cr.c
+@@ -320,6 +320,11 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ {
+ int retval;
+ u8 cmnd[12] = { 0 };
++ u8 *buf;
++
++ buf = kmalloc(len, GFP_NOIO);
++ if (buf == NULL)
++ return USB_STOR_TRANSPORT_ERROR;
+
+ US_DEBUGP("%s, addr = 0x%x, len = %d\n", __func__, addr, len);
+
+@@ -331,10 +336,14 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ cmnd[5] = (u8) len;
+
+ retval = rts51x_bulk_transport(us, 0, cmnd, 12,
+- data, len, DMA_FROM_DEVICE, NULL);
+- if (retval != USB_STOR_TRANSPORT_GOOD)
++ buf, len, DMA_FROM_DEVICE, NULL);
++ if (retval != USB_STOR_TRANSPORT_GOOD) {
++ kfree(buf);
+ return -EIO;
++ }
+
++ memcpy(data, buf, len);
++ kfree(buf);
+ return 0;
+ }
+
+@@ -342,6 +351,12 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ {
+ int retval;
+ u8 cmnd[12] = { 0 };
++ u8 *buf;
++
++ buf = kmalloc(len, GFP_NOIO);
++ if (buf == NULL)
++ return USB_STOR_TRANSPORT_ERROR;
++ memcpy(buf, data, len);
+
+ US_DEBUGP("%s, addr = 0x%x, len = %d\n", __func__, addr, len);
+
+@@ -353,7 +368,8 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
+ cmnd[5] = (u8) len;
+
+ retval = rts51x_bulk_transport(us, 0, cmnd, 12,
+- data, len, DMA_TO_DEVICE, NULL);
++ buf, len, DMA_TO_DEVICE, NULL);
++ kfree(buf);
+ if (retval != USB_STOR_TRANSPORT_GOOD)
+ return -EIO;
+
+@@ -365,6 +381,11 @@ static int rts51x_read_status(struct us_data *us,
+ {
+ int retval;
+ u8 cmnd[12] = { 0 };
++ u8 *buf;
++
++ buf = kmalloc(len, GFP_NOIO);
++ if (buf == NULL)
++ return USB_STOR_TRANSPORT_ERROR;
+
+ US_DEBUGP("%s, lun = %d\n", __func__, lun);
+
+@@ -372,10 +393,14 @@ static int rts51x_read_status(struct us_data *us,
+ cmnd[1] = 0x09;
+
+ retval = rts51x_bulk_transport(us, lun, cmnd, 12,
+- status, len, DMA_FROM_DEVICE, actlen);
+- if (retval != USB_STOR_TRANSPORT_GOOD)
++ buf, len, DMA_FROM_DEVICE, actlen);
++ if (retval != USB_STOR_TRANSPORT_GOOD) {
++ kfree(buf);
+ return -EIO;
++ }
+
++ memcpy(status, buf, len);
++ kfree(buf);
+ return 0;
+ }
+
+ commit 1ef48593bd6a508984d1270a1075532628bfd9c8 +Author: Will Simoneau <simoneau@ele.uri.edu> +Date: Sat Jul 16 10:45:12 2011 -0700 + + sparc: sun4m SMP: fix wrong shift instruction in IPI handler + + This shift instruction appears to be shifting in the wrong direction. + Without this change, my SparcStation-20MP hangs just after bringing up + the second CPU: + + Entering SMP Mode... + Starting CPU 2 at f02b4e90 + Brought up 2 CPUs + Total of 2 processors activated (99.52 BogoMIPS). + *** stuck *** + + Signed-off-by: Will Simoneau <simoneau@ele.uri.edu> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S +index 9fe08a1ea6c6..f445e98463e6 100644 +--- a/arch/sparc/kernel/entry.S ++++ b/arch/sparc/kernel/entry.S +@@ -293,7 +293,7 @@ maybe_smp4m_msg: + WRITE_PAUSE + wr %l4, PSR_ET, %psr + WRITE_PAUSE +- sll %o3, 28, %o2 ! shift for simpler checks below ++ srl %o3, 28, %o2 ! shift for simpler checks below + maybe_smp4m_msg_check_single: + andcc %o2, 0x1, %g0 + beq,a maybe_smp4m_msg_check_mask+
commit 115726c5d312b462c9d9931ea42becdfa838a076
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 06:43:46 2021 -0700
+
+ habanalabs/gaudi: Fix a potential use after free in gaudi_memset_device_memory
+
+ Our code analyzer reported a uaf.
+
+ In gaudi_memset_device_memory, cb is get via hl_cb_kernel_create()
+ with 2 refcount.
+ If hl_cs_allocate_job() failed, the execution runs into release_cb
+ branch. One ref of cb is dropped by hl_cb_put(cb) and could be freed
+ if other thread also drops one ref. Then cb is used by cb->id later,
+ which is a potential uaf.
+
+ My patch add a variable 'id' to accept the value of cb->id before the
+ hl_cb_put(cb) is called, to avoid the potential uaf.
+
+ Fixes: 423815bf02e25 ("habanalabs/gaudi: remove PCI access to SM block")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
+ Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
+
+diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
+index 81155f06c126..9e4a6bb3acd1 100644
+--- a/drivers/misc/habanalabs/gaudi/gaudi.c
++++ b/drivers/misc/habanalabs/gaudi/gaudi.c
+@@ -5579,6 +5579,7 @@ static int gaudi_memset_device_memory(struct hl_device *hdev, u64 addr,
+ struct hl_cs_job *job;
+ u32 cb_size, ctl, err_cause;
+ struct hl_cb *cb;
++ u64 id;
+ int rc;
+
+ cb = hl_cb_kernel_create(hdev, PAGE_SIZE, false);
+@@ -5645,8 +5646,9 @@ static int gaudi_memset_device_memory(struct hl_device *hdev, u64 addr,
+ }
+
+ release_cb:
++ id = cb->id;
+ hl_cb_put(cb);
+- hl_cb_destroy(hdev, &hdev->kernel_cb_mgr, cb->id << PAGE_SHIFT);
++ hl_cb_destroy(hdev, &hdev->kernel_cb_mgr, id << PAGE_SHIFT);
+
+ return rc;
+ }commit 643001b47adc844ae33510c4bb93c236667008a3
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Sun May 2 04:58:18 2021 -0700
+
+ ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
+
+ In enic_hard_start_xmit, it calls enic_queue_wq_skb(). Inside
+ enic_queue_wq_skb, if some error happens, the skb will be freed
+ by dev_kfree_skb(skb). But the freed skb is still used in
+ skb_tx_timestamp(skb).
+
+ My patch makes enic_queue_wq_skb() return error and goto spin_unlock()
+ incase of error. The solution is provided by Govind.
+ See https://lkml.org/lkml/2021/4/30/961.
+
+ Fixes: fb7516d42478e ("enic: add sw timestamp support")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Acked-by: Govindarajulu Varadarajan <gvaradar@cisco.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
+index f48957a17c3a..d0a8f7106958 100644
+--- a/drivers/net/ethernet/cisco/enic/enic_main.c
++++ b/drivers/net/ethernet/cisco/enic/enic_main.c
+@@ -768,7 +768,7 @@ static inline int enic_queue_wq_skb_encap(struct enic *enic, struct vnic_wq *wq,
+ return err;
+ }
+
+-static inline void enic_queue_wq_skb(struct enic *enic,
++static inline int enic_queue_wq_skb(struct enic *enic,
+ struct vnic_wq *wq, struct sk_buff *skb)
+ {
+ unsigned int mss = skb_shinfo(skb)->gso_size;
+@@ -814,6 +814,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,
+ wq->to_use = buf->next;
+ dev_kfree_skb(skb);
+ }
++ return err;
+ }
+
+ /* netif_tx_lock held, process context with BHs disabled, or BH */
+@@ -857,7 +858,8 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
+ return NETDEV_TX_BUSY;
+ }
+
+- enic_queue_wq_skb(enic, wq, skb);
++ if (enic_queue_wq_skb(enic, wq, skb))
++ goto error;
+
+ if (vnic_wq_desc_avail(wq) < MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)
+ netif_tx_stop_queue(txq);
+@@ -865,6 +867,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
+ if (!netdev_xmit_more() || netif_xmit_stopped(txq))
+ vnic_wq_doorbell(wq);
+
++error:
+ spin_unlock(&enic->wq_lock[txq_map]);
+
+ return NETDEV_TX_OK;commit 75258586793efc521e5dd52a5bf6c7a4cf7002be
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Tue Apr 27 09:22:58 2021 -0700
+
+ net:nfc:digital: Fix a double free in digital_tg_recv_dep_req
+
+ In digital_tg_recv_dep_req, it calls nfc_tm_data_received(..,resp).
+ If nfc_tm_data_received() failed, the callee will free the resp via
+ kfree_skb() and return error. But in the exit branch, the resp
+ will be freed again.
+
+ My patch sets resp to NULL if nfc_tm_data_received() failed, to
+ avoid the double free.
+
+ Fixes: 1c7a4c24fbfd9 ("NFC Digital: Add target NFC-DEP support")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c
+index 1150731126e2..3982fa084737 100644
+--- a/net/nfc/digital_dep.c
++++ b/net/nfc/digital_dep.c
+@@ -1273,6 +1273,8 @@ static void digital_tg_recv_dep_req(struct nfc_digital_dev *ddev, void *arg,
+ }
+
+ rc = nfc_tm_data_received(ddev->nfc_dev, resp);
++ if (rc)
++ resp = NULL;
+
+ exit:
+ kfree_skb(ddev->chaining_skb);commit 34b39efa5ae82fc0ad0acc27653c12a56328dbbe
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 07:06:14 2021 -0700
+
+ RDMA/bnxt_re: Fix a double free in bnxt_qplib_alloc_res
+
+ In bnxt_qplib_alloc_res, it calls bnxt_qplib_alloc_dpi_tbl(). Inside
+ bnxt_qplib_alloc_dpi_tbl, dpit->dbr_bar_reg_iomem is freed via
+ pci_iounmap() in unmap_io error branch. After the callee returns err code,
+ bnxt_qplib_alloc_res calls
+ bnxt_qplib_free_res()->bnxt_qplib_free_dpi_tbl() in the fail branch. Then
+ dpit->dbr_bar_reg_iomem is freed in the second time by pci_iounmap().
+
+ My patch set dpit->dbr_bar_reg_iomem to NULL after it is freed by
+ pci_iounmap() in the first time, to avoid the double free.
+
+ Fixes: 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
+ Link: https://lore.kernel.org/r/20210426140614.6722-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
+ Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
+ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+
+diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
+index fa7878336100..3ca47004b752 100644
+--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
++++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
+@@ -854,6 +854,7 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res,
+
+ unmap_io:
+ pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
++ dpit->dbr_bar_reg_iomem = NULL;
+ return -ENOMEM;
+ }
+ commit 3093ee182f01689b89e9f8797b321603e5de4f63
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Sun Apr 25 18:16:47 2021 -0700
+
+ RDMA/siw: Fix a use after free in siw_alloc_mr
+
+ Our code analyzer reported a UAF.
+
+ In siw_alloc_mr(), it calls siw_mr_add_mem(mr,..). In the implementation of
+ siw_mr_add_mem(), mem is assigned to mr->mem and then mem is freed via
+ kfree(mem) if xa_alloc_cyclic() failed. Here, mr->mem still point to a
+ freed object. After, the execution continue up to the err_out branch of
+ siw_alloc_mr, and the freed mr->mem is used in siw_mr_drop_mem(mr).
+
+ My patch moves "mr->mem = mem" behind the if (xa_alloc_cyclic(..)<0) {}
+ section, to avoid the uaf.
+
+ Fixes: 2251334dcac9 ("rdma/siw: application buffer management")
+ Link: https://lore.kernel.org/r/20210426011647.3561-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Bernard Metzler <bmt@zurich.ihm.com>
+ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+
+diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/siw/siw_mem.c
+index 34a910cf0edb..61c17db70d65 100644
+--- a/drivers/infiniband/sw/siw/siw_mem.c
++++ b/drivers/infiniband/sw/siw/siw_mem.c
+@@ -106,8 +106,6 @@ int siw_mr_add_mem(struct siw_mr *mr, struct ib_pd *pd, void *mem_obj,
+ mem->perms = rights & IWARP_ACCESS_MASK;
+ kref_init(&mem->ref);
+
+- mr->mem = mem;
+-
+ get_random_bytes(&next, 4);
+ next &= 0x00ffffff;
+
+@@ -116,6 +114,8 @@ int siw_mr_add_mem(struct siw_mr *mr, struct ib_pd *pd, void *mem_obj,
+ kfree(mem);
+ return -ENOMEM;
+ }
++
++ mr->mem = mem;
+ /* Set the STag index part */
+ mem->stag = id << 8;
+ mr->base_mr.lkey = mr->base_mr.rkey = mem->stag;commit ac69496fe65cca0611d5917b7d232730ff605bc7
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 05:43:40 2021 -0700
+
+ drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp
+
+ Our code analyzer reported a double free bug.
+
+ In gen8_preallocate_top_level_pdp, pde and pde->pt.base are allocated
+ via alloc_pd(vm) with one reference. If pin_pt_dma() failed, pde->pt.base
+ is freed by i915_gem_object_put() with a reference dropped. Then free_pd
+ calls free_px() defined in intel_ppgtt.c, which calls i915_gem_object_put()
+ to put pde->pt.base again.
+
+ As pde->pt.base is protected by refcount, so the second put will not free
+ pde->pt.base actually. But, maybe it is better to remove the first put?
+
+ Fixes: 82adf901138cc ("drm/i915/gt: Shrink i915_page_directory's slab bucket")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Matthew Auld <matthew.auld@intel.com>
+ Signed-off-by: Matthew Auld <matthew.auld@intel.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20210426124340.4238-1-lyl2019@mail.ustc.edu.cn
+
+diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+index 176c19633412..74bf6fc8461f 100644
+--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
++++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+@@ -641,7 +641,6 @@ static int gen8_preallocate_top_level_pdp(struct i915_ppgtt *ppgtt)
+
+ err = pin_pt_dma(vm, pde->pt.base);
+ if (err) {
+- i915_gem_object_put(pde->pt.base);
+ free_pd(vm, pde);
+ return err;
+ }commit 6d72e7c767acbbdd44ebc7d89c6690b405b32b57
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 09:06:25 2021 -0700
+
+ net:emac/emac-mac: Fix a use after free in emac_mac_tx_buf_send
+
+ In emac_mac_tx_buf_send, it calls emac_tx_fill_tpd(..,skb,..).
+ If some error happens in emac_tx_fill_tpd(), the skb will be freed via
+ dev_kfree_skb(skb) in error branch of emac_tx_fill_tpd().
+ But the freed skb is still used via skb->len by netdev_sent_queue(,skb->len).
+
+ As i observed that emac_tx_fill_tpd() haven't modified the value of skb->len,
+ thus my patch assigns skb->len to 'len' before the possible free and
+ use 'len' instead of skb->len later.
+
+ Fixes: b9b17debc69d2 ("net: emac: emac gigabit ethernet controller driver")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
+index 117188e3c7de..87b8c032195d 100644
+--- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c
++++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c
+@@ -1437,6 +1437,7 @@ netdev_tx_t emac_mac_tx_buf_send(struct emac_adapter *adpt,
+ {
+ struct emac_tpd tpd;
+ u32 prod_idx;
++ int len;
+
+ memset(&tpd, 0, sizeof(tpd));
+
+@@ -1456,9 +1457,10 @@ netdev_tx_t emac_mac_tx_buf_send(struct emac_adapter *adpt,
+ if (skb_network_offset(skb) != ETH_HLEN)
+ TPD_TYP_SET(&tpd, 1);
+
++ len = skb->len;
+ emac_tx_fill_tpd(adpt, tx_q, skb, &tpd);
+
+- netdev_sent_queue(adpt->netdev, skb->len);
++ netdev_sent_queue(adpt->netdev, len);
+
+ /* Make sure the are enough free descriptors to hold one
+ * maximum-sized SKB. We need one desc for each fragment,commit 4fb44dd2c1dda18606348acdfdb97e8759dde9df
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 07:55:41 2021 -0700
+
+ ALSA: sb: Fix two use after free in snd_sb_qsound_build
+
+ In snd_sb_qsound_build, snd_ctl_add(..,p->qsound_switch...) and
+ snd_ctl_add(..,p->qsound_space..) are called. But the second
+ arguments of snd_ctl_add() could be freed via snd_ctl_add_replace()
+ ->snd_ctl_free_one(). After the error code is returned,
+ snd_sb_qsound_destroy(p) is called in __error branch.
+
+ But in snd_sb_qsound_destroy(), the freed p->qsound_switch and
+ p->qsound_space are still used by snd_ctl_remove().
+
+ My patch set p->qsound_switch and p->qsound_space to NULL if
+ snd_ctl_add() failed to avoid the uaf bugs. But these codes need
+ to further be improved with the code style.
+
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/20210426145541.8070-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
+index 8635a2b6b36b..4789345a8fdd 100644
+--- a/sound/isa/sb/sb16_csp.c
++++ b/sound/isa/sb/sb16_csp.c
+@@ -1045,10 +1045,14 @@ static int snd_sb_qsound_build(struct snd_sb_csp * p)
+
+ spin_lock_init(&p->q_lock);
+
+- if ((err = snd_ctl_add(card, p->qsound_switch = snd_ctl_new1(&snd_sb_qsound_switch, p))) < 0)
++ if ((err = snd_ctl_add(card, p->qsound_switch = snd_ctl_new1(&snd_sb_qsound_switch, p))) < 0) {
++ p->qsound_switch = NULL;
+ goto __error;
+- if ((err = snd_ctl_add(card, p->qsound_space = snd_ctl_new1(&snd_sb_qsound_space, p))) < 0)
++ }
++ if ((err = snd_ctl_add(card, p->qsound_space = snd_ctl_new1(&snd_sb_qsound_space, p))) < 0) {
++ p->qsound_space = NULL;
+ goto __error;
++ }
+
+ return 0;
+ commit 72ce11ddfa4e9e1879103581a60b7e34547eaa0a
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 07:32:29 2021 -0700
+
+ drivers/block/null_blk/main: Fix a double free in null_init.
+
+ In null_init, null_add_dev(dev) is called.
+ In null_add_dev, it calls null_free_zoned_dev(dev) to free dev->zones
+ via kvfree(dev->zones) in out_cleanup_zone branch and returns err.
+ Then null_init accept the err code and then calls null_free_dev(dev).
+
+ But in null_free_dev(dev), dev->zones is freed again by
+ null_free_zoned_dev().
+
+ My patch set dev->zones to NULL in null_free_zoned_dev() after
+ kvfree(dev->zones) is called, to avoid the double free.
+
+ Fixes: 2984c8684f962 ("nullb: factor disk parameters")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Link: https://lore.kernel.org/r/20210426143229.7374-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Jens Axboe <axboe@kernel.dk>
+
+diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c
+index bfcab1c782b5..dae54dd1aeac 100644
+--- a/drivers/block/null_blk/zoned.c
++++ b/drivers/block/null_blk/zoned.c
+@@ -180,6 +180,7 @@ int null_register_zoned_dev(struct nullb *nullb)
+ void null_free_zoned_dev(struct nullb_device *dev)
+ {
+ kvfree(dev->zones);
++ dev->zones = NULL;
+ }
+
+ int null_report_zones(struct gendisk *disk, sector_t sector,commit 1c98f574403dbcf2eb832d5535a10d967333ef2d
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Apr 26 06:11:29 2021 -0700
+
+ ALSA: emu8000: Fix a use after free in snd_emu8000_create_mixer
+
+ Our code analyzer reported a uaf.
+
+ In snd_emu8000_create_mixer, the callee snd_ctl_add(..,emu->controls[i])
+ calls snd_ctl_add_replace(.., kcontrol,..). Inside snd_ctl_add_replace(),
+ if error happens, kcontrol will be freed by snd_ctl_free_one(kcontrol).
+ Then emu->controls[i] points to a freed memory, and the execution comes
+ to __error branch of snd_emu8000_create_mixer. The freed emu->controls[i]
+ is used in snd_ctl_remove(card, emu->controls[i]).
+
+ My patch set emu->controls[i] to NULL if snd_ctl_add() failed to avoid
+ the uaf.
+
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/20210426131129.4796-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
+index 0aa545ac6e60..1c90421a88dc 100644
+--- a/sound/isa/sb/emu8000.c
++++ b/sound/isa/sb/emu8000.c
+@@ -1029,8 +1029,10 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
+
+ memset(emu->controls, 0, sizeof(emu->controls));
+ for (i = 0; i < EMU8000_NUM_CONTROLS; i++) {
+- if ((err = snd_ctl_add(card, emu->controls[i] = snd_ctl_new1(mixer_defs[i], emu))) < 0)
++ if ((err = snd_ctl_add(card, emu->controls[i] = snd_ctl_new1(mixer_defs[i], emu))) < 0) {
++ emu->controls[i] = NULL;
+ goto __error;
++ }
+ }
+ return 0;
+
+ commit 8392df5d7e0b6a7d21440da1fc259f9938f4dec3
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Mar 29 05:01:54 2021 -0700
+
+ ath10k: Fix a use after free in ath10k_htc_send_bundle
+
+ In ath10k_htc_send_bundle, the bundle_skb could be freed by
+ dev_kfree_skb_any(bundle_skb). But the bundle_skb is used later
+ by bundle_skb->len.
+
+ As skb_len = bundle_skb->len, my patch replaces bundle_skb->len to
+ skb_len after the bundle_skb was freed.
+
+ Fixes: c8334512f3dd1 ("ath10k: add htt TX bundle for sdio")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+ Link: https://lore.kernel.org/r/20210329120154.8963-1-lyl2019@mail.ustc.edu.cn
+
+diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
+index 0a37be6a7d33..fab398046a3f 100644
+--- a/drivers/net/wireless/ath/ath10k/htc.c
++++ b/drivers/net/wireless/ath/ath10k/htc.c
+@@ -669,7 +669,7 @@ static int ath10k_htc_send_bundle(struct ath10k_htc_ep *ep,
+
+ ath10k_dbg(ar, ATH10K_DBG_HTC,
+ "bundle tx status %d eid %d req count %d count %d len %d\n",
+- ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, bundle_skb->len);
++ ret, ep->eid, skb_queue_len(&ep->tx_req_head), cn, skb_len);
+ return ret;
+ }
+ commit a8e083ee8e2a6c94c29733835adae8bf5b832748
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Fri Apr 2 11:26:27 2021 -0700
+
+ mwl8k: Fix a double Free in mwl8k_probe_hw
+
+ In mwl8k_probe_hw, hw->priv->txq is freed at the first time by
+ dma_free_coherent() in the call chain:
+ if(!priv->ap_fw)->mwl8k_init_txqs(hw)->mwl8k_txq_init(hw, i).
+
+ Then in err_free_queues of mwl8k_probe_hw, hw->priv->txq is freed
+ at the second time by mwl8k_txq_deinit(hw, i)->dma_free_coherent().
+
+ My patch set txq->txd to NULL after the first free to avoid the
+ double free.
+
+ Fixes: a66098daacee2 ("mwl8k: Marvell TOPDOG wireless driver")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+ Link: https://lore.kernel.org/r/20210402182627.4256-1-lyl2019@mail.ustc.edu.cn
+
+diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
+index c9f8c056aa51..84b32a5f01ee 100644
+--- a/drivers/net/wireless/marvell/mwl8k.c
++++ b/drivers/net/wireless/marvell/mwl8k.c
+@@ -1473,6 +1473,7 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
+ if (txq->skb == NULL) {
+ dma_free_coherent(&priv->pdev->dev, size, txq->txd,
+ txq->txd_dma);
++ txq->txd = NULL;
+ return -ENOMEM;
+ }
+ commit ea45b6008f8095db0cc09ad6e03c7785c2986197
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Tue Mar 30 18:44:58 2021 -0700
+
+ dmaengine: Fix a double free in dma_async_device_register
+
+ In the first list_for_each_entry() macro of dma_async_device_register,
+ it gets the chan from list and calls __dma_async_device_channel_register
+ (..,chan). We can see that chan->local is allocated by alloc_percpu() and
+ it is freed chan->local by free_percpu(chan->local) when
+ __dma_async_device_channel_register() failed.
+
+ But after __dma_async_device_channel_register() failed, the caller will
+ goto err_out and freed the chan->local in the second time by free_percpu().
+
+ The cause of this problem is forget to set chan->local to NULL when
+ chan->local was freed in __dma_async_device_channel_register(). My
+ patch sets chan->local to NULL when the callee failed to avoid double free.
+
+ Fixes: d2fb0a0438384 ("dmaengine: break out channel registration")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Dave Jiang <dave.jiang@intel.com>
+ Link: https://lore.kernel.org/r/20210331014458.3944-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Vinod Koul <vkoul@kernel.org>
+
+diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
+index fe6a460c4373..af3ee288bc11 100644
+--- a/drivers/dma/dmaengine.c
++++ b/drivers/dma/dmaengine.c
+@@ -1086,6 +1086,7 @@ static int __dma_async_device_channel_register(struct dma_device *device,
+ kfree(chan->dev);
+ err_free_local:
+ free_percpu(chan->local);
++ chan->local = NULL;
+ return rc;
+ }
+ commit f7cae626cabb3350b23722b78fe34dd7a615ca04
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Fri Apr 2 10:13:48 2021 -0700
+
+ crypto: qat - Fix a double free in adf_create_ring
+
+ In adf_create_ring, if the callee adf_init_ring() failed, the callee will
+ free the ring->base_addr by dma_free_coherent() and return -EFAULT. Then
+ adf_create_ring will goto err and the ring->base_addr will be freed again
+ in adf_cleanup_ring().
+
+ My patch sets ring->base_addr to NULL after the first freed to avoid the
+ double free.
+
+ Fixes: a672a9dc872ec ("crypto: qat - Intel(R) QAT transport code")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto/qat/qat_common/adf_transport.c
+index 888c1e047295..8ba28409fb74 100644
+--- a/drivers/crypto/qat/qat_common/adf_transport.c
++++ b/drivers/crypto/qat/qat_common/adf_transport.c
+@@ -172,6 +172,7 @@ static int adf_init_ring(struct adf_etr_ring_data *ring)
+ dev_err(&GET_DEV(accel_dev), "Ring address not aligned\n");
+ dma_free_coherent(&GET_DEV(accel_dev), ring_size_bytes,
+ ring->base_addr, ring->dma_addr);
++ ring->base_addr = NULL;
+ return -EFAULT;
+ }
+ commit 076de75de1e53160e9b099f75872c1f9adf41a0b
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Fri Apr 2 23:09:05 2021 -0700
+
+ mtd: rawnand: gpmi: Fix a double free in gpmi_nand_init
+
+ If the callee gpmi_alloc_dma_buffer() failed to alloc memory for
+ this->raw_buffer, gpmi_free_dma_buffer() will be called to free
+ this->auxiliary_virt. But this->auxiliary_virt is still a non-NULL
+ and valid ptr.
+
+ Then gpmi_alloc_dma_buffer() returns err and gpmi_free_dma_buffer()
+ is called again to free this->auxiliary_virt in err_out. This causes
+ a double free.
+
+ As gpmi_free_dma_buffer() has already called in gpmi_alloc_dma_buffer's
+ error path, so it should return err directly instead of releasing the dma
+ buffer again.
+
+ Fixes: 4d02423e9afe6 ("mtd: nand: gpmi: Fix gpmi_nand_init() error path")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+ Link: https://lore.kernel.org/linux-mtd/20210403060905.5251-1-lyl2019@mail.ustc.edu.cn
+
+diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+index 3fa8c22d3f36..4d08e4ab5c1b 100644
+--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
++++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+@@ -2449,7 +2449,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
+ this->bch_geometry.auxiliary_size = 128;
+ ret = gpmi_alloc_dma_buffer(this);
+ if (ret)
+- goto err_out;
++ return ret;
+
+ nand_controller_init(&this->base);
+ this->base.ops = &gpmi_nand_controller_ops;commit b25b343db0526669947a427e9a31bac91d29bb06
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Fri Apr 2 10:40:19 2021 -0700
+
+ net: broadcom: bcm4908enet: Fix a double free in bcm4908_enet_dma_alloc
+
+ In bcm4908_enet_dma_alloc, if callee bcm4908_dma_alloc_buf_descs() failed,
+ it will free the ring->cpu_addr by dma_free_coherent() and return error.
+ Then bcm4908_enet_dma_free() will be called, and free the same cpu_addr
+ by dma_free_coherent() again.
+
+ My patch set ring->cpu_addr to NULL after it is freed in
+ bcm4908_dma_alloc_buf_descs() to avoid the double free.
+
+ Fixes: 4feffeadbcb2e ("net: broadcom: bcm4908enet: add BCM4908 controller driver")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
+index 98cf82dea3e4..65981931a798 100644
+--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
++++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
+@@ -172,6 +172,7 @@ static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,
+
+ err_free_buf_descs:
+ dma_free_coherent(dev, size, ring->cpu_addr, ring->dma_addr);
++ ring->cpu_addr = NULL;
+ return -ENOMEM;
+ }
+ commit bdc2ab5c61a5c07388f4820ff21e787b4dfd1ced
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Tue Mar 30 18:59:59 2021 -0700
+
+ net/rds: Fix a use after free in rds_message_map_pages
+
+ In rds_message_map_pages, the rm is freed by rds_message_put(rm).
+ But rm is still used by rm->data.op_sg in return value.
+
+ My patch assigns ERR_CAST(rm->data.op_sg) to err before the rm is
+ freed to avoid the uaf.
+
+ Fixes: 7dba92037baf3 ("net/rds: Use ERR_PTR for rds_message_alloc_sgs()")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/rds/message.c b/net/rds/message.c
+index 071a261fdaab..799034e0f513 100644
+--- a/net/rds/message.c
++++ b/net/rds/message.c
+@@ -347,8 +347,9 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
+ rm->data.op_nents = DIV_ROUND_UP(total_len, PAGE_SIZE);
+ rm->data.op_sg = rds_message_alloc_sgs(rm, num_sgs);
+ if (IS_ERR(rm->data.op_sg)) {
++ void *err = ERR_CAST(rm->data.op_sg);
+ rds_message_put(rm);
+- return ERR_CAST(rm->data.op_sg);
++ return err;
+ }
+
+ for (i = 0; i < rm->data.op_nents; ++i) {commit 6e5a03bcba44e080a6bf300194a68ce9bb1e5184
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Mar 29 04:50:02 2021 -0700
+
+ ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx
+
+ In nfp_bpf_ctrl_msg_rx, if
+ nfp_ccm_get_type(skb) == NFP_CCM_TYPE_BPF_BPF_EVENT is true, the skb
+ will be freed. But the skb is still used by nfp_ccm_rx(&bpf->ccm, skb).
+
+ My patch adds a return when the skb was freed.
+
+ Fixes: bcf0cafab44fd ("nfp: split out common control message handling code")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Jakub Kicinski <kuba@kernel.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
+index 0e2db6ea79e9..2ec62c8d86e1 100644
+--- a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
++++ b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
+@@ -454,6 +454,7 @@ void nfp_bpf_ctrl_msg_rx(struct nfp_app *app, struct sk_buff *skb)
+ dev_consume_skb_any(skb);
+ else
+ dev_kfree_skb_any(skb);
++ return;
+ }
+
+ nfp_ccm_rx(&bpf->ccm, skb);commit 6bf24dc0cc0cc43b29ba344b66d78590e687e046
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Sun Mar 28 00:30:29 2021 -0700
+
+ net:tipc: Fix a double free in tipc_sk_mcast_rcv
+
+ In the if(skb_peek(arrvq) == skb) branch, it calls __skb_dequeue(arrvq) to get
+ the skb by skb = skb_peek(arrvq). Then __skb_dequeue() unlinks the skb from arrvq
+ and returns the skb which equals to skb_peek(arrvq). After __skb_dequeue(arrvq)
+ finished, the skb is freed by kfree_skb(__skb_dequeue(arrvq)) in the first time.
+
+ Unfortunately, the same skb is freed in the second time by kfree_skb(skb) after
+ the branch completed.
+
+ My patch removes kfree_skb() in the if(skb_peek(arrvq) == skb) branch, because
+ this skb will be freed by kfree_skb(skb) finally.
+
+ Fixes: cb1b728096f54 ("tipc: eliminate race condition at multicast reception")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/tipc/socket.c b/net/tipc/socket.c
+index cebcc104dc70..022999e0202d 100644
+--- a/net/tipc/socket.c
++++ b/net/tipc/socket.c
+@@ -1265,7 +1265,7 @@ void tipc_sk_mcast_rcv(struct net *net, struct sk_buff_head *arrvq,
+ spin_lock_bh(&inputq->lock);
+ if (skb_peek(arrvq) == skb) {
+ skb_queue_splice_tail_init(&tmpq, inputq);
+- kfree_skb(__skb_dequeue(arrvq));
++ __skb_dequeue(arrvq);
+ }
+ spin_unlock_bh(&inputq->lock);
+ __skb_queue_purge(&tmpq);commit 63415767a2446136372e777cde5bb351f21ec21d
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Mar 29 05:36:48 2021 -0700
+
+ ethernet: myri10ge: Fix a use after free in myri10ge_sw_tso
+
+ In myri10ge_sw_tso, the skb_list_walk_safe macro will set
+ (curr) = (segs) and (next) = (curr)->next. If status!=0 is true,
+ the memory pointed by curr and segs will be free by dev_kfree_skb_any(curr).
+ But later, the segs is used by segs = segs->next and causes a uaf.
+
+ As (next) = (curr)->next, my patch replaces seg->next to next.
+
+ Fixes: 536577f36ff7a ("net: myri10ge: use skb_list_walk_safe helper for gso segments")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+index 1634ca6d4a8f..c84c8bf2bc20 100644
+--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
++++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+@@ -2897,7 +2897,7 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
+ dev_kfree_skb_any(curr);
+ if (segs != NULL) {
+ curr = segs;
+- segs = segs->next;
++ segs = next;
+ curr->next = NULL;
+ dev_kfree_skb_any(segs);
+ }
+ commit 1b479fb801602b22512f53c19b1f93a4fc5d5d9d
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Sun Mar 28 00:50:08 2021 -0700
+
+ drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit
+
+ In pvc_xmit, if __skb_pad(skb, pad, false) failed, it will free
+ the skb in the first time and goto drop. But the same skb is freed
+ by kfree_skb(skb) in the second time in drop.
+
+ Maintaining the original function unchanged, my patch adds a new
+ label out to avoid the double free if __skb_pad() failed.
+
+ Fixes: f5083d0cee08a ("drivers/net/wan/hdlc_fr: Improvements to the code of pvc_xmit")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
+index 0720f5f92caa..4d9dc7d15908 100644
+--- a/drivers/net/wan/hdlc_fr.c
++++ b/drivers/net/wan/hdlc_fr.c
+@@ -415,7 +415,7 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
+
+ if (pad > 0) { /* Pad the frame with zeros */
+ if (__skb_pad(skb, pad, false))
+- goto drop;
++ goto out;
+ skb_put(skb, pad);
+ }
+ }
+@@ -448,8 +448,9 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
+ return NETDEV_TX_OK;
+
+ drop:
+- dev->stats.tx_dropped++;
+ kfree_skb(skb);
++out:
++ dev->stats.tx_dropped++;
+ return NETDEV_TX_OK;
+ }
+ commit adb76a520d068a54ee5ca82e756cf8e5a47363a4
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Mar 22 09:13:25 2021 -0700
+
+ IB/isert: Fix a use after free in isert_connect_request
+
+ The device is got by isert_device_get() with refcount is 1, and is
+ assigned to isert_conn by
+ isert_conn->device = device.
+
+ When isert_create_qp() failed, device will be freed with
+ isert_device_put().
+
+ Later, the device is used in isert_free_login_buf(isert_conn) by the
+ isert_conn->device->ib_device statement.
+
+ Free the device in the correct order.
+
+ Fixes: ae9ea9ed38c9 ("iser-target: Split some logic in isert_connect_request to routines")
+ Link: https://lore.kernel.org/r/20210322161325.7491-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Acked-by: Sagi Grimberg <sagi@grimberg.me>
+ Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
+ Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
+ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+
+diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
+index 7305ed8976c2..18266f07c58d 100644
+--- a/drivers/infiniband/ulp/isert/ib_isert.c
++++ b/drivers/infiniband/ulp/isert/ib_isert.c
+@@ -438,23 +438,23 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
+ isert_init_conn(isert_conn);
+ isert_conn->cm_id = cma_id;
+
+- ret = isert_alloc_login_buf(isert_conn, cma_id->device);
+- if (ret)
+- goto out;
+-
+ device = isert_device_get(cma_id);
+ if (IS_ERR(device)) {
+ ret = PTR_ERR(device);
+- goto out_rsp_dma_map;
++ goto out;
+ }
+ isert_conn->device = device;
+
++ ret = isert_alloc_login_buf(isert_conn, cma_id->device);
++ if (ret)
++ goto out_conn_dev;
++
+ isert_set_nego_params(isert_conn, &event->param.conn);
+
+ isert_conn->qp = isert_create_qp(isert_conn, cma_id);
+ if (IS_ERR(isert_conn->qp)) {
+ ret = PTR_ERR(isert_conn->qp);
+- goto out_conn_dev;
++ goto out_rsp_dma_map;
+ }
+
+ ret = isert_login_post_recv(isert_conn);
+@@ -473,10 +473,10 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
+
+ out_destroy_qp:
+ isert_destroy_qp(isert_conn);
+-out_conn_dev:
+- isert_device_put(device);
+ out_rsp_dma_map:
+ isert_free_login_buf(isert_conn);
++out_conn_dev:
++ isert_device_put(device);
+ out:
+ kfree(isert_conn);
+ rdma_reject(cma_id, NULL, 0, IB_CM_REJ_CONSUMER_DEFINED);commit 52762efa2b256ed1c5274e5177cbd52ee11a2f6a
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Mon Mar 22 18:46:56 2021 -0700
+
+ gpu/xen: Fix a use after free in xen_drm_drv_init
+
+ In function displback_changed, has the call chain
+ displback_connect(front_info)->xen_drm_drv_init(front_info).
+ We can see that drm_info is assigned to front_info->drm_info
+ and drm_info is freed in fail branch in xen_drm_drv_init().
+
+ Later displback_disconnect(front_info) is called and it calls
+ xen_drm_drv_fini(front_info) cause a use after free by
+ drm_info = front_info->drm_info statement.
+
+ My patch has done two things. First fixes the fail label which
+ drm_info = kzalloc() failed and still free the drm_info.
+ Second sets front_info->drm_info to NULL to avoid uaf.
+
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
+ Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20210323014656.10068-1-lyl2019@mail.ustc.edu.cn
+
+diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c
+index 30d9adf31c84..9f14d99c763c 100644
+--- a/drivers/gpu/drm/xen/xen_drm_front.c
++++ b/drivers/gpu/drm/xen/xen_drm_front.c
+@@ -521,7 +521,7 @@ static int xen_drm_drv_init(struct xen_drm_front_info *front_info)
+ drm_dev = drm_dev_alloc(&xen_drm_driver, dev);
+ if (IS_ERR(drm_dev)) {
+ ret = PTR_ERR(drm_dev);
+- goto fail;
++ goto fail_dev;
+ }
+
+ drm_info->drm_dev = drm_dev;
+@@ -551,8 +551,10 @@ static int xen_drm_drv_init(struct xen_drm_front_info *front_info)
+ drm_kms_helper_poll_fini(drm_dev);
+ drm_mode_config_cleanup(drm_dev);
+ drm_dev_put(drm_dev);
+-fail:
++fail_dev:
+ kfree(drm_info);
++ front_info->drm_info = NULL;
++fail:
+ return ret;
+ }
+ commit 37df9f3fedb6aeaff5564145e8162aab912c9284
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 24 03:37:24 2021 -0700
+
+ video: hyperv_fb: Fix a double free in hvfb_probe
+
+ Function hvfb_probe() calls hvfb_getmem(), expecting upon return that
+ info->apertures is either NULL or points to memory that should be freed
+ by framebuffer_release(). But hvfb_getmem() is freeing the memory and
+ leaving the pointer non-NULL, resulting in a double free if an error
+ occurs or later if hvfb_remove() is called.
+
+ Fix this by removing all kfree(info->apertures) calls in hvfb_getmem().
+ This will allow framebuffer_release() to free the memory, which follows
+ the pattern of other fbdev drivers.
+
+ Fixes: 3a6fb6c4255c ("video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Reviewed-by: Michael Kelley <mikelley@microsoft.com>
+ Link: https://lore.kernel.org/r/20210324103724.4189-1-lyl2019@mail.ustc.edu.cn
+ Signed-off-by: Wei Liu <wei.liu@kernel.org>
+
+diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
+index c8b0ae676809..4dc9077dd2ac 100644
+--- a/drivers/video/fbdev/hyperv_fb.c
++++ b/drivers/video/fbdev/hyperv_fb.c
+@@ -1031,7 +1031,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
+ PCI_DEVICE_ID_HYPERV_VIDEO, NULL);
+ if (!pdev) {
+ pr_err("Unable to find PCI Hyper-V video\n");
+- kfree(info->apertures);
+ return -ENODEV;
+ }
+
+@@ -1129,7 +1128,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
+ } else {
+ pci_dev_put(pdev);
+ }
+- kfree(info->apertures);
+
+ return 0;
+
+@@ -1141,7 +1139,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
+ err1:
+ if (!gen2vm)
+ pci_dev_put(pdev);
+- kfree(info->apertures);
+
+ return -ENOMEM;
+ }commit 9ceee7d0841a8f7d7644021ba7d4cc1fbc7966e3
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 10 00:31:27 2021 -0800
+
+ firmware/efi: Fix a use after bug in efi_mem_reserve_persistent
+
+ In the for loop in efi_mem_reserve_persistent(), prsv = rsv->next
+ use the unmapped rsv. Use the unmapped pages will cause segment
+ fault.
+
+ Fixes: 18df7577adae6 ("efi/memreserve: deal with memreserve entries in unmapped memory")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
+
+diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
+index df3f9bcab581..4b7ee3fa9224 100644
+--- a/drivers/firmware/efi/efi.c
++++ b/drivers/firmware/efi/efi.c
+@@ -927,7 +927,7 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
+ }
+
+ /* first try to find a slot in an existing linked list entry */
+- for (prsv = efi_memreserve_root->next; prsv; prsv = rsv->next) {
++ for (prsv = efi_memreserve_root->next; prsv; ) {
+ rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB);
+ index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size);
+ if (index < rsv->size) {
+@@ -937,6 +937,7 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size)
+ memunmap(rsv);
+ return efi_mem_reserve_iomem(addr, size);
+ }
++ prsv = rsv->next;
+ memunmap(rsv);
+ }
+ commit c8c165dea4c8f5ad67b1240861e4f6c5395fa4ac
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 10 22:46:36 2021 -0800
+
+ scsi: st: Fix a use after free in st_open()
+
+ In st_open(), if STp->in_use is true, STp will be freed by
+ scsi_tape_put(). However, STp is still used by DEBC_printk() after. It is
+ better to DEBC_printk() before scsi_tape_put().
+
+ Link: https://lore.kernel.org/r/20210311064636.10522-1-lyl2019@mail.ustc.edu.cn
+ Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi>
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
+index 841ad2fc369a..9ca536aae784 100644
+--- a/drivers/scsi/st.c
++++ b/drivers/scsi/st.c
+@@ -1269,8 +1269,8 @@ static int st_open(struct inode *inode, struct file *filp)
+ spin_lock(&st_use_lock);
+ if (STp->in_use) {
+ spin_unlock(&st_use_lock);
+- scsi_tape_put(STp);
+ DEBC_printk(STp, "Device already in use.\n");
++ scsi_tape_put(STp);
+ return (-EBUSY);
+ }
+ commit 2bb817712e2f77486d6ee17e7efaf91997a685f8
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 10 22:30:05 2021 -0800
+
+ scsi: myrs: Fix a double free in myrs_cleanup()
+
+ In myrs_cleanup(), cs->mmio_base will be freed twice by iounmap().
+
+ Link: https://lore.kernel.org/r/20210311063005.9963-1-lyl2019@mail.ustc.edu.cn
+ Fixes: 77266186397c ("scsi: myrs: Add Mylex RAID controller (SCSI interface)")
+ Reviewed-by: Hannes Reinecke <hare@suse.de>
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
+index 4adf9ded296a..329fd025c718 100644
+--- a/drivers/scsi/myrs.c
++++ b/drivers/scsi/myrs.c
+@@ -2273,12 +2273,12 @@ static void myrs_cleanup(struct myrs_hba *cs)
+ if (cs->mmio_base) {
+ cs->disable_intr(cs);
+ iounmap(cs->mmio_base);
++ cs->mmio_base = NULL;
+ }
+ if (cs->irq)
+ free_irq(cs->irq, cs);
+ if (cs->io_addr)
+ release_region(cs->io_addr, 0x80);
+- iounmap(cs->mmio_base);
+ pci_set_drvdata(pdev, NULL);
+ pci_disable_device(pdev);
+ scsi_host_put(cs->host);commit db74623a3850db99cb9692fda9e836a56b74198d
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 10 20:01:40 2021 -0800
+
+ net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
+
+ In qlcnic_83xx_get_minidump_template, fw_dump->tmpl_hdr was freed by
+ vfree(). But unfortunately, it is used when extended is true.
+
+ Fixes: 7061b2bdd620e ("qlogic: Deletion of unnecessary checks before two function calls")
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+index 7760a3394e93..7ecb3dfe30bd 100644
+--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
++++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+@@ -1425,6 +1425,7 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
+
+ if (fw_dump->tmpl_hdr == NULL || current_version > prev_version) {
+ vfree(fw_dump->tmpl_hdr);
++ fw_dump->tmpl_hdr = NULL;
+
+ if (qlcnic_83xx_md_check_extended_dump_capability(adapter))
+ extended = !qlcnic_83xx_extend_md_capab(adapter);
+@@ -1443,6 +1444,8 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
+ struct qlcnic_83xx_dump_template_hdr *hdr;
+
+ hdr = fw_dump->tmpl_hdr;
++ if (!hdr)
++ return;
+ hdr->drv_cap_mask = 0x1f;
+ fw_dump->cap_mask = 0x1f;
+ dev_info(&pdev->dev,commit abec6561fc4e0fbb19591a0b35676d8c783b5493
+Author: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+Date: Wed Mar 10 21:44:13 2021 -0800
+
+ nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
+
+ In nvmet_rdma_write_data_done, rsp is recoverd by wc->wr_cqe and freed by
+ nvmet_rdma_release_rsp(). But after that, pr_info() used the freed
+ chunk's member object and could leak the freed chunk address with
+ wc->wr_cqe by computing the offset.
+
+ Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
+ Signed-off-by: Christoph Hellwig <hch@lst.de>
+
+diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
+index 06b6b742bb21..6c1f3ab7649c 100644
+--- a/drivers/nvme/target/rdma.c
++++ b/drivers/nvme/target/rdma.c
+@@ -802,9 +802,8 @@ static void nvmet_rdma_write_data_done(struct ib_cq *cq, struct ib_wc *wc)
+ nvmet_req_uninit(&rsp->req);
+ nvmet_rdma_release_rsp(rsp);
+ if (wc->status != IB_WC_WR_FLUSH_ERR) {
+- pr_info("RDMA WRITE for CQE 0x%p failed with status %s (%d).\n",
+- wc->wr_cqe, ib_wc_status_msg(wc->status),
+- wc->status);
++ pr_info("RDMA WRITE for CQE failed with status %s (%d).\n",
++ ib_wc_status_msg(wc->status), wc->status);
+ nvmet_rdma_error_comp(queue);
+ }
+ return;commit d1c2b5010d07e967d7cbcc232a86b2308d824ca3
+Author: He Chunhui <hchunhui@mail.ustc.edu.cn>
+Date: Tue Jul 26 06:16:52 2016 +0000
+
+ net: neigh: disallow transition to NUD_STALE if lladdr is unchanged in neigh_update()
+
+ NUD_STALE is used when the caller(e.g. arp_process()) can't guarantee
+ neighbour reachability. If the entry was NUD_VALID and lladdr is unchanged,
+ the entry state should not be changed.
+
+ Currently the code puts an extra "NUD_CONNECTED" condition. So if old state
+ was NUD_DELAY or NUD_PROBE (they are NUD_VALID but not NUD_CONNECTED), the
+ state can be changed to NUD_STALE.
+
+ This may cause problem. Because NUD_STALE lladdr doesn't guarantee
+ reachability, when we send traffic, the state will be changed to
+ NUD_DELAY. In normal case, if we get no confirmation (by dst_confirm()),
+ we will change the state to NUD_PROBE and send probe traffic. But now the
+ state may be reset to NUD_STALE again(e.g. by broadcast ARP packets),
+ so the probe traffic will not be sent. This situation may happen again and
+ again, and packets will be sent to an non-reachable lladdr forever.
+
+ The fix is to remove the "NUD_CONNECTED" condition. After that the
+ "NEIGH_UPDATE_F_WEAK_OVERRIDE" condition (used by IPv6) in that branch will
+ be redundant, so remove it.
+
+ This change may increase probe traffic, but it's essential since NUD_STALE
+ lladdr is unreliable. To ensure correctness, we prefer to resolve lladdr,
+ when we can't get confirmation, even while remote packets try to set
+ NUD_STALE state.
+
+ Signed-off-by: Chunhui He <hchunhui@mail.ustc.edu.cn>
+ Signed-off-by: Julian Anastasov <ja@ssi.bg>
+ Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/core/neighbour.c b/net/core/neighbour.c
+index 5cdc62a8eb84..cf26e04c4046 100644
+--- a/net/core/neighbour.c
++++ b/net/core/neighbour.c
+@@ -1060,8 +1060,6 @@ static void neigh_update_hhs(struct neighbour *neigh)
+ NEIGH_UPDATE_F_WEAK_OVERRIDE will suspect existing "connected"
+ lladdr instead of overriding it
+ if it is different.
+- It also allows to retain current state
+- if lladdr is unchanged.
+ NEIGH_UPDATE_F_ADMIN means that the change is administrative.
+
+ NEIGH_UPDATE_F_OVERRIDE_ISROUTER allows to override existing
+@@ -1150,10 +1148,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
+ } else
+ goto out;
+ } else {
+- if (lladdr == neigh->ha && new == NUD_STALE &&
+- ((flags & NEIGH_UPDATE_F_WEAK_OVERRIDE) ||
+- (old & NUD_CONNECTED))
+- )
++ if (lladdr == neigh->ha && new == NUD_STALE)
+ new = old;
+ }
+ }
+ commit 35f1790e6c6a7e4cae57b616cf36444d27fa6b28
+Author: He Chunhui <hchunhui@mail.ustc.edu.cn>
+Date: Wed Feb 1 00:48:28 2012 +0800
+
+ x86, boot: Fix port argument to inl() function
+
+ "u32 port" in inl() should be "u16 port".
+
+ [ hpa: it's a bug, but it doesn't produce incorrect code, so no need
+ to put this into urgent or stable. ]
+
+ Signed-off-by: He Chunhui <hchunhui@mail.ustc.edu.cn>
+ Link: http://lkml.kernel.org/r/32892299.2931391328028508117.JavaMail.coremail@mailweb
+ Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+
+diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
+index c7093bd9f2d3..18997e5a1053 100644
+--- a/arch/x86/boot/boot.h
++++ b/arch/x86/boot/boot.h
+@@ -67,7 +67,7 @@ static inline void outl(u32 v, u16 port)
+ {
+ asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
+ }
+-static inline u32 inl(u32 port)
++static inline u32 inl(u16 port)
+ {
+ u32 v;
+ asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));commit f9543d0ab6392a9a5bff0034622688dc10d9d225 +Author: JiSheng Zhang <jszhang3@mail.ustc.edu.cn> +Date: Sat Jul 19 15:35:41 2008 +0800 + + firewire: queue the right number of data + + There will be 4 padding bytes in struct fw_cdev_event_response on some platforms + The member:__u32 data will point to these padding bytes. While queue the + response and data in complete_transaction in fw-cdev.c, it will queue like this: + |response(excluding padding bytes)|4 padding bytes|4 padding bytes|data. + It queue 4 extra bytes. That is to say it use "&response + sizeof(response)" + while other place of kernel and userspace library use "&response + offsetof + (typeof(response), data)". So it will lost the last 4 bytes of data. This patch + can fix it while not changing the struct definition. + + Signed-off-by: JiSheng Zhang <jszhang3@mail.ustc.edu.cn> + + This fixes responses to outbound block read requests on 64bit architectures. + Tested on i686, x86-64, and x86-64 with i686 userland, using firecontrol and + gscanbus. + + Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> + +diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c +index c639915fc3cb..bc81d6fcd2fd 100644 +--- a/drivers/firewire/fw-cdev.c ++++ b/drivers/firewire/fw-cdev.c +@@ -382,9 +382,9 @@ complete_transaction(struct fw_card *card, int rcode, + + response->response.type = FW_CDEV_EVENT_RESPONSE; + response->response.rcode = rcode; +- queue_event(client, &response->event, +- &response->response, sizeof(response->response), +- response->response.data, response->response.length); ++ queue_event(client, &response->event, &response->response, ++ sizeof(response->response) + response->response.length, ++ NULL, 0); + } + + static int ioctl_send_request(struct client *client, void *buffer)
commit 8bc3be2751b4f74ab90a446da1912fd8204d53f7
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Mon Feb 4 22:29:36 2008 -0800
+
+ writeback: speed up writeback of big dirty files
+
+ After making dirty a 100M file, the normal behavior is to start the
+ writeback for all data after 30s delays. But sometimes the following
+ happens instead:
+
+ - after 30s: ~4M
+ - after 5s: ~4M
+ - after 5s: all remaining 92M
+
+ Some analyze shows that the internal io dispatch queues goes like this:
+
+ s_io s_more_io
+ -------------------------
+ 1) 100M,1K 0
+ 2) 1K 96M
+ 3) 0 96M
+ 1) initial state with a 100M file and a 1K file
+
+ 2) 4M written, nr_to_write <= 0, so write more
+
+ 3) 1K written, nr_to_write > 0, no more writes(BUG)
+
+ nr_to_write > 0 in (3) fools the upper layer to think that data have all
+ been written out. The big dirty file is actually still sitting in
+ s_more_io. We cannot simply splice s_more_io back to s_io as soon as s_io
+ becomes empty, and let the loop in generic_sync_sb_inodes() continue: this
+ may starve newly expired inodes in s_dirty. It is also not an option to
+ draw inodes from both s_more_io and s_dirty, an let the loop go on: this
+ might lead to live locks, and might also starve other superblocks in sync
+ time(well kupdate may still starve some superblocks, that's another bug).
+
+ We have to return when a full scan of s_io completes. So nr_to_write > 0
+ does not necessarily mean that "all data are written". This patch
+ introduces a flag writeback_control.more_io to indicate that more io should
+ be done. With it the big dirty file no longer has to wait for the next
+ kupdate invokation 5s later.
+
+ In sync_sb_inodes() we only set more_io on super_blocks we actually
+ visited. This avoids the interaction between two pdflush deamons.
+
+ Also in __sync_single_inode() we don't blindly keep requeuing the io if the
+ filesystem cannot progress. Failing to do so may lead to 100% iowait.
+
+ Tested-by: Mike Snitzer <snitzer@gmail.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Michael Rubin <mrubin@google.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
+index 3fe782d70a71..0b3064079fa5 100644
+--- a/fs/fs-writeback.c
++++ b/fs/fs-writeback.c
+@@ -284,7 +284,17 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
+ * soon as the queue becomes uncongested.
+ */
+ inode->i_state |= I_DIRTY_PAGES;
+- requeue_io(inode);
++ if (wbc->nr_to_write <= 0) {
++ /*
++ * slice used up: queue for next turn
++ */
++ requeue_io(inode);
++ } else {
++ /*
++ * somehow blocked: retry later
++ */
++ redirty_tail(inode);
++ }
+ } else {
+ /*
+ * Otherwise fully redirty the inode so that
+@@ -468,8 +478,12 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ iput(inode);
+ cond_resched();
+ spin_lock(&inode_lock);
+- if (wbc->nr_to_write <= 0)
++ if (wbc->nr_to_write <= 0) {
++ wbc->more_io = 1;
+ break;
++ }
++ if (!list_empty(&sb->s_more_io))
++ wbc->more_io = 1;
+ }
+ return; /* Leave any unwritten inodes on s_io */
+ }
+diff --git a/include/linux/writeback.h b/include/linux/writeback.h
+index b2cd826a8c90..b7b3362f7717 100644
+--- a/include/linux/writeback.h
++++ b/include/linux/writeback.h
+@@ -62,6 +62,7 @@ struct writeback_control {
+ unsigned for_reclaim:1; /* Invoked from the page allocator */
+ unsigned for_writepages:1; /* This is a writepages() call */
+ unsigned range_cyclic:1; /* range_start is cyclic */
++ unsigned more_io:1; /* more io to be dispatched */
+ };
+
+ /*
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index a4ca162666c5..5e00f1772c20 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -567,6 +567,7 @@ static void background_writeout(unsigned long _min_pages)
+ global_page_state(NR_UNSTABLE_NFS) < background_thresh
+ && min_pages <= 0)
+ break;
++ wbc.more_io = 0;
+ wbc.encountered_congestion = 0;
+ wbc.nr_to_write = MAX_WRITEBACK_PAGES;
+ wbc.pages_skipped = 0;
+@@ -574,8 +575,9 @@ static void background_writeout(unsigned long _min_pages)
+ min_pages -= MAX_WRITEBACK_PAGES - wbc.nr_to_write;
+ if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) {
+ /* Wrote less than expected */
+- congestion_wait(WRITE, HZ/10);
+- if (!wbc.encountered_congestion)
++ if (wbc.encountered_congestion || wbc.more_io)
++ congestion_wait(WRITE, HZ/10);
++ else
+ break;
+ }
+ }
+@@ -640,11 +642,12 @@ static void wb_kupdate(unsigned long arg)
+ global_page_state(NR_UNSTABLE_NFS) +
+ (inodes_stat.nr_inodes - inodes_stat.nr_unused);
+ while (nr_to_write > 0) {
++ wbc.more_io = 0;
+ wbc.encountered_congestion = 0;
+ wbc.nr_to_write = MAX_WRITEBACK_PAGES;
+ writeback_inodes(&wbc);
+ if (wbc.nr_to_write > 0) {
+- if (wbc.encountered_congestion)
++ if (wbc.encountered_congestion || wbc.more_io)
+ congestion_wait(WRITE, HZ/10);
+ else
+ break; /* All the old data is written */commit ec4dd3eb35759f9fbeb5c1abb01403b2fde64cc9
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Mon Feb 4 22:28:56 2008 -0800
+
+ maps4: add proportional set size accounting in smaps
+
+ The "proportional set size" (PSS) of a process is the count of pages it has
+ in memory, where each page is divided by the number of processes sharing
+ it. So if a process has 1000 pages all to itself, and 1000 shared with one
+ other process, its PSS will be 1500.
+
+ - lwn.net: "ELC: How much memory are applications really using?"
+
+ The PSS proposed by Matt Mackall is a very nice metic for measuring an
+ process's memory footprint. So collect and export it via
+ /proc/<pid>/smaps.
+
+ Matt Mackall's pagemap/kpagemap and John Berthels's exmap can also do the
+ job. They are comprehensive tools. But for PSS, let's do it in the simple
+ way.
+
+ Cc: John Berthels <jjberthels@gmail.com>
+ Cc: Bernardo Innocenti <bernie@codewiz.org>
+ Cc: Padraig Brady <P@draigBrady.com>
+ Cc: Denys Vlasenko <vda.linux@googlemail.com>
+ Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
+ Signed-off-by: Matt Mackall <mpm@selenic.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Hugh Dickins <hugh@veritas.com>
+ Cc: Dave Hansen <haveblue@us.ibm.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
+index 8043a3eab52c..8952ce70315e 100644
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -114,6 +114,25 @@ static void pad_len_spaces(struct seq_file *m, int len)
+ seq_printf(m, "%*c", len, ' ');
+ }
+
++/*
++ * Proportional Set Size(PSS): my share of RSS.
++ *
++ * PSS of a process is the count of pages it has in memory, where each
++ * page is divided by the number of processes sharing it. So if a
++ * process has 1000 pages all to itself, and 1000 shared with one other
++ * process, its PSS will be 1500.
++ *
++ * To keep (accumulated) division errors low, we adopt a 64bit
++ * fixed-point pss counter to minimize division errors. So (pss >>
++ * PSS_SHIFT) would be the real byte count.
++ *
++ * A shift of 12 before division means (assuming 4K page size):
++ * - 1M 3-user-pages add up to 8KB errors;
++ * - supports mapcount up to 2^24, or 16M;
++ * - supports PSS up to 2^52 bytes, or 4PB.
++ */
++#define PSS_SHIFT 12
++
+ struct mem_size_stats
+ {
+ unsigned long resident;
+@@ -122,6 +141,7 @@ struct mem_size_stats
+ unsigned long private_clean;
+ unsigned long private_dirty;
+ unsigned long referenced;
++ u64 pss;
+ };
+
+ struct pmd_walker {
+@@ -195,6 +215,7 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
+ seq_printf(m,
+ "Size: %8lu kB\n"
+ "Rss: %8lu kB\n"
++ "Pss: %8lu kB\n"
+ "Shared_Clean: %8lu kB\n"
+ "Shared_Dirty: %8lu kB\n"
+ "Private_Clean: %8lu kB\n"
+@@ -202,6 +223,7 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
+ "Referenced: %8lu kB\n",
+ (vma->vm_end - vma->vm_start) >> 10,
+ mss->resident >> 10,
++ (unsigned long)(mss->pss >> (10 + PSS_SHIFT)),
+ mss->shared_clean >> 10,
+ mss->shared_dirty >> 10,
+ mss->private_clean >> 10,
+@@ -226,6 +248,7 @@ static void smaps_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
+ pte_t *pte, ptent;
+ spinlock_t *ptl;
+ struct page *page;
++ int mapcount;
+
+ pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
+ for (; addr != end; pte++, addr += PAGE_SIZE) {
+@@ -242,16 +265,19 @@ static void smaps_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
+ /* Accumulate the size in pages that have been accessed. */
+ if (pte_young(ptent) || PageReferenced(page))
+ mss->referenced += PAGE_SIZE;
+- if (page_mapcount(page) >= 2) {
++ mapcount = page_mapcount(page);
++ if (mapcount >= 2) {
+ if (pte_dirty(ptent))
+ mss->shared_dirty += PAGE_SIZE;
+ else
+ mss->shared_clean += PAGE_SIZE;
++ mss->pss += (PAGE_SIZE << PSS_SHIFT) / mapcount;
+ } else {
+ if (pte_dirty(ptent))
+ mss->private_dirty += PAGE_SIZE;
+ else
+ mss->private_clean += PAGE_SIZE;
++ mss->pss += (PAGE_SIZE << PSS_SHIFT);
+ }
+ }
+ pte_unmap_unlock(pte - 1, ptl);commit 28bc44d7d1d967b8251214dd7a130d523b5ba5ee +Author: Fengguang Wu <wfg@mail.ustc.edu.cn> +Date: Sun Feb 3 18:04:10 2008 +0200 + + do_invalidatepage() comment typo fix + + Fix a typo in the comment for do_invalidatepage(). + + Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> + Signed-off-by: Adrian Bunk <bunk@kernel.org> + +diff --git a/mm/truncate.c b/mm/truncate.c +index cadc15653dde..c3123b08ff6d 100644 +--- a/mm/truncate.c ++++ b/mm/truncate.c +@@ -21,7 +21,7 @@ + + + /** +- * do_invalidatepage - invalidate part of all of a page ++ * do_invalidatepage - invalidate part or all of a page + * @page: the page which is affected + * @offset: the index of the truncation point + *
commit 70d215c4a7dfbddc138a2dd726d8f80f3e6d2622
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Fri Dec 7 16:35:14 2007 +0800
+
+ HID: the `bit' in hidinput_mapping_quirks() is an out parameter
+
+ Fix a panic, by changing
+ hidinput_mapping_quirks(,, unsigned long *bit,)
+ to
+ hidinput_mapping_quirks(,, unsigned long **bit,)
+
+ The `bit' in this function is an out parameter.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+
+diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
+index fbe8b6de1a63..4bcdc9bb658e 100644
+--- a/drivers/hid/hid-input-quirks.c
++++ b/drivers/hid/hid-input-quirks.c
+@@ -16,16 +16,16 @@
+ #include <linux/input.h>
+ #include <linux/hid.h>
+
+-#define map_abs(c) do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; *max = ABS_MAX; } while (0)
+-#define map_rel(c) do { usage->code = c; usage->type = EV_REL; bit = input->relbit; *max = REL_MAX; } while (0)
+-#define map_key(c) do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; *max = KEY_MAX; } while (0)
+-#define map_led(c) do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; *max = LED_MAX; } while (0)
++#define map_abs(c) do { usage->code = c; usage->type = EV_ABS; *bit = input->absbit; *max = ABS_MAX; } while (0)
++#define map_rel(c) do { usage->code = c; usage->type = EV_REL; *bit = input->relbit; *max = REL_MAX; } while (0)
++#define map_key(c) do { usage->code = c; usage->type = EV_KEY; *bit = input->keybit; *max = KEY_MAX; } while (0)
++#define map_led(c) do { usage->code = c; usage->type = EV_LED; *bit = input->ledbit; *max = LED_MAX; } while (0)
+
+-#define map_abs_clear(c) do { map_abs(c); clear_bit(c, bit); } while (0)
+-#define map_key_clear(c) do { map_key(c); clear_bit(c, bit); } while (0)
++#define map_abs_clear(c) do { map_abs(c); clear_bit(c, *bit); } while (0)
++#define map_key_clear(c) do { map_key(c); clear_bit(c, *bit); } while (0)
+
+ static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+ return 0;
+@@ -41,7 +41,7 @@ static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
+ }
+
+ static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+ return 0;
+@@ -57,7 +57,7 @@ static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *inpu
+ }
+
+ static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
+ return 0;
+@@ -90,7 +90,7 @@ static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_de
+ }
+
+ static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+ return 0;
+@@ -115,7 +115,7 @@ static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev
+ }
+
+ static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+ return 0;
+@@ -138,7 +138,7 @@ static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev
+ }
+
+ static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+ return 0;
+@@ -156,7 +156,7 @@ static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_de
+ }
+
+ static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
+ ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
+@@ -184,7 +184,7 @@ static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *inpu
+ }
+
+ static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+ return 0;
+@@ -236,7 +236,7 @@ static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *in
+ }
+
+ static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+ return 0;
+@@ -254,7 +254,7 @@ static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *in
+ }
+
+ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+ return 0;
+@@ -307,7 +307,7 @@ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
+ static const struct hid_input_blacklist {
+ __u16 idVendor;
+ __u16 idProduct;
+- int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long *, int *);
++ int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long **, int *);
+ } hid_input_blacklist[] = {
+ { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
+
+@@ -335,7 +335,7 @@ static const struct hid_input_blacklist {
+
+ int hidinput_mapping_quirks(struct hid_usage *usage,
+ struct input_dev *input,
+- unsigned long *bit, int *max)
++ unsigned long **bit, int *max)
+ {
+ struct hid_device *device = input_get_drvdata(input);
+ int i = 0;
+diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
+index aeb018e31bfc..5325d98b4328 100644
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -382,7 +382,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
+ }
+
+ /* handle input mappings for quirky devices */
+- ret = hidinput_mapping_quirks(usage, input, bit, &max);
++ ret = hidinput_mapping_quirks(usage, input, &bit, &max);
+ if (ret)
+ goto mapped;
+
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index 24f04cd742de..6a70b788ee9c 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -526,7 +526,7 @@ extern void hidinput_disconnect(struct hid_device *);
+ int hid_set_field(struct hid_field *, unsigned, __s32);
+ int hid_input_report(struct hid_device *, int type, u8 *, int, int);
+ int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
+-int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long *, int *);
++int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *);
+ void hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
+ int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32);
+ void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);commit c06a018fa5362fa9ed0768bd747c0fab26bc8849
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Wed Nov 14 16:59:54 2007 -0800
+
+ reiserfs: don't drop PG_dirty when releasing sub-page-sized dirty file
+
+ This is not a new problem in 2.6.23-git17. 2.6.22/2.6.23 is buggy in the
+ same way.
+
+ Reiserfs could accumulate dirty sub-page-size files until umount time.
+ They cannot be synced to disk by pdflush routines or explicit `sync'
+ commands. Only `umount' can do the trick.
+
+ The direct cause is: the dirty page's PG_dirty is wrongly _cleared_.
+ Call trace:
+ [<ffffffff8027e920>] cancel_dirty_page+0xd0/0xf0
+ [<ffffffff8816d470>] :reiserfs:reiserfs_cut_from_item+0x660/0x710
+ [<ffffffff8816d791>] :reiserfs:reiserfs_do_truncate+0x271/0x530
+ [<ffffffff8815872d>] :reiserfs:reiserfs_truncate_file+0xfd/0x3b0
+ [<ffffffff8815d3d0>] :reiserfs:reiserfs_file_release+0x1e0/0x340
+ [<ffffffff802a187c>] __fput+0xcc/0x1b0
+ [<ffffffff802a1ba6>] fput+0x16/0x20
+ [<ffffffff8029e676>] filp_close+0x56/0x90
+ [<ffffffff8029fe0d>] sys_close+0xad/0x110
+ [<ffffffff8020c41e>] system_call+0x7e/0x83
+
+ Fix the bug by removing the cancel_dirty_page() call. Tests show that
+ it causes no bad behaviors on various write sizes.
+
+ === for the patient ===
+ Here are more detailed demonstrations of the problem.
+
+ 1) the page has both PG_dirty(D)/PAGECACHE_TAG_DIRTY(d) after being written to;
+ and then only PAGECACHE_TAG_DIRTY(d) remains after the file is closed.
+
+ ------------------------------ screen 0 ------------------------------
+ [T0] root /home/wfg# cat > /test/tiny
+ [T1] hi
+ [T2] root /home/wfg#
+
+ ------------------------------ screen 1 ------------------------------
+ [T1] root /home/wfg# echo /test/tiny > /proc/filecache
+ [T1] root /home/wfg# cat /proc/filecache
+ # file /test/tiny
+ # flags R:referenced A:active M:mmap U:uptodate D:dirty W:writeback O:owner B:buffer d:dirty w:writeback
+ # idx len state refcnt
+ 0 1 ___UD__Bd_ 2
+ [T2] root /home/wfg# cat /proc/filecache
+ # file /test/tiny
+ # flags R:referenced A:active M:mmap U:uptodate D:dirty W:writeback O:owner B:buffer d:dirty w:writeback
+ # idx len state refcnt
+ 0 1 ___U___Bd_ 2
+
+ 2) note the non-zero 'cancelled_write_bytes' after /tmp/hi is copied.
+
+ ------------------------------ screen 0 ------------------------------
+ [T0] root /home/wfg# echo hi > /tmp/hi
+ [T1] root /home/wfg# cp /tmp/hi /dev/stdin /test
+ [T2] hi
+ [T3] root /home/wfg#
+
+ ------------------------------ screen 1 ------------------------------
+ [T1] root /proc/4397# cd /proc/`pidof cp`
+ [T1] root /proc/4713# cat io
+ rchar: 8396
+ wchar: 3
+ syscr: 20
+ syscw: 1
+ read_bytes: 0
+ write_bytes: 20480
+ cancelled_write_bytes: 4096
+ [T2] root /proc/4713# cat io
+ rchar: 8399
+ wchar: 6
+ syscr: 21
+ syscw: 2
+ read_bytes: 0
+ write_bytes: 24576
+ cancelled_write_bytes: 4096
+
+ //Question: the 'write_bytes' is a bit more than expected ;-)
+
+ Tested-by: Maxim Levitsky <maximlevitsky@gmail.com>
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Cc: Jeff Mahoney <jeffm@suse.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Reviewed-by: Chris Mason <chris.mason@oracle.com>
+ Cc: <stable@kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
+index ca41567d7890..d2db2417b2bd 100644
+--- a/fs/reiserfs/stree.c
++++ b/fs/reiserfs/stree.c
+@@ -1458,9 +1458,6 @@ static void unmap_buffers(struct page *page, loff_t pos)
+ }
+ bh = next;
+ } while (bh != head);
+- if (PAGE_SIZE == bh->b_size) {
+- cancel_dirty_page(page, PAGE_CACHE_SIZE);
+- }
+ }
+ }
+ }commit df7c487250b17aa0caeee7d85f120330f1d31355
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Sat Oct 20 02:26:04 2007 +0200
+
+ trivial copy_data_pages() tidy up
+
+ Change the loop style of copy_data_pages() to remove a duplicate condition.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
+ Signed-off-by: Adrian Bunk <bunk@kernel.org>
+
+diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
+index ccc95ac07bed..78039b477d2b 100644
+--- a/kernel/power/snapshot.c
++++ b/kernel/power/snapshot.c
+@@ -1005,11 +1005,12 @@ copy_data_pages(struct memory_bitmap *copy_bm, struct memory_bitmap *orig_bm)
+ }
+ memory_bm_position_reset(orig_bm);
+ memory_bm_position_reset(copy_bm);
+- do {
++ for(;;) {
+ pfn = memory_bm_next_pfn(orig_bm);
+- if (likely(pfn != BM_END_OF_MAP))
+- copy_data_page(memory_bm_next_pfn(copy_bm), pfn);
+- } while (pfn != BM_END_OF_MAP);
++ if (unlikely(pfn == BM_END_OF_MAP))
++ break;
++ copy_data_page(memory_bm_next_pfn(copy_bm), pfn);
++ }
+ }
+
+ /* Total number of image pages */commit f68fd5f480248ca49e20e30a8e2387bc54694580
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Wed Oct 17 18:04:34 2007 +0200
+
+ x86: call free_init_pages() with irqs enabled in alternative_instructions()
+
+ In alternative_instructions(), call free_init_pages() with irqs enabled.
+
+ It fixes the warning message in smp_call_function*(), which should not be
+ called with irqs disabled.
+
+ [ 0.310000] CPU: L1 I Cache: 64K (64 bytes/line), D cache 64K (64 bytes/line)
+ [ 0.310000] CPU: L2 Cache: 512K (64 bytes/line)
+ [ 0.310000] CPU 0/0 -> Node 0
+ [ 0.310000] SMP alternatives: switching to UP code
+ [ 0.310000] Freeing SMP alternatives: 25k freed
+ [ 0.310000] WARNING: at arch/x86_64/kernel/smp.c:397 smp_call_function_mask()
+ [ 0.310000]
+ [ 0.310000] Call Trace:
+ [ 0.310000] [<ffffffff8100dbde>] dump_trace+0x3ee/0x4a0
+ [ 0.310000] [<ffffffff8100dcd3>] show_trace+0x43/0x70
+ [ 0.310000] [<ffffffff8100dd15>] dump_stack+0x15/0x20
+ [ 0.310000] [<ffffffff8101cd44>] smp_call_function_mask+0x94/0xa0
+ [ 0.310000] [<ffffffff8101d0b2>] smp_call_function+0x32/0x40
+ [ 0.310000] [<ffffffff8104277f>] on_each_cpu+0x1f/0x50
+ [ 0.310000] [<ffffffff81026eac>] global_flush_tlb+0x8c/0x110
+ [ 0.310000] [<ffffffff81025c85>] free_init_pages+0xe5/0xf0
+ [ 0.310000] [<ffffffff81549b5e>] alternative_instructions+0x7e/0x150
+ [ 0.310000] [<ffffffff8154a2ea>] check_bugs+0x1a/0x20
+ [ 0.310000] [<ffffffff81540c4a>] start_kernel+0x2da/0x380
+ [ 0.310000] [<ffffffff81540132>] _sinittext+0x132/0x140
+ [ 0.310000]
+ [ 0.320000] ACPI: Core revision 20070126
+ [ 0.560000] Using local APIC timer interrupts.
+ [ 0.590000] Detected 62.496 MHz APIC timer.
+ [ 0.590000] Brought up 1 CPUs
+
+ [ tglx: arch/x86 adaptation ]
+
+ Cc: Laurent Vivier <Laurent.Vivier@bull.net>
+ Cc: Andi Kleen <ak@suse.de>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+ Signed-off-by: Ingo Molnar <mingo@elte.hu>
+ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
+index 11b03d3c6fda..dff1c9e1c2ee 100644
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -415,9 +415,6 @@ void __init alternative_instructions(void)
+ alternatives_smp_unlock(__smp_locks, __smp_locks_end,
+ _text, _etext);
+ }
+- free_init_pages("SMP alternatives",
+- (unsigned long)__smp_locks,
+- (unsigned long)__smp_locks_end);
+ } else {
+ alternatives_smp_module_add(NULL, "core kernel",
+ __smp_locks, __smp_locks_end,
+@@ -428,6 +425,11 @@ void __init alternative_instructions(void)
+ apply_paravirt(__parainstructions, __parainstructions_end);
+ local_irq_restore(flags);
+
++ if (smp_alt_once)
++ free_init_pages("SMP alternatives",
++ (unsigned long)__smp_locks,
++ (unsigned long)__smp_locks_end);
++
+ restart_nmi();
+ #ifdef CONFIG_X86_MCE
+ restart_mce();commit 369f2389e7d03022abdd25e298bffb9613cd0e54
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 23:30:45 2007 -0700
+
+ writeback: remove unnecessary wait in throttle_vm_writeout()
+
+ We don't want to introduce pointless delays in throttle_vm_writeout() when
+ the writeback limits are not yet exceeded, do we?
+
+ Cc: Nick Piggin <nickpiggin@yahoo.com.au>
+ Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
+ Cc: Kumar Gala <galak@kernel.crashing.org>
+ Cc: Pete Zaitcev <zaitcev@redhat.com>
+ Cc: Greg KH <greg@kroah.com>
+ Reviewed-by: Rik van Riel <riel@redhat.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index d8c21e5a1bc9..7845462064f4 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -502,16 +502,6 @@ void throttle_vm_writeout(gfp_t gfp_mask)
+ long background_thresh;
+ long dirty_thresh;
+
+- if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO)) {
+- /*
+- * The caller might hold locks which can prevent IO completion
+- * or progress in the filesystem. So we cannot just sit here
+- * waiting for IO to complete.
+- */
+- congestion_wait(WRITE, HZ/10);
+- return;
+- }
+-
+ for ( ; ; ) {
+ get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL);
+
+@@ -525,6 +515,14 @@ void throttle_vm_writeout(gfp_t gfp_mask)
+ global_page_state(NR_WRITEBACK) <= dirty_thresh)
+ break;
+ congestion_wait(WRITE, HZ/10);
++
++ /*
++ * The caller might hold locks which can prevent IO completion
++ * or progress in the filesystem. So we cannot just sit here
++ * waiting for IO to complete.
++ */
++ if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO))
++ break;
+ }
+ }
+
+ commit 2e6883bdf49abd0e7f0d9b6297fc3be7ebb2250b
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 23:30:43 2007 -0700
+
+ writeback: introduce writeback_control.more_io to indicate more io
+
+ After making dirty a 100M file, the normal behavior is to start the writeback
+ for all data after 30s delays. But sometimes the following happens instead:
+
+ - after 30s: ~4M
+ - after 5s: ~4M
+ - after 5s: all remaining 92M
+
+ Some analyze shows that the internal io dispatch queues goes like this:
+
+ s_io s_more_io
+ -------------------------
+ 1) 100M,1K 0
+ 2) 1K 96M
+ 3) 0 96M
+
+ 1) initial state with a 100M file and a 1K file
+ 2) 4M written, nr_to_write <= 0, so write more
+ 3) 1K written, nr_to_write > 0, no more writes(BUG)
+
+ nr_to_write > 0 in (3) fools the upper layer to think that data have all been
+ written out. The big dirty file is actually still sitting in s_more_io. We
+ cannot simply splice s_more_io back to s_io as soon as s_io becomes empty, and
+ let the loop in generic_sync_sb_inodes() continue: this may starve newly
+ expired inodes in s_dirty. It is also not an option to draw inodes from both
+ s_more_io and s_dirty, an let the loop go on: this might lead to live locks,
+ and might also starve other superblocks in sync time(well kupdate may still
+ starve some superblocks, that's another bug).
+
+ We have to return when a full scan of s_io completes. So nr_to_write > 0 does
+ not necessarily mean that "all data are written". This patch introduces a
+ flag writeback_control.more_io to indicate this situation. With it the big
+ dirty file no longer has to wait for the next kupdate invocation 5s later.
+
+ Cc: David Chinner <dgc@sgi.com>
+ Cc: Ken Chen <kenchen@google.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
+index 414df43706c7..71c158ac60a3 100644
+--- a/fs/fs-writeback.c
++++ b/fs/fs-writeback.c
+@@ -473,6 +473,8 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ if (wbc->nr_to_write <= 0)
+ break;
+ }
++ if (!list_empty(&sb->s_more_io))
++ wbc->more_io = 1;
+ return; /* Leave any unwritten inodes on s_io */
+ }
+
+diff --git a/include/linux/writeback.h b/include/linux/writeback.h
+index 52be879793ed..1200868a5dee 100644
+--- a/include/linux/writeback.h
++++ b/include/linux/writeback.h
+@@ -62,6 +62,7 @@ struct writeback_control {
+ unsigned for_reclaim:1; /* Invoked from the page allocator */
+ unsigned for_writepages:1; /* This is a writepages() call */
+ unsigned range_cyclic:1; /* range_start is cyclic */
++ unsigned more_io:1; /* more io to be dispatched */
+ };
+
+ /*
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index 334852131588..bcdbbf6c4a85 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -553,6 +553,7 @@ static void background_writeout(unsigned long _min_pages)
+ global_page_state(NR_UNSTABLE_NFS) < background_thresh
+ && min_pages <= 0)
+ break;
++ wbc.more_io = 0;
+ wbc.encountered_congestion = 0;
+ wbc.nr_to_write = MAX_WRITEBACK_PAGES;
+ wbc.pages_skipped = 0;
+@@ -560,8 +561,9 @@ static void background_writeout(unsigned long _min_pages)
+ min_pages -= MAX_WRITEBACK_PAGES - wbc.nr_to_write;
+ if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) {
+ /* Wrote less than expected */
+- congestion_wait(WRITE, HZ/10);
+- if (!wbc.encountered_congestion)
++ if (wbc.encountered_congestion || wbc.more_io)
++ congestion_wait(WRITE, HZ/10);
++ else
+ break;
+ }
+ }
+@@ -626,11 +628,12 @@ static void wb_kupdate(unsigned long arg)
+ global_page_state(NR_UNSTABLE_NFS) +
+ (inodes_stat.nr_inodes - inodes_stat.nr_unused);
+ while (nr_to_write > 0) {
++ wbc.more_io = 0;
+ wbc.encountered_congestion = 0;
+ wbc.nr_to_write = MAX_WRITEBACK_PAGES;
+ writeback_inodes(&wbc);
+ if (wbc.nr_to_write > 0) {
+- if (wbc.encountered_congestion)
++ if (wbc.encountered_congestion || wbc.more_io)
+ congestion_wait(WRITE, HZ/10);
+ else
+ break; /* All the old data is written */commit 1f7decf6d9f06dac008b8d66935c0c3b18e564f9
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 23:30:42 2007 -0700
+
+ writeback: remove pages_skipped accounting in __block_write_full_page()
+
+ Miklos Szeredi <miklos@szeredi.hu> and me identified a writeback bug:
+
+ > The following strange behavior can be observed:
+ >
+ > 1. large file is written
+ > 2. after 30 seconds, nr_dirty goes down by 1024
+ > 3. then for some time (< 30 sec) nothing happens (disk idle)
+ > 4. then nr_dirty again goes down by 1024
+ > 5. repeat from 3. until whole file is written
+ >
+ > So basically a 4Mbyte chunk of the file is written every 30 seconds.
+ > I'm quite sure this is not the intended behavior.
+
+ It can be produced by the following test scheme:
+
+ # cat bin/test-writeback.sh
+ grep nr_dirty /proc/vmstat
+ echo 1 > /proc/sys/fs/inode_debug
+ dd if=/dev/zero of=/var/x bs=1K count=204800&
+ while true; do grep nr_dirty /proc/vmstat; sleep 1; done
+
+ # bin/test-writeback.sh
+ nr_dirty 19207
+ nr_dirty 19207
+ nr_dirty 30924
+ 204800+0 records in
+ 204800+0 records out
+ 209715200 bytes (210 MB) copied, 1.58363 seconds, 132 MB/s
+ nr_dirty 47150
+ nr_dirty 47141
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47205
+ nr_dirty 47214
+ nr_dirty 47214
+ nr_dirty 47214
+ nr_dirty 47214
+ nr_dirty 47214
+ nr_dirty 47215
+ nr_dirty 47216
+ nr_dirty 47216
+ nr_dirty 47216
+ nr_dirty 47154
+ nr_dirty 47143
+ nr_dirty 47143
+ nr_dirty 47143
+ nr_dirty 47143
+ nr_dirty 47143
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47142
+ nr_dirty 47134
+ nr_dirty 47134
+ nr_dirty 47135
+ nr_dirty 47135
+ nr_dirty 47135
+ nr_dirty 46097 <== -1038
+ nr_dirty 46098
+ nr_dirty 46098
+ nr_dirty 46098
+ [...]
+ nr_dirty 46091
+ nr_dirty 46092
+ nr_dirty 46092
+ nr_dirty 45069 <== -1023
+ nr_dirty 45056
+ nr_dirty 45056
+ nr_dirty 45056
+ [...]
+ nr_dirty 37822
+ nr_dirty 36799 <== -1023
+ [...]
+ nr_dirty 36781
+ nr_dirty 35758 <== -1023
+ [...]
+ nr_dirty 34708
+ nr_dirty 33672 <== -1024
+ [...]
+ nr_dirty 33692
+ nr_dirty 32669 <== -1023
+
+ % ls -li /var/x
+ 847824 -rw-r--r-- 1 root root 200M 2007-08-12 04:12 /var/x
+
+ % dmesg|grep 847824 # generated by a debug printk
+ [ 529.263184] redirtied inode 847824 line 548
+ [ 564.250872] redirtied inode 847824 line 548
+ [ 594.272797] redirtied inode 847824 line 548
+ [ 629.231330] redirtied inode 847824 line 548
+ [ 659.224674] redirtied inode 847824 line 548
+ [ 689.219890] redirtied inode 847824 line 548
+ [ 724.226655] redirtied inode 847824 line 548
+ [ 759.198568] redirtied inode 847824 line 548
+
+ # line 548 in fs/fs-writeback.c:
+ 543 if (wbc->pages_skipped != pages_skipped) {
+ 544 /*
+ 545 * writeback is not making progress due to locked
+ 546 * buffers. Skip this inode for now.
+ 547 */
+ 548 redirty_tail(inode);
+ 549 }
+
+ More debug efforts show that __block_write_full_page()
+ never has the chance to call submit_bh() for that big dirty file:
+ the buffer head is *clean*. So basicly no page io is issued by
+ __block_write_full_page(), hence pages_skipped goes up.
+
+ Also the comment in generic_sync_sb_inodes():
+
+ 544 /*
+ 545 * writeback is not making progress due to locked
+ 546 * buffers. Skip this inode for now.
+ 547 */
+
+ and the comment in __block_write_full_page():
+
+ 1713 /*
+ 1714 * The page was marked dirty, but the buffers were
+ 1715 * clean. Someone wrote them back by hand with
+ 1716 * ll_rw_block/submit_bh. A rare case.
+ 1717 */
+
+ do not quite agree with each other. The page writeback should be skipped for
+ 'locked buffer', but here it is 'clean buffer'!
+
+ This patch fixes this bug. Though I'm not sure why __block_write_full_page()
+ is called only to do nothing and who actually issued the writeback for us.
+
+ This is the two possible new behaviors after the patch:
+
+ 1) pretty nice: wait 30s and write ALL:)
+ 2) not so good:
+ - during the dd: ~16M
+ - after 30s: ~4M
+ - after 5s: ~4M
+ - after 5s: ~176M
+
+ The next patch will fix case (2).
+
+ Cc: David Chinner <dgc@sgi.com>
+ Cc: Ken Chen <kenchen@google.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: David Chinner <dgc@sgi.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/buffer.c b/fs/buffer.c
+index 86e58b1dcd9c..76403b1764c5 100644
+--- a/fs/buffer.c
++++ b/fs/buffer.c
+@@ -1730,7 +1730,6 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
+ * The page and buffer_heads can be released at any time from
+ * here on.
+ */
+- wbc->pages_skipped++; /* We didn't write this page */
+ }
+ return err;
+
+diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
+index 354d68a32d4a..52bd08c0a278 100644
+--- a/fs/xfs/linux-2.6/xfs_aops.c
++++ b/fs/xfs/linux-2.6/xfs_aops.c
+@@ -402,10 +402,9 @@ xfs_start_page_writeback(
+ clear_page_dirty_for_io(page);
+ set_page_writeback(page);
+ unlock_page(page);
+- if (!buffers) {
++ /* If no buffers on the page are to be written, finish it here */
++ if (!buffers)
+ end_page_writeback(page);
+- wbc->pages_skipped++; /* We didn't write this page */
+- }
+ }
+
+ static inline int bio_add_buffer(struct bio *bio, struct buffer_head *bh)commit 08d8e9749e7f0435ba4683b620e8d30d59276b4c
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 23:30:39 2007 -0700
+
+ writeback: fix ntfs with sb_has_dirty_inodes()
+
+ NTFS's if-condition on dirty inodes is not complete. Fix it with
+ sb_has_dirty_inodes().
+
+ Cc: Anton Altaparmakov <aia21@cantab.net>
+ Cc: Ken Chen <kenchen@google.com>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
+index 1f22fb5217c0..414df43706c7 100644
+--- a/fs/fs-writeback.c
++++ b/fs/fs-writeback.c
+@@ -199,6 +199,14 @@ static void queue_io(struct super_block *sb,
+ move_expired_inodes(&sb->s_dirty, &sb->s_io, older_than_this);
+ }
+
++int sb_has_dirty_inodes(struct super_block *sb)
++{
++ return !list_empty(&sb->s_dirty) ||
++ !list_empty(&sb->s_io) ||
++ !list_empty(&sb->s_more_io);
++}
++EXPORT_SYMBOL(sb_has_dirty_inodes);
++
+ /*
+ * Write a single inode's dirty pages and inode data out to disk.
+ * If `wait' is set, wait on the writeout.
+@@ -497,7 +505,7 @@ writeback_inodes(struct writeback_control *wbc)
+ restart:
+ sb = sb_entry(super_blocks.prev);
+ for (; sb != sb_entry(&super_blocks); sb = sb_entry(sb->s_list.prev)) {
+- if (!list_empty(&sb->s_dirty) || !list_empty(&sb->s_io)) {
++ if (sb_has_dirty_inodes(sb)) {
+ /* we're making our own get_super here */
+ sb->s_count++;
+ spin_unlock(&sb_lock);
+diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
+index ad2124573024..3e76f3b216bc 100644
+--- a/fs/ntfs/super.c
++++ b/fs/ntfs/super.c
+@@ -2381,14 +2381,14 @@ static void ntfs_put_super(struct super_block *sb)
+ */
+ ntfs_commit_inode(vol->mft_ino);
+ write_inode_now(vol->mft_ino, 1);
+- if (!list_empty(&sb->s_dirty)) {
++ if (sb_has_dirty_inodes(sb)) {
+ const char *s1, *s2;
+
+ mutex_lock(&vol->mft_ino->i_mutex);
+ truncate_inode_pages(vol->mft_ino->i_mapping, 0);
+ mutex_unlock(&vol->mft_ino->i_mutex);
+ write_inode_now(vol->mft_ino, 1);
+- if (!list_empty(&sb->s_dirty)) {
++ if (sb_has_dirty_inodes(sb)) {
+ static const char *_s1 = "inodes";
+ static const char *_s2 = "";
+ s1 = _s1;
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 0b38a897c114..b70331f9f5b7 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -1729,6 +1729,7 @@ extern int bdev_read_only(struct block_device *);
+ extern int set_blocksize(struct block_device *, int);
+ extern int sb_set_blocksize(struct super_block *, int);
+ extern int sb_min_blocksize(struct super_block *, int);
++extern int sb_has_dirty_inodes(struct super_block *);
+
+ extern int generic_file_mmap(struct file *, struct vm_area_struct *);
+ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);commit 2c1365791048e8aff42138ed5f6040b3c7824a69
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 23:30:39 2007 -0700
+
+ writeback: fix time ordering of the per superblock inode lists 8
+
+ Streamline the management of dirty inode lists and fix time ordering bugs.
+
+ The writeback logic used to move not-yet-expired dirty inodes from s_dirty to
+ s_io, *only to* move them back. The move-inodes-back-and-forth thing is a
+ mess, which is eliminated by this patch.
+
+ The new scheme is:
+ - s_dirty acts as a time ordered io delaying queue;
+ - s_io/s_more_io together acts as an io dispatching queue.
+
+ On kupdate writeback, we pull some inodes from s_dirty to s_io at the start of
+ every full scan of s_io. Otherwise (i.e. for sync/throttle/background
+ writeback), we always pull from s_dirty on each run (a partial scan).
+
+ Note that the line
+ list_splice_init(&sb->s_more_io, &sb->s_io);
+ is moved to queue_io() to leave s_io empty. Otherwise a big dirtied file will
+ sit in s_io for a long time, preventing new expired inodes to get in.
+
+ Cc: Ken Chen <kenchen@google.com>
+ Cc: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
+index c9d105ff7970..1f22fb5217c0 100644
+--- a/fs/fs-writeback.c
++++ b/fs/fs-writeback.c
+@@ -119,7 +119,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
+ goto out;
+
+ /*
+- * If the inode was already on s_dirty or s_io, don't
++ * If the inode was already on s_dirty/s_io/s_more_io, don't
+ * reposition it (that would break s_dirty time-ordering).
+ */
+ if (!was_dirty) {
+@@ -172,6 +172,33 @@ static void requeue_io(struct inode *inode)
+ list_move(&inode->i_list, &inode->i_sb->s_more_io);
+ }
+
++/*
++ * Move expired dirty inodes from @delaying_queue to @dispatch_queue.
++ */
++static void move_expired_inodes(struct list_head *delaying_queue,
++ struct list_head *dispatch_queue,
++ unsigned long *older_than_this)
++{
++ while (!list_empty(delaying_queue)) {
++ struct inode *inode = list_entry(delaying_queue->prev,
++ struct inode, i_list);
++ if (older_than_this &&
++ time_after(inode->dirtied_when, *older_than_this))
++ break;
++ list_move(&inode->i_list, dispatch_queue);
++ }
++}
++
++/*
++ * Queue all expired dirty inodes for io, eldest first.
++ */
++static void queue_io(struct super_block *sb,
++ unsigned long *older_than_this)
++{
++ list_splice_init(&sb->s_more_io, sb->s_io.prev);
++ move_expired_inodes(&sb->s_dirty, &sb->s_io, older_than_this);
++}
++
+ /*
+ * Write a single inode's dirty pages and inode data out to disk.
+ * If `wait' is set, wait on the writeout.
+@@ -222,7 +249,7 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
+ /*
+ * We didn't write back all the pages. nfs_writepages()
+ * sometimes bales out without doing anything. Redirty
+- * the inode. It is moved from s_io onto s_dirty.
++ * the inode; Move it from s_io onto s_more_io/s_dirty.
+ */
+ /*
+ * akpm: if the caller was the kupdate function we put
+@@ -235,10 +262,9 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
+ */
+ if (wbc->for_kupdate) {
+ /*
+- * For the kupdate function we leave the inode
+- * at the head of sb_dirty so it will get more
+- * writeout as soon as the queue becomes
+- * uncongested.
++ * For the kupdate function we move the inode
++ * to s_more_io so it will get more writeout as
++ * soon as the queue becomes uncongested.
+ */
+ inode->i_state |= I_DIRTY_PAGES;
+ requeue_io(inode);
+@@ -296,10 +322,10 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
+
+ /*
+ * We're skipping this inode because it's locked, and we're not
+- * doing writeback-for-data-integrity. Move it to the head of
+- * s_dirty so that writeback can proceed with the other inodes
+- * on s_io. We'll have another go at writing back this inode
+- * when the s_dirty iodes get moved back onto s_io.
++ * doing writeback-for-data-integrity. Move it to s_more_io so
++ * that writeback can proceed with the other inodes on s_io.
++ * We'll have another go at writing back this inode when we
++ * completed a full scan of s_io.
+ */
+ requeue_io(inode);
+
+@@ -366,7 +392,7 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ const unsigned long start = jiffies; /* livelock avoidance */
+
+ if (!wbc->for_kupdate || list_empty(&sb->s_io))
+- list_splice_init(&sb->s_dirty, &sb->s_io);
++ queue_io(sb, wbc->older_than_this);
+
+ while (!list_empty(&sb->s_io)) {
+ struct inode *inode = list_entry(sb->s_io.prev,
+@@ -411,13 +437,6 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ if (time_after(inode->dirtied_when, start))
+ break;
+
+- /* Was this inode dirtied too recently? */
+- if (wbc->older_than_this && time_after(inode->dirtied_when,
+- *wbc->older_than_this)) {
+- list_splice_init(&sb->s_io, sb->s_dirty.prev);
+- break;
+- }
+-
+ /* Is another pdflush already flushing this queue? */
+ if (current_is_pdflush() && !writeback_acquire(bdi))
+ break;
+@@ -446,10 +465,6 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ if (wbc->nr_to_write <= 0)
+ break;
+ }
+-
+- if (list_empty(&sb->s_io))
+- list_splice_init(&sb->s_more_io, &sb->s_io);
+-
+ return; /* Leave any unwritten inodes on s_io */
+ }
+
+@@ -459,7 +474,7 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
+ * Note:
+ * We don't need to grab a reference to superblock here. If it has non-empty
+ * ->s_dirty it's hadn't been killed yet and kill_super() won't proceed
+- * past sync_inodes_sb() until both the ->s_dirty and ->s_io lists are
++ * past sync_inodes_sb() until the ->s_dirty/s_io/s_more_io lists are all
+ * empty. Since __sync_single_inode() regains inode_lock before it finally moves
+ * inode from superblock lists we are OK.
+ *commit 57f6b96c09c30e444e0d3fc3080feba037657a7b
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:37 2007 -0700
+
+ filemap: convert some unsigned long to pgoff_t
+
+ Convert some 'unsigned long' to pgoff_t.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
+index 8a83537d6978..862fc07dc6c0 100644
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
+@@ -84,11 +84,11 @@ static inline struct page *page_cache_alloc_cold(struct address_space *x)
+ typedef int filler_t(void *, struct page *);
+
+ extern struct page * find_get_page(struct address_space *mapping,
+- unsigned long index);
++ pgoff_t index);
+ extern struct page * find_lock_page(struct address_space *mapping,
+- unsigned long index);
++ pgoff_t index);
+ extern struct page * find_or_create_page(struct address_space *mapping,
+- unsigned long index, gfp_t gfp_mask);
++ pgoff_t index, gfp_t gfp_mask);
+ unsigned find_get_pages(struct address_space *mapping, pgoff_t start,
+ unsigned int nr_pages, struct page **pages);
+ unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t start,
+@@ -99,41 +99,42 @@ unsigned find_get_pages_tag(struct address_space *mapping, pgoff_t *index,
+ /*
+ * Returns locked page at given index in given cache, creating it if needed.
+ */
+-static inline struct page *grab_cache_page(struct address_space *mapping, unsigned long index)
++static inline struct page *grab_cache_page(struct address_space *mapping,
++ pgoff_t index)
+ {
+ return find_or_create_page(mapping, index, mapping_gfp_mask(mapping));
+ }
+
+ extern struct page * grab_cache_page_nowait(struct address_space *mapping,
+- unsigned long index);
++ pgoff_t index);
+ extern struct page * read_cache_page_async(struct address_space *mapping,
+- unsigned long index, filler_t *filler,
++ pgoff_t index, filler_t *filler,
+ void *data);
+ extern struct page * read_cache_page(struct address_space *mapping,
+- unsigned long index, filler_t *filler,
++ pgoff_t index, filler_t *filler,
+ void *data);
+ extern int read_cache_pages(struct address_space *mapping,
+ struct list_head *pages, filler_t *filler, void *data);
+
+ static inline struct page *read_mapping_page_async(
+ struct address_space *mapping,
+- unsigned long index, void *data)
++ pgoff_t index, void *data)
+ {
+ filler_t *filler = (filler_t *)mapping->a_ops->readpage;
+ return read_cache_page_async(mapping, index, filler, data);
+ }
+
+ static inline struct page *read_mapping_page(struct address_space *mapping,
+- unsigned long index, void *data)
++ pgoff_t index, void *data)
+ {
+ filler_t *filler = (filler_t *)mapping->a_ops->readpage;
+ return read_cache_page(mapping, index, filler, data);
+ }
+
+ int add_to_page_cache(struct page *page, struct address_space *mapping,
+- unsigned long index, gfp_t gfp_mask);
++ pgoff_t index, gfp_t gfp_mask);
+ int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
+- unsigned long index, gfp_t gfp_mask);
++ pgoff_t index, gfp_t gfp_mask);
+ extern void remove_from_page_cache(struct page *page);
+ extern void __remove_from_page_cache(struct page *page);
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index c1b94054cbbe..b436cbb3a834 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -593,7 +593,7 @@ void fastcall __lock_page_nosync(struct page *page)
+ * Is there a pagecache struct page at the given (mapping, offset) tuple?
+ * If yes, increment its refcount and return it; if no, return NULL.
+ */
+-struct page * find_get_page(struct address_space *mapping, unsigned long offset)
++struct page * find_get_page(struct address_space *mapping, pgoff_t offset)
+ {
+ struct page *page;
+
+@@ -617,7 +617,7 @@ EXPORT_SYMBOL(find_get_page);
+ * Returns zero if the page was not present. find_lock_page() may sleep.
+ */
+ struct page *find_lock_page(struct address_space *mapping,
+- unsigned long offset)
++ pgoff_t offset)
+ {
+ struct page *page;
+
+@@ -663,7 +663,7 @@ EXPORT_SYMBOL(find_lock_page);
+ * memory exhaustion.
+ */
+ struct page *find_or_create_page(struct address_space *mapping,
+- unsigned long index, gfp_t gfp_mask)
++ pgoff_t index, gfp_t gfp_mask)
+ {
+ struct page *page, *cached_page = NULL;
+ int err;
+@@ -797,7 +797,7 @@ EXPORT_SYMBOL(find_get_pages_tag);
+ * and deadlock against the caller's locked page.
+ */
+ struct page *
+-grab_cache_page_nowait(struct address_space *mapping, unsigned long index)
++grab_cache_page_nowait(struct address_space *mapping, pgoff_t index)
+ {
+ struct page *page = find_get_page(mapping, index);
+
+@@ -866,10 +866,10 @@ void do_generic_mapping_read(struct address_space *mapping,
+ read_actor_t actor)
+ {
+ struct inode *inode = mapping->host;
+- unsigned long index;
+- unsigned long offset;
+- unsigned long last_index;
+- unsigned long prev_index;
++ pgoff_t index;
++ pgoff_t last_index;
++ pgoff_t prev_index;
++ unsigned long offset; /* offset into pagecache page */
+ unsigned int prev_offset;
+ struct page *cached_page;
+ int error;
+@@ -883,7 +883,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+
+ for (;;) {
+ struct page *page;
+- unsigned long end_index;
++ pgoff_t end_index;
+ loff_t isize;
+ unsigned long nr, ret;
+
+@@ -1217,7 +1217,7 @@ EXPORT_SYMBOL(generic_file_aio_read);
+
+ static ssize_t
+ do_readahead(struct address_space *mapping, struct file *filp,
+- unsigned long index, unsigned long nr)
++ pgoff_t index, unsigned long nr)
+ {
+ if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage)
+ return -EINVAL;
+@@ -1237,8 +1237,8 @@ asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count)
+ if (file) {
+ if (file->f_mode & FMODE_READ) {
+ struct address_space *mapping = file->f_mapping;
+- unsigned long start = offset >> PAGE_CACHE_SHIFT;
+- unsigned long end = (offset + count - 1) >> PAGE_CACHE_SHIFT;
++ pgoff_t start = offset >> PAGE_CACHE_SHIFT;
++ pgoff_t end = (offset + count - 1) >> PAGE_CACHE_SHIFT;
+ unsigned long len = end - start + 1;
+ ret = do_readahead(mapping, file, start, len);
+ }
+@@ -1256,7 +1256,7 @@ asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count)
+ * This adds the requested page to the page cache if it isn't already there,
+ * and schedules an I/O to read in its contents from disk.
+ */
+-static int fastcall page_cache_read(struct file * file, unsigned long offset)
++static int fastcall page_cache_read(struct file * file, pgoff_t offset)
+ {
+ struct address_space *mapping = file->f_mapping;
+ struct page *page;
+@@ -1497,7 +1497,7 @@ EXPORT_SYMBOL(generic_file_mmap);
+ EXPORT_SYMBOL(generic_file_readonly_mmap);
+
+ static struct page *__read_cache_page(struct address_space *mapping,
+- unsigned long index,
++ pgoff_t index,
+ int (*filler)(void *,struct page*),
+ void *data)
+ {
+@@ -1538,7 +1538,7 @@ static struct page *__read_cache_page(struct address_space *mapping,
+ * after submitting it to the filler.
+ */
+ struct page *read_cache_page_async(struct address_space *mapping,
+- unsigned long index,
++ pgoff_t index,
+ int (*filler)(void *,struct page*),
+ void *data)
+ {
+@@ -1586,7 +1586,7 @@ EXPORT_SYMBOL(read_cache_page_async);
+ * If the page does not get brought uptodate, return -EIO.
+ */
+ struct page *read_cache_page(struct address_space *mapping,
+- unsigned long index,
++ pgoff_t index,
+ int (*filler)(void *,struct page*),
+ void *data)
+ {commit b2c3843b1e25e2c67347c4671f33fbe6f5067e6b +Author: Fengguang Wu <wfg@mail.ustc.edu.cn> +Date: Tue Oct 16 01:24:37 2007 -0700 + + filemap: trivial code cleanups + + - remove unused local next_index in do_generic_mapping_read() + - remove a redudant page_cache_read() declaration + + Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> + Cc: Rusty Russell <rusty@rustcorp.com.au> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/mm/filemap.c b/mm/filemap.c +index 3c97bdc74a85..c1b94054cbbe 100644 +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -869,7 +869,6 @@ void do_generic_mapping_read(struct address_space *mapping, + unsigned long index; + unsigned long offset; + unsigned long last_index; +- unsigned long next_index; + unsigned long prev_index; + unsigned int prev_offset; + struct page *cached_page; +@@ -877,7 +876,6 @@ void do_generic_mapping_read(struct address_space *mapping, + + cached_page = NULL; + index = *ppos >> PAGE_CACHE_SHIFT; +- next_index = index; + prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT; + prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1); + last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; +@@ -1250,7 +1248,6 @@ asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count) + } + + #ifdef CONFIG_MMU +-static int FASTCALL(page_cache_read(struct file * file, unsigned long offset)); + /** + * page_cache_read - adds requested page to the page cache if not already there + * @file: file to read
commit f2e189827a914b66e435e68b1c9e37775cb995ed +Author: Fengguang Wu <wfg@mail.ustc.edu.cn> +Date: Tue Oct 16 01:24:36 2007 -0700 + + readahead: remove the limit max_sectors_kb imposed on max_readahead_kb + + Remove the size limit max_sectors_kb imposed on max_readahead_kb. + + The size restriction is unreasonable. Especially when max_sectors_kb cannot + grow larger than max_hw_sectors_kb, which can be rather small for some disk + drives. + + Cc: Jens Axboe <jens.axboe@oracle.com> + Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> + Acked-by: Jens Axboe <jens.axboe@oracle.com> + Cc: Rusty Russell <rusty@rustcorp.com.au> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c +index d875673e76cd..a83823fcd74f 100644 +--- a/block/ll_rw_blk.c ++++ b/block/ll_rw_blk.c +@@ -3928,7 +3928,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) + max_hw_sectors_kb = q->max_hw_sectors >> 1, + page_kb = 1 << (PAGE_CACHE_SHIFT - 10); + ssize_t ret = queue_var_store(&max_sectors_kb, page, count); +- int ra_kb; + + if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb) + return -EINVAL; +@@ -3937,14 +3936,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count) + * values synchronously: + */ + spin_lock_irq(q->queue_lock); +- /* +- * Trim readahead window as well, if necessary: +- */ +- ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10); +- if (ra_kb > max_sectors_kb) +- q->backing_dev_info.ra_pages = +- max_sectors_kb >> (PAGE_CACHE_SHIFT - 10); +- + q->max_sectors = max_sectors_kb << 1; + spin_unlock_irq(q->queue_lock); +
commit 535443f51543df61111bbd234300ae549d220448
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:36 2007 -0700
+
+ readahead: remove several readahead macros
+
+ Remove VM_MAX_CACHE_HIT, MAX_RA_PAGES and MIN_RA_PAGES.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index fbff8e481cc4..291c4cc06ea7 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1106,8 +1106,6 @@ int write_one_page(struct page *page, int wait);
+ /* readahead.c */
+ #define VM_MAX_READAHEAD 128 /* kbytes */
+ #define VM_MIN_READAHEAD 16 /* kbytes (includes current page) */
+-#define VM_MAX_CACHE_HIT 256 /* max pages in a row in cache before
+- * turning readahead off */
+
+ int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ pgoff_t offset, unsigned long nr_to_read);
+diff --git a/mm/readahead.c b/mm/readahead.c
+index fd588ffc5086..fc52f9f1b80c 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -22,16 +22,8 @@ void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
+ }
+ EXPORT_SYMBOL(default_unplug_io_fn);
+
+-/*
+- * Convienent macros for min/max read-ahead pages.
+- * Note that MAX_RA_PAGES is rounded down, while MIN_RA_PAGES is rounded up.
+- * The latter is necessary for systems with large page size(i.e. 64k).
+- */
+-#define MAX_RA_PAGES (VM_MAX_READAHEAD*1024 / PAGE_CACHE_SIZE)
+-#define MIN_RA_PAGES DIV_ROUND_UP(VM_MIN_READAHEAD*1024, PAGE_CACHE_SIZE)
+-
+ struct backing_dev_info default_backing_dev_info = {
+- .ra_pages = MAX_RA_PAGES,
++ .ra_pages = VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE,
+ .state = 0,
+ .capabilities = BDI_CAP_MAP_COPY,
+ .unplug_io_fn = default_unplug_io_fn,commit 7ff81078d8b9f3d05a27b7bd3786ffb1ef1b0d1f
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:35 2007 -0700
+
+ readahead: remove the local copy of ra in do_generic_mapping_read()
+
+ The local copy of ra in do_generic_mapping_read() can now go away.
+
+ It predates readanead(req_size). In a time when the readahead code was called
+ on *every* single page. Hence a local has to be made to reduce the chance of
+ the readahead state being overwritten by a concurrent reader. More details
+ in: Linux: Random File I/O Regressions In 2.6
+ <http://kerneltrap.org/node/3039>
+
+ Cc: Nick Piggin <nickpiggin@yahoo.com.au>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index bbcca456d8a6..3c97bdc74a85 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -859,7 +859,7 @@ static void shrink_readahead_size_eio(struct file *filp,
+ * It may be NULL.
+ */
+ void do_generic_mapping_read(struct address_space *mapping,
+- struct file_ra_state *_ra,
++ struct file_ra_state *ra,
+ struct file *filp,
+ loff_t *ppos,
+ read_descriptor_t *desc,
+@@ -874,13 +874,12 @@ void do_generic_mapping_read(struct address_space *mapping,
+ unsigned int prev_offset;
+ struct page *cached_page;
+ int error;
+- struct file_ra_state ra = *_ra;
+
+ cached_page = NULL;
+ index = *ppos >> PAGE_CACHE_SHIFT;
+ next_index = index;
+- prev_index = ra.prev_pos >> PAGE_CACHE_SHIFT;
+- prev_offset = ra.prev_pos & (PAGE_CACHE_SIZE-1);
++ prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
++ prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1);
+ last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
+ offset = *ppos & ~PAGE_CACHE_MASK;
+
+@@ -895,7 +894,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+ page = find_get_page(mapping, index);
+ if (!page) {
+ page_cache_sync_readahead(mapping,
+- &ra, filp,
++ ra, filp,
+ index, last_index - index);
+ page = find_get_page(mapping, index);
+ if (unlikely(page == NULL))
+@@ -903,7 +902,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+ }
+ if (PageReadahead(page)) {
+ page_cache_async_readahead(mapping,
+- &ra, filp, page,
++ ra, filp, page,
+ index, last_index - index);
+ }
+ if (!PageUptodate(page))
+@@ -1014,7 +1013,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+ }
+ unlock_page(page);
+ error = -EIO;
+- shrink_readahead_size_eio(filp, &ra);
++ shrink_readahead_size_eio(filp, ra);
+ goto readpage_error;
+ }
+ unlock_page(page);
+@@ -1054,10 +1053,9 @@ void do_generic_mapping_read(struct address_space *mapping,
+ }
+
+ out:
+- *_ra = ra;
+- _ra->prev_pos = prev_index;
+- _ra->prev_pos <<= PAGE_CACHE_SHIFT;
+- _ra->prev_pos |= prev_offset;
++ ra->prev_pos = prev_index;
++ ra->prev_pos <<= PAGE_CACHE_SHIFT;
++ ra->prev_pos |= prev_offset;
+
+ *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
+ if (cached_page)commit 6b10c6c9fbfe754e8482efb8c8b84f8e40c0f2eb
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:34 2007 -0700
+
+ readahead: basic support of interleaved reads
+
+ This is a simplified version of the pagecache context based readahead. It
+ handles the case of multiple threads reading on the same fd and invalidating
+ each others' readahead state. It does the trick by scanning the pagecache and
+ recovering the current read stream's readahead status.
+
+ The algorithm works in a opportunistic way, in that it does not try to detect
+ interleaved reads _actively_, which requires a probe into the page cache
+ (which means a little more overhead for random reads). It only tries to
+ handle a previously started sequential readahead whose state was overwritten
+ by another concurrent stream, and it can do this job pretty well.
+
+ Negative and positive examples(or what you can expect from it):
+
+ 1) it cannot detect and serve perfect request-by-request interleaved reads
+ right:
+ time stream 1 stream 2
+ 0 1
+ 1 1001
+ 2 2
+ 3 1002
+ 4 3
+ 5 1003
+ 6 4
+ 7 1004
+ 8 5
+ 9 1005
+
+ Here no single readahead will be carried out.
+
+ 2) However, if it's two concurrent reads by two threads, the chance of the
+ initial sequential readahead be started is huge. Once the first sequential
+ readahead is started for a stream, this patch will ensure that the readahead
+ window continues to rampup and won't be disturbed by other streams.
+
+ time stream 1 stream 2
+ 0 1
+ 1 2
+ 2 1001
+ 3 3
+ 4 1002
+ 5 1003
+ 6 4
+ 7 5
+ 8 1004
+ 9 6
+ 10 1005
+ 11 7
+ 12 1006
+ 13 1007
+
+ Here stream 1 will start a readahead at page 2, and stream 2 will start its
+ first readahead at page 1003. From then on the two streams will be served
+ right.
+
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 4a58befbde4a..fd588ffc5086 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -379,6 +379,29 @@ ondemand_readahead(struct address_space *mapping,
+ offset, req_size, 0);
+ }
+
++ /*
++ * Hit a marked page without valid readahead state.
++ * E.g. interleaved reads.
++ * Query the pagecache for async_size, which normally equals to
++ * readahead size. Ramp it up and use it as the new readahead size.
++ */
++ if (hit_readahead_marker) {
++ pgoff_t start;
++
++ read_lock_irq(&mapping->tree_lock);
++ start = radix_tree_next_hole(&mapping->page_tree, offset, max+1);
++ read_unlock_irq(&mapping->tree_lock);
++
++ if (!start || start - offset > max)
++ return 0;
++
++ ra->start = start;
++ ra->size = start - offset; /* old async_size */
++ ra->size = get_next_ra_size(ra, max);
++ ra->async_size = ra->size;
++ goto readit;
++ }
++
+ /*
+ * It may be one of
+ * - first read on start of file
+@@ -390,16 +413,6 @@ ondemand_readahead(struct address_space *mapping,
+ ra->size = get_init_ra_size(req_size, max);
+ ra->async_size = ra->size > req_size ? ra->size - req_size : ra->size;
+
+- /*
+- * Hit on a marked page without valid readahead state.
+- * E.g. interleaved reads.
+- * Not knowing its readahead pos/size, bet on the minimal possible one.
+- */
+- if (hit_readahead_marker) {
+- ra->start++;
+- ra->size = get_next_ra_size(ra, max);
+- }
+-
+ readit:
+ return ra_submit(ra, mapping, filp);
+ }
+ commit 6df8ba4f8a4c4abca9ccad10441d0dddbdff301c
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:33 2007 -0700
+
+ radixtree: introduce radix_tree_next_hole()
+
+ Introduce radix_tree_next_hole(root, index, max_scan) to scan radix tree for
+ the first hole. It will be used in interleaved readahead.
+
+ The implementation is dumb and obviously correct. It can help debug(and
+ document) the possible smart one in future.
+
+ Cc: Nick Piggin <nickpiggin@yahoo.com.au>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
+index f9e77d2ee320..430e4a8c1382 100644
+--- a/include/linux/radix-tree.h
++++ b/include/linux/radix-tree.h
+@@ -155,6 +155,8 @@ void *radix_tree_delete(struct radix_tree_root *, unsigned long);
+ unsigned int
+ radix_tree_gang_lookup(struct radix_tree_root *root, void **results,
+ unsigned long first_index, unsigned int max_items);
++unsigned long radix_tree_next_hole(struct radix_tree_root *root,
++ unsigned long index, unsigned long max_scan);
+ int radix_tree_preload(gfp_t gfp_mask);
+ void radix_tree_init(void);
+ void *radix_tree_tag_set(struct radix_tree_root *root,
+diff --git a/lib/radix-tree.c b/lib/radix-tree.c
+index 514efb200be6..7af368a4401b 100644
+--- a/lib/radix-tree.c
++++ b/lib/radix-tree.c
+@@ -599,6 +599,42 @@ int radix_tree_tag_get(struct radix_tree_root *root,
+ EXPORT_SYMBOL(radix_tree_tag_get);
+ #endif
+
++/**
++ * radix_tree_next_hole - find the next hole (not-present entry)
++ * @root: tree root
++ * @index: index key
++ * @max_scan: maximum range to search
++ *
++ * Search the set [index, min(index+max_scan-1, MAX_INDEX)] for the lowest
++ * indexed hole.
++ *
++ * Returns: the index of the hole if found, otherwise returns an index
++ * outside of the set specified (in which case 'return - index >= max_scan'
++ * will be true).
++ *
++ * radix_tree_next_hole may be called under rcu_read_lock. However, like
++ * radix_tree_gang_lookup, this will not atomically search a snapshot of the
++ * tree at a single point in time. For example, if a hole is created at index
++ * 5, then subsequently a hole is created at index 10, radix_tree_next_hole
++ * covering both indexes may return 10 if called under rcu_read_lock.
++ */
++unsigned long radix_tree_next_hole(struct radix_tree_root *root,
++ unsigned long index, unsigned long max_scan)
++{
++ unsigned long i;
++
++ for (i = 0; i < max_scan; i++) {
++ if (!radix_tree_lookup(root, index))
++ break;
++ index++;
++ if (index == 0)
++ break;
++ }
++
++ return index;
++}
++EXPORT_SYMBOL(radix_tree_next_hole);
++
+ static unsigned int
+ __lookup(struct radix_tree_node *slot, void **results, unsigned long index,
+ unsigned int max_items, unsigned long *next_index)commit f4e6b498d6e06742d72706ef50593a9c4dd72214
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:33 2007 -0700
+
+ readahead: combine file_ra_state.prev_index/prev_offset into prev_pos
+
+ Combine the file_ra_state members
+ unsigned long prev_index
+ unsigned int prev_offset
+ into
+ loff_t prev_pos
+
+ It is more consistent and better supports huge files.
+
+ Thanks to Peter for the nice proposal!
+
+ [akpm@linux-foundation.org: fix shift overflow]
+ Cc: Peter Zijlstra <peterz@infradead.org>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
+index c00723a99f44..c2c3491b18cf 100644
+--- a/fs/ext3/dir.c
++++ b/fs/ext3/dir.c
+@@ -143,7 +143,7 @@ static int ext3_readdir(struct file * filp,
+ sb->s_bdev->bd_inode->i_mapping,
+ &filp->f_ra, filp,
+ index, 1);
+- filp->f_ra.prev_index = index;
++ filp->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
+ bh = ext3_bread(NULL, inode, blk, 0, &err);
+ }
+
+diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
+index 3ab01c04e00c..e11890acfa21 100644
+--- a/fs/ext4/dir.c
++++ b/fs/ext4/dir.c
+@@ -142,7 +142,7 @@ static int ext4_readdir(struct file * filp,
+ sb->s_bdev->bd_inode->i_mapping,
+ &filp->f_ra, filp,
+ index, 1);
+- filp->f_ra.prev_index = index;
++ filp->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
+ bh = ext4_bread(NULL, inode, blk, 0, &err);
+ }
+
+diff --git a/fs/splice.c b/fs/splice.c
+index e95a36228863..2df6be43c667 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -447,7 +447,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ */
+ while (page_nr < nr_pages)
+ page_cache_release(pages[page_nr++]);
+- in->f_ra.prev_index = index;
++ in->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
+
+ if (spd.nr_pages)
+ return splice_to_pipe(pipe, &spd);
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 8250811081ff..500ffc0e4ac7 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -704,8 +704,7 @@ struct file_ra_state {
+
+ unsigned int ra_pages; /* Maximum readahead window */
+ int mmap_miss; /* Cache miss stat for mmap accesses */
+- unsigned long prev_index; /* Cache last read() position */
+- unsigned int prev_offset; /* Offset where last read() ended in a page */
++ loff_t prev_pos; /* Cache last read() position */
+ };
+
+ /*
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 5dc18d76e703..bbcca456d8a6 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -879,8 +879,8 @@ void do_generic_mapping_read(struct address_space *mapping,
+ cached_page = NULL;
+ index = *ppos >> PAGE_CACHE_SHIFT;
+ next_index = index;
+- prev_index = ra.prev_index;
+- prev_offset = ra.prev_offset;
++ prev_index = ra.prev_pos >> PAGE_CACHE_SHIFT;
++ prev_offset = ra.prev_pos & (PAGE_CACHE_SIZE-1);
+ last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
+ offset = *ppos & ~PAGE_CACHE_MASK;
+
+@@ -966,7 +966,6 @@ void do_generic_mapping_read(struct address_space *mapping,
+ index += offset >> PAGE_CACHE_SHIFT;
+ offset &= ~PAGE_CACHE_MASK;
+ prev_offset = offset;
+- ra.prev_offset = offset;
+
+ page_cache_release(page);
+ if (ret == nr && desc->count)
+@@ -1056,9 +1055,11 @@ void do_generic_mapping_read(struct address_space *mapping,
+
+ out:
+ *_ra = ra;
+- _ra->prev_index = prev_index;
++ _ra->prev_pos = prev_index;
++ _ra->prev_pos <<= PAGE_CACHE_SHIFT;
++ _ra->prev_pos |= prev_offset;
+
+- *ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset;
++ *ppos = ((loff_t)index << PAGE_CACHE_SHIFT) + offset;
+ if (cached_page)
+ page_cache_release(cached_page);
+ if (filp)
+@@ -1396,7 +1397,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ * Found the page and have a reference on it.
+ */
+ mark_page_accessed(page);
+- ra->prev_index = page->index;
++ ra->prev_pos = (loff_t)page->index << PAGE_CACHE_SHIFT;
+ vmf->page = page;
+ return ret | VM_FAULT_LOCKED;
+
+diff --git a/mm/readahead.c b/mm/readahead.c
+index d2504877b269..4a58befbde4a 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -46,7 +46,7 @@ void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping)
+ {
+ ra->ra_pages = mapping->backing_dev_info->ra_pages;
+- ra->prev_index = -1;
++ ra->prev_pos = -1;
+ }
+ EXPORT_SYMBOL_GPL(file_ra_state_init);
+
+@@ -327,7 +327,7 @@ static unsigned long get_next_ra_size(struct file_ra_state *ra,
+ * indicator. The flag won't be set on already cached pages, to avoid the
+ * readahead-for-nothing fuss, saving pointless page cache lookups.
+ *
+- * prev_index tracks the last visited page in the _previous_ read request.
++ * prev_pos tracks the last visited byte in the _previous_ read request.
+ * It should be maintained by the caller, and will be used for detecting
+ * small random reads. Note that the readahead algorithm checks loosely
+ * for sequential patterns. Hence interleaved reads might be served as
+@@ -351,11 +351,9 @@ ondemand_readahead(struct address_space *mapping,
+ bool hit_readahead_marker, pgoff_t offset,
+ unsigned long req_size)
+ {
+- int max; /* max readahead pages */
+- int sequential;
+-
+- max = ra->ra_pages;
+- sequential = (offset - ra->prev_index <= 1UL) || (req_size > max);
++ int max = ra->ra_pages; /* max readahead pages */
++ pgoff_t prev_offset;
++ int sequential;
+
+ /*
+ * It's the expected callback offset, assume sequential access.
+@@ -369,6 +367,9 @@ ondemand_readahead(struct address_space *mapping,
+ goto readit;
+ }
+
++ prev_offset = ra->prev_pos >> PAGE_CACHE_SHIFT;
++ sequential = offset - prev_offset <= 1UL || req_size > max;
++
+ /*
+ * Standalone, small read.
+ * Read as is, and do not pollute the readahead state.commit 0bb7ba6b9c358c12084a3cbc6ac08c8d1e973937
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:32 2007 -0700
+
+ readahead: mmap read-around simplification
+
+ Fold file_ra_state.mmap_hit into file_ra_state.mmap_miss and make it an int.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 7a998c49a086..8250811081ff 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -703,8 +703,7 @@ struct file_ra_state {
+ there are only # of pages ahead */
+
+ unsigned int ra_pages; /* Maximum readahead window */
+- unsigned long mmap_hit; /* Cache hit stat for mmap accesses */
+- unsigned long mmap_miss; /* Cache miss stat for mmap accesses */
++ int mmap_miss; /* Cache miss stat for mmap accesses */
+ unsigned long prev_index; /* Cache last read() position */
+ unsigned int prev_offset; /* Offset where last read() ended in a page */
+ };
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 15c8413ee929..5dc18d76e703 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -1349,7 +1349,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ * Do we miss much more than hit in this file? If so,
+ * stop bothering with read-ahead. It will only hurt.
+ */
+- if (ra->mmap_miss > ra->mmap_hit + MMAP_LOTSAMISS)
++ if (ra->mmap_miss > MMAP_LOTSAMISS)
+ goto no_cached_page;
+
+ /*
+@@ -1375,7 +1375,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ }
+
+ if (!did_readaround)
+- ra->mmap_hit++;
++ ra->mmap_miss--;
+
+ /*
+ * We have a locked page in the page cache, now we need to checkcommit 937085aa35cc873d427d250a1e304d641af24628
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Tue Oct 16 01:24:31 2007 -0700
+
+ readahead: compacting file_ra_state
+
+ Use 'unsigned int' instead of 'unsigned long' for readahead sizes.
+
+ This helps reduce memory consumption on 64bit CPU when a lot of files are
+ opened.
+
+ CC: Andi Kleen <andi@firstfloor.org>
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 4a6a21077bae..7a998c49a086 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -697,12 +697,12 @@ struct fown_struct {
+ * Track a single file's readahead state
+ */
+ struct file_ra_state {
+- pgoff_t start; /* where readahead started */
+- unsigned long size; /* # of readahead pages */
+- unsigned long async_size; /* do asynchronous readahead when
++ pgoff_t start; /* where readahead started */
++ unsigned int size; /* # of readahead pages */
++ unsigned int async_size; /* do asynchronous readahead when
+ there are only # of pages ahead */
+
+- unsigned long ra_pages; /* Maximum readahead window */
++ unsigned int ra_pages; /* Maximum readahead window */
+ unsigned long mmap_hit; /* Cache hit stat for mmap accesses */
+ unsigned long mmap_miss; /* Cache miss stat for mmap accesses */
+ unsigned long prev_index; /* Cache last read() position */
+diff --git a/mm/readahead.c b/mm/readahead.c
+index be20c9d699d3..d2504877b269 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -351,7 +351,7 @@ ondemand_readahead(struct address_space *mapping,
+ bool hit_readahead_marker, pgoff_t offset,
+ unsigned long req_size)
+ {
+- unsigned long max; /* max readahead pages */
++ int max; /* max readahead pages */
+ int sequential;
+
+ max = ra->ra_pages;commit f9acc8c7b35a100f3a9e0e6977f7807b0169f9a5
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:08 2007 -0700
+
+ readahead: sanify file_ra_state names
+
+ Rename some file_ra_state variables and remove some accessors.
+
+ It results in much simpler code.
+ Kudos to Rusty!
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 29cb32d3a849..d33beadd9a43 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -695,16 +695,12 @@ struct fown_struct {
+
+ /*
+ * Track a single file's readahead state
+- *
+- * ================#============|==================#==================|
+- * ^ ^ ^ ^
+- * file_ra_state.la_index .ra_index .lookahead_index .readahead_index
+ */
+ struct file_ra_state {
+- pgoff_t la_index; /* enqueue time */
+- pgoff_t ra_index; /* begin offset */
+- pgoff_t lookahead_index; /* time to do next readahead */
+- pgoff_t readahead_index; /* end offset */
++ pgoff_t start; /* where readahead started */
++ unsigned long size; /* # of readahead pages */
++ unsigned long async_size; /* do asynchronous readahead when
++ there are only # of pages ahead */
+
+ unsigned long ra_pages; /* Maximum readahead window */
+ unsigned long mmap_hit; /* Cache hit stat for mmap accesses */
+@@ -713,60 +709,15 @@ struct file_ra_state {
+ unsigned int prev_offset; /* Offset where last read() ended in a page */
+ };
+
+-/*
+- * Measuring read-ahead sizes.
+- *
+- * |----------- readahead size ------------>|
+- * ===#============|==================#=====================|
+- * |------- invoke interval ------>|-- lookahead size -->|
+- */
+-static inline unsigned long ra_readahead_size(struct file_ra_state *ra)
+-{
+- return ra->readahead_index - ra->ra_index;
+-}
+-
+-static inline unsigned long ra_lookahead_size(struct file_ra_state *ra)
+-{
+- return ra->readahead_index - ra->lookahead_index;
+-}
+-
+-static inline unsigned long ra_invoke_interval(struct file_ra_state *ra)
+-{
+- return ra->lookahead_index - ra->la_index;
+-}
+-
+ /*
+ * Check if @index falls in the readahead windows.
+ */
+ static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index)
+ {
+- return (index >= ra->la_index &&
+- index < ra->readahead_index);
+-}
+-
+-/*
+- * Where is the old read-ahead and look-ahead?
+- */
+-static inline void ra_set_index(struct file_ra_state *ra,
+- pgoff_t la_index, pgoff_t ra_index)
+-{
+- ra->la_index = la_index;
+- ra->ra_index = ra_index;
++ return (index >= ra->start &&
++ index < ra->start + ra->size);
+ }
+
+-/*
+- * Where is the new read-ahead and look-ahead?
+- */
+-static inline void ra_set_size(struct file_ra_state *ra,
+- unsigned long ra_size, unsigned long la_size)
+-{
+- ra->readahead_index = ra->ra_index + ra_size;
+- ra->lookahead_index = ra->ra_index + ra_size - la_size;
+-}
+-
+-unsigned long ra_submit(struct file_ra_state *ra,
+- struct address_space *mapping, struct file *filp);
+-
+ struct file {
+ /*
+ * fu_list becomes invalid after file_free is called and queued via
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 3d262bb738a9..39bf45d43320 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -253,21 +253,16 @@ unsigned long max_sane_readahead(unsigned long nr)
+ /*
+ * Submit IO for the read-ahead request in file_ra_state.
+ */
+-unsigned long ra_submit(struct file_ra_state *ra,
++static unsigned long ra_submit(struct file_ra_state *ra,
+ struct address_space *mapping, struct file *filp)
+ {
+- unsigned long ra_size;
+- unsigned long la_size;
+ int actual;
+
+- ra_size = ra_readahead_size(ra);
+- la_size = ra_lookahead_size(ra);
+ actual = __do_page_cache_readahead(mapping, filp,
+- ra->ra_index, ra_size, la_size);
++ ra->start, ra->size, ra->async_size);
+
+ return actual;
+ }
+-EXPORT_SYMBOL_GPL(ra_submit);
+
+ /*
+ * Set the initial window size, round to next power of 2 and square
+@@ -296,7 +291,7 @@ static unsigned long get_init_ra_size(unsigned long size, unsigned long max)
+ static unsigned long get_next_ra_size(struct file_ra_state *ra,
+ unsigned long max)
+ {
+- unsigned long cur = ra->readahead_index - ra->ra_index;
++ unsigned long cur = ra->size;
+ unsigned long newsize;
+
+ if (cur < max / 16)
+@@ -313,28 +308,21 @@ static unsigned long get_next_ra_size(struct file_ra_state *ra,
+ * The fields in struct file_ra_state represent the most-recently-executed
+ * readahead attempt:
+ *
+- * |-------- last readahead window -------->|
+- * |-- application walking here -->|
+- * ======#============|==================#=====================|
+- * ^la_index ^ra_index ^lookahead_index ^readahead_index
+- *
+- * [ra_index, readahead_index) represents the last readahead window.
+- *
+- * [la_index, lookahead_index] is where the application would be walking(in
+- * the common case of cache-cold sequential reads): the last window was
+- * established when the application was at la_index, and the next window will
+- * be bring in when the application reaches lookahead_index.
++ * |<----- async_size ---------|
++ * |------------------- size -------------------->|
++ * |==================#===========================|
++ * ^start ^page marked with PG_readahead
+ *
+ * To overlap application thinking time and disk I/O time, we do
+ * `readahead pipelining': Do not wait until the application consumed all
+ * readahead pages and stalled on the missing page at readahead_index;
+- * Instead, submit an asynchronous readahead I/O as early as the application
+- * reads on the page at lookahead_index. Normally lookahead_index will be
+- * equal to ra_index, for maximum pipelining.
++ * Instead, submit an asynchronous readahead I/O as soon as there are
++ * only async_size pages left in the readahead window. Normally async_size
++ * will be equal to size, for maximum pipelining.
+ *
+ * In interleaved sequential reads, concurrent streams on the same fd can
+ * be invalidating each other's readahead state. So we flag the new readahead
+- * page at lookahead_index with PG_readahead, and use it as readahead
++ * page at (start+size-async_size) with PG_readahead, and use it as readahead
+ * indicator. The flag won't be set on already cached pages, to avoid the
+ * readahead-for-nothing fuss, saving pointless page cache lookups.
+ *
+@@ -363,24 +351,21 @@ ondemand_readahead(struct address_space *mapping,
+ unsigned long req_size)
+ {
+ unsigned long max; /* max readahead pages */
+- pgoff_t ra_index; /* readahead index */
+- unsigned long ra_size; /* readahead size */
+- unsigned long la_size; /* lookahead size */
+ int sequential;
+
+ max = ra->ra_pages;
+ sequential = (offset - ra->prev_index <= 1UL) || (req_size > max);
+
+ /*
+- * Lookahead/readahead hit, assume sequential access.
++ * It's the expected callback offset, assume sequential access.
+ * Ramp up sizes, and push forward the readahead window.
+ */
+- if (offset && (offset == ra->lookahead_index ||
+- offset == ra->readahead_index)) {
+- ra_index = ra->readahead_index;
+- ra_size = get_next_ra_size(ra, max);
+- la_size = ra_size;
+- goto fill_ra;
++ if (offset && (offset == (ra->start + ra->size - ra->async_size) ||
++ offset == (ra->start + ra->size))) {
++ ra->start += ra->size;
++ ra->size = get_next_ra_size(ra, max);
++ ra->async_size = ra->size;
++ goto readit;
+ }
+
+ /*
+@@ -399,24 +384,21 @@ ondemand_readahead(struct address_space *mapping,
+ * - oversize random read
+ * Start readahead for it.
+ */
+- ra_index = offset;
+- ra_size = get_init_ra_size(req_size, max);
+- la_size = ra_size > req_size ? ra_size - req_size : ra_size;
++ ra->start = offset;
++ ra->size = get_init_ra_size(req_size, max);
++ ra->async_size = ra->size > req_size ? ra->size - req_size : ra->size;
+
+ /*
+- * Hit on a lookahead page without valid readahead state.
++ * Hit on a marked page without valid readahead state.
+ * E.g. interleaved reads.
+ * Not knowing its readahead pos/size, bet on the minimal possible one.
+ */
+ if (hit_readahead_marker) {
+- ra_index++;
+- ra_size = min(4 * ra_size, max);
++ ra->start++;
++ ra->size = get_next_ra_size(ra, max);
+ }
+
+-fill_ra:
+- ra_set_index(ra, offset, ra_index);
+- ra_set_size(ra, ra_size, la_size);
+-
++readit:
+ return ra_submit(ra, mapping, filp);
+ }
+ commit fe3cba17c49471e99d3421e675fc8b3deaaf0b70
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:07 2007 -0700
+
+ mm: share PG_readahead and PG_reclaim
+
+ Share the same page flag bit for PG_readahead and PG_reclaim.
+
+ One is used only on file reads, another is only for emergency writes. One
+ is used mostly for fresh/young pages, another is for old pages.
+
+ Combinations of possible interactions are:
+
+ a) clear PG_reclaim => implicit clear of PG_readahead
+ it will delay an asynchronous readahead into a synchronous one
+ it actually does _good_ for readahead:
+ the pages will be reclaimed soon, it's readahead thrashing!
+ in this case, synchronous readahead makes more sense.
+
+ b) clear PG_readahead => implicit clear of PG_reclaim
+ one(and only one) page will not be reclaimed in time
+ it can be avoided by checking PageWriteback(page) in readahead first
+
+ c) set PG_reclaim => implicit set of PG_readahead
+ will confuse readahead and make it restart the size rampup process
+ it's a trivial problem, and can mostly be avoided by checking
+ PageWriteback(page) first in readahead
+
+ d) set PG_readahead => implicit set of PG_reclaim
+ PG_readahead will never be set on already cached pages.
+ PG_reclaim will always be cleared on dirtying a page.
+ so not a problem.
+
+ In summary,
+ a) we get better behavior
+ b,d) possible interactions can be avoided
+ c) racy condition exists that might affect readahead, but the chance
+ is _really_ low, and the hurt on readahead is trivial.
+
+ Compound pages also use PG_reclaim, but for now they do not interact with
+ reclaim/readahead code.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
+index 709d92fd2877..a454176c3e30 100644
+--- a/include/linux/page-flags.h
++++ b/include/linux/page-flags.h
+@@ -83,7 +83,6 @@
+ #define PG_private 11 /* If pagecache, has fs-private data */
+
+ #define PG_writeback 12 /* Page is under writeback */
+-#define PG_readahead 13 /* Reminder to do async read-ahead */
+ #define PG_compound 14 /* Part of a compound page */
+ #define PG_swapcache 15 /* Swap page: swp_entry_t in private */
+
+@@ -91,6 +90,9 @@
+ #define PG_reclaim 17 /* To be reclaimed asap */
+ #define PG_buddy 19 /* Page is free, on buddy lists */
+
++/* PG_readahead is only used for file reads; PG_reclaim is only for writes */
++#define PG_readahead PG_reclaim /* Reminder to do async read-ahead */
++
+ /* PG_owner_priv_1 users should have descriptive aliases */
+ #define PG_checked PG_owner_priv_1 /* Used by some filesystems */
+ #define PG_pinned PG_owner_priv_1 /* Xen pinned pagetable */
+diff --git a/mm/page-writeback.c b/mm/page-writeback.c
+index e62482718012..51b3eb6ab445 100644
+--- a/mm/page-writeback.c
++++ b/mm/page-writeback.c
+@@ -920,6 +920,7 @@ int clear_page_dirty_for_io(struct page *page)
+
+ BUG_ON(!PageLocked(page));
+
++ ClearPageReclaim(page);
+ if (mapping && mapping_cap_account_dirty(mapping)) {
+ /*
+ * Yes, Virginia, this is indeed insane.
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 2165be9462c0..43cb3b3e1679 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -453,12 +453,6 @@ static inline int free_pages_check(struct page *page)
+ 1 << PG_reserved |
+ 1 << PG_buddy ))))
+ bad_page(page);
+- /*
+- * PageReclaim == PageTail. It is only an error
+- * for PageReclaim to be set if PageCompound is clear.
+- */
+- if (unlikely(!PageCompound(page) && PageReclaim(page)))
+- bad_page(page);
+ if (PageDirty(page))
+ __ClearPageDirty(page);
+ /*
+@@ -602,7 +596,6 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+ 1 << PG_locked |
+ 1 << PG_active |
+ 1 << PG_dirty |
+- 1 << PG_reclaim |
+ 1 << PG_slab |
+ 1 << PG_swapcache |
+ 1 << PG_writeback |
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 5b3c9b7d70fa..205a4a431516 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -448,6 +448,12 @@ page_cache_readahead_ondemand(struct address_space *mapping,
+ return 0;
+
+ if (page) {
++ /*
++ * It can be PG_reclaim.
++ */
++ if (PageWriteback(page))
++ return 0;
++
+ ClearPageReadahead(page);
+
+ /*commit d8983910a4045fa21022cfccf76ed13eb40fd7f5
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:06 2007 -0700
+
+ readahead: pass real splice size
+
+ Pass real splice size to page_cache_readahead_ondemand().
+
+ The splice code works in chunks of 16 pages internally. The readahead code
+ should be told of the overall splice size, instead of the internal chunk size.
+ Otherwize bad things may happen. Imagine some 17-page random splice reads.
+ The code before this patch will result in two readahead calls: readahead(16);
+ readahead(1); That leads to one 16-page I/O and one 32-page I/O: one extra I/O
+ and 31 readahead miss pages.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Jens Axboe <jens.axboe@oracle.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/splice.c b/fs/splice.c
+index 421b3b821152..6ddd0329f866 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -265,7 +265,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ unsigned int flags)
+ {
+ struct address_space *mapping = in->f_mapping;
+- unsigned int loff, nr_pages;
++ unsigned int loff, nr_pages, req_pages;
+ struct page *pages[PIPE_BUFFERS];
+ struct partial_page partial[PIPE_BUFFERS];
+ struct page *page;
+@@ -281,10 +281,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+
+ index = *ppos >> PAGE_CACHE_SHIFT;
+ loff = *ppos & ~PAGE_CACHE_MASK;
+- nr_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+-
+- if (nr_pages > PIPE_BUFFERS)
+- nr_pages = PIPE_BUFFERS;
++ req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
++ nr_pages = min(req_pages, (unsigned)PIPE_BUFFERS);
+
+ /*
+ * Lookup the (hopefully) full range of pages we need.
+@@ -298,7 +296,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ */
+ if (spd.nr_pages < nr_pages)
+ page_cache_readahead_ondemand(mapping, &in->f_ra, in,
+- NULL, index, nr_pages - spd.nr_pages);
++ NULL, index, req_pages - spd.nr_pages);
+
+ error = 0;
+ while (spd.nr_pages < nr_pages) {
+@@ -355,7 +353,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+
+ if (PageReadahead(page))
+ page_cache_readahead_ondemand(mapping, &in->f_ra, in,
+- page, index, nr_pages - page_nr);
++ page, index, req_pages - page_nr);
+
+ /*
+ * If the page isn't uptodate, we may need to start io on itcommit 431a4820bfcdf7ff530e745230bafb06c9bf2d6d
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:05 2007 -0700
+
+ readahead: move synchronous readahead call out of splice loop
+
+ Move synchronous page_cache_readahead_ondemand() call out of splice loop.
+
+ This avoids one pointless page allocation/insertion in case of non-zero
+ ra_pages, or many pointless readahead calls in case of zero ra_pages.
+
+ Note that if a user sets ra_pages to less than PIPE_BUFFERS=16 pages, he will
+ not get expected readahead behavior anyway. The splice code works in batches
+ of 16 pages, which can be taken as another form of synchronous readahead.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Jens Axboe <jens.axboe@oracle.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/splice.c b/fs/splice.c
+index 722449f7d5d6..421b3b821152 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -290,13 +290,17 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ * Lookup the (hopefully) full range of pages we need.
+ */
+ spd.nr_pages = find_get_pages_contig(mapping, index, nr_pages, pages);
++ index += spd.nr_pages;
+
+ /*
+ * If find_get_pages_contig() returned fewer pages than we needed,
+- * allocate the rest and fill in the holes.
++ * readahead/allocate the rest and fill in the holes.
+ */
++ if (spd.nr_pages < nr_pages)
++ page_cache_readahead_ondemand(mapping, &in->f_ra, in,
++ NULL, index, nr_pages - spd.nr_pages);
++
+ error = 0;
+- index += spd.nr_pages;
+ while (spd.nr_pages < nr_pages) {
+ /*
+ * Page could be there, find_get_pages_contig() breaks on
+@@ -304,9 +308,6 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ */
+ page = find_get_page(mapping, index);
+ if (!page) {
+- page_cache_readahead_ondemand(mapping, &in->f_ra, in,
+- NULL, index, nr_pages - spd.nr_pages);
+-
+ /*
+ * page didn't exist, allocate one.
+ */commit c743d96b6d2ff55a94df7b5ac7c74987bb9c343b
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:04 2007 -0700
+
+ readahead: remove the old algorithm
+
+ Remove the old readahead algorithm.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 9a5f562abc77..29cb32d3a849 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -701,14 +701,6 @@ struct fown_struct {
+ * file_ra_state.la_index .ra_index .lookahead_index .readahead_index
+ */
+ struct file_ra_state {
+- unsigned long start; /* Current window */
+- unsigned long size;
+- unsigned long flags; /* ra flags RA_FLAG_xxx*/
+- unsigned long cache_hit; /* cache hit count*/
+- unsigned long prev_index; /* Cache last read() position */
+- unsigned long ahead_start; /* Ahead window */
+- unsigned long ahead_size;
+-
+ pgoff_t la_index; /* enqueue time */
+ pgoff_t ra_index; /* begin offset */
+ pgoff_t lookahead_index; /* time to do next readahead */
+@@ -717,10 +709,9 @@ struct file_ra_state {
+ unsigned long ra_pages; /* Maximum readahead window */
+ unsigned long mmap_hit; /* Cache hit stat for mmap accesses */
+ unsigned long mmap_miss; /* Cache miss stat for mmap accesses */
++ unsigned long prev_index; /* Cache last read() position */
+ unsigned int prev_offset; /* Offset where last read() ended in a page */
+ };
+-#define RA_FLAG_MISS 0x01 /* a cache miss occured against this file */
+-#define RA_FLAG_INCACHE 0x02 /* file is already in cache */
+
+ /*
+ * Measuring read-ahead sizes.
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index 619c0e80cf0c..3d0d7d285237 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1144,13 +1144,6 @@ unsigned long page_cache_readahead_ondemand(struct address_space *mapping,
+ struct page *page,
+ pgoff_t offset,
+ unsigned long size);
+-unsigned long page_cache_readahead(struct address_space *mapping,
+- struct file_ra_state *ra,
+- struct file *filp,
+- pgoff_t offset,
+- unsigned long size);
+-void handle_ra_miss(struct address_space *mapping,
+- struct file_ra_state *ra, pgoff_t offset);
+ unsigned long max_sane_readahead(unsigned long nr);
+
+ /* Do stack extension */
+diff --git a/mm/readahead.c b/mm/readahead.c
+index c094e4f5a250..5b3c9b7d70fa 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -49,82 +49,6 @@ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping)
+ }
+ EXPORT_SYMBOL_GPL(file_ra_state_init);
+
+-/*
+- * Return max readahead size for this inode in number-of-pages.
+- */
+-static inline unsigned long get_max_readahead(struct file_ra_state *ra)
+-{
+- return ra->ra_pages;
+-}
+-
+-static inline unsigned long get_min_readahead(struct file_ra_state *ra)
+-{
+- return MIN_RA_PAGES;
+-}
+-
+-static inline void reset_ahead_window(struct file_ra_state *ra)
+-{
+- /*
+- * ... but preserve ahead_start + ahead_size value,
+- * see 'recheck:' label in page_cache_readahead().
+- * Note: We never use ->ahead_size as rvalue without
+- * checking ->ahead_start != 0 first.
+- */
+- ra->ahead_size += ra->ahead_start;
+- ra->ahead_start = 0;
+-}
+-
+-static inline void ra_off(struct file_ra_state *ra)
+-{
+- ra->start = 0;
+- ra->flags = 0;
+- ra->size = 0;
+- reset_ahead_window(ra);
+- return;
+-}
+-
+-/*
+- * Set the initial window size, round to next power of 2 and square
+- * for small size, x 4 for medium, and x 2 for large
+- * for 128k (32 page) max ra
+- * 1-8 page = 32k initial, > 8 page = 128k initial
+- */
+-static unsigned long get_init_ra_size(unsigned long size, unsigned long max)
+-{
+- unsigned long newsize = roundup_pow_of_two(size);
+-
+- if (newsize <= max / 32)
+- newsize = newsize * 4;
+- else if (newsize <= max / 4)
+- newsize = newsize * 2;
+- else
+- newsize = max;
+- return newsize;
+-}
+-
+-/*
+- * Set the new window size, this is called only when I/O is to be submitted,
+- * not for each call to readahead. If a cache miss occured, reduce next I/O
+- * size, else increase depending on how close to max we are.
+- */
+-static inline unsigned long get_next_ra_size(struct file_ra_state *ra)
+-{
+- unsigned long max = get_max_readahead(ra);
+- unsigned long min = get_min_readahead(ra);
+- unsigned long cur = ra->size;
+- unsigned long newsize;
+-
+- if (ra->flags & RA_FLAG_MISS) {
+- ra->flags &= ~RA_FLAG_MISS;
+- newsize = max((cur - 2), min);
+- } else if (cur < max / 16) {
+- newsize = 4 * cur;
+- } else {
+- newsize = 2 * cur;
+- }
+- return min(newsize, max);
+-}
+-
+ #define list_to_page(head) (list_entry((head)->prev, struct page, lru))
+
+ /**
+@@ -200,66 +124,6 @@ static int read_pages(struct address_space *mapping, struct file *filp,
+ return ret;
+ }
+
+-/*
+- * Readahead design.
+- *
+- * The fields in struct file_ra_state represent the most-recently-executed
+- * readahead attempt:
+- *
+- * start: Page index at which we started the readahead
+- * size: Number of pages in that read
+- * Together, these form the "current window".
+- * Together, start and size represent the `readahead window'.
+- * prev_index: The page which the readahead algorithm most-recently inspected.
+- * It is mainly used to detect sequential file reading.
+- * If page_cache_readahead sees that it is again being called for
+- * a page which it just looked at, it can return immediately without
+- * making any state changes.
+- * offset: Offset in the prev_index where the last read ended - used for
+- * detection of sequential file reading.
+- * ahead_start,
+- * ahead_size: Together, these form the "ahead window".
+- * ra_pages: The externally controlled max readahead for this fd.
+- *
+- * When readahead is in the off state (size == 0), readahead is disabled.
+- * In this state, prev_index is used to detect the resumption of sequential I/O.
+- *
+- * The readahead code manages two windows - the "current" and the "ahead"
+- * windows. The intent is that while the application is walking the pages
+- * in the current window, I/O is underway on the ahead window. When the
+- * current window is fully traversed, it is replaced by the ahead window
+- * and the ahead window is invalidated. When this copying happens, the
+- * new current window's pages are probably still locked. So
+- * we submit a new batch of I/O immediately, creating a new ahead window.
+- *
+- * So:
+- *
+- * ----|----------------|----------------|-----
+- * ^start ^start+size
+- * ^ahead_start ^ahead_start+ahead_size
+- *
+- * ^ When this page is read, we submit I/O for the
+- * ahead window.
+- *
+- * A `readahead hit' occurs when a read request is made against a page which is
+- * the next sequential page. Ahead window calculations are done only when it
+- * is time to submit a new IO. The code ramps up the size agressively at first,
+- * but slow down as it approaches max_readhead.
+- *
+- * Any seek/ramdom IO will result in readahead being turned off. It will resume
+- * at the first sequential access.
+- *
+- * There is a special-case: if the first page which the application tries to
+- * read happens to be the first page of the file, it is assumed that a linear
+- * read is about to happen and the window is immediately set to the initial size
+- * based on I/O request size and the max_readahead.
+- *
+- * This function is to be called for every read request, rather than when
+- * it is time to perform readahead. It is called only once for the entire I/O
+- * regardless of size unless readahead is unable to start enough I/O to satisfy
+- * the request (I/O request > max_readahead).
+- */
+-
+ /*
+ * do_page_cache_readahead actually reads a chunk of disk. It allocates all
+ * the pages first, then submits them all for I/O. This avoids the very bad
+@@ -295,7 +159,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ read_lock_irq(&mapping->tree_lock);
+ for (page_idx = 0; page_idx < nr_to_read; page_idx++) {
+ pgoff_t page_offset = offset + page_idx;
+-
++
+ if (page_offset > end_index)
+ break;
+
+@@ -360,28 +224,6 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ return ret;
+ }
+
+-/*
+- * Check how effective readahead is being. If the amount of started IO is
+- * less than expected then the file is partly or fully in pagecache and
+- * readahead isn't helping.
+- *
+- */
+-static inline int check_ra_success(struct file_ra_state *ra,
+- unsigned long nr_to_read, unsigned long actual)
+-{
+- if (actual == 0) {
+- ra->cache_hit += nr_to_read;
+- if (ra->cache_hit >= VM_MAX_CACHE_HIT) {
+- ra_off(ra);
+- ra->flags |= RA_FLAG_INCACHE;
+- return 0;
+- }
+- } else {
+- ra->cache_hit=0;
+- }
+- return 1;
+-}
+-
+ /*
+ * This version skips the IO if the queue is read-congested, and will tell the
+ * block layer to abandon the readahead if request allocation would block.
+@@ -398,191 +240,6 @@ int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ return __do_page_cache_readahead(mapping, filp, offset, nr_to_read, 0);
+ }
+
+-/*
+- * Read 'nr_to_read' pages starting at page 'offset'. If the flag 'block'
+- * is set wait till the read completes. Otherwise attempt to read without
+- * blocking.
+- * Returns 1 meaning 'success' if read is successful without switching off
+- * readahead mode. Otherwise return failure.
+- */
+-static int
+-blockable_page_cache_readahead(struct address_space *mapping, struct file *filp,
+- pgoff_t offset, unsigned long nr_to_read,
+- struct file_ra_state *ra, int block)
+-{
+- int actual;
+-
+- if (!block && bdi_read_congested(mapping->backing_dev_info))
+- return 0;
+-
+- actual = __do_page_cache_readahead(mapping, filp, offset, nr_to_read, 0);
+-
+- return check_ra_success(ra, nr_to_read, actual);
+-}
+-
+-static int make_ahead_window(struct address_space *mapping, struct file *filp,
+- struct file_ra_state *ra, int force)
+-{
+- int block, ret;
+-
+- ra->ahead_size = get_next_ra_size(ra);
+- ra->ahead_start = ra->start + ra->size;
+-
+- block = force || (ra->prev_index >= ra->ahead_start);
+- ret = blockable_page_cache_readahead(mapping, filp,
+- ra->ahead_start, ra->ahead_size, ra, block);
+-
+- if (!ret && !force) {
+- /* A read failure in blocking mode, implies pages are
+- * all cached. So we can safely assume we have taken
+- * care of all the pages requested in this call.
+- * A read failure in non-blocking mode, implies we are
+- * reading more pages than requested in this call. So
+- * we safely assume we have taken care of all the pages
+- * requested in this call.
+- *
+- * Just reset the ahead window in case we failed due to
+- * congestion. The ahead window will any way be closed
+- * in case we failed due to excessive page cache hits.
+- */
+- reset_ahead_window(ra);
+- }
+-
+- return ret;
+-}
+-
+-/**
+- * page_cache_readahead - generic adaptive readahead
+- * @mapping: address_space which holds the pagecache and I/O vectors
+- * @ra: file_ra_state which holds the readahead state
+- * @filp: passed on to ->readpage() and ->readpages()
+- * @offset: start offset into @mapping, in PAGE_CACHE_SIZE units
+- * @req_size: hint: total size of the read which the caller is performing in
+- * PAGE_CACHE_SIZE units
+- *
+- * page_cache_readahead() is the main function. It performs the adaptive
+- * readahead window size management and submits the readahead I/O.
+- *
+- * Note that @filp is purely used for passing on to the ->readpage[s]()
+- * handler: it may refer to a different file from @mapping (so we may not use
+- * @filp->f_mapping or @filp->f_path.dentry->d_inode here).
+- * Also, @ra may not be equal to &@filp->f_ra.
+- *
+- */
+-unsigned long
+-page_cache_readahead(struct address_space *mapping, struct file_ra_state *ra,
+- struct file *filp, pgoff_t offset, unsigned long req_size)
+-{
+- unsigned long max, newsize;
+- int sequential;
+-
+- /*
+- * We avoid doing extra work and bogusly perturbing the readahead
+- * window expansion logic.
+- */
+- if (offset == ra->prev_index && --req_size)
+- ++offset;
+-
+- /* Note that prev_index == -1 if it is a first read */
+- sequential = (offset == ra->prev_index + 1);
+- ra->prev_index = offset;
+- ra->prev_offset = 0;
+-
+- max = get_max_readahead(ra);
+- newsize = min(req_size, max);
+-
+- /* No readahead or sub-page sized read or file already in cache */
+- if (newsize == 0 || (ra->flags & RA_FLAG_INCACHE))
+- goto out;
+-
+- ra->prev_index += newsize - 1;
+-
+- /*
+- * Special case - first read at start of file. We'll assume it's
+- * a whole-file read and grow the window fast. Or detect first
+- * sequential access
+- */
+- if (sequential && ra->size == 0) {
+- ra->size = get_init_ra_size(newsize, max);
+- ra->start = offset;
+- if (!blockable_page_cache_readahead(mapping, filp, offset,
+- ra->size, ra, 1))
+- goto out;
+-
+- /*
+- * If the request size is larger than our max readahead, we
+- * at least want to be sure that we get 2 IOs in flight and
+- * we know that we will definitly need the new I/O.
+- * once we do this, subsequent calls should be able to overlap
+- * IOs,* thus preventing stalls. so issue the ahead window
+- * immediately.
+- */
+- if (req_size >= max)
+- make_ahead_window(mapping, filp, ra, 1);
+-
+- goto out;
+- }
+-
+- /*
+- * Now handle the random case:
+- * partial page reads and first access were handled above,
+- * so this must be the next page otherwise it is random
+- */
+- if (!sequential) {
+- ra_off(ra);
+- blockable_page_cache_readahead(mapping, filp, offset,
+- newsize, ra, 1);
+- goto out;
+- }
+-
+- /*
+- * If we get here we are doing sequential IO and this was not the first
+- * occurence (ie we have an existing window)
+- */
+- if (ra->ahead_start == 0) { /* no ahead window yet */
+- if (!make_ahead_window(mapping, filp, ra, 0))
+- goto recheck;
+- }
+-
+- /*
+- * Already have an ahead window, check if we crossed into it.
+- * If so, shift windows and issue a new ahead window.
+- * Only return the #pages that are in the current window, so that
+- * we get called back on the first page of the ahead window which
+- * will allow us to submit more IO.
+- */
+- if (ra->prev_index >= ra->ahead_start) {
+- ra->start = ra->ahead_start;
+- ra->size = ra->ahead_size;
+- make_ahead_window(mapping, filp, ra, 0);
+-recheck:
+- /* prev_index shouldn't overrun the ahead window */
+- ra->prev_index = min(ra->prev_index,
+- ra->ahead_start + ra->ahead_size - 1);
+- }
+-
+-out:
+- return ra->prev_index + 1;
+-}
+-EXPORT_SYMBOL_GPL(page_cache_readahead);
+-
+-/*
+- * handle_ra_miss() is called when it is known that a page which should have
+- * been present in the pagecache (we just did some readahead there) was in fact
+- * not found. This will happen if it was evicted by the VM (readahead
+- * thrashing)
+- *
+- * Turn on the cache miss flag in the RA struct, this will cause the RA code
+- * to reduce the RA size on the next read.
+- */
+-void handle_ra_miss(struct address_space *mapping,
+- struct file_ra_state *ra, pgoff_t offset)
+-{
+- ra->flags |= RA_FLAG_MISS;
+- ra->flags &= ~RA_FLAG_INCACHE;
+- ra->cache_hit = 0;
+-}
+-
+ /*
+ * Given a desired number of PAGE_CACHE_SIZE readahead pages, return a
+ * sensible upper limit.
+@@ -612,20 +269,40 @@ unsigned long ra_submit(struct file_ra_state *ra,
+ }
+ EXPORT_SYMBOL_GPL(ra_submit);
+
++/*
++ * Set the initial window size, round to next power of 2 and square
++ * for small size, x 4 for medium, and x 2 for large
++ * for 128k (32 page) max ra
++ * 1-8 page = 32k initial, > 8 page = 128k initial
++ */
++static unsigned long get_init_ra_size(unsigned long size, unsigned long max)
++{
++ unsigned long newsize = roundup_pow_of_two(size);
++
++ if (newsize <= max / 32)
++ newsize = newsize * 4;
++ else if (newsize <= max / 4)
++ newsize = newsize * 2;
++ else
++ newsize = max;
++
++ return newsize;
++}
++
+ /*
+ * Get the previous window size, ramp it up, and
+ * return it as the new window size.
+ */
+-static unsigned long get_next_ra_size2(struct file_ra_state *ra,
++static unsigned long get_next_ra_size(struct file_ra_state *ra,
+ unsigned long max)
+ {
+ unsigned long cur = ra->readahead_index - ra->ra_index;
+ unsigned long newsize;
+
+ if (cur < max / 16)
+- newsize = cur * 4;
++ newsize = 4 * cur;
+ else
+- newsize = cur * 2;
++ newsize = 2 * cur;
+
+ return min(newsize, max);
+ }
+@@ -701,7 +378,7 @@ ondemand_readahead(struct address_space *mapping,
+ if (offset && (offset == ra->lookahead_index ||
+ offset == ra->readahead_index)) {
+ ra_index = ra->readahead_index;
+- ra_size = get_next_ra_size2(ra, max);
++ ra_size = get_next_ra_size(ra, max);
+ la_size = ra_size;
+ goto fill_ra;
+ }commit dc7868fcb9a73990e6f30371c1be465c436a7a7f
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:04 2007 -0700
+
+ readahead: convert ext3/ext4 invocations
+
+ Convert ext3/ext4 dir reads to use on-demand readahead.
+
+ Readahead for dirs operates _not_ on file level, but on blockdev level. This
+ makes a difference when the data blocks are not continuous. And the read
+ routine is somehow opaque: there's no handy info about the status of current
+ page. So a simplified call scheme is employed: to call into readahead
+ whenever the current page falls out of readahead windows.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
+index 852869840f24..3c6d384a2c66 100644
+--- a/fs/ext3/dir.c
++++ b/fs/ext3/dir.c
+@@ -136,12 +136,14 @@ static int ext3_readdir(struct file * filp,
+ err = ext3_get_blocks_handle(NULL, inode, blk, 1,
+ &map_bh, 0, 0);
+ if (err > 0) {
+- page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
+- &filp->f_ra,
+- filp,
+- map_bh.b_blocknr >>
+- (PAGE_CACHE_SHIFT - inode->i_blkbits),
+- 1);
++ pgoff_t index = map_bh.b_blocknr >>
++ (PAGE_CACHE_SHIFT - inode->i_blkbits);
++ if (!ra_has_index(&filp->f_ra, index))
++ page_cache_readahead_ondemand(
++ sb->s_bdev->bd_inode->i_mapping,
++ &filp->f_ra, filp,
++ NULL, index, 1);
++ filp->f_ra.prev_index = index;
+ bh = ext3_bread(NULL, inode, blk, 0, &err);
+ }
+
+diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
+index e8ad06e28318..0a872a09fed8 100644
+--- a/fs/ext4/dir.c
++++ b/fs/ext4/dir.c
+@@ -135,12 +135,14 @@ static int ext4_readdir(struct file * filp,
+ map_bh.b_state = 0;
+ err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
+ if (err > 0) {
+- page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
+- &filp->f_ra,
+- filp,
+- map_bh.b_blocknr >>
+- (PAGE_CACHE_SHIFT - inode->i_blkbits),
+- 1);
++ pgoff_t index = map_bh.b_blocknr >>
++ (PAGE_CACHE_SHIFT - inode->i_blkbits);
++ if (!ra_has_index(&filp->f_ra, index))
++ page_cache_readahead_ondemand(
++ sb->s_bdev->bd_inode->i_mapping,
++ &filp->f_ra, filp,
++ NULL, index, 1);
++ filp->f_ra.prev_index = index;
+ bh = ext4_bread(NULL, inode, blk, 0, &err);
+ }
+
+ commit a08a166fe77d9f9ad88ed6d06b97e73453661f89
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:03 2007 -0700
+
+ readahead: convert splice invocations
+
+ Convert splice reads to use on-demand readahead.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Jens Axboe <axboe@suse.de>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/splice.c b/fs/splice.c
+index 53fc2082a468..722449f7d5d6 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -286,12 +286,6 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ if (nr_pages > PIPE_BUFFERS)
+ nr_pages = PIPE_BUFFERS;
+
+- /*
+- * Don't try to 2nd guess the read-ahead logic, call into
+- * page_cache_readahead() like the page cache reads would do.
+- */
+- page_cache_readahead(mapping, &in->f_ra, in, index, nr_pages);
+-
+ /*
+ * Lookup the (hopefully) full range of pages we need.
+ */
+@@ -310,11 +304,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ */
+ page = find_get_page(mapping, index);
+ if (!page) {
+- /*
+- * Make sure the read-ahead engine is notified
+- * about this failure.
+- */
+- handle_ra_miss(mapping, &in->f_ra, index);
++ page_cache_readahead_ondemand(mapping, &in->f_ra, in,
++ NULL, index, nr_pages - spd.nr_pages);
+
+ /*
+ * page didn't exist, allocate one.
+@@ -361,6 +352,10 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);
+ page = pages[page_nr];
+
++ if (PageReadahead(page))
++ page_cache_readahead_ondemand(mapping, &in->f_ra, in,
++ page, index, nr_pages - page_nr);
++
+ /*
+ * If the page isn't uptodate, we may need to start io on it
+ */
+@@ -453,6 +448,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+ */
+ while (page_nr < nr_pages)
+ page_cache_release(pages[page_nr++]);
++ in->f_ra.prev_index = index;
+
+ if (spd.nr_pages)
+ return splice_to_pipe(pipe, &spd);commit 3ea89ee86a82e9fbde37018d9b9e92a552e5fd13
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:02 2007 -0700
+
+ readahead: convert filemap invocations
+
+ Convert filemap reads to use on-demand readahead.
+
+ The new call scheme is to
+ - call readahead on non-cached page
+ - call readahead on look-ahead page
+ - update prev_index when finished with the read request
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 4fd9e3f0f48a..5eb0a6b9d607 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -891,15 +891,20 @@ void do_generic_mapping_read(struct address_space *mapping,
+ unsigned long nr, ret;
+
+ cond_resched();
+- if (index == next_index)
+- next_index = page_cache_readahead(mapping, &ra, filp,
+- index, last_index - index);
+-
+ find_page:
+ page = find_get_page(mapping, index);
+- if (unlikely(page == NULL)) {
+- handle_ra_miss(mapping, &ra, index);
+- goto no_cached_page;
++ if (!page) {
++ page_cache_readahead_ondemand(mapping,
++ &ra, filp, page,
++ index, last_index - index);
++ page = find_get_page(mapping, index);
++ if (unlikely(page == NULL))
++ goto no_cached_page;
++ }
++ if (PageReadahead(page)) {
++ page_cache_readahead_ondemand(mapping,
++ &ra, filp, page,
++ index, last_index - index);
+ }
+ if (!PageUptodate(page))
+ goto page_not_up_to_date;
+@@ -1051,6 +1056,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+
+ out:
+ *_ra = ra;
++ _ra->prev_index = prev_index;
+
+ *ppos = ((loff_t) index << PAGE_CACHE_SHIFT) + offset;
+ if (cached_page)
+@@ -1332,27 +1338,31 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ if (VM_RandomReadHint(vma))
+ goto no_cached_page;
+
+- /*
+- * The readahead code wants to be told about each and every page
+- * so it can build and shrink its windows appropriately
+- *
+- * For sequential accesses, we use the generic readahead logic.
+- */
+- if (VM_SequentialReadHint(vma))
+- page_cache_readahead(mapping, ra, file, vmf->pgoff, 1);
+-
+ /*
+ * Do we have something in the page cache already?
+ */
+ retry_find:
+ page = find_lock_page(mapping, vmf->pgoff);
++ /*
++ * For sequential accesses, we use the generic readahead logic.
++ */
++ if (VM_SequentialReadHint(vma)) {
++ if (!page) {
++ page_cache_readahead_ondemand(mapping, ra, file, page,
++ vmf->pgoff, 1);
++ page = find_lock_page(mapping, vmf->pgoff);
++ if (!page)
++ goto no_cached_page;
++ }
++ if (PageReadahead(page)) {
++ page_cache_readahead_ondemand(mapping, ra, file, page,
++ vmf->pgoff, 1);
++ }
++ }
++
+ if (!page) {
+ unsigned long ra_pages;
+
+- if (VM_SequentialReadHint(vma)) {
+- handle_ra_miss(mapping, ra, vmf->pgoff);
+- goto no_cached_page;
+- }
+ ra->mmap_miss++;
+
+ /*
+@@ -1405,6 +1415,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ * Found the page and have a reference on it.
+ */
+ mark_page_accessed(page);
++ ra->prev_index = page->index;
+ vmf->page = page;
+ return ret | VM_FAULT_LOCKED;
+ commit 122a21d11cbfda6d1e33cbc8ae9e4c4ee2f1886e
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:48:01 2007 -0700
+
+ readahead: on-demand readahead logic
+
+ This is a minimal readahead algorithm that aims to replace the current one.
+ It is more flexible and reliable, while maintaining almost the same behavior
+ and performance. Also it is full integrated with adaptive readahead.
+
+ It is designed to be called on demand:
+ - on a missing page, to do synchronous readahead
+ - on a lookahead page, to do asynchronous readahead
+
+ In this way it eliminated the awkward workarounds for cache hit/miss,
+ readahead thrashing, retried read, and unaligned read. It also adopts the
+ data structure introduced by adaptive readahead, parameterizes readahead
+ pipelining with `lookahead_index', and reduces the current/ahead windows to
+ one single window.
+
+ HEURISTICS
+
+ The logic deals with four cases:
+
+ - sequential-next
+ found a consistent readahead window, so push it forward
+
+ - random
+ standalone small read, so read as is
+
+ - sequential-first
+ create a new readahead window for a sequential/oversize request
+
+ - lookahead-clueless
+ hit a lookahead page not associated with the readahead window,
+ so create a new readahead window and ramp it up
+
+ In each case, three parameters are determined:
+
+ - readahead index: where the next readahead begins
+ - readahead size: how much to readahead
+ - lookahead size: when to do the next readahead (for pipelining)
+
+ BEHAVIORS
+
+ The old behaviors are maximally preserved for trivial sequential/random reads.
+ Notable changes are:
+
+ - It no longer imposes strict sequential checks.
+ It might help some interleaved cases, and clustered random reads.
+ It does introduce risks of a random lookahead hit triggering an
+ unexpected readahead. But in general it is more likely to do good
+ than to do evil.
+
+ - Interleaved reads are supported in a minimal way.
+ Their chances of being detected and proper handled are still low.
+
+ - Readahead thrashings are better handled.
+ The current readahead leads to tiny average I/O sizes, because it
+ never turn back for the thrashed pages. They have to be fault in
+ by do_generic_mapping_read() one by one. Whereas the on-demand
+ readahead will redo readahead for them.
+
+ OVERHEADS
+
+ The new code reduced the overheads of
+
+ - excessively calling the readahead routine on small sized reads
+ (the current readahead code insists on seeing all requests)
+
+ - doing a lot of pointless page-cache lookups for small cached files
+ (the current readahead only turns itself off after 256 cache hits,
+ unfortunately most files are < 1MB, so never see that chance)
+
+ That accounts for speedup of
+ - 0.3% on 1-page sequential reads on sparse file
+ - 1.2% on 1-page cache hot sequential reads
+ - 3.2% on 256-page cache hot sequential reads
+ - 1.3% on cache hot `tar /lib`
+
+ However, it does introduce one extra page-cache lookup per cache miss, which
+ impacts random reads slightly. That's 1% overheads for 1-page random reads on
+ sparse file.
+
+ PERFORMANCE
+
+ The basic benchmark setup is
+ - 2.6.20 kernel with on-demand readahead
+ - 1MB max readahead size
+ - 2.9GHz Intel Core 2 CPU
+ - 2GB memory
+ - 160G/8M Hitachi SATA II 7200 RPM disk
+
+ The benchmarks show that
+ - it maintains the same performance for trivial sequential/random reads
+ - sysbench/OLTP performance on MySQL gains up to 8%
+ - performance on readahead thrashing gains up to 3 times
+
+ iozone throughput (KB/s): roughly the same
+ ==========================================
+ iozone -c -t1 -s 4096m -r 64k
+
+ 2.6.20 on-demand gain
+ first run
+ " Initial write " 61437.27 64521.53 +5.0%
+ " Rewrite " 47893.02 48335.20 +0.9%
+ " Read " 62111.84 62141.49 +0.0%
+ " Re-read " 62242.66 62193.17 -0.1%
+ " Reverse Read " 50031.46 49989.79 -0.1%
+ " Stride read " 8657.61 8652.81 -0.1%
+ " Random read " 13914.28 13898.23 -0.1%
+ " Mixed workload " 19069.27 19033.32 -0.2%
+ " Random write " 14849.80 14104.38 -5.0%
+ " Pwrite " 62955.30 65701.57 +4.4%
+ " Pread " 62209.99 62256.26 +0.1%
+
+ second run
+ " Initial write " 60810.31 66258.69 +9.0%
+ " Rewrite " 49373.89 57833.66 +17.1%
+ " Read " 62059.39 62251.28 +0.3%
+ " Re-read " 62264.32 62256.82 -0.0%
+ " Reverse Read " 49970.96 50565.72 +1.2%
+ " Stride read " 8654.81 8638.45 -0.2%
+ " Random read " 13901.44 13949.91 +0.3%
+ " Mixed workload " 19041.32 19092.04 +0.3%
+ " Random write " 14019.99 14161.72 +1.0%
+ " Pwrite " 64121.67 68224.17 +6.4%
+ " Pread " 62225.08 62274.28 +0.1%
+
+ In summary, writes are unstable, reads are pretty close on average:
+
+ access pattern 2.6.20 on-demand gain
+ Read 62085.61 62196.38 +0.2%
+ Re-read 62253.49 62224.99 -0.0%
+ Reverse Read 50001.21 50277.75 +0.6%
+ Stride read 8656.21 8645.63 -0.1%
+ Random read 13907.86 13924.07 +0.1%
+ Mixed workload 19055.29 19062.68 +0.0%
+ Pread 62217.53 62265.27 +0.1%
+
+ aio-stress: roughly the same
+ ============================
+ aio-stress -l -s4096 -r128 -t1 -o1 knoppix511-dvd-cn.iso
+ aio-stress -l -s4096 -r128 -t1 -o3 knoppix511-dvd-cn.iso
+
+ 2.6.20 on-demand delta
+ sequential 92.57s 92.54s -0.0%
+ random 311.87s 312.15s +0.1%
+
+ sysbench fileio: roughly the same
+ =================================
+ sysbench --test=fileio --file-io-mode=async --file-test-mode=rndrw \
+ --file-total-size=4G --file-block-size=64K \
+ --num-threads=001 --max-requests=10000 --max-time=900 run
+
+ threads 2.6.20 on-demand delta
+ first run
+ 1 59.1974s 59.2262s +0.0%
+ 2 58.0575s 58.2269s +0.3%
+ 4 48.0545s 47.1164s -2.0%
+ 8 41.0684s 41.2229s +0.4%
+ 16 35.8817s 36.4448s +1.6%
+ 32 32.6614s 32.8240s +0.5%
+ 64 23.7601s 24.1481s +1.6%
+ 128 24.3719s 23.8225s -2.3%
+ 256 23.2366s 22.0488s -5.1%
+
+ second run
+ 1 59.6720s 59.5671s -0.2%
+ 8 41.5158s 41.9541s +1.1%
+ 64 25.0200s 23.9634s -4.2%
+ 256 22.5491s 20.9486s -7.1%
+
+ Note that the numbers are not very stable because of the writes.
+ The overall performance is close when we sum all seconds up:
+
+ sum all up 495.046s 491.514s -0.7%
+
+ sysbench oltp (trans/sec): up to 8% gain
+ ========================================
+ sysbench --test=oltp --oltp-table-size=10000000 --oltp-read-only \
+ --mysql-socket=/var/run/mysqld/mysqld.sock \
+ --mysql-user=root --mysql-password=readahead \
+ --num-threads=064 --max-requests=10000 --max-time=900 run
+
+ 10000-transactions run
+ threads 2.6.20 on-demand gain
+ 1 62.81 64.56 +2.8%
+ 2 67.97 70.93 +4.4%
+ 4 81.81 85.87 +5.0%
+ 8 94.60 97.89 +3.5%
+ 16 99.07 104.68 +5.7%
+ 32 95.93 104.28 +8.7%
+ 64 96.48 103.68 +7.5%
+ 5000-transactions run
+ 1 48.21 48.65 +0.9%
+ 8 68.60 70.19 +2.3%
+ 64 70.57 74.72 +5.9%
+ 2000-transactions run
+ 1 37.57 38.04 +1.3%
+ 2 38.43 38.99 +1.5%
+ 4 45.39 46.45 +2.3%
+ 8 51.64 52.36 +1.4%
+ 16 54.39 55.18 +1.5%
+ 32 52.13 54.49 +4.5%
+ 64 54.13 54.61 +0.9%
+
+ That's interesting results. Some investigations show that
+ - MySQL is accessing the db file non-uniformly: some parts are
+ more hot than others
+ - It is mostly doing 4-page random reads, and sometimes doing two
+ reads in a row, the latter one triggers a 16-page readahead.
+ - The on-demand readahead leaves many lookahead pages (flagged
+ PG_readahead) there. Many of them will be hit, and trigger
+ more readahead pages. Which might save more seeks.
+ - Naturally, the readahead windows tend to lie in hot areas,
+ and the lookahead pages in hot areas is more likely to be hit.
+ - The more overall read density, the more possible gain.
+
+ That also explains the adaptive readahead tricks for clustered random reads.
+
+ readahead thrashing: 3 times better
+ ===================================
+ We boot kernel with "mem=128m single", and start a 100KB/s stream on every
+ second, until reaching 200 streams.
+
+ max throughput min avg I/O size
+ 2.6.20: 5MB/s 16KB
+ on-demand: 15MB/s 140KB
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index f8e12b3b6110..619c0e80cf0c 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -1138,6 +1138,12 @@ int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ pgoff_t offset, unsigned long nr_to_read);
+ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ pgoff_t offset, unsigned long nr_to_read);
++unsigned long page_cache_readahead_ondemand(struct address_space *mapping,
++ struct file_ra_state *ra,
++ struct file *filp,
++ struct page *page,
++ pgoff_t offset,
++ unsigned long size);
+ unsigned long page_cache_readahead(struct address_space *mapping,
+ struct file_ra_state *ra,
+ struct file *filp,
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 072ce8f8357d..c094e4f5a250 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -611,3 +611,177 @@ unsigned long ra_submit(struct file_ra_state *ra,
+ return actual;
+ }
+ EXPORT_SYMBOL_GPL(ra_submit);
++
++/*
++ * Get the previous window size, ramp it up, and
++ * return it as the new window size.
++ */
++static unsigned long get_next_ra_size2(struct file_ra_state *ra,
++ unsigned long max)
++{
++ unsigned long cur = ra->readahead_index - ra->ra_index;
++ unsigned long newsize;
++
++ if (cur < max / 16)
++ newsize = cur * 4;
++ else
++ newsize = cur * 2;
++
++ return min(newsize, max);
++}
++
++/*
++ * On-demand readahead design.
++ *
++ * The fields in struct file_ra_state represent the most-recently-executed
++ * readahead attempt:
++ *
++ * |-------- last readahead window -------->|
++ * |-- application walking here -->|
++ * ======#============|==================#=====================|
++ * ^la_index ^ra_index ^lookahead_index ^readahead_index
++ *
++ * [ra_index, readahead_index) represents the last readahead window.
++ *
++ * [la_index, lookahead_index] is where the application would be walking(in
++ * the common case of cache-cold sequential reads): the last window was
++ * established when the application was at la_index, and the next window will
++ * be bring in when the application reaches lookahead_index.
++ *
++ * To overlap application thinking time and disk I/O time, we do
++ * `readahead pipelining': Do not wait until the application consumed all
++ * readahead pages and stalled on the missing page at readahead_index;
++ * Instead, submit an asynchronous readahead I/O as early as the application
++ * reads on the page at lookahead_index. Normally lookahead_index will be
++ * equal to ra_index, for maximum pipelining.
++ *
++ * In interleaved sequential reads, concurrent streams on the same fd can
++ * be invalidating each other's readahead state. So we flag the new readahead
++ * page at lookahead_index with PG_readahead, and use it as readahead
++ * indicator. The flag won't be set on already cached pages, to avoid the
++ * readahead-for-nothing fuss, saving pointless page cache lookups.
++ *
++ * prev_index tracks the last visited page in the _previous_ read request.
++ * It should be maintained by the caller, and will be used for detecting
++ * small random reads. Note that the readahead algorithm checks loosely
++ * for sequential patterns. Hence interleaved reads might be served as
++ * sequential ones.
++ *
++ * There is a special-case: if the first page which the application tries to
++ * read happens to be the first page of the file, it is assumed that a linear
++ * read is about to happen and the window is immediately set to the initial size
++ * based on I/O request size and the max_readahead.
++ *
++ * The code ramps up the readahead size aggressively at first, but slow down as
++ * it approaches max_readhead.
++ */
++
++/*
++ * A minimal readahead algorithm for trivial sequential/random reads.
++ */
++static unsigned long
++ondemand_readahead(struct address_space *mapping,
++ struct file_ra_state *ra, struct file *filp,
++ struct page *page, pgoff_t offset,
++ unsigned long req_size)
++{
++ unsigned long max; /* max readahead pages */
++ pgoff_t ra_index; /* readahead index */
++ unsigned long ra_size; /* readahead size */
++ unsigned long la_size; /* lookahead size */
++ int sequential;
++
++ max = ra->ra_pages;
++ sequential = (offset - ra->prev_index <= 1UL) || (req_size > max);
++
++ /*
++ * Lookahead/readahead hit, assume sequential access.
++ * Ramp up sizes, and push forward the readahead window.
++ */
++ if (offset && (offset == ra->lookahead_index ||
++ offset == ra->readahead_index)) {
++ ra_index = ra->readahead_index;
++ ra_size = get_next_ra_size2(ra, max);
++ la_size = ra_size;
++ goto fill_ra;
++ }
++
++ /*
++ * Standalone, small read.
++ * Read as is, and do not pollute the readahead state.
++ */
++ if (!page && !sequential) {
++ return __do_page_cache_readahead(mapping, filp,
++ offset, req_size, 0);
++ }
++
++ /*
++ * It may be one of
++ * - first read on start of file
++ * - sequential cache miss
++ * - oversize random read
++ * Start readahead for it.
++ */
++ ra_index = offset;
++ ra_size = get_init_ra_size(req_size, max);
++ la_size = ra_size > req_size ? ra_size - req_size : ra_size;
++
++ /*
++ * Hit on a lookahead page without valid readahead state.
++ * E.g. interleaved reads.
++ * Not knowing its readahead pos/size, bet on the minimal possible one.
++ */
++ if (page) {
++ ra_index++;
++ ra_size = min(4 * ra_size, max);
++ }
++
++fill_ra:
++ ra_set_index(ra, offset, ra_index);
++ ra_set_size(ra, ra_size, la_size);
++
++ return ra_submit(ra, mapping, filp);
++}
++
++/**
++ * page_cache_readahead_ondemand - generic file readahead
++ * @mapping: address_space which holds the pagecache and I/O vectors
++ * @ra: file_ra_state which holds the readahead state
++ * @filp: passed on to ->readpage() and ->readpages()
++ * @page: the page at @offset, or NULL if non-present
++ * @offset: start offset into @mapping, in PAGE_CACHE_SIZE units
++ * @req_size: hint: total size of the read which the caller is performing in
++ * PAGE_CACHE_SIZE units
++ *
++ * page_cache_readahead_ondemand() is the entry point of readahead logic.
++ * This function should be called when it is time to perform readahead:
++ * 1) @page == NULL
++ * A cache miss happened, time for synchronous readahead.
++ * 2) @page != NULL && PageReadahead(@page)
++ * A look-ahead hit occured, time for asynchronous readahead.
++ */
++unsigned long
++page_cache_readahead_ondemand(struct address_space *mapping,
++ struct file_ra_state *ra, struct file *filp,
++ struct page *page, pgoff_t offset,
++ unsigned long req_size)
++{
++ /* no read-ahead */
++ if (!ra->ra_pages)
++ return 0;
++
++ if (page) {
++ ClearPageReadahead(page);
++
++ /*
++ * Defer asynchronous read-ahead on IO congestion.
++ */
++ if (bdi_read_congested(mapping->backing_dev_info))
++ return 0;
++ }
++
++ /* do read-ahead */
++ return ondemand_readahead(mapping, ra, filp, page,
++ offset, req_size);
++}
++EXPORT_SYMBOL_GPL(page_cache_readahead_ondemand);commit 5ce1110b92b31d079aa443e967f43a2294e01194
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:47:59 2007 -0700
+
+ readahead: data structure and routines
+
+ Extend struct file_ra_state to support the on-demand readahead logic. Also
+ define some helpers for it.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index 75dd16efc9b6..9a5f562abc77 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -695,6 +695,10 @@ struct fown_struct {
+
+ /*
+ * Track a single file's readahead state
++ *
++ * ================#============|==================#==================|
++ * ^ ^ ^ ^
++ * file_ra_state.la_index .ra_index .lookahead_index .readahead_index
+ */
+ struct file_ra_state {
+ unsigned long start; /* Current window */
+@@ -704,6 +708,12 @@ struct file_ra_state {
+ unsigned long prev_index; /* Cache last read() position */
+ unsigned long ahead_start; /* Ahead window */
+ unsigned long ahead_size;
++
++ pgoff_t la_index; /* enqueue time */
++ pgoff_t ra_index; /* begin offset */
++ pgoff_t lookahead_index; /* time to do next readahead */
++ pgoff_t readahead_index; /* end offset */
++
+ unsigned long ra_pages; /* Maximum readahead window */
+ unsigned long mmap_hit; /* Cache hit stat for mmap accesses */
+ unsigned long mmap_miss; /* Cache miss stat for mmap accesses */
+@@ -712,6 +722,60 @@ struct file_ra_state {
+ #define RA_FLAG_MISS 0x01 /* a cache miss occured against this file */
+ #define RA_FLAG_INCACHE 0x02 /* file is already in cache */
+
++/*
++ * Measuring read-ahead sizes.
++ *
++ * |----------- readahead size ------------>|
++ * ===#============|==================#=====================|
++ * |------- invoke interval ------>|-- lookahead size -->|
++ */
++static inline unsigned long ra_readahead_size(struct file_ra_state *ra)
++{
++ return ra->readahead_index - ra->ra_index;
++}
++
++static inline unsigned long ra_lookahead_size(struct file_ra_state *ra)
++{
++ return ra->readahead_index - ra->lookahead_index;
++}
++
++static inline unsigned long ra_invoke_interval(struct file_ra_state *ra)
++{
++ return ra->lookahead_index - ra->la_index;
++}
++
++/*
++ * Check if @index falls in the readahead windows.
++ */
++static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index)
++{
++ return (index >= ra->la_index &&
++ index < ra->readahead_index);
++}
++
++/*
++ * Where is the old read-ahead and look-ahead?
++ */
++static inline void ra_set_index(struct file_ra_state *ra,
++ pgoff_t la_index, pgoff_t ra_index)
++{
++ ra->la_index = la_index;
++ ra->ra_index = ra_index;
++}
++
++/*
++ * Where is the new read-ahead and look-ahead?
++ */
++static inline void ra_set_size(struct file_ra_state *ra,
++ unsigned long ra_size, unsigned long la_size)
++{
++ ra->readahead_index = ra->ra_index + ra_size;
++ ra->lookahead_index = ra->ra_index + ra_size - la_size;
++}
++
++unsigned long ra_submit(struct file_ra_state *ra,
++ struct address_space *mapping, struct file *filp);
++
+ struct file {
+ /*
+ * fu_list becomes invalid after file_free is called and queued via
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 7f9bf588c936..072ce8f8357d 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -592,3 +592,22 @@ unsigned long max_sane_readahead(unsigned long nr)
+ return min(nr, (node_page_state(numa_node_id(), NR_INACTIVE)
+ + node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2);
+ }
++
++/*
++ * Submit IO for the read-ahead request in file_ra_state.
++ */
++unsigned long ra_submit(struct file_ra_state *ra,
++ struct address_space *mapping, struct file *filp)
++{
++ unsigned long ra_size;
++ unsigned long la_size;
++ int actual;
++
++ ra_size = ra_readahead_size(ra);
++ la_size = ra_lookahead_size(ra);
++ actual = __do_page_cache_readahead(mapping, filp,
++ ra->ra_index, ra_size, la_size);
++
++ return actual;
++}
++EXPORT_SYMBOL_GPL(ra_submit);commit f615bfca468c9b80ed2d09be5fdbaf470a32c045
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:47:58 2007 -0700
+
+ readahead: MIN_RA_PAGES/MAX_RA_PAGES macros
+
+ Define two convenient macros for read-ahead:
+ - MAX_RA_PAGES: rounded down counterpart of VM_MAX_READAHEAD
+ - MIN_RA_PAGES: rounded _up_ counterpart of VM_MIN_READAHEAD
+
+ Note that the rounded up MIN_RA_PAGES will work flawlessly with _large_
+ page sizes like 64k.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Cc: <stable@kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 88ea0f29aac8..7f9bf588c936 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -21,8 +21,16 @@ void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
+ }
+ EXPORT_SYMBOL(default_unplug_io_fn);
+
++/*
++ * Convienent macros for min/max read-ahead pages.
++ * Note that MAX_RA_PAGES is rounded down, while MIN_RA_PAGES is rounded up.
++ * The latter is necessary for systems with large page size(i.e. 64k).
++ */
++#define MAX_RA_PAGES (VM_MAX_READAHEAD*1024 / PAGE_CACHE_SIZE)
++#define MIN_RA_PAGES DIV_ROUND_UP(VM_MIN_READAHEAD*1024, PAGE_CACHE_SIZE)
++
+ struct backing_dev_info default_backing_dev_info = {
+- .ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE,
++ .ra_pages = MAX_RA_PAGES,
+ .state = 0,
+ .capabilities = BDI_CAP_MAP_COPY,
+ .unplug_io_fn = default_unplug_io_fn,
+@@ -51,7 +59,7 @@ static inline unsigned long get_max_readahead(struct file_ra_state *ra)
+
+ static inline unsigned long get_min_readahead(struct file_ra_state *ra)
+ {
+- return (VM_MIN_READAHEAD * 1024) / PAGE_CACHE_SIZE;
++ return MIN_RA_PAGES;
+ }
+
+ static inline void reset_ahead_window(struct file_ra_state *ra)commit 46fc3e7b4e7233a0ac981ac9084b55217318d04d
+Author: Fengguang Wu <wfg@mail.ustc.edu.cn>
+Date: Thu Jul 19 01:47:57 2007 -0700
+
+ readahead: add look-ahead support to __do_page_cache_readahead()
+
+ Add look-ahead support to __do_page_cache_readahead().
+
+ It works by
+ - mark the Nth backwards page with PG_readahead,
+ (which instructs the page's first reader to invoke readahead)
+ - and only do the marking for newly allocated pages.
+ (to prevent blindly doing readahead on already cached pages)
+
+ Look-ahead is a technique to achieve I/O pipelining:
+
+ While the application is working through a chunk of cached pages, the kernel
+ reads-ahead the next chunk of pages _before_ time of need. It effectively
+ hides low level I/O latencies to high level applications.
+
+ Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
+ Cc: Steven Pratt <slpratt@austin.ibm.com>
+ Cc: Ram Pai <linuxram@us.ibm.com>
+ Cc: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/mm/readahead.c b/mm/readahead.c
+index 9861e883fe57..88ea0f29aac8 100644
+--- a/mm/readahead.c
++++ b/mm/readahead.c
+@@ -265,7 +265,8 @@ static int read_pages(struct address_space *mapping, struct file *filp,
+ */
+ static int
+ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+- pgoff_t offset, unsigned long nr_to_read)
++ pgoff_t offset, unsigned long nr_to_read,
++ unsigned long lookahead_size)
+ {
+ struct inode *inode = mapping->host;
+ struct page *page;
+@@ -278,7 +279,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ if (isize == 0)
+ goto out;
+
+- end_index = ((isize - 1) >> PAGE_CACHE_SHIFT);
++ end_index = ((isize - 1) >> PAGE_CACHE_SHIFT);
+
+ /*
+ * Preallocate as many pages as we will need.
+@@ -301,6 +302,8 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ break;
+ page->index = page_offset;
+ list_add(&page->lru, &page_pool);
++ if (page_idx == nr_to_read - lookahead_size)
++ SetPageReadahead(page);
+ ret++;
+ }
+ read_unlock_irq(&mapping->tree_lock);
+@@ -337,7 +340,7 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ if (this_chunk > nr_to_read)
+ this_chunk = nr_to_read;
+ err = __do_page_cache_readahead(mapping, filp,
+- offset, this_chunk);
++ offset, this_chunk, 0);
+ if (err < 0) {
+ ret = err;
+ break;
+@@ -384,7 +387,7 @@ int do_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ if (bdi_read_congested(mapping->backing_dev_info))
+ return -1;
+
+- return __do_page_cache_readahead(mapping, filp, offset, nr_to_read);
++ return __do_page_cache_readahead(mapping, filp, offset, nr_to_read, 0);
+ }
+
+ /*
+@@ -404,7 +407,7 @@ blockable_page_cache_readahead(struct address_space *mapping, struct file *filp,
+ if (!block && bdi_read_congested(mapping->backing_dev_info))
+ return 0;
+
+- actual = __do_page_cache_readahead(mapping, filp, offset, nr_to_read);
++ actual = __do_page_cache_readahead(mapping, filp, offset, nr_to_read, 0);
+
+ return check_ra_success(ra, nr_to_read, actual);
+ }
+@@ -449,7 +452,7 @@ static int make_ahead_window(struct address_space *mapping, struct file *filp,
+ * @req_size: hint: total size of the read which the caller is performing in
+ * PAGE_CACHE_SIZE units
+ *
+- * page_cache_readahead() is the main function. If performs the adaptive
++ * page_cache_readahead() is the main function. It performs the adaptive
+ * readahead window size management and submits the readahead I/O.
+ *
+ * Note that @filp is purely used for passing on to the ->readpage[s]()commit d77c2d7cc5126639a47d73300b40d461f2811a0f +Author: Fengguang Wu <wfg@mail.ustc.edu.cn> +Date: Thu Jul 19 01:47:55 2007 -0700 + + readahead: introduce PG_readahead + + Introduce a new page flag: PG_readahead. + + It acts as a look-ahead mark, which tells the page reader: Hey, it's time to + invoke the read-ahead logic. For the sake of I/O pipelining, don't wait until + it runs out of cached pages! + + Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> + Cc: Steven Pratt <slpratt@austin.ibm.com> + Cc: Ram Pai <linuxram@us.ibm.com> + Cc: Rusty Russell <rusty@rustcorp.com.au> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h +index 731cd2ac3227..709d92fd2877 100644 +--- a/include/linux/page-flags.h ++++ b/include/linux/page-flags.h +@@ -83,6 +83,7 @@ + #define PG_private 11 /* If pagecache, has fs-private data */ + + #define PG_writeback 12 /* Page is under writeback */ ++#define PG_readahead 13 /* Reminder to do async read-ahead */ + #define PG_compound 14 /* Part of a compound page */ + #define PG_swapcache 15 /* Swap page: swp_entry_t in private */ + +@@ -226,6 +227,10 @@ static inline void SetPageUptodate(struct page *page) + #define SetPageMappedToDisk(page) set_bit(PG_mappedtodisk, &(page)->flags) + #define ClearPageMappedToDisk(page) clear_bit(PG_mappedtodisk, &(page)->flags) + ++#define PageReadahead(page) test_bit(PG_readahead, &(page)->flags) ++#define SetPageReadahead(page) set_bit(PG_readahead, &(page)->flags) ++#define ClearPageReadahead(page) clear_bit(PG_readahead, &(page)->flags) ++ + #define PageReclaim(page) test_bit(PG_reclaim, &(page)->flags) + #define SetPageReclaim(page) set_bit(PG_reclaim, &(page)->flags) + #define ClearPageReclaim(page) clear_bit(PG_reclaim, &(page)->flags) +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index e2a10b957f23..2165be9462c0 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -617,7 +617,7 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) + if (PageReserved(page)) + return 1; + +- page->flags &= ~(1 << PG_uptodate | 1 << PG_error | ++ page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_readahead | + 1 << PG_referenced | 1 << PG_arch_1 | + 1 << PG_owner_priv_1 | 1 << PG_mappedtodisk); + set_page_private(page, 0);
commit 76d42bd96984832c4ea8bc8cbd74e496ac31409e
+Author: Wu Fengguang <wfg@mail.ustc.edu.cn>
+Date: Sun Jun 25 05:48:43 2006 -0700
+
+ [PATCH] readahead: backoff on I/O error
+
+ Backoff readahead size exponentially on I/O error.
+
+ Michael Tokarev <mjt@tls.msk.ru> described the problem as:
+
+ [QUOTE]
+ Suppose there's a CD-rom with a scratch/etc, one sector is unreadable.
+ In order to "fix" it, one have to read it and write to another CD-rom,
+ or something.. or just ignore the error (if it's just a skip in a video
+ stream). Let's assume the unreadable block is number U.
+
+ But current behavior is just insane. An application requests block
+ number N, which is before U. Kernel tries to read-ahead blocks N..U.
+ Cdrom drive tries to read it, re-read it.. for some time. Finally,
+ when all the N..U-1 blocks are read, kernel returns block number N
+ (as requested) to an application, successefully.
+
+ Now an app requests block number N+1, and kernel tries to read
+ blocks N+1..U+1. Retrying again as in previous step.
+
+ And so on, up to when an app requests block number U-1. And when,
+ finally, it requests block U, it receives read error.
+
+ So, kernel currentry tries to re-read the same failing block as
+ many times as the current readahead value (256 (times?) by default).
+
+ This whole process already killed my cdrom drive (I posted about it
+ to LKML several months ago) - literally, the drive has fried, and
+ does not work anymore. Ofcourse that problem was a bug in firmware
+ (or whatever) of the drive *too*, but.. main problem with that is
+ current readahead logic as described above.
+ [/QUOTE]
+
+ Which was confirmed by Jens Axboe <axboe@suse.de>:
+
+ [QUOTE]
+ For ide-cd, it tends do only end the first part of the request on a
+ medium error. So you may see a lot of repeats :/
+ [/QUOTE]
+
+ With this patch, retries are expected to be reduced from, say, 256, to 5.
+
+ [akpm@osdl.org: cleanups]
+ Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/mm/filemap.c b/mm/filemap.c
+index 1ed4be2a7654..9c7334bafda8 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -828,6 +828,32 @@ grab_cache_page_nowait(struct address_space *mapping, unsigned long index)
+ }
+ EXPORT_SYMBOL(grab_cache_page_nowait);
+
++/*
++ * CD/DVDs are error prone. When a medium error occurs, the driver may fail
++ * a _large_ part of the i/o request. Imagine the worst scenario:
++ *
++ * ---R__________________________________________B__________
++ * ^ reading here ^ bad block(assume 4k)
++ *
++ * read(R) => miss => readahead(R...B) => media error => frustrating retries
++ * => failing the whole request => read(R) => read(R+1) =>
++ * readahead(R+1...B+1) => bang => read(R+2) => read(R+3) =>
++ * readahead(R+3...B+2) => bang => read(R+3) => read(R+4) =>
++ * readahead(R+4...B+3) => bang => read(R+4) => read(R+5) => ......
++ *
++ * It is going insane. Fix it by quickly scaling down the readahead size.
++ */
++static void shrink_readahead_size_eio(struct file *filp,
++ struct file_ra_state *ra)
++{
++ if (!ra->ra_pages)
++ return;
++
++ ra->ra_pages /= 4;
++ printk(KERN_WARNING "Reducing readahead size to %luK\n",
++ ra->ra_pages << (PAGE_CACHE_SHIFT - 10));
++}
++
+ /**
+ * do_generic_mapping_read - generic file read routine
+ * @mapping: address_space to be read
+@@ -985,6 +1011,7 @@ void do_generic_mapping_read(struct address_space *mapping,
+ }
+ unlock_page(page);
+ error = -EIO;
++ shrink_readahead_size_eio(filp, &ra);
+ goto readpage_error;
+ }
+ unlock_page(page);
+@@ -1522,6 +1549,7 @@ struct page *filemap_nopage(struct vm_area_struct *area,
+ * Things didn't work out. Return zero to tell the
+ * mm layer so, possibly freeing the page cache page first.
+ */
++ shrink_readahead_size_eio(file, ra);
+ page_cache_release(page);
+ return NULL;
+ }commit e5dcd90b53d601a04482db9800336a0ccf190880 +Author: Wu Fengguang <wfg@mail.ustc.edu.cn> +Date: Sun Jun 25 05:48:14 2006 -0700 + + [PATCH] radixtree: normalize radix_tree_tag_get() return value + + In radix_tree_tag_get(), return normalized value of 0/1, as indicated + by its comment. + + Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/lib/radix-tree.c b/lib/radix-tree.c +index b32efae7688e..637d55608de5 100644 +--- a/lib/radix-tree.c ++++ b/lib/radix-tree.c +@@ -530,7 +530,7 @@ int radix_tree_tag_get(struct radix_tree_root *root, + int ret = tag_get(slot, tag, offset); + + BUG_ON(ret && saw_unset_tag); +- return ret; ++ return !!ret; + } + slot = slot->slots[offset]; + shift -= RADIX_TREE_MAP_SHIFT;
commit fb8d14e172a29ba5ac69a73b61196be86fdfc3e1 +Author: Wu Fengguang <wfg@mail.ustc.edu.cn> +Date: Wed Mar 22 00:08:28 2006 -0800 + + [PATCH] mm: shrink_inactive_lis() nr_scan accounting fix + + In shrink_inactive_list(), nr_scan is not accounted when nr_taken is 0. + But 0 pages taken does not mean 0 pages scanned. + + Move the goto statement below the accounting code to fix it. + + Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/mm/vmscan.c b/mm/vmscan.c +index 85e95f445022..486184d2b50c 100644 +--- a/mm/vmscan.c ++++ b/mm/vmscan.c +@@ -1132,9 +1132,6 @@ static unsigned long shrink_inactive_list(unsigned long max_scan, + zone->pages_scanned += nr_scan; + spin_unlock_irq(&zone->lru_lock); + +- if (nr_taken == 0) +- goto done; +- + nr_scanned += nr_scan; + nr_freed = shrink_page_list(&page_list, sc); + nr_reclaimed += nr_freed; +@@ -1146,6 +1143,9 @@ static unsigned long shrink_inactive_list(unsigned long max_scan, + __mod_page_state_zone(zone, pgscan_direct, nr_scan); + __mod_page_state_zone(zone, pgsteal, nr_freed); + ++ if (nr_taken == 0) ++ goto done; ++ + spin_lock(&zone->lru_lock); + /* + * Put back any unfreeable pages. +@@ -1166,8 +1166,9 @@ static unsigned long shrink_inactive_list(unsigned long max_scan, + } + } + } while (nr_scanned < max_scan); +- spin_unlock_irq(&zone->lru_lock); ++ spin_unlock(&zone->lru_lock); + done: ++ local_irq_enable(); + pagevec_release(&pvec); + return nr_reclaimed; + }+
commit c9b02d970c385a253edb36c87643b0df706b50b4
+Author: Wu Fengguang <wfg@mail.ustc.edu.cn>
+Date: Wed Mar 22 00:08:23 2006 -0800
+
+ [PATCH] mm: isolate_lru_pages() scan count fix
+
+ In isolate_lru_pages(), *scanned reports one more scan because the scan
+ counter is increased one more time on exit of the while-loop.
+
+ Change the while-loop to for-loop to fix it.
+
+ Signed-off-by: Nick Piggin <npiggin@suse.de>
+ Signed-off-by: Wu Fengguang <wfg@mail.ustc.edu.cn>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/mm/vmscan.c b/mm/vmscan.c
+index c712b946e4ff..85e95f445022 100644
+--- a/mm/vmscan.c
++++ b/mm/vmscan.c
+@@ -1074,9 +1074,9 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
+ {
+ unsigned long nr_taken = 0;
+ struct page *page;
+- unsigned long scan = 0;
++ unsigned long scan;
+
+- while (scan++ < nr_to_scan && !list_empty(src)) {
++ for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
+ struct list_head *target;
+ page = lru_to_page(src);
+ prefetchw_prev_lru_page(page, src, flags);
+ commit 19050da1d1057a7bc73fd9039f94b7f63a00e54e
+Author: Kenneth Lee <klee33@uw.edu>
+Date: Tue Aug 9 00:20:50 2022 -0700
+
+ ARM: OMAP2+: hwmod: Use kzalloc for allocating only one element
+
+ Use kzalloc(...) rather than kcalloc(1, ...) because the number of
+ elements we are specifying in this case is 1, so kzalloc would
+ accomplish the same thing and we can simplify.
+
+ Signed-off-by: Kenneth Lee <klee33@uw.edu>
+ Message-Id: <20220809072050.1733996-1-klee33@uw.edu>
+ Signed-off-by: Tony Lindgren <tony@atomide.com>
+
+diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
+index de3fd0bc862d..aac4c4ee2528 100644
+--- a/arch/arm/mach-omap2/omap_hwmod.c
++++ b/arch/arm/mach-omap2/omap_hwmod.c
+@@ -3454,7 +3454,7 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
+ }
+
+ if (list_empty(&oh->slave_ports)) {
+- oi = kcalloc(1, sizeof(*oi), GFP_KERNEL);
++ oi = kzalloc(sizeof(*oi), GFP_KERNEL);
+ if (!oi)
+ goto out_free_class;
+ commit aa1d627207cace003163dee24d1c06fa4e910c6b
+Author: Kenneth Lee <klee33@uw.edu>
+Date: Thu Aug 18 22:42:55 2022 -0700
+
+ ceph: Use kcalloc for allocating multiple elements
+
+ Prefer using kcalloc(a, b) over kzalloc(a * b) as this improves
+ semantics since kcalloc is intended for allocating an array of memory.
+
+ Signed-off-by: Kenneth Lee <klee33@uw.edu>
+ Reviewed-by: Xiubo Li <xiubli@redhat.com>
+ Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+
+diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
+index 0dc1251c3c6d..fb023f9fafcb 100644
+--- a/fs/ceph/caps.c
++++ b/fs/ceph/caps.c
+@@ -2286,7 +2286,7 @@ static int flush_mdlog_and_wait_inode_unsafe_requests(struct inode *inode)
+ struct ceph_mds_request *req;
+ int i;
+
+- sessions = kzalloc(max_sessions * sizeof(s), GFP_KERNEL);
++ sessions = kcalloc(max_sessions, sizeof(s), GFP_KERNEL);
+ if (!sessions) {
+ err = -ENOMEM;
+ goto out;commit 92f017c4aee6e2bb79593adeacccbea3afe62223
+Author: Kenneth Lee <klee33@uw.edu>
+Date: Thu Aug 18 22:51:17 2022 -0700
+
+ fs/ntfs3: Use kmalloc_array for allocating multiple elements
+
+ Prefer using kmalloc_array(a, b) over kmalloc(a * b) as this
+ improves semantics since kmalloc is intended for allocating an
+ array of memory.
+
+ Signed-off-by: Kenneth Lee <klee33@uw.edu>
+ Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
+
+diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
+index 5d44ceac855b..1675c9a69788 100644
+--- a/fs/ntfs3/bitmap.c
++++ b/fs/ntfs3/bitmap.c
+@@ -1324,7 +1324,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
+ new_last = wbits;
+
+ if (new_wnd != wnd->nwnd) {
+- new_free = kmalloc(new_wnd * sizeof(u16), GFP_NOFS);
++ new_free = kmalloc_array(new_wnd, sizeof(u16), GFP_NOFS);
+ if (!new_free)
+ return -ENOMEM;
+ commit d3524bb5b9a0c567b853a0024526afe87dde01ed +Author: Kenneth Lee <klee33@uw.edu> +Date: Fri Sep 16 13:20:52 2022 +0100 + + nvmem: brcm_nvram: Use kzalloc for allocating only one element + + Use kzalloc(...) rather than kcalloc(1, ...) because the number of + elements we are specifying in this case is 1, so kzalloc would + accomplish the same thing and we can simplify. + + Signed-off-by: Kenneth Lee <klee33@uw.edu> + Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> + Link: https://lore.kernel.org/r/20220916122100.170016-6-srinivas.kandagatla@linaro.org + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c +index 450b927691c3..4441daa20965 100644 +--- a/drivers/nvmem/brcm_nvram.c ++++ b/drivers/nvmem/brcm_nvram.c +@@ -96,7 +96,7 @@ static int brcm_nvram_parse(struct brcm_nvram *priv) + + len = le32_to_cpu(header.len); + +- data = kcalloc(1, len, GFP_KERNEL); ++ data = kzalloc(len, GFP_KERNEL); + memcpy_fromio(data, priv->base, len); + data[len - 1] = '\0'; +
commit b2d4c646d5a15c1854e09898a374983167e53e0e
+Author: Kenneth Lee <klee33@uw.edu>
+Date: Mon Aug 8 15:00:19 2022 -0700
+
+ mm/damon/dbgfs: use kmalloc for allocating only one element
+
+ Use kmalloc(...) rather than kmalloc_array(1, ...) because the number of
+ elements we are specifying in this case is 1, kmalloc would accomplish the
+ same thing and we can simplify.
+
+ Link: https://lkml.kernel.org/r/20220808220019.1680469-1-klee33@uw.edu
+ Signed-off-by: Kenneth Lee <klee33@uw.edu>
+ Reviewed-by: SeongJae Park <sj@kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+
+diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c
+index cfdf63132d5a..3b55a1b219b5 100644
+--- a/mm/damon/dbgfs.c
++++ b/mm/damon/dbgfs.c
+@@ -1044,7 +1044,7 @@ static int __init __damon_dbgfs_init(void)
+ fops[i]);
+ dbgfs_fill_ctx_dir(dbgfs_root, dbgfs_ctxs[0]);
+
+- dbgfs_dirs = kmalloc_array(1, sizeof(dbgfs_root), GFP_KERNEL);
++ dbgfs_dirs = kmalloc(sizeof(dbgfs_root), GFP_KERNEL);
+ if (!dbgfs_dirs) {
+ debugfs_remove(dbgfs_root);
+ return -ENOMEM;commit 00784da3e6b8c1f0e58d813272503d014de8f64b +Author: Kenneth Lee <klee33@uw.edu> +Date: Sat Aug 6 22:16:56 2022 -0700 + + can: kvaser_usb: kvaser_usb_hydra: Use kzalloc for allocating only one element + + Use kzalloc(...) rather than kcalloc(1, ...) since because the number of + elements we are specifying in this case is 1, kzalloc would accomplish the + same thing and we can simplify. Also refactor how we calculate the sizeof() + as checkstyle for kzalloc() prefers using the variable we are assigning + to versus the type of that variable for calculating the size to allocate. + + Signed-off-by: Kenneth Lee <klee33@uw.edu> + Link: https://lore.kernel.org/all/20220807051656.1991446-1-klee33@uw.edu + Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +index dd65c101bfb8..6871d474dabf 100644 +--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c ++++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +@@ -534,7 +534,7 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev, + struct kvaser_cmd *cmd; + int err; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -573,7 +573,7 @@ kvaser_usb_hydra_send_simple_cmd_async(struct kvaser_usb_net_priv *priv, + struct kvaser_usb *dev = priv->dev; + int err; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_ATOMIC); ++ cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); + if (!cmd) + return -ENOMEM; + +@@ -694,7 +694,7 @@ static int kvaser_usb_hydra_map_channel(struct kvaser_usb *dev, u16 transid, + struct kvaser_cmd *cmd; + int err; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -735,7 +735,7 @@ static int kvaser_usb_hydra_get_single_capability(struct kvaser_usb *dev, + int err; + int i; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -1394,7 +1394,7 @@ kvaser_usb_hydra_frame_to_cmd_ext(const struct kvaser_usb_net_priv *priv, + u32 kcan_id; + u32 kcan_header; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd_ext), GFP_ATOMIC); ++ cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); + if (!cmd) + return NULL; + +@@ -1468,7 +1468,7 @@ kvaser_usb_hydra_frame_to_cmd_std(const struct kvaser_usb_net_priv *priv, + u32 flags; + u32 id; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_ATOMIC); ++ cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); + if (!cmd) + return NULL; + +@@ -1533,7 +1533,7 @@ static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev) + int sjw = bt->sjw; + int err; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -1567,7 +1567,7 @@ static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev) + int sjw = dbt->sjw; + int err; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -1711,7 +1711,7 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev) + u32 flags; + struct kvaser_usb_dev_card_data *card_data = &dev->card_data; + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; + +@@ -1851,7 +1851,7 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv) + return -EINVAL; + } + +- cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); ++ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); + if (!cmd) + return -ENOMEM; +
commit d2ff1d2067ac382f189eadc1a400b948fd398658
+Author: Conrad Meyer <cemeyer@uw.edu>
+Date: Sat Mar 8 21:42:58 2014 -0500
+
+ Staging: comedi: do not initialize statics to 0 (apci1500)
+
+ Minor style cleanup per checkpatch.pl.
+
+ Signed-off-by: Conrad Meyer <cse.cem@gmail.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+index 4f5ce6af59dc..1f7adc5a97f2 100644
+--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+@@ -141,16 +141,16 @@ enum {
+ APCI1500_RW_PORT_B_PATTERN_MASK
+ };
+
+-static int i_TimerCounter1Init = 0;
+-static int i_TimerCounter2Init = 0;
+-static int i_WatchdogCounter3Init = 0;
+-static int i_Event1Status = 0, i_Event2Status = 0;
+-static int i_TimerCounterWatchdogInterrupt = 0;
+-static int i_Logic = 0, i_CounterLogic = 0;
+-static int i_InterruptMask = 0;
+-static int i_InputChannel = 0;
+-static int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = 0,
+- i_WatchdogCounter3Enabled = 0;
++static int i_TimerCounter1Init;
++static int i_TimerCounter2Init;
++static int i_WatchdogCounter3Init;
++static int i_Event1Status, i_Event2Status;
++static int i_TimerCounterWatchdogInterrupt;
++static int i_Logic, i_CounterLogic;
++static int i_InterruptMask;
++static int i_InputChannel;
++static int i_TimerCounter1Enabled, i_TimerCounter2Enabled,
++ i_WatchdogCounter3Enabled;
+
+ /*
+ +----------------------------------------------------------------------------+
+@@ -977,7 +977,7 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
+ unsigned int *data)
+ {
+ struct addi_private *devpriv = dev->private;
+- static unsigned int ui_Temp = 0;
++ static unsigned int ui_Temp;
+ unsigned int ui_Temp1;
+ unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */
+ commit c9847a6eeb8906d9026848dc442ae1bf7c5de7a9
+Author: Conrad Meyer <cemeyer@uw.edu>
+Date: Sat Mar 8 21:42:49 2014 -0500
+
+ Staging: comedi: Kill comment art in hwdrv_apci1500.c
+
+ Nudge the commenting in this mess a little further from 'bad.' Much of
+ it was incorrectly indented.
+
+ Another sed cleanup:
+ $ sed -i -e '/\/\*\*\*\*\*\*\*\*\**\//,1d' addi-data/hwdrv_apci1500.c
+
+ Signed-off-by: Conrad Meyer <cse.cem@gmail.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+index 0ccf784b81a4..4f5ce6af59dc 100644
+--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+@@ -241,14 +241,10 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ int i_PatternTransitionCount = 0, i_RegValue;
+ int i;
+
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Disables the main interrupt on the board */
+- /**********************************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+ if (data[0] == 1) {
+@@ -327,17 +323,13 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ } /* for (i_Count = i_MaxChannel; i_Count >0;i_Count --) */
+
+ if (data[0] == 1) {
+- /****************************/
+ /* Test the interrupt logic */
+- /****************************/
+
+ if (data[1] == APCI1500_AND ||
+ data[1] == APCI1500_OR ||
+ data[1] == APCI1500_OR_PRIORITY) {
+- /**************************************/
+ /* Tests if a transition was declared */
+ /* for a OR PRIORITY logic */
+- /**************************************/
+
+ if (data[1] == APCI1500_OR_PRIORITY
+ && i_PatternTransition != 0) {
+@@ -346,10 +338,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ return -EINVAL;
+ } /* if (data[1]== APCI1500_OR_PRIORITY && i_PatternTransition != 0) */
+
+- /*************************************/
+ /* Tests if more than one transition */
+ /* was declared for an AND logic */
+- /*************************************/
+
+ if (data[1] == APCI1500_AND) {
+ for (i_Count = 0; i_Count < 8; i_Count++) {
+@@ -367,21 +357,15 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ } /* if (i_PatternTransitionCount > 1) */
+ } /* if (data[1]== APCI1500_AND) */
+
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port A */
+- /******************/
+ outb(0xF0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Selects the polarity register of port 1 */
+- /**********************************************/
+ outb(APCI1500_RW_PORT_A_PATTERN_POLARITY,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -389,20 +373,16 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*********************************************/
+ /* Selects the pattern mask register of */
+ /* port 1 */
+- /*********************************************/
+ outb(APCI1500_RW_PORT_A_PATTERN_MASK,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_PatternMask,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /********************************************/
+ /* Selects the pattern transition register */
+ /* of port 1 */
+- /********************************************/
+ outb(APCI1500_RW_PORT_A_PATTERN_TRANSITION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -410,10 +390,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /******************************************/
+ /* Selects the mode specification mask */
+ /* register of port 1 */
+- /******************************************/
+ outb(APCI1500_RW_PORT_A_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -421,17 +399,13 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /******************************************/
+ /* Selects the mode specification mask */
+ /* register of port 1 */
+- /******************************************/
+ outb(APCI1500_RW_PORT_A_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**********************/
+ /* Port A new mode */
+- /**********************/
+
+ i_RegValue = (i_RegValue & 0xF9) | data[1] | 0x9;
+ outb(i_RegValue,
+@@ -440,16 +414,12 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+
+ i_Event1Status = 1;
+
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port A */
+- /*****************/
+ outb(0xF4,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -462,32 +432,22 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ } /* else }// if(data[1]==APCI1500_AND||data[1]==APCI1500_OR||data[1]==APCI1500_OR_PRIORITY) */
+ } /* if (data[0]== 1) */
+
+- /************************************/
+ /* Test if event setting for port 2 */
+- /************************************/
+
+ if (data[0] == 2) {
+- /************************/
+ /* Test the event logic */
+- /************************/
+
+ if (data[1] == APCI1500_OR) {
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port B */
+- /******************/
+ outb(0x74,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************************************/
+ /* Selects the mode specification mask */
+ /* register of port B */
+- /****************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -495,10 +455,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /******************************************/
+ /* Selects the mode specification mask */
+ /* register of port B */
+- /******************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -507,37 +465,29 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**********************************/
+ /* Selects error channels 1 and 2 */
+- /**********************************/
+
+ i_PatternMask = (i_PatternMask | 0xC0);
+ i_PatternPolarity = (i_PatternPolarity | 0xC0);
+ i_PatternTransition = (i_PatternTransition | 0xC0);
+
+- /**********************************************/
+ /* Selects the polarity register of port 2 */
+- /**********************************************/
+ outb(APCI1500_RW_PORT_B_PATTERN_POLARITY,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_PatternPolarity,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Selects the pattern transition register */
+ /* of port 2 */
+- /**********************************************/
+ outb(APCI1500_RW_PORT_B_PATTERN_TRANSITION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_PatternTransition,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Selects the pattern Mask register */
+ /* of port 2 */
+- /**********************************************/
+
+ outb(APCI1500_RW_PORT_B_PATTERN_MASK,
+ devpriv->iobase +
+@@ -546,20 +496,16 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /******************************************/
+ /* Selects the mode specification mask */
+ /* register of port 2 */
+- /******************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************/
+ /* Selects the mode specification mask */
+ /* register of port 2 */
+- /******************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -569,16 +515,12 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+ i_Event2Status = 1;
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port B */
+- /*****************/
+
+ outb(0xF4,
+ devpriv->iobase +
+@@ -627,48 +569,30 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+
+ switch (data[0]) {
+ case START:
+- /*************************/
+ /* Tests the port number */
+- /*************************/
+
+ if (data[1] == 1 || data[1] == 2) {
+- /***************************/
+ /* Test if port 1 selected */
+- /***************************/
+
+ if (data[1] == 1) {
+- /*****************************/
+ /* Test if event initialised */
+- /*****************************/
+ if (i_Event1Status == 1) {
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port A */
+- /******************/
+ outb(0xF0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***************************************************/
+ /* Selects the command and status register of */
+ /* port 1 */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************/
+ /* Allows the pattern interrupt */
+- /*************************************/
+ outb(0xC0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port A */
+- /*****************/
+ outb(0xF4,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -681,11 +605,8 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Authorizes the main interrupt on the board */
+- /**********************************************/
+ outb(0xD0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -700,44 +621,29 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ if (data[1] == 2) {
+
+ if (i_Event2Status == 1) {
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port B */
+- /******************/
+ outb(0x74,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***************************************************/
+ /* Selects the command and status register of */
+ /* port 2 */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************/
+ /* Allows the pattern interrupt */
+- /*************************************/
+ outb(0xC0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port B */
+- /*****************/
+ outb(0xF4,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Authorizes the main interrupt on the board */
+- /**********************************************/
+ outb(0xD0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -759,48 +665,30 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ break;
+
+ case STOP:
+- /*************************/
+ /* Tests the port number */
+- /*************************/
+
+ if (data[1] == 1 || data[1] == 2) {
+- /***************************/
+ /* Test if port 1 selected */
+- /***************************/
+
+ if (data[1] == 1) {
+- /*****************************/
+ /* Test if event initialised */
+- /*****************************/
+ if (i_Event1Status == 1) {
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port A */
+- /******************/
+ outb(0xF0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***************************************************/
+ /* Selects the command and status register of */
+ /* port 1 */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************/
+ /* Inhibits the pattern interrupt */
+- /*************************************/
+ outb(0xE0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port A */
+- /*****************/
+ outb(0xF4,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -813,38 +701,24 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ } /* else if(i_Event1Status==1) */
+ } /* if (data[1]==1) */
+ if (data[1] == 2) {
+- /*****************************/
+ /* Test if event initialised */
+- /*****************************/
+ if (i_Event2Status == 1) {
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************/
+ /* Disable Port B */
+- /******************/
+ outb(0x74,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***************************************************/
+ /* Selects the command and status register of */
+ /* port 2 */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************/
+ /* Inhibits the pattern interrupt */
+- /*************************************/
+ outb(0xE0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************************/
+ /* Selects the APCI1500_RW_MASTER_CONFIGURATION_CONTROL register */
+- /*****************************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************/
+ /* Enable Port B */
+- /*****************/
+ outb(0xF4,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -900,9 +774,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ struct addi_private *devpriv = dev->private;
+ int i_DummyRead = 0;
+
+- /******************/
+ /* Software reset */
+- /******************/
+ i_DummyRead = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_DummyRead = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -910,16 +782,12 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ outb(1, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the master configuration control register */
+- /*****************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0xF4, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the mode specification register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0x10, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -951,9 +819,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ /* Deletes the register */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the mode specification register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0x10, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -983,9 +849,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ /* Deletes the register */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the data path polarity register of port C */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* High level of port C means 1 */
+@@ -1000,9 +864,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes it */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 1 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -1012,9 +874,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates the interrupt management of timer 1 */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 2 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -1024,9 +884,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates Timer 2 interrupt management: */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 3 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -1036,9 +894,7 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates interrupt management of timer 3: */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes all interrupts */
+@@ -1368,123 +1224,91 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ } /* switch(data[4]) */
+
+ i_TimerCounterMode = data[2] | data[4] | 7;
+- /*************************/
+ /* Test the reload value */
+- /*************************/
+
+ if ((data[3] >= 0) && (data[3] <= 65535)) {
+ if (data[7] == APCI1500_ENABLE
+ || data[7] == APCI1500_DISABLE) {
+
+- /************************************************/
+ /* Selects the mode register of timer/counter 1 */
+- /************************************************/
+ outb(APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************/
+ /* Writes the new mode */
+- /***********************/
+ outb(i_TimerCounterMode,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of timer/counter 1 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*************************/
+ /* Writes the low value */
+- /*************************/
+
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of timer/counter 1 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR1_TIME_CST_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**************************/
+ /* Writes the high value */
+- /**************************/
+
+ data[3] = data[3] >> 8;
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**********************/
+ /* Reads the register */
+- /**********************/
+
+ i_MasterConfiguration =
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************************************/
+ /* Enables timer/counter 1 and triggers timer/counter 1 */
+- /********************************************************/
+
+ i_MasterConfiguration =
+ i_MasterConfiguration | 0x40;
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************/
+ /* Writes the new configuration */
+- /********************************/
+ outb(i_MasterConfiguration,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************************************/
+ /* Selects the commands register of */
+ /* timer/counter 1 */
+- /****************************************/
+
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************/
+ /* Disable timer/counter 1 */
+- /***************************/
+
+ outb(0x0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************************************/
+ /* Selects the commands register of */
+ /* timer/counter 1 */
+- /****************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************/
+ /* Trigger timer/counter 1 */
+- /***************************/
+ outb(0x2,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -1562,123 +1386,91 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+
+ i_TimerCounterMode = data[2] | data[4] | data[5] | data[6] | 7;
+
+- /*************************/
+ /* Test the reload value */
+- /*************************/
+
+ if ((data[3] >= 0) && (data[3] <= 65535)) {
+ if (data[7] == APCI1500_ENABLE
+ || data[7] == APCI1500_DISABLE) {
+
+- /************************************************/
+ /* Selects the mode register of timer/counter 2 */
+- /************************************************/
+ outb(APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************/
+ /* Writes the new mode */
+- /***********************/
+ outb(i_TimerCounterMode,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of timer/counter 2 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR2_TIME_CST_LOW,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*************************/
+ /* Writes the low value */
+- /*************************/
+
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of timer/counter 2 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR2_TIME_CST_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**************************/
+ /* Writes the high value */
+- /**************************/
+
+ data[3] = data[3] >> 8;
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**********************/
+ /* Reads the register */
+- /**********************/
+
+ i_MasterConfiguration =
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************************************/
+ /* Enables timer/counter 2 and triggers timer/counter 2 */
+- /********************************************************/
+
+ i_MasterConfiguration =
+ i_MasterConfiguration | 0x20;
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************/
+ /* Writes the new configuration */
+- /********************************/
+ outb(i_MasterConfiguration,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************************************/
+ /* Selects the commands register of */
+ /* timer/counter 2 */
+- /****************************************/
+
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************/
+ /* Disable timer/counter 2 */
+- /***************************/
+
+ outb(0x0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************************************/
+ /* Selects the commands register of */
+ /* timer/counter 2 */
+- /****************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************/
+ /* Trigger timer/counter 1 */
+- /***************************/
+ outb(0x2,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -1740,142 +1532,104 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ return -EINVAL;
+ } /* switch(data[6]) */
+
+- /*****************************/
+ /* Test if used for watchdog */
+- /*****************************/
+
+ if (data[2] == APCI1500_WATCHDOG) {
+- /*****************************/
+ /* - Enables the output line */
+ /* - Enables retrigger */
+ /* - Pulses output */
+- /*****************************/
+ i_TimerCounterMode = data[2] | data[4] | 0x54;
+ } /* if (data[2] == APCI1500_WATCHDOG) */
+ else {
+ i_TimerCounterMode = data[2] | data[4] | data[6] | 7;
+ } /* elseif (data[2] == APCI1500_WATCHDOG) */
+- /*************************/
+ /* Test the reload value */
+- /*************************/
+
+ if ((data[3] >= 0) && (data[3] <= 65535)) {
+ if (data[7] == APCI1500_ENABLE
+ || data[7] == APCI1500_DISABLE) {
+
+- /************************************************/
+ /* Selects the mode register of watchdog/counter 3 */
+- /************************************************/
+ outb(APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************/
+ /* Writes the new mode */
+- /***********************/
+ outb(i_TimerCounterMode,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of watchdog/counter 3 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR3_TIME_CST_LOW,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*************************/
+ /* Writes the low value */
+- /*************************/
+
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /****************************************************/
+ /* Selects the constant register of watchdog/counter 3 */
+- /****************************************************/
+
+ outb(APCI1500_RW_CPT_TMR3_TIME_CST_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**************************/
+ /* Writes the high value */
+- /**************************/
+
+ data[3] = data[3] >> 8;
+ outb(data[3],
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /**********************/
+ /* Reads the register */
+- /**********************/
+
+ i_MasterConfiguration =
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************************************/
+ /* Enables watchdog/counter 3 and triggers watchdog/counter 3 */
+- /********************************************************/
+
+ i_MasterConfiguration =
+ i_MasterConfiguration | 0x10;
+
+- /*********************************************/
+ /* Selects the master configuration register */
+- /*********************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************************/
+ /* Writes the new configuration */
+- /********************************/
+ outb(i_MasterConfiguration,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /********************/
+ /* Test if COUNTER */
+- /********************/
+ if (data[2] == APCI1500_COUNTER) {
+
+- /*************************************/
+ /* Selects the command register of */
+ /* watchdog/counter 3 */
+- /*************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************************/
+ /* Disable the watchdog/counter 3 and starts it */
+- /*************************************************/
+ outb(0x0,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*************************************/
+ /* Selects the command register of */
+ /* watchdog/counter 3 */
+- /*************************************/
+
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************************/
+ /* Trigger the watchdog/counter 3 and starts it */
+- /*************************************************/
+ outb(0x2,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -1953,13 +1707,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ else {
+ i_CommandAndStatusValue = 0xE4; /* disable the interrupt */
+ } /* elseif(i_TimerCounterWatchdogInterrupt==1) */
+- /**************************/
+ /* Starts timer/counter 1 */
+- /**************************/
+ i_TimerCounter1Enabled = 1;
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -1976,13 +1726,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+
+ case STOP:
+
+- /**************************/
+ /* Stop timer/counter 1 */
+- /**************************/
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -1995,23 +1741,17 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ case TRIGGER:
+ if (i_TimerCounter1Init == 1) {
+ if (i_TimerCounter1Enabled == 1) {
+- /************************/
+ /* Set Trigger and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0x6;
+ } /* if( i_TimerCounter1Enabled==1) */
+ else {
+- /***************/
+ /* Set Trigger */
+- /***************/
+
+ i_CommandAndStatusValue = 0x2;
+ } /* elseif(i_TimerCounter1Enabled==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2043,13 +1783,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ else {
+ i_CommandAndStatusValue = 0xE4; /* disable the interrupt */
+ } /* elseif(i_TimerCounterWatchdogInterrupt==1) */
+- /**************************/
+ /* Starts timer/counter 2 */
+- /**************************/
+ i_TimerCounter2Enabled = 1;
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2066,13 +1802,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+
+ case STOP:
+
+- /**************************/
+ /* Stop timer/counter 2 */
+- /**************************/
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2084,23 +1816,17 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ case TRIGGER:
+ if (i_TimerCounter2Init == 1) {
+ if (i_TimerCounter2Enabled == 1) {
+- /************************/
+ /* Set Trigger and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0x6;
+ } /* if( i_TimerCounter2Enabled==1) */
+ else {
+- /***************/
+ /* Set Trigger */
+- /***************/
+
+ i_CommandAndStatusValue = 0x2;
+ } /* elseif(i_TimerCounter2Enabled==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2131,13 +1857,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ else {
+ i_CommandAndStatusValue = 0xE4; /* disable the interrupt */
+ } /* elseif(i_TimerCounterWatchdogInterrupt==1) */
+- /**************************/
+ /* Starts Watchdog/counter 3 */
+- /**************************/
+ i_WatchdogCounter3Enabled = 1;
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2155,13 +1877,9 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+
+ case STOP:
+
+- /**************************/
+ /* Stop Watchdog/counter 3 */
+- /**************************/
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2176,23 +1894,17 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ case 0: /* triggering counter 3 */
+ if (i_WatchdogCounter3Init == 1) {
+ if (i_WatchdogCounter3Enabled == 1) {
+- /************************/
+ /* Set Trigger and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0x6;
+ } /* if( i_WatchdogCounter3Enabled==1) */
+ else {
+- /***************/
+ /* Set Trigger */
+- /***************/
+
+ i_CommandAndStatusValue = 0x2;
+ } /* elseif(i_WatchdogCounter3Enabled==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2210,9 +1922,7 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ /* triggering Watchdog 3 */
+ if (i_WatchdogCounter3Init == 1) {
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2283,23 +1993,17 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ /* Read counter/timer1 */
+ if (i_TimerCounter1Init == 1) {
+ if (i_TimerCounter1Enabled == 1) {
+- /************************/
+ /* Set RCC and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0xC;
+ } /* if( i_TimerCounter1Init==1) */
+ else {
+- /***************/
+ /* Set RCC */
+- /***************/
+
+ i_CommandAndStatusValue = 0x8;
+ } /* elseif(i_TimerCounter1Init==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2307,9 +2011,7 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************************/
+ /* Selects the counter register (high) */
+- /***************************************/
+ outb(APCI1500_R_CPT_TMR1_VALUE_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2335,23 +2037,17 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ /* Read counter/timer2 */
+ if (i_TimerCounter2Init == 1) {
+ if (i_TimerCounter2Enabled == 1) {
+- /************************/
+ /* Set RCC and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0xC;
+ } /* if( i_TimerCounter2Init==1) */
+ else {
+- /***************/
+ /* Set RCC */
+- /***************/
+
+ i_CommandAndStatusValue = 0x8;
+ } /* elseif(i_TimerCounter2Init==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2359,9 +2055,7 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************************/
+ /* Selects the counter register (high) */
+- /***************************************/
+ outb(APCI1500_R_CPT_TMR2_VALUE_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2387,23 +2081,17 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ /* Read counter/watchdog2 */
+ if (i_WatchdogCounter3Init == 1) {
+ if (i_WatchdogCounter3Enabled == 1) {
+- /************************/
+ /* Set RCC and gate */
+- /************************/
+
+ i_CommandAndStatusValue = 0xC;
+ } /* if( i_TimerCounter2Init==1) */
+ else {
+- /***************/
+ /* Set RCC */
+- /***************/
+
+ i_CommandAndStatusValue = 0x8;
+ } /* elseif(i_WatchdogCounter3Init==1) */
+
+- /********************************************/
+ /* Selects the commands and status register */
+- /********************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2411,9 +2099,7 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************************/
+ /* Selects the counter register (high) */
+- /***************************************/
+ outb(APCI1500_R_CPT_TMR3_VALUE_HIGH,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2525,135 +2211,95 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
+ } /* else if(data[0]==0) */
+ } /* elseif(data[0]==1) */
+
+- /*****************************************************/
+ /* Selects the mode specification register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*********************************************/
+ /* Writes the new configuration (APCI1500_OR) */
+- /*********************************************/
+ i_RegValue = (i_RegValue & 0xF9) | APCI1500_OR;
+
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************/
+ /* Authorises the interrupt on the board */
+- /*****************************************/
+ outb(0xC0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***************************************************/
+ /* Selects the pattern polarity register of port B */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_B_PATTERN_POLARITY,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_Constant, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************/
+ /* Selects the pattern transition register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_PATTERN_TRANSITION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_Constant, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************************/
+ /* Selects the pattern mask register of port B */
+- /***********************************************/
+ outb(APCI1500_RW_PORT_B_PATTERN_MASK,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(i_Constant, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the command and status register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of port A */
+- /***********************************/
+
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of port B */
+- /***********************************/
+
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the command and status register of timer 1 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 1 */
+- /***********************************/
+
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the command and status register of timer 2 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 2 */
+- /***********************************/
+
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the command and status register of timer 3 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 3 */
+- /***********************************/
+
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Authorizes the main interrupt on the board */
+- /**********************************************/
+ outb(0xD0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************/
+ /* Enables the PCI interrupt */
+- /*****************************/
+ outl(0x3000, devpriv->i_IobaseAmcc + 0x38);
+ ui_Status = inl(devpriv->i_IobaseAmcc + 0x10);
+ ui_Status = inl(devpriv->i_IobaseAmcc + 0x38);
+@@ -2688,44 +2334,28 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ int i_RegValue = 0;
+ i_InterruptMask = 0;
+
+- /***********************************/
+ /* Read the board interrupt status */
+- /***********************************/
+ ui_InterruptStatus = inl(devpriv->i_IobaseAmcc + 0x38);
+
+- /***************************************/
+ /* Test if board generated a interrupt */
+- /***************************************/
+ if ((ui_InterruptStatus & 0x800000) == 0x800000) {
+- /************************/
+ /* Disable all Interrupt */
+- /************************/
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ /* outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,devpriv->iobase+APCI1500_Z8536_CONTROL_REGISTER); */
+- /**********************************************/
+ /* Disables the main interrupt on the board */
+- /**********************************************/
+ /* outb(0x00,devpriv->iobase+APCI1500_Z8536_CONTROL_REGISTER); */
+
+- /*****************************************************/
+ /* Selects the command and status register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ if ((i_RegValue & 0x60) == 0x60) {
+- /*****************************************************/
+ /* Selects the command and status register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of port A */
+- /***********************************/
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue,
+ devpriv->iobase +
+@@ -2739,9 +2369,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ inb(devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+
+- /***************************************************/
+ /* Selects the interrupt vector register of port A */
+- /***************************************************/
+ outb(APCI1500_RW_PORT_A_INTERRUPT_CONTROL,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2757,44 +2385,32 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ } /* elseif(i_Logic==APCI1500_OR_PRIORITY) */
+ } /* if ((i_RegValue & 0x60) == 0x60) */
+
+- /*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ if ((i_RegValue & 0x60) == 0x60) {
+- /*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of port B */
+- /***********************************/
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /****************/
+ /* Reads port B */
+- /****************/
+ i_RegValue =
+ inb((unsigned int) devpriv->iobase +
+ APCI1500_Z8536_PORT_B);
+
+ i_RegValue = i_RegValue & 0xC0;
+- /**************************************/
+ /* Tests if this is an external error */
+- /**************************************/
+
+ if (i_RegValue) {
+ /* Disable the interrupt */
+- /*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outl(0x0, devpriv->i_IobaseAmcc + 0x38);
+
+ if (i_RegValue & 0x80) {
+@@ -2812,46 +2428,34 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ } /* if (i_RegValue) */
+ } /* if ((i_RegValue & 0x60) == 0x60) */
+
+- /*****************************************************/
+ /* Selects the command and status register of timer 1 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ if ((i_RegValue & 0x60) == 0x60) {
+- /*****************************************************/
+ /* Selects the command and status register of timer 1 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 1 */
+- /***********************************/
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+ i_InterruptMask = i_InterruptMask | 4;
+ } /* if ((i_RegValue & 0x60) == 0x60) */
+- /*****************************************************/
+ /* Selects the command and status register of timer 2 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ if ((i_RegValue & 0x60) == 0x60) {
+- /*****************************************************/
+ /* Selects the command and status register of timer 2 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 2 */
+- /***********************************/
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue,
+ devpriv->iobase +
+@@ -2859,23 +2463,17 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ i_InterruptMask = i_InterruptMask | 8;
+ } /* if ((i_RegValue & 0x60) == 0x60) */
+
+- /*****************************************************/
+ /* Selects the command and status register of timer 3 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_RegValue =
+ inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ if ((i_RegValue & 0x60) == 0x60) {
+- /*****************************************************/
+ /* Selects the command and status register of timer 3 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- /***********************************/
+ /* Deletes the interrupt of timer 3 */
+- /***********************************/
+ i_RegValue = (i_RegValue & 0x0F) | 0x20;
+ outb(i_RegValue,
+ devpriv->iobase +
+@@ -2889,18 +2487,12 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ } /* if ((i_RegValue & 0x60) == 0x60) */
+
+ send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
+- /***********************/
+ /* Enable all Interrupts */
+- /***********************/
+
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /**********************************************/
+ /* Authorizes the main interrupt on the board */
+- /**********************************************/
+ outb(0xD0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if ((ui_InterruptStatus & 0x800000) == 0x800000) */
+ else {
+@@ -2944,9 +2536,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ i_TimerCounter2Enabled = 0;
+ i_WatchdogCounter3Enabled = 0;
+
+- /******************/
+ /* Software reset */
+- /******************/
+ i_DummyRead = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ i_DummyRead = inb(devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2954,16 +2544,12 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ outb(1, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the master configuration control register */
+- /*****************************************************/
+ outb(APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0xF4, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the mode specification register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0x10, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -2995,9 +2581,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ /* Deletes the register */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the mode specification register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_SPECIFICATION,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ outb(0x10, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+@@ -3027,9 +2611,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ /* Deletes the register */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+
+- /*****************************************************/
+ /* Selects the data path polarity register of port C */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* High level of port C means 1 */
+@@ -3044,9 +2626,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes it */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 1 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -3056,9 +2636,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates the interrupt management of timer 1 */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 2 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -3068,9 +2646,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates Timer 2 interrupt management: */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /******************************************************/
+ /* Selects the command and status register of timer 3 */
+- /******************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes IP and IUS */
+@@ -3080,71 +2656,43 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deactivates interrupt management of timer 3: */
+ outb(0xE0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* Deletes all interrupts */
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ /* reset all the digital outputs */
+ outw(0x0, devpriv->i_IobaseAddon + APCI1500_DIGITAL_OP);
+-/*******************************/
+ /* Disable the board interrupt */
+-/*******************************/
+- /*************************************************/
+ /* Selects the master interrupt control register */
+- /*************************************************/
+ outb(APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+- /*****************************************************/
+ /* Selects the command and status register of port A */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/*****************************************************/
+ /* Selects the command and status register of port B */
+- /*****************************************************/
+ outb(APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/*****************************************************/
+ /* Selects the command and status register of timer 1 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR1_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/*****************************************************/
+ /* Selects the command and status register of timer 2 */
+- /*****************************************************/
+ outb(APCI1500_RW_CPT_TMR2_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/*****************************************************/
+ /* Selects the command and status register of timer 3*/
+-/*****************************************************/
+ outb(APCI1500_RW_CPT_TMR3_CMD_STATUS,
+ devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+-/****************************/
+ /* Deactivates all interrupts */
+-/******************************/
+ outb(0x00, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ return 0;
+ }commit d0ba1e38e05212037b5107522f12537f8168c463
+Author: Conrad Meyer <cemeyer@uw.edu>
+Date: Sat Mar 8 21:42:39 2014 -0500
+
+ Staging: comedi: Fix some raw printks with dev_warn()
+
+ Brought to you with the help of sed and manual clean-up after.
+
+ $ sed -i -e 's|printk("\\n|dev_warn(dev->hw_dev,\n\t"|' \
+ addi-data/hwdrv_apci1500.c
+
+ Since all of these printk()s were for invalid API inputs and most of
+ them returned -EINVAL, I fixed the rest of them to return -EINVAL as
+ well.
+
+ Signed-off-by: Conrad Meyer <cse.cem@gmail.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+index 2628ac44f109..0ccf784b81a4 100644
+--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+@@ -259,7 +259,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ i_MaxChannel = 6;
+ } /* if(data[0]==2) */
+ else {
+- printk("\nThe specified port event does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified port event does not exist\n");
+ return -EINVAL;
+ } /* else if(data[0]==2) */
+ } /* else if (data[0] == 1) */
+@@ -274,7 +275,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ data[1] = APCI1500_OR_PRIORITY;
+ break;
+ default:
+- printk("\nThe specified interrupt logic does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified interrupt logic does not exist\n");
+ return -EINVAL;
+ } /* switch(data[1]); */
+
+@@ -318,7 +320,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ case 5:
+ break;
+ default:
+- printk("\nThe option indicated in the event mask does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The option indicated in the event mask does not exist\n");
+ return -EINVAL;
+ } /* switch(i_EventMask) */
+ } /* for (i_Count = i_MaxChannel; i_Count >0;i_Count --) */
+@@ -338,10 +341,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+
+ if (data[1] == APCI1500_OR_PRIORITY
+ && i_PatternTransition != 0) {
+- /********************************************/
+- /* Transition error on an OR PRIORITY logic */
+- /********************************************/
+- printk("\nTransition error on an OR PRIORITY logic\n");
++ dev_warn(dev->hw_dev,
++ "Transition error on an OR PRIORITY logic\n");
+ return -EINVAL;
+ } /* if (data[1]== APCI1500_OR_PRIORITY && i_PatternTransition != 0) */
+
+@@ -360,10 +361,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ } /* for (i_Count = 0; i_Count < 8; i_Count++) */
+
+ if (i_PatternTransitionCount > 1) {
+- /****************************************/
+- /* Transition error on an AND logic */
+- /****************************************/
+- printk("\n Transition error on an AND logic\n");
++ dev_warn(dev->hw_dev,
++ "Transition error on an AND logic\n");
+ return -EINVAL;
+ } /* if (i_PatternTransitionCount > 1) */
+ } /* if (data[1]== APCI1500_AND) */
+@@ -457,7 +456,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+
+ } /* if(data[1]==APCI1500_AND||data[1]==APCI1500_OR||data[1]==APCI1500_OR_PRIORITY) */
+ else {
+- printk("\nThe choice for interrupt logic does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The choice for interrupt logic does not exist\n");
+ return -EINVAL;
+ } /* else }// if(data[1]==APCI1500_AND||data[1]==APCI1500_OR||data[1]==APCI1500_OR_PRIORITY) */
+ } /* if (data[0]== 1) */
+@@ -585,7 +585,8 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if (data[1] == APCI1500_OR) */
+ else {
+- printk("\nThe choice for interrupt logic does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The choice for interrupt logic does not exist\n");
+ return -EINVAL;
+ } /* elseif (data[1] == APCI1500_OR) */
+ } /* if(data[0]==2) */
+@@ -691,7 +692,8 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+
+ } /* if(i_Event1Status==1) */
+ else {
+- printk("\nEvent 1 not initialised\n");
++ dev_warn(dev->hw_dev,
++ "Event 1 not initialised\n");
+ return -EINVAL;
+ } /* else if(i_Event1Status==1) */
+ } /* if (data[1]==1) */
+@@ -742,13 +744,15 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ i_Event2InterruptStatus = 1;
+ } /* if(i_Event2Status==1) */
+ else {
+- printk("\nEvent 2 not initialised\n");
++ dev_warn(dev->hw_dev,
++ "Event 2 not initialised\n");
+ return -EINVAL;
+ } /* else if(i_Event2Status==1) */
+ } /* if(data[1]==2) */
+ } /* if (data[1] == 1 || data[0] == 2) */
+ else {
+- printk("\nThe port parameter is in error\n");
++ dev_warn(dev->hw_dev,
++ "The port parameter is in error\n");
+ return -EINVAL;
+ } /* else if (data[1] == 1 || data[0] == 2) */
+
+@@ -803,7 +807,8 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ i_Event1InterruptStatus = 0;
+ } /* if(i_Event1Status==1) */
+ else {
+- printk("\nEvent 1 not initialised\n");
++ dev_warn(dev->hw_dev,
++ "Event 1 not initialised\n");
+ return -EINVAL;
+ } /* else if(i_Event1Status==1) */
+ } /* if (data[1]==1) */
+@@ -846,19 +851,22 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
+ i_Event2InterruptStatus = 0;
+ } /* if(i_Event2Status==1) */
+ else {
+- printk("\nEvent 2 not initialised\n");
++ dev_warn(dev->hw_dev,
++ "Event 2 not initialised\n");
+ return -EINVAL;
+ } /* else if(i_Event2Status==1) */
+ } /* if(data[1]==2) */
+
+ } /* if (data[1] == 1 || data[1] == 2) */
+ else {
+- printk("\nThe port parameter is in error\n");
++ dev_warn(dev->hw_dev,
++ "The port parameter is in error\n");
+ return -EINVAL;
+ } /* else if (data[1] == 1 || data[1] == 2) */
+ break;
+ default:
+- printk("\nThe option of START/STOP logic does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The option of START/STOP logic does not exist\n");
+ return -EINVAL;
+ } /* switch(data[0]) */
+
+@@ -1164,7 +1172,9 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
+ APCI1500_DIGITAL_OP);
+ } /* if(data[1]==1) */
+ else {
+- printk("\nSpecified channel not supported\n");
++ dev_warn(dev->hw_dev,
++ "Specified channel not supported\n");
++ return -EINVAL;
+ } /* else if(data[1]==1) */
+ } /* elseif(data[1]==0) */
+ } /* if(data[3]==0) */
+@@ -1241,12 +1251,15 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
+ APCI1500_DIGITAL_OP);
+ } /* if(data[1]==1) */
+ else {
+- printk("\nSpecified channel not supported\n");
++ dev_warn(dev->hw_dev,
++ "Specified channel not supported\n");
++ return -EINVAL;
+ } /* else if(data[1]==1) */
+ } /* elseif(data[1]==0) */
+ } /* if(data[3]==1); */
+ else {
+- printk("\nSpecified functionality does not exist\n");
++ dev_warn(dev->hw_dev,
++ "Specified functionality does not exist\n");
+ return -EINVAL;
+ } /* if else data[3]==1) */
+ } /* if else data[3]==0) */
+@@ -1318,7 +1331,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ } /* if(data[0]==0||data[0]==1||data[0]==2) */
+ else {
+ if (data[0] != 3) {
+- printk("\nThe option for input clock selection does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The option for input clock selection does not exist\n");
+ return -EINVAL;
+ } /* if(data[0]!=3) */
+ } /* elseif(data[0]==0||data[0]==1||data[0]==2) */
+@@ -1334,7 +1348,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[2] = APCI1500_TIMER;
+ break;
+ default:
+- printk("\nThis choice is not a timer nor a counter\n");
++ dev_warn(dev->hw_dev,
++ "This choice is not a timer nor a counter\n");
+ return -EINVAL;
+ } /* switch(data[2]) */
+
+@@ -1347,7 +1362,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[4] = APCI1500_SINGLE;
+ break;
+ default:
+- printk("\nThis option for single/continuous mode does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This option for single/continuous mode does not exist\n");
+ return -EINVAL;
+ } /* switch(data[4]) */
+
+@@ -1474,12 +1490,14 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ else {
+- printk("\nError in selection of interrupt enable or disable\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of interrupt enable or disable\n");
+ return -EINVAL;
+ } /* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ } /* if ((data[3]>= 0) && (data[3] <= 65535)) */
+ else {
+- printk("\nError in selection of reload value\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of reload value\n");
+ return -EINVAL;
+ } /* else if ((data[3]>= 0) && (data[3] <= 65535)) */
+ i_TimerCounterWatchdogInterrupt = data[7];
+@@ -1495,7 +1513,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[2] = APCI1500_TIMER;
+ break;
+ default:
+- printk("\nThis choice is not a timer nor a counter\n");
++ dev_warn(dev->hw_dev,
++ "This choice is not a timer nor a counter\n");
+ return -EINVAL;
+ } /* switch(data[2]) */
+
+@@ -1508,7 +1527,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[4] = APCI1500_SINGLE;
+ break;
+ default:
+- printk("\nThis option for single/continuous mode does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This option for single/continuous mode does not exist\n");
+ return -EINVAL;
+ } /* switch(data[4]) */
+
+@@ -1521,7 +1541,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[5] = APCI1500_HARDWARE_TRIGGER;
+ break;
+ default:
+- printk("\nThis choice for software or hardware trigger does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This choice for software or hardware trigger does not exist\n");
+ return -EINVAL;
+ } /* switch(data[5]) */
+
+@@ -1534,7 +1555,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[6] = APCI1500_HARDWARE_GATE;
+ break;
+ default:
+- printk("\nThis choice for software or hardware gate does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This choice for software or hardware gate does not exist\n");
+ return -EINVAL;
+ } /* switch(data[6]) */
+
+@@ -1662,12 +1684,14 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ else {
+- printk("\nError in selection of interrupt enable or disable\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of interrupt enable or disable\n");
+ return -EINVAL;
+ } /* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ } /* if ((data[3]>= 0) && (data[3] <= 65535)) */
+ else {
+- printk("\nError in selection of reload value\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of reload value\n");
+ return -EINVAL;
+ } /* else if ((data[3]>= 0) && (data[3] <= 65535)) */
+ i_TimerCounterWatchdogInterrupt = data[7];
+@@ -1683,7 +1707,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[2] = APCI1500_WATCHDOG;
+ break;
+ default:
+- printk("\nThis choice is not a watchdog nor a counter\n");
++ dev_warn(dev->hw_dev,
++ "This choice is not a watchdog nor a counter\n");
+ return -EINVAL;
+ } /* switch(data[2]) */
+
+@@ -1696,7 +1721,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[4] = APCI1500_SINGLE;
+ break;
+ default:
+- printk("\nThis option for single/continuous mode does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This option for single/continuous mode does not exist\n");
+ return -EINVAL;
+ } /* switch(data[4]) */
+
+@@ -1709,7 +1735,8 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ data[6] = APCI1500_HARDWARE_GATE;
+ break;
+ default:
+- printk("\nThis choice for software or hardware gate does not exist\n");
++ dev_warn(dev->hw_dev,
++ "This choice for software or hardware gate does not exist\n");
+ return -EINVAL;
+ } /* switch(data[6]) */
+
+@@ -1857,12 +1884,14 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+
+ } /* if(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ else {
+- printk("\nError in selection of interrupt enable or disable\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of interrupt enable or disable\n");
+ return -EINVAL;
+ } /* elseif(data[7]== APCI1500_ENABLE ||data[7]== APCI1500_DISABLE) */
+ } /* if ((data[3]>= 0) && (data[3] <= 65535)) */
+ else {
+- printk("\nError in selection of reload value\n");
++ dev_warn(dev->hw_dev,
++ "Error in selection of reload value\n");
+ return -EINVAL;
+ } /* else if ((data[3]>= 0) && (data[3] <= 65535)) */
+ i_TimerCounterWatchdogInterrupt = data[7];
+@@ -1870,7 +1899,9 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ break;
+
+ default:
+- printk("\nThe specified counter\timer option does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified counter/timer option does not exist\n");
++ return -EINVAL;
+ } /* switch(data[1]) */
+ i_CounterLogic = data[2];
+ return insn->n;
+@@ -1937,7 +1968,8 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter1Init==1) */
+ else {
+- printk("\nCounter/Timer1 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Counter/Timer1 not configured\n");
+ return -EINVAL;
+ }
+ break;
+@@ -1988,13 +2020,15 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter1Init==1) */
+ else {
+- printk("\nCounter/Timer1 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Counter/Timer1 not configured\n");
+ return -EINVAL;
+ }
+ break;
+
+ default:
+- printk("\nThe specified option for start/stop/trigger does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified option for start/stop/trigger does not exist\n");
+ return -EINVAL;
+ } /* switch(data[1]) */
+ break;
+@@ -2024,7 +2058,8 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter2Init==1) */
+ else {
+- printk("\nCounter/Timer2 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Counter/Timer2 not configured\n");
+ return -EINVAL;
+ }
+ break;
+@@ -2074,12 +2109,14 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter2Init==1) */
+ else {
+- printk("\nCounter/Timer2 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Counter/Timer2 not configured\n");
+ return -EINVAL;
+ }
+ break;
+ default:
+- printk("\nThe specified option for start/stop/trigger does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified option for start/stop/trigger does not exist\n");
+ return -EINVAL;
+ } /* switch(data[1]) */
+ break;
+@@ -2110,7 +2147,8 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+
+ } /* if( i_WatchdogCounter3init==1) */
+ else {
+- printk("\nWatchdog/Counter3 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Watchdog/Counter3 not configured\n");
+ return -EINVAL;
+ }
+ break;
+@@ -2163,7 +2201,8 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_WatchdogCounter3Init==1) */
+ else {
+- printk("\nCounter3 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Counter3 not configured\n");
+ return -EINVAL;
+ }
+ break;
+@@ -2182,22 +2221,26 @@ static int i_apci1500_timer_watchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_WatchdogCounter3Init==1) */
+ else {
+- printk("\nWatchdog 3 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Watchdog 3 not configured\n");
+ return -EINVAL;
+ }
+ break;
+ default:
+- printk("\nWrong choice of watchdog/counter3\n");
++ dev_warn(dev->hw_dev,
++ "Wrong choice of watchdog/counter3\n");
+ return -EINVAL;
+ } /* switch(data[2]) */
+ break;
+ default:
+- printk("\nThe specified option for start/stop/trigger does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified option for start/stop/trigger does not exist\n");
+ return -EINVAL;
+ } /* switch(data[1]) */
+ break;
+ default:
+- printk("\nThe specified choice for counter/watchdog/timer does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The specified choice for counter/watchdog/timer does not exist\n");
+ return -EINVAL;
+ } /* switch(data[0]) */
+ return insn->n;
+@@ -2283,7 +2326,8 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter1Init==1) */
+ else {
+- printk("\nTimer/Counter1 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Timer/Counter1 not configured\n");
+ return -EINVAL;
+ } /* elseif( i_TimerCounter1Init==1) */
+ break;
+@@ -2334,7 +2378,8 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_TimerCounter2Init==1) */
+ else {
+- printk("\nTimer/Counter2 not configured\n");
++ dev_warn(dev->hw_dev,
++ "Timer/Counter2 not configured\n");
+ return -EINVAL;
+ } /* elseif( i_TimerCounter2Init==1) */
+ break;
+@@ -2385,12 +2430,14 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+ APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if( i_WatchdogCounter3Init==1) */
+ else {
+- printk("\nWatchdogCounter3 not configured\n");
++ dev_warn(dev->hw_dev,
++ "WatchdogCounter3 not configured\n");
+ return -EINVAL;
+ } /* elseif( i_WatchdogCounter3Init==1) */
+ break;
+ default:
+- printk("\nThe choice of timer/counter/watchdog does not exist\n");
++ dev_warn(dev->hw_dev,
++ "The choice of timer/counter/watchdog does not exist\n");
+ return -EINVAL;
+ } /* switch(data[0]) */
+
+@@ -2472,7 +2519,8 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
+ i_Constant = 0x00;
+ } /* if{data[0]==0) */
+ else {
+- printk("\nThe parameter passed to driver is in error for enabling the voltage interrupt\n");
++ dev_warn(dev->hw_dev,
++ "The parameter passed to driver is in error for enabling the voltage interrupt\n");
+ return -EINVAL;
+ } /* else if(data[0]==0) */
+ } /* elseif(data[0]==1) */
+@@ -2730,7 +2778,6 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ outb(i_RegValue,
+ devpriv->iobase +
+ APCI1500_Z8536_CONTROL_REGISTER);
+- printk("\n\n\n");
+ /****************/
+ /* Reads port B */
+ /****************/
+@@ -2857,7 +2904,8 @@ static void v_APCI1500_Interrupt(int irq, void *d)
+ outb(0xD0, devpriv->iobase + APCI1500_Z8536_CONTROL_REGISTER);
+ } /* if ((ui_InterruptStatus & 0x800000) == 0x800000) */
+ else {
+- printk("\nInterrupt from unknown source\n");
++ dev_warn(dev->hw_dev,
++ "Interrupt from unknown source\n");
+
+ } /* else if ((ui_InterruptStatus & 0x800000) == 0x800000) */
+ return;commit f3c25d569045c8e0f274956291b51641241da174
+Author: Conrad Meyer <cemeyer@uw.edu>
+Date: Sat Mar 8 15:47:24 2014 -0500
+
+ Staging: comedi: Fix 80-char line limit style issue in addi_apci_1500.c
+
+ Rename some very long functions in addi-data/hwdrv_apci1500.c.
+
+ Signed-off-by: Conrad Meyer <cse.cem@gmail.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+index 054910511e9e..2628ac44f109 100644
+--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
++++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+@@ -1052,7 +1052,7 @@ static int apci1500_di_insn_bits(struct comedi_device *dev,
+
+ /*
+ +----------------------------------------------------------------------------+
+-| Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt
++| Function Name : int i_apci1500_config_output
+ | (struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn
+ | *insn,unsigned int *data) |
+ | |
+@@ -1078,10 +1078,9 @@ static int apci1500_di_insn_bits(struct comedi_device *dev,
+ | |
+ +----------------------------------------------------------------------------+
+ */
+-static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
+- struct comedi_subdevice *s,
+- struct comedi_insn *insn,
+- unsigned int *data)
++static int i_acpi1500_config_output(struct comedi_device *dev,
++ struct comedi_subdevice *s, struct comedi_insn *insn,
++ unsigned int *data)
+ {
+ struct addi_private *devpriv = dev->private;
+
+@@ -1879,7 +1878,7 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+
+ /*
+ +----------------------------------------------------------------------------+
+-| Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog |
++| Function Name : int i_apci1500_timer_watchdog
+ | (struct comedi_device *dev,struct comedi_subdevice *s,
+ | struct comedi_insn *insn,unsigned int *data); |
+ +----------------------------------------------------------------------------+
+@@ -1905,10 +1904,9 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+ | |
+ +----------------------------------------------------------------------------+
+ */
+-static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
+- struct comedi_subdevice *s,
+- struct comedi_insn *insn,
+- unsigned int *data)
++static int i_apci1500_timer_watchdog(struct comedi_device *dev,
++ struct comedi_subdevice *s, struct comedi_insn *insn,
++ unsigned int *data)
+ {
+ struct addi_private *devpriv = dev->private;
+ int i_CommandAndStatusValue;
+diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
+index 74f7ace8adbc..afa7d6e97a5b 100644
+--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
++++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
+@@ -26,11 +26,11 @@ static const struct addi_board apci1500_boardtypes[] = {
+ .di_read = i_APCI1500_Initialisation,
+ .di_write = i_APCI1500_StartStopInputEvent,
+ .di_bits = apci1500_di_insn_bits,
+- .do_config = i_APCI1500_ConfigDigitalOutputErrorInterrupt,
++ .do_config = i_acpi1500_config_output,
+ .do_write = i_APCI1500_WriteDigitalOutput,
+ .do_bits = i_APCI1500_ConfigureInterrupt,
+ .timer_config = i_APCI1500_ConfigCounterTimerWatchdog,
+- .timer_write = i_APCI1500_StartStopTriggerTimerCounterWatchdog,
++ .timer_write = i_apci1500_timer_watchdog,
+ .timer_read = i_APCI1500_ReadInterruptMask,
+ .timer_bits = i_APCI1500_ReadCounterTimerWatchdog,
+ },
+ commit 8d03e971cf403305217b8e62db3a2e5ad2d6263f +Author: Filip Palian <s3810@pjwstk.edu.pl> +Date: Thu May 12 19:32:46 2011 +0200 + + Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace. + + Structures "l2cap_conninfo" and "rfcomm_conninfo" have one padding + byte each. This byte in "cinfo" is copied to userspace uninitialized. + + Signed-off-by: Filip Palian <filip.palian@pjwstk.edu.pl> + Acked-by: Marcel Holtmann <marcel@holtmann.org> + Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> + +diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c +index 18dc9888d8c2..8248303f44e8 100644 +--- a/net/bluetooth/l2cap_sock.c ++++ b/net/bluetooth/l2cap_sock.c +@@ -413,6 +413,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us + break; + } + ++ memset(&cinfo, 0, sizeof(cinfo)); + cinfo.hci_handle = chan->conn->hcon->handle; + memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3); + +diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c +index 386cfaffd4b7..1b10727ce523 100644 +--- a/net/bluetooth/rfcomm/sock.c ++++ b/net/bluetooth/rfcomm/sock.c +@@ -788,6 +788,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u + + l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; + ++ memset(&cinfo, 0, sizeof(cinfo)); + cinfo.hci_handle = conn->hcon->handle; + memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); ++
commit ab7f863e4183057dc494f3180199934a9637d401
+Author: Scott Rixner <rixner@rice.edu>
+Date: Thu Mar 3 09:30:08 2011 +0000
+
+ xen: events: Process event channels notifications in round-robin order.
+
+ Avoids fairness issue resulting from domain 0 processing lowest
+ numbered event channel first.
+
+ Fixes bug #1115 "Event channel port scanning unfair".
+
+ Bugzilla: http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1115
+ Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
+ [ijc: forward ported from linux-2.6.18-xen.hg 324:7fe1c6d02a2b
+ various variables have different names in this tree:
+ l1 -> pending_words
+ l2 -> pending_bits
+ l1i -> word_idx
+ l2i -> bit_idx]
+ Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+
+diff --git a/drivers/xen/events.c b/drivers/xen/events.c
+index 6befe6227159..75cc6f50bd29 100644
+--- a/drivers/xen/events.c
++++ b/drivers/xen/events.c
+@@ -1027,6 +1027,11 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
+
+ static DEFINE_PER_CPU(unsigned, xed_nesting_count);
+
++/*
++ * Mask out the i least significant bits of w
++ */
++#define MASK_LSBS(w, i) (w & ((~0UL) << i))
++
+ /*
+ * Search the CPUs pending events bitmasks. For each one found, map
+ * the event number to an irq, and feed it into do_IRQ() for
+@@ -1038,6 +1043,9 @@ static DEFINE_PER_CPU(unsigned, xed_nesting_count);
+ */
+ static void __xen_evtchn_do_upcall(void)
+ {
++ static unsigned int last_word_idx = BITS_PER_LONG - 1;
++ static unsigned int last_bit_idx = BITS_PER_LONG - 1;
++ int word_idx, bit_idx;
+ int cpu = get_cpu();
+ struct shared_info *s = HYPERVISOR_shared_info;
+ struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
+@@ -1056,17 +1064,50 @@ static void __xen_evtchn_do_upcall(void)
+ wmb();
+ #endif
+ pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0);
++
++ word_idx = last_word_idx;
++ bit_idx = last_bit_idx;
++
+ while (pending_words != 0) {
+ unsigned long pending_bits;
+- int word_idx = __ffs(pending_words);
+- pending_words &= ~(1UL << word_idx);
++ unsigned long words;
++
++ word_idx = (word_idx + 1) % BITS_PER_LONG;
++ words = MASK_LSBS(pending_words, word_idx);
++
++ /*
++ * If we masked out all events, wrap around to the
++ * beginning.
++ */
++ if (words == 0) {
++ word_idx = BITS_PER_LONG - 1;
++ bit_idx = BITS_PER_LONG - 1;
++ continue;
++ }
++ word_idx = __ffs(words);
+
+- while ((pending_bits = active_evtchns(cpu, s, word_idx)) != 0) {
+- int bit_idx = __ffs(pending_bits);
+- int port = (word_idx * BITS_PER_LONG) + bit_idx;
+- int irq = evtchn_to_irq[port];
++ do {
++ unsigned long bits;
++ int port, irq;
+ struct irq_desc *desc;
+
++ pending_bits = active_evtchns(cpu, s, word_idx);
++
++ bit_idx = (bit_idx + 1) % BITS_PER_LONG;
++ bits = MASK_LSBS(pending_bits, bit_idx);
++
++ /* If we masked out all events, move on. */
++ if (bits == 0) {
++ bit_idx = BITS_PER_LONG - 1;
++ break;
++ }
++
++ bit_idx = __ffs(bits);
++
++ /* Process port. */
++ port = (word_idx * BITS_PER_LONG) + bit_idx;
++ irq = evtchn_to_irq[port];
++
+ mask_evtchn(port);
+ clear_evtchn(port);
+
+@@ -1075,7 +1116,24 @@ static void __xen_evtchn_do_upcall(void)
+ if (desc)
+ generic_handle_irq_desc(irq, desc);
+ }
+- }
++
++ /*
++ * If this is the final port processed, we'll
++ * pick up here+1 next time.
++ */
++ last_word_idx = word_idx;
++ last_bit_idx = bit_idx;
++
++ } while (bit_idx != BITS_PER_LONG - 1);
++
++ pending_bits = active_evtchns(cpu, s, word_idx);
++
++ /*
++ * We handled all ports, so we can clear the
++ * selector bit.
++ */
++ if (pending_bits == 0)
++ pending_words &= ~(1UL << word_idx);
+ }
+
+ BUG_ON(!irqs_disabled());
+ commit bc8bf90a643123f99f98027040f7256ce79b45da
+Author: Nick Robinson <nr33@msstate.edu>
+Date: Mon Jan 31 10:56:50 2011 -0600
+
+ Staging: comedi: Fix checpatch.pl issues in file rtd520.c
+
+ This patch fixes the checkpatch errors listed below:
+
+ ERROR: code indent should use tabs where possible
+ WARNING: space prohibited between function name and open parenthesis '('
+ WARNING: please, no spaces at the start of a line
+ WARNING: braces {} are not necessary for single statement blocks
+ WARNING: printk() should include KERN_ facility level
+
+ Signed-off-by: Nick Robinson <nr33@msstate.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
+index aa8aeeee043f..357858d27441 100644
+--- a/drivers/staging/comedi/drivers/rtd520.c
++++ b/drivers/staging/comedi/drivers/rtd520.c
+@@ -59,7 +59,7 @@ Configuration options:
+ Data sheet: http://www.rtdusa.com/pdf/dm7520.pdf
+ Example source: http://www.rtdusa.com/examples/dm/dm7520.zip
+ Call them and ask for the register level manual.
+- PCI chip: http://www.plxtech.com/products/io/pci9080
++ PCI chip: http://www.plxtech.com/products/io/pci9080
+
+ Notes:
+ This board is memory mapped. There is some IO stuff, but it isn't needed.
+@@ -136,7 +136,7 @@ Configuration options:
+ #define RTD_DMA_TIMEOUT 33000 /* 1 msec */
+ #else
+ /* by delaying, power and electrical noise are reduced somewhat */
+-#define WAIT_QUIETLY udelay (1)
++#define WAIT_QUIETLY udelay(1)
+ #define RTD_ADC_TIMEOUT 2000 /* in usec */
+ #define RTD_DAC_TIMEOUT 2000 /* in usec */
+ #define RTD_DMA_TIMEOUT 1000 /* in usec */
+@@ -414,296 +414,296 @@ struct rtdPrivate {
+
+ /* Reset board */
+ #define RtdResetBoard(dev) \
+- writel (0, devpriv->las0+LAS0_BOARD_RESET)
++ writel(0, devpriv->las0+LAS0_BOARD_RESET)
+
+ /* Reset channel gain table read pointer */
+ #define RtdResetCGT(dev) \
+- writel (0, devpriv->las0+LAS0_CGT_RESET)
++ writel(0, devpriv->las0+LAS0_CGT_RESET)
+
+ /* Reset channel gain table read and write pointers */
+ #define RtdClearCGT(dev) \
+- writel (0, devpriv->las0+LAS0_CGT_CLEAR)
++ writel(0, devpriv->las0+LAS0_CGT_CLEAR)
+
+ /* Reset channel gain table read and write pointers */
+ #define RtdEnableCGT(dev, v) \
+- writel ((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)
++ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_CGT_ENABLE)
+
+ /* Write channel gain table entry */
+ #define RtdWriteCGTable(dev, v) \
+- writel (v, devpriv->las0+LAS0_CGT_WRITE)
++ writel(v, devpriv->las0+LAS0_CGT_WRITE)
+
+ /* Write Channel Gain Latch */
+ #define RtdWriteCGLatch(dev, v) \
+- writel (v, devpriv->las0+LAS0_CGL_WRITE)
++ writel(v, devpriv->las0+LAS0_CGL_WRITE)
+
+ /* Reset ADC FIFO */
+ #define RtdAdcClearFifo(dev) \
+- writel (0, devpriv->las0+LAS0_ADC_FIFO_CLEAR)
++ writel(0, devpriv->las0+LAS0_ADC_FIFO_CLEAR)
+
+ /* Set ADC start conversion source select (write only) */
+ #define RtdAdcConversionSource(dev, v) \
+- writel (v, devpriv->las0+LAS0_ADC_CONVERSION)
++ writel(v, devpriv->las0+LAS0_ADC_CONVERSION)
+
+ /* Set burst start source select (write only) */
+ #define RtdBurstStartSource(dev, v) \
+- writel (v, devpriv->las0+LAS0_BURST_START)
++ writel(v, devpriv->las0+LAS0_BURST_START)
+
+ /* Set Pacer start source select (write only) */
+ #define RtdPacerStartSource(dev, v) \
+- writel (v, devpriv->las0+LAS0_PACER_START)
++ writel(v, devpriv->las0+LAS0_PACER_START)
+
+ /* Set Pacer stop source select (write only) */
+ #define RtdPacerStopSource(dev, v) \
+- writel (v, devpriv->las0+LAS0_PACER_STOP)
++ writel(v, devpriv->las0+LAS0_PACER_STOP)
+
+ /* Set Pacer clock source select (write only) 0=external 1=internal */
+ #define RtdPacerClockSource(dev, v) \
+- writel ((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_SELECT)
++ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_SELECT)
+
+ /* Set sample counter source select (write only) */
+ #define RtdAdcSampleCounterSource(dev, v) \
+- writel (v, devpriv->las0+LAS0_ADC_SCNT_SRC)
++ writel(v, devpriv->las0+LAS0_ADC_SCNT_SRC)
+
+ /* Set Pacer trigger mode select (write only) 0=single cycle, 1=repeat */
+ #define RtdPacerTriggerMode(dev, v) \
+- writel ((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_REPEAT)
++ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_PACER_REPEAT)
+
+ /* Set About counter stop enable (write only) */
+ #define RtdAboutStopEnable(dev, v) \
+- writel ((v > 0) ? 1 : 0, devpriv->las0+LAS0_ACNT_STOP_ENABLE)
++ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ACNT_STOP_ENABLE)
+
+ /* Set external trigger polarity (write only) 0=positive edge, 1=negative */
+ #define RtdTriggerPolarity(dev, v) \
+- writel ((v > 0) ? 1 : 0, devpriv->las0+LAS0_ETRG_POLARITY)
++ writel((v > 0) ? 1 : 0, devpriv->las0+LAS0_ETRG_POLARITY)
+
+ /* Start single ADC conversion */
+ #define RtdAdcStart(dev) \
+- writew (0, devpriv->las0+LAS0_ADC)
++ writew(0, devpriv->las0+LAS0_ADC)
+
+ /* Read one ADC data value (12bit (with sign extend) as 16bit) */
+ /* Note: matches what DMA would get. Actual value >> 3 */
+ #define RtdAdcFifoGet(dev) \
+- readw (devpriv->las1+LAS1_ADC_FIFO)
++ readw(devpriv->las1+LAS1_ADC_FIFO)
+
+ /* Read two ADC data values (DOESNT WORK) */
+ #define RtdAdcFifoGet2(dev) \
+- readl (devpriv->las1+LAS1_ADC_FIFO)
++ readl(devpriv->las1+LAS1_ADC_FIFO)
+
+ /* FIFO status */
+ #define RtdFifoStatus(dev) \
+- readl (devpriv->las0+LAS0_ADC)
++ readl(devpriv->las0+LAS0_ADC)
+
+ /* pacer start/stop read=start, write=stop*/
+ #define RtdPacerStart(dev) \
+- readl (devpriv->las0+LAS0_PACER)
++ readl(devpriv->las0+LAS0_PACER)
+ #define RtdPacerStop(dev) \
+- writel (0, devpriv->las0+LAS0_PACER)
++ writel(0, devpriv->las0+LAS0_PACER)
+
+ /* Interrupt status */
+ #define RtdInterruptStatus(dev) \
+- readw (devpriv->las0+LAS0_IT)
++ readw(devpriv->las0+LAS0_IT)
+
+ /* Interrupt mask */
+ #define RtdInterruptMask(dev, v) \
+- writew ((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)
++ writew((devpriv->intMask = (v)), devpriv->las0+LAS0_IT)
+
+ /* Interrupt status clear (only bits set in mask) */
+ #define RtdInterruptClear(dev) \
+- readw (devpriv->las0+LAS0_CLEAR)
++ readw(devpriv->las0+LAS0_CLEAR)
+
+ /* Interrupt clear mask */
+ #define RtdInterruptClearMask(dev, v) \
+- writew ((devpriv->intClearMask = (v)), devpriv->las0+LAS0_CLEAR)
++ writew((devpriv->intClearMask = (v)), devpriv->las0+LAS0_CLEAR)
+
+ /* Interrupt overrun status */
+ #define RtdInterruptOverrunStatus(dev) \
+- readl (devpriv->las0+LAS0_OVERRUN)
++ readl(devpriv->las0+LAS0_OVERRUN)
+
+ /* Interrupt overrun clear */
+ #define RtdInterruptOverrunClear(dev) \
+- writel (0, devpriv->las0+LAS0_OVERRUN)
++ writel(0, devpriv->las0+LAS0_OVERRUN)
+
+ /* Pacer counter, 24bit */
+ #define RtdPacerCount(dev) \
+- readl (devpriv->las0+LAS0_PCLK)
++ readl(devpriv->las0+LAS0_PCLK)
+ #define RtdPacerCounter(dev, v) \
+- writel ((v) & 0xffffff, devpriv->las0+LAS0_PCLK)
++ writel((v) & 0xffffff, devpriv->las0+LAS0_PCLK)
+
+ /* Burst counter, 10bit */
+ #define RtdBurstCount(dev) \
+- readl (devpriv->las0+LAS0_BCLK)
++ readl(devpriv->las0+LAS0_BCLK)
+ #define RtdBurstCounter(dev, v) \
+- writel ((v) & 0x3ff, devpriv->las0+LAS0_BCLK)
++ writel((v) & 0x3ff, devpriv->las0+LAS0_BCLK)
+
+ /* Delay counter, 16bit */
+ #define RtdDelayCount(dev) \
+- readl (devpriv->las0+LAS0_DCLK)
++ readl(devpriv->las0+LAS0_DCLK)
+ #define RtdDelayCounter(dev, v) \
+- writel ((v) & 0xffff, devpriv->las0+LAS0_DCLK)
++ writel((v) & 0xffff, devpriv->las0+LAS0_DCLK)
+
+ /* About counter, 16bit */
+ #define RtdAboutCount(dev) \
+- readl (devpriv->las0+LAS0_ACNT)
++ readl(devpriv->las0+LAS0_ACNT)
+ #define RtdAboutCounter(dev, v) \
+- writel ((v) & 0xffff, devpriv->las0+LAS0_ACNT)
++ writel((v) & 0xffff, devpriv->las0+LAS0_ACNT)
+
+ /* ADC sample counter, 10bit */
+ #define RtdAdcSampleCount(dev) \
+- readl (devpriv->las0+LAS0_ADC_SCNT)
++ readl(devpriv->las0+LAS0_ADC_SCNT)
+ #define RtdAdcSampleCounter(dev, v) \
+- writel ((v) & 0x3ff, devpriv->las0+LAS0_ADC_SCNT)
++ writel((v) & 0x3ff, devpriv->las0+LAS0_ADC_SCNT)
+
+ /* User Timer/Counter (8254) */
+ #define RtdUtcCounterGet(dev, n) \
+- readb (devpriv->las0 \
+- + ((n <= 0) ? LAS0_UTC0 : ((1 == n) ? LAS0_UTC1 : LAS0_UTC2)))
++ readb(devpriv->las0 \
++ + ((n <= 0) ? LAS0_UTC0 : ((1 == n) ? LAS0_UTC1 : LAS0_UTC2)))
+
+ #define RtdUtcCounterPut(dev, n, v) \
+- writeb ((v) & 0xff, devpriv->las0 \
+- + ((n <= 0) ? LAS0_UTC0 : ((1 == n) ? LAS0_UTC1 : LAS0_UTC2)))
++ writeb((v) & 0xff, devpriv->las0 \
++ + ((n <= 0) ? LAS0_UTC0 : ((1 == n) ? LAS0_UTC1 : LAS0_UTC2)))
+
+ /* Set UTC (8254) control byte */
+ #define RtdUtcCtrlPut(dev, n, v) \
+- writeb (devpriv->utcCtrl[(n) & 3] = (((n) & 3) << 6) | ((v) & 0x3f), \
+- devpriv->las0 + LAS0_UTC_CTRL)
++ writeb(devpriv->utcCtrl[(n) & 3] = (((n) & 3) << 6) | ((v) & 0x3f), \
++ devpriv->las0 + LAS0_UTC_CTRL)
+
+ /* Set UTCn clock source (write only) */
+ #define RtdUtcClockSource(dev, n, v) \
+- writew (v, devpriv->las0 \
+- + ((n <= 0) ? LAS0_UTC0_CLOCK : \
+- ((1 == n) ? LAS0_UTC1_CLOCK : LAS0_UTC2_CLOCK)))
++ writew(v, devpriv->las0 \
++ + ((n <= 0) ? LAS0_UTC0_CLOCK : \
++ ((1 == n) ? LAS0_UTC1_CLOCK : LAS0_UTC2_CLOCK)))
+
+ /* Set UTCn gate source (write only) */
+ #define RtdUtcGateSource(dev, n, v) \
+- writew (v, devpriv->las0 \
+- + ((n <= 0) ? LAS0_UTC0_GATE : \
+- ((1 == n) ? LAS0_UTC1_GATE : LAS0_UTC2_GATE)))
++ writew(v, devpriv->las0 \
++ + ((n <= 0) ? LAS0_UTC0_GATE : \
++ ((1 == n) ? LAS0_UTC1_GATE : LAS0_UTC2_GATE)))
+
+ /* User output N source select (write only) */
+ #define RtdUsrOutSource(dev, n, v) \
+- writel (v, devpriv->las0+((n <= 0) ? LAS0_UOUT0_SELECT : LAS0_UOUT1_SELECT))
++ writel(v, devpriv->las0+((n <= 0) ? LAS0_UOUT0_SELECT : LAS0_UOUT1_SELECT))
+
+ /* Digital IO */
+ #define RtdDio0Read(dev) \
+- (readw (devpriv->las0+LAS0_DIO0) & 0xff)
++ (readw(devpriv->las0+LAS0_DIO0) & 0xff)
+ #define RtdDio0Write(dev, v) \
+- writew ((v) & 0xff, devpriv->las0+LAS0_DIO0)
++ writew((v) & 0xff, devpriv->las0+LAS0_DIO0)
+
+ #define RtdDio1Read(dev) \
+- (readw (devpriv->las0+LAS0_DIO1) & 0xff)
++ (readw(devpriv->las0+LAS0_DIO1) & 0xff)
+ #define RtdDio1Write(dev, v) \
+- writew ((v) & 0xff, devpriv->las0+LAS0_DIO1)
++ writew((v) & 0xff, devpriv->las0+LAS0_DIO1)
+
+ #define RtdDioStatusRead(dev) \
+- (readw (devpriv->las0+LAS0_DIO_STATUS) & 0xff)
++ (readw(devpriv->las0+LAS0_DIO_STATUS) & 0xff)
+ #define RtdDioStatusWrite(dev, v) \
+- writew ((devpriv->dioStatus = (v)), devpriv->las0+LAS0_DIO_STATUS)
++ writew((devpriv->dioStatus = (v)), devpriv->las0+LAS0_DIO_STATUS)
+
+ #define RtdDio0CtrlRead(dev) \
+- (readw (devpriv->las0+LAS0_DIO0_CTRL) & 0xff)
++ (readw(devpriv->las0+LAS0_DIO0_CTRL) & 0xff)
+ #define RtdDio0CtrlWrite(dev, v) \
+- writew ((v) & 0xff, devpriv->las0+LAS0_DIO0_CTRL)
++ writew((v) & 0xff, devpriv->las0+LAS0_DIO0_CTRL)
+
+ /* Digital to Analog converter */
+ /* Write one data value (sign + 12bit + marker bits) */
+ /* Note: matches what DMA would put. Actual value << 3 */
+ #define RtdDacFifoPut(dev, n, v) \
+- writew ((v), devpriv->las1 +(((n) == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO))
++ writew((v), devpriv->las1 + (((n) == 0) ? LAS1_DAC1_FIFO : LAS1_DAC2_FIFO))
+
+ /* Start single DAC conversion */
+ #define RtdDacUpdate(dev, n) \
+- writew (0, devpriv->las0 +(((n) == 0) ? LAS0_DAC1 : LAS0_DAC2))
++ writew(0, devpriv->las0 + (((n) == 0) ? LAS0_DAC1 : LAS0_DAC2))
+
+ /* Start single DAC conversion on both DACs */
+ #define RtdDacBothUpdate(dev) \
+- writew (0, devpriv->las0+LAS0_DAC)
++ writew(0, devpriv->las0+LAS0_DAC)
+
+ /* Set DAC output type and range */
+ #define RtdDacRange(dev, n, v) \
+- writew ((v) & 7, devpriv->las0 \
+- +(((n) == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL))
++ writew((v) & 7, devpriv->las0 \
++ +(((n) == 0) ? LAS0_DAC1_CTRL : LAS0_DAC2_CTRL))
+
+ /* Reset DAC FIFO */
+ #define RtdDacClearFifo(dev, n) \
+- writel (0, devpriv->las0+(((n) == 0) ? LAS0_DAC1_RESET : LAS0_DAC2_RESET))
++ writel(0, devpriv->las0+(((n) == 0) ? LAS0_DAC1_RESET : LAS0_DAC2_RESET))
+
+ /* Set source for DMA 0 (write only, shadow?) */
+ #define RtdDma0Source(dev, n) \
+- writel ((n) & 0xf, devpriv->las0+LAS0_DMA0_SRC)
++ writel((n) & 0xf, devpriv->las0+LAS0_DMA0_SRC)
+
+ /* Set source for DMA 1 (write only, shadow?) */
+ #define RtdDma1Source(dev, n) \
+- writel ((n) & 0xf, devpriv->las0+LAS0_DMA1_SRC)
++ writel((n) & 0xf, devpriv->las0+LAS0_DMA1_SRC)
+
+ /* Reset board state for DMA 0 */
+ #define RtdDma0Reset(dev) \
+- writel (0, devpriv->las0+LAS0_DMA0_RESET)
++ writel(0, devpriv->las0+LAS0_DMA0_RESET)
+
+ /* Reset board state for DMA 1 */
+ #define RtdDma1Reset(dev) \
+- writel (0, devpriv->las0+LAS0_DMA1_SRC)
++ writel(0, devpriv->las0+LAS0_DMA1_SRC)
+
+ /* PLX9080 interrupt mask and status */
+ #define RtdPlxInterruptRead(dev) \
+- readl (devpriv->lcfg+LCFG_ITCSR)
++ readl(devpriv->lcfg+LCFG_ITCSR)
+ #define RtdPlxInterruptWrite(dev, v) \
+- writel (v, devpriv->lcfg+LCFG_ITCSR)
++ writel(v, devpriv->lcfg+LCFG_ITCSR)
+
+ /* Set mode for DMA 0 */
+ #define RtdDma0Mode(dev, m) \
+- writel ((m), devpriv->lcfg+LCFG_DMAMODE0)
++ writel((m), devpriv->lcfg+LCFG_DMAMODE0)
+
+ /* Set PCI address for DMA 0 */
+ #define RtdDma0PciAddr(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMAPADR0)
++ writel((a), devpriv->lcfg+LCFG_DMAPADR0)
+
+ /* Set local address for DMA 0 */
+ #define RtdDma0LocalAddr(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMALADR0)
++ writel((a), devpriv->lcfg+LCFG_DMALADR0)
+
+ /* Set byte count for DMA 0 */
+ #define RtdDma0Count(dev, c) \
+- writel ((c), devpriv->lcfg+LCFG_DMASIZ0)
++ writel((c), devpriv->lcfg+LCFG_DMASIZ0)
+
+ /* Set next descriptor for DMA 0 */
+ #define RtdDma0Next(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMADPR0)
++ writel((a), devpriv->lcfg+LCFG_DMADPR0)
+
+ /* Set mode for DMA 1 */
+ #define RtdDma1Mode(dev, m) \
+- writel ((m), devpriv->lcfg+LCFG_DMAMODE1)
++ writel((m), devpriv->lcfg+LCFG_DMAMODE1)
+
+ /* Set PCI address for DMA 1 */
+ #define RtdDma1PciAddr(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMAADR1)
++ writel((a), devpriv->lcfg+LCFG_DMAADR1)
+
+ /* Set local address for DMA 1 */
+ #define RtdDma1LocalAddr(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMALADR1)
++ writel((a), devpriv->lcfg+LCFG_DMALADR1)
+
+ /* Set byte count for DMA 1 */
+ #define RtdDma1Count(dev, c) \
+- writel ((c), devpriv->lcfg+LCFG_DMASIZ1)
++ writel((c), devpriv->lcfg+LCFG_DMASIZ1)
+
+ /* Set next descriptor for DMA 1 */
+ #define RtdDma1Next(dev, a) \
+- writel ((a), devpriv->lcfg+LCFG_DMADPR1)
++ writel((a), devpriv->lcfg+LCFG_DMADPR1)
+
+ /* Set control for DMA 0 (write only, shadow?) */
+ #define RtdDma0Control(dev, n) \
+- writeb (devpriv->dma0Control = (n), devpriv->lcfg+LCFG_DMACSR0)
++ writeb(devpriv->dma0Control = (n), devpriv->lcfg+LCFG_DMACSR0)
+
+ /* Get status for DMA 0 */
+ #define RtdDma0Status(dev) \
+- readb (devpriv->lcfg+LCFG_DMACSR0)
++ readb(devpriv->lcfg+LCFG_DMACSR0)
+
+ /* Set control for DMA 1 (write only, shadow?) */
+ #define RtdDma1Control(dev, n) \
+- writeb (devpriv->dma1Control = (n), devpriv->lcfg+LCFG_DMACSR1)
++ writeb(devpriv->dma1Control = (n), devpriv->lcfg+LCFG_DMACSR1)
+
+ /* Get status for DMA 1 */
+ #define RtdDma1Status(dev) \
+- readb (devpriv->lcfg+LCFG_DMACSR1)
++ readb(devpriv->lcfg+LCFG_DMACSR1)
+
+ /*
+ * The struct comedi_driver structure tells the Comedi core module
+@@ -760,9 +760,9 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ int index;
+ #endif
+
+- printk("comedi%d: rtd520 attaching.\n", dev->minor);
++ printk(KERN_INFO "comedi%d: rtd520 attaching.\n", dev->minor);
+
+-#if defined (CONFIG_COMEDI_DEBUG) && defined (USE_DMA)
++#if defined(CONFIG_COMEDI_DEBUG) && defined(USE_DMA)
+ /* You can set this a load time: modprobe comedi comedi_debug=1 */
+ if (0 == comedi_debug) /* force DMA debug printks */
+ comedi_debug = 1;
+@@ -800,10 +800,10 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ }
+ if (!pcidev) {
+ if (it->options[0] && it->options[1]) {
+- printk("No RTD card at bus=%d slot=%d.\n",
++ printk(KERN_INFO "No RTD card at bus=%d slot=%d.\n",
+ it->options[0], it->options[1]);
+ } else {
+- printk("No RTD card found.\n");
++ printk(KERN_INFO "No RTD card found.\n");
+ }
+ return -EIO;
+ }
+@@ -812,7 +812,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+
+ ret = comedi_pci_enable(pcidev, DRV_NAME);
+ if (ret < 0) {
+- printk("Failed to enable PCI device and request regions.\n");
++ printk(KERN_INFO "Failed to enable PCI device and request regions.\n");
+ return ret;
+ }
+ devpriv->got_regions = 1;
+@@ -830,9 +830,9 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ devpriv->las1 = ioremap_nocache(physLas1, LAS1_PCISIZE);
+ devpriv->lcfg = ioremap_nocache(physLcfg, LCFG_PCISIZE);
+
+- if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg) {
++ if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg)
+ return -ENOMEM;
+- }
++
+
+ DPRINTK("%s: LAS0=%llx, LAS1=%llx, CFG=%llx.\n", dev->board_name,
+ (unsigned long long)physLas0, (unsigned long long)physLas1,
+@@ -849,7 +849,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ pci_read_config_byte(devpriv->pci_dev,
+ PCI_LATENCY_TIMER, &pci_latency);
+ if (pci_latency < 32) {
+- printk("%s: PCI latency changed from %d to %d\n",
++ printk(KERN_INFO "%s: PCI latency changed from %d to %d\n",
+ dev->board_name, pci_latency, 32);
+ pci_write_config_byte(devpriv->pci_dev,
+ PCI_LATENCY_TIMER, 32);
+@@ -875,9 +875,9 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ * Allocate the subdevice structures. alloc_subdevice() is a
+ * convenient macro defined in comedidev.h.
+ */
+- if (alloc_subdevices(dev, 4) < 0) {
++ if (alloc_subdevices(dev, 4) < 0)
+ return -ENOMEM;
+- }
++
+
+ s = dev->subdevices + 0;
+ dev->read_subdev = s;
+@@ -887,11 +887,11 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF | SDF_CMD_READ;
+ s->n_chan = thisboard->aiChans;
+ s->maxdata = (1 << thisboard->aiBits) - 1;
+- if (thisboard->aiMaxGain <= 32) {
++ if (thisboard->aiMaxGain <= 32)
+ s->range_table = &rtd_ai_7520_range;
+- } else {
++ else
+ s->range_table = &rtd_ai_4520_range;
+- }
++
+ s->len_chanlist = RTD_MAX_CHANLIST; /* devpriv->fifoLen */
+ s->insn_read = rtd_ai_rinsn;
+ s->do_cmd = rtd_ai_cmd;
+@@ -961,9 +961,9 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ printk("( irq=%u )", dev->irq);
+
+ ret = rtd520_probe_fifo_depth(dev);
+- if (ret < 0) {
++ if (ret < 0)
+ return ret;
+- }
++
+ devpriv->fifoLen = ret;
+ printk("( fifoLen=%d )", devpriv->fifoLen);
+
+@@ -1028,7 +1028,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ RtdDma0Mode(dev, DMA_MODE_BITS);
+ RtdDma0Source(dev, DMAS_ADFIFO_HALF_FULL); /* set DMA trigger source */
+ } else {
+- printk("( no IRQ->no DMA )");
++ printk(KERN_INFO "( no IRQ->no DMA )");
+ }
+ #endif /* USE_DMA */
+
+@@ -1071,18 +1071,18 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+ }
+
+ /* release all regions that were allocated */
+- if (devpriv->las0) {
++ if (devpriv->las0)
+ iounmap(devpriv->las0);
+- }
+- if (devpriv->las1) {
++
++ if (devpriv->las1)
+ iounmap(devpriv->las1);
+- }
+- if (devpriv->lcfg) {
++
++ if (devpriv->lcfg)
+ iounmap(devpriv->lcfg);
+- }
+- if (devpriv->pci_dev) {
++
++ if (devpriv->pci_dev)
+ pci_dev_put(devpriv->pci_dev);
+- }
++
+ return ret;
+ #endif
+ }
+@@ -1158,24 +1158,24 @@ static int rtd_detach(struct comedi_device *dev)
+ }
+
+ /* release all regions that were allocated */
+- if (devpriv->las0) {
++ if (devpriv->las0)
+ iounmap(devpriv->las0);
+- }
+- if (devpriv->las1) {
++
++ if (devpriv->las1)
+ iounmap(devpriv->las1);
+- }
+- if (devpriv->lcfg) {
++
++ if (devpriv->lcfg)
+ iounmap(devpriv->lcfg);
+- }
++
+ if (devpriv->pci_dev) {
+- if (devpriv->got_regions) {
++ if (devpriv->got_regions)
+ comedi_pci_disable(devpriv->pci_dev);
+- }
++
+ pci_dev_put(devpriv->pci_dev);
+ }
+ }
+
+- printk("comedi%d: rtd520: removed.\n", dev->minor);
++ printk(KERN_INFO "comedi%d: rtd520: removed.\n", dev->minor);
+
+ return 0;
+ }
+@@ -1275,13 +1275,13 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev)
+ }
+ }
+ if (i == limit) {
+- printk("\ncomedi: %s: failed to probe fifo size.\n", DRV_NAME);
++ printk(KERN_INFO "\ncomedi: %s: failed to probe fifo size.\n", DRV_NAME);
+ return -EIO;
+ }
+ RtdAdcClearFifo(dev);
+ if (fifo_size != 0x400 && fifo_size != 0x2000) {
+ printk
+- ("\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n",
++ (KERN_INFO "\ncomedi: %s: unexpected fifo size of %i, expected 1024 or 8192.\n",
+ DRV_NAME, fifo_size);
+ return -EIO;
+ }
+@@ -1335,11 +1335,10 @@ static int rtd_ai_rinsn(struct comedi_device *dev,
+ d = RtdAdcFifoGet(dev); /* get 2s comp value */
+ /*printk ("rtd520: Got 0x%x after %d usec\n", d, ii+1); */
+ d = d >> 3; /* low 3 bits are marker lines */
+- if (CHAN_ARRAY_TEST(devpriv->chanBipolar, 0)) {
++ if (CHAN_ARRAY_TEST(devpriv->chanBipolar, 0))
+ data[n] = d + 2048; /* convert to comedi unsigned data */
+- } else {
++ else
+ data[n] = d;
+- }
+ }
+
+ /* return the number of samples read/written */
+@@ -1375,11 +1374,11 @@ static int ai_read_n(struct comedi_device *dev, struct comedi_subdevice *s,
+ d = RtdAdcFifoGet(dev); /* get 2s comp value */
+
+ d = d >> 3; /* low 3 bits are marker lines */
+- if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan)) {
++ if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan))
+ sample = d + 2048; /* convert to comedi unsigned data */
+- } else {
++ else
+ sample = d;
+- }
++
+ if (!comedi_buf_put(s->async, sample))
+ return -1;
+
+@@ -1403,11 +1402,11 @@ static int ai_read_dregs(struct comedi_device *dev, struct comedi_subdevice *s)
+ }
+
+ d = d >> 3; /* low 3 bits are marker lines */
+- if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan)) {
++ if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan))
+ sample = d + 2048; /* convert to comedi unsigned data */
+- } else {
++ else
+ sample = d;
+- }
++
+ if (!comedi_buf_put(s->async, sample))
+ return -1;
+
+@@ -1493,9 +1492,9 @@ static int ai_process_dma(struct comedi_device *dev, struct comedi_subdevice *s)
+
+ if (CHAN_ARRAY_TEST(devpriv->chanBipolar, s->async->cur_chan)) {
+ sample = (*dp >> 3) + 2048; /* convert to comedi unsigned data */
+- } else {
++ else
+ sample = *dp >> 3; /* low 3 bits are marker lines */
+- }
++
+ *dp++ = sample; /* put processed value back */
+
+ if (++s->async->cur_chan >= s->async->cmd.chanlist_len)
+@@ -1546,9 +1545,8 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
+ u16 fifoStatus;
+ struct comedi_subdevice *s = dev->subdevices + 0; /* analog in subdevice */
+
+- if (!dev->attached) {
++ if (!dev->attached)
+ return IRQ_NONE;
+- }
+
+ devpriv->intCount++; /* DEBUG statistics */
+
+@@ -1594,9 +1592,8 @@ static irqreturn_t rtd_interrupt(int irq, /* interrupt number (ignored) */
+
+ status = RtdInterruptStatus(dev);
+ /* if interrupt was not caused by our board, or handled above */
+- if (0 == status) {
++ if (0 == status)
+ return IRQ_HANDLED;
+- }
+
+ if (status & IRQM_ADC_ABOUT_CNT) { /* sample count -> read FIFO */
+ /* since the priority interrupt controller may have queued a sample
+@@ -1734,33 +1731,32 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
+
+ tmp = cmd->start_src;
+ cmd->start_src &= TRIG_NOW;
+- if (!cmd->start_src || tmp != cmd->start_src) {
++ if (!cmd->start_src || tmp != cmd->start_src)
+ err++;
+- }
+
+ tmp = cmd->scan_begin_src;
+ cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT;
+- if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) {
++ if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
+ err++;
+- }
++
+
+ tmp = cmd->convert_src;
+ cmd->convert_src &= TRIG_TIMER | TRIG_EXT;
+- if (!cmd->convert_src || tmp != cmd->convert_src) {
++ if (!cmd->convert_src || tmp != cmd->convert_src)
+ err++;
+- }
++
+
+ tmp = cmd->scan_end_src;
+ cmd->scan_end_src &= TRIG_COUNT;
+- if (!cmd->scan_end_src || tmp != cmd->scan_end_src) {
++ if (!cmd->scan_end_src || tmp != cmd->scan_end_src)
+ err++;
+- }
++
+
+ tmp = cmd->stop_src;
+ cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
+- if (!cmd->stop_src || tmp != cmd->stop_src) {
++ if (!cmd->stop_src || tmp != cmd->stop_src)
+ err++;
+- }
++
+
+ if (err)
+ return 1;
+@@ -1772,16 +1768,14 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
+ cmd->scan_begin_src != TRIG_EXT) {
+ err++;
+ }
+- if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT) {
++ if (cmd->convert_src != TRIG_TIMER && cmd->convert_src != TRIG_EXT)
+ err++;
+- }
+- if (cmd->stop_src != TRIG_COUNT && cmd->stop_src != TRIG_NONE) {
++
++ if (cmd->stop_src != TRIG_COUNT && cmd->stop_src != TRIG_NONE)
+ err++;
+- }
+
+- if (err) {
++ if (err)
+ return 2;
+- }
+
+ /* step 3: make sure arguments are trivially compatible */
+
+@@ -1882,9 +1876,9 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
+ }
+ }
+
+- if (err) {
++ if (err)
+ return 3;
+- }
++
+
+ /* step 4: fix up any arguments */
+
+@@ -1896,17 +1890,17 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
+ tmp = cmd->scan_begin_arg;
+ rtd_ns_to_timer(&cmd->scan_begin_arg,
+ cmd->flags & TRIG_ROUND_MASK);
+- if (tmp != cmd->scan_begin_arg) {
++ if (tmp != cmd->scan_begin_arg)
+ err++;
+- }
++
+ }
+ if (cmd->convert_src == TRIG_TIMER) {
+ tmp = cmd->convert_arg;
+ rtd_ns_to_timer(&cmd->convert_arg,
+ cmd->flags & TRIG_ROUND_MASK);
+- if (tmp != cmd->convert_arg) {
++ if (tmp != cmd->convert_arg)
+ err++;
+- }
++
+ if (cmd->scan_begin_src == TRIG_TIMER
+ && (cmd->scan_begin_arg
+ < (cmd->convert_arg * cmd->scan_end_arg))) {
+@@ -1916,9 +1910,8 @@ static int rtd_ai_cmdtest(struct comedi_device *dev,
+ }
+ }
+
+- if (err) {
++ if (err)
+ return 4;
+- }
+
+ return 0;
+ }
+@@ -2221,7 +2214,7 @@ static int rtd_ao_winsn(struct comedi_device *dev,
+ /* VERIFY: comedi range and offset conversions */
+
+ if ((range > 1) /* bipolar */
+- &&(data[i] < 2048)) {
++ && (data[i] < 2048)) {
+ /* offset and sign extend */
+ val = (((int)data[i]) - 2048) << 3;
+ } else { /* unipolor */
+@@ -2267,9 +2260,9 @@ static int rtd_ao_rinsn(struct comedi_device *dev,
+ int i;
+ int chan = CR_CHAN(insn->chanspec);
+
+- for (i = 0; i < insn->n; i++) {
++ for (i = 0; i < insn->n; i++)
+ data[i] = devpriv->aoValue[chan];
+- }
++
+
+ return i;
+ }
+ commit aa5bd67dcfdf9af34c7fa36ebc87d4e1f7e91873 +Author: Kacper Kornet <kornet@camk.edu.pl> +Date: Sat Jan 29 00:21:04 2011 +0100 + + Fix prlimit64 for suid/sgid processes + + Since check_prlimit_permission always fails in the case of SUID/GUID + processes, such processes are not able to read or set their own limits. + This commit changes this by assuming that process can always read/change + its own limits. + + Signed-off-by: Kacper Kornet <kornet@camk.edu.pl> + Acked-by: Jiri Slaby <jslaby@suse.cz> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/kernel/sys.c b/kernel/sys.c +index 31b71a276b40..18da702ec813 100644 +--- a/kernel/sys.c ++++ b/kernel/sys.c +@@ -1385,7 +1385,8 @@ static int check_prlimit_permission(struct task_struct *task) + const struct cred *cred = current_cred(), *tcred; + + tcred = __task_cred(task); +- if ((cred->uid != tcred->euid || ++ if (current != task && ++ (cred->uid != tcred->euid || + cred->uid != tcred->suid || + cred->uid != tcred->uid || + cred->gid != tcred->egid ||+
commit 4f5c933abb34532dc962185c999509b97a97fa1b +Author: James M McLaren <mclaren@tulane.edu> +Date: Sun Oct 3 19:09:18 2010 -0300 + + [media] hdpvr: Add missing URB_NO_TRANSFER_DMA_MAP flag + + Necessary on arm. + + Signed-off-by: Janne Grunau <j@jannau.net> + Cc: stable@kernel.org + Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> + +diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c +index 4863a21b1f24..93f795960a94 100644 +--- a/drivers/media/video/hdpvr/hdpvr-video.c ++++ b/drivers/media/video/hdpvr/hdpvr-video.c +@@ -157,6 +157,7 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count) + mem, dev->bulk_in_size, + hdpvr_read_bulk_callback, buf); + ++ buf->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + buf->status = BUFSTAT_AVAILABLE; + list_add_tail(&buf->buff_list, &dev->free_buff_list); + }+
commit d196c9a5d4e150cdff675662214c80c69b906958
+Author: Ivo Calado <ivocalado@embedded.ufcg.edu.br>
+Date: Mon Oct 11 20:40:04 2010 +0200
+
+ dccp: generalise data-loss condition
+
+ This patch generalises the task of determining data loss from RFC 4340, 7.7.1.
+
+ Let S_A, S_B be sequence numbers such that S_B is "after" S_A, and let
+ N_B be the NDP count of packet S_B. Then, using modulo-2^48 arithmetic,
+ D = S_B - S_A - 1 is an upper bound of the number of lost data packets,
+ D - N_B is an approximation of the number of lost data packets
+ (there are cases where this is not exact).
+
+ The patch implements this as
+ dccp_loss_count(S_A, S_B, N_B) := max(S_B - S_A - 1 - N_B, 0)
+
+ Signed-off-by: Ivo Calado <ivocalado@embedded.ufcg.edu.br>
+ Signed-off-by: Erivaldo Xavier <desadoc@gmail.com>
+ Signed-off-by: Leandro Sales <leandroal@gmail.com>
+ Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
+
+diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
+index e051c774ef5c..60f4f9622ab3 100644
+--- a/net/dccp/dccp.h
++++ b/net/dccp/dccp.h
+@@ -153,18 +153,27 @@ static inline u64 max48(const u64 seq1, const u64 seq2)
+ }
+
+ /**
+- * dccp_loss_free - Evaluates condition for data loss from RFC 4340, 7.7.1
+- * @s1: start sequence number
+- * @s2: end sequence number
++ * dccp_loss_count - Approximate the number of lost data packets in a burst loss
++ * @s1: last known sequence number before the loss ('hole')
++ * @s2: first sequence number seen after the 'hole'
+ * @ndp: NDP count on packet with sequence number @s2
+- * Returns true if the sequence range s1...s2 has no data loss.
+ */
+-static inline bool dccp_loss_free(const u64 s1, const u64 s2, const u64 ndp)
++static inline u64 dccp_loss_count(const u64 s1, const u64 s2, const u64 ndp)
+ {
+ s64 delta = dccp_delta_seqno(s1, s2);
+
+ WARN_ON(delta < 0);
+- return (u64)delta <= ndp + 1;
++ delta -= ndp + 1;
++
++ return delta > 0 ? delta : 0;
++}
++
++/**
++ * dccp_loss_free - Evaluate condition for data loss from RFC 4340, 7.7.1
++ */
++static inline bool dccp_loss_free(const u64 s1, const u64 s2, const u64 ndp)
++{
++ return dccp_loss_count(s1, s2, ndp) == 0;
+ }
+
+ enum {
+ commit 77c1ff3982c6b36961725dd19e872a1c07df7f3b
+Author: Andy Getzendanner <james.getzendanner@students.olin.edu>
+Date: Thu Feb 11 14:04:48 2010 +1000
+
+ vgaarb: fix incorrect dereference of userspace pointer.
+
+ This patch corrects a userspace pointer dereference in the VGA arbiter
+ in 2.6.32.1.
+
+ copy_from_user() is used at line 822 to copy the contents of buf into
+ kbuf, but a call to strncmp() on line 964 uses buf rather than kbuf. This
+ problem led to a GPF in strncmp() when X was started on my x86_32 systems.
+ X triggered the behavior with a write of "target PCI:0000:01:00.0" to
+ /dev/vga_arbiter.
+
+ The patch has been tested against 2.6.32.1 and observed to correct the GPF
+ observed when starting X or manually writing the string "target
+ PCI:0000:01:00.0" to /dev/vga_arbiter.
+
+ Signed-off-by: Andy Getzendanner <james.getzendanner@students.olin.edu>
+ Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
+ Cc: <stable@kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
+index 1ac0c93603c9..24b56dc54597 100644
+--- a/drivers/gpu/vga/vgaarb.c
++++ b/drivers/gpu/vga/vgaarb.c
+@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
+ remaining -= 7;
+ pr_devel("client 0x%p called 'target'\n", priv);
+ /* if target is default */
+- if (!strncmp(buf, "default", 7))
++ if (!strncmp(kbuf, "default", 7))
+ pdev = pci_dev_get(vga_default_device());
+ else {
+ if (!vga_pci_str_to_vars(curr_pos, remaining,
+ commit 0c7a2b72746a96f999fd2728520d03d94879be69
+Author: CHENG Renquan <rqcheng@smu.edu.sg>
+Date: Sun Nov 22 01:28:52 2009 +0800
+
+ USB: add remove_id sysfs attr for usb drivers
+
+ Accroding commit 0994375e, which is adding remove_id sysfs attr
+ for pci drivers, for management tools dynamically bind/unbind
+ a pci/usb devices to a specified drivers; with this patch,
+ the management tools can be simplied.
+
+ And the original code didn't handle the failure of
+ usb_create_newid_file, fixed in this patch.
+
+ Signed-off-by: CHENG Renquan <rqcheng@smu.edu.sg>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
+index 7772928ee48f..deb6b489e4e5 100644
+--- a/Documentation/ABI/testing/sysfs-bus-usb
++++ b/Documentation/ABI/testing/sysfs-bus-usb
+@@ -144,3 +144,16 @@ Description:
+
+ Write a 1 to force the device to disconnect
+ (equivalent to unplugging a wired USB device).
++
++What: /sys/bus/usb/drivers/.../remove_id
++Date: November 2009
++Contact: CHENG Renquan <rqcheng@smu.edu.sg>
++Description:
++ Writing a device ID to this file will remove an ID
++ that was dynamically added via the new_id sysfs entry.
++ The format for the device ID is:
++ idVendor idProduct. After successfully
++ removing an ID, the driver will no longer support the
++ device. This is useful to ensure auto probing won't
++ match the driver to the device. For example:
++ # echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
+diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
+index 7a05bab73960..60a45f1e3a67 100644
+--- a/drivers/usb/core/driver.c
++++ b/drivers/usb/core/driver.c
+@@ -83,6 +83,47 @@ static ssize_t store_new_id(struct device_driver *driver,
+ }
+ static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);
+
++/**
++ * store_remove_id - remove a USB device ID from this driver
++ * @driver: target device driver
++ * @buf: buffer for scanning device ID data
++ * @count: input size
++ *
++ * Removes a dynamic usb device ID from this driver.
++ */
++static ssize_t
++store_remove_id(struct device_driver *driver, const char *buf, size_t count)
++{
++ struct usb_dynid *dynid, *n;
++ struct usb_driver *usb_driver = to_usb_driver(driver);
++ u32 idVendor = 0;
++ u32 idProduct = 0;
++ int fields = 0;
++ int retval = 0;
++
++ fields = sscanf(buf, "%x %x", &idVendor, &idProduct);
++ if (fields < 2)
++ return -EINVAL;
++
++ spin_lock(&usb_driver->dynids.lock);
++ list_for_each_entry_safe(dynid, n, &usb_driver->dynids.list, node) {
++ struct usb_device_id *id = &dynid->id;
++ if ((id->idVendor == idVendor) &&
++ (id->idProduct == idProduct)) {
++ list_del(&dynid->node);
++ kfree(dynid);
++ retval = 0;
++ break;
++ }
++ }
++ spin_unlock(&usb_driver->dynids.lock);
++
++ if (retval)
++ return retval;
++ return count;
++}
++static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id);
++
+ static int usb_create_newid_file(struct usb_driver *usb_drv)
+ {
+ int error = 0;
+@@ -107,6 +148,21 @@ static void usb_remove_newid_file(struct usb_driver *usb_drv)
+ &driver_attr_new_id);
+ }
+
++static int
++usb_create_removeid_file(struct usb_driver *drv)
++{
++ int error = 0;
++ if (drv->probe != NULL)
++ error = driver_create_file(&drv->drvwrap.driver,
++ &driver_attr_remove_id);
++ return error;
++}
++
++static void usb_remove_removeid_file(struct usb_driver *drv)
++{
++ driver_remove_file(&drv->drvwrap.driver, &driver_attr_remove_id);
++}
++
+ static void usb_free_dynids(struct usb_driver *usb_drv)
+ {
+ struct usb_dynid *dynid, *n;
+@@ -128,6 +184,16 @@ static void usb_remove_newid_file(struct usb_driver *usb_drv)
+ {
+ }
+
++static int
++usb_create_removeid_file(struct usb_driver *drv)
++{
++ return 0;
++}
++
++static void usb_remove_removeid_file(struct usb_driver *drv)
++{
++}
++
+ static inline void usb_free_dynids(struct usb_driver *usb_drv)
+ {
+ }
+@@ -774,19 +840,34 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner,
+ INIT_LIST_HEAD(&new_driver->dynids.list);
+
+ retval = driver_register(&new_driver->drvwrap.driver);
++ if (retval)
++ goto out;
+
+- if (!retval) {
+- pr_info("%s: registered new interface driver %s\n",
++ usbfs_update_special();
++
++ retval = usb_create_newid_file(new_driver);
++ if (retval)
++ goto out_newid;
++
++ retval = usb_create_removeid_file(new_driver);
++ if (retval)
++ goto out_removeid;
++
++ pr_info("%s: registered new interface driver %s\n",
+ usbcore_name, new_driver->name);
+- usbfs_update_special();
+- usb_create_newid_file(new_driver);
+- } else {
+- printk(KERN_ERR "%s: error %d registering interface "
+- " driver %s\n",
+- usbcore_name, retval, new_driver->name);
+- }
+
++out:
+ return retval;
++
++out_removeid:
++ usb_remove_newid_file(new_driver);
++out_newid:
++ driver_unregister(&new_driver->drvwrap.driver);
++
++ printk(KERN_ERR "%s: error %d registering interface "
++ " driver %s\n",
++ usbcore_name, retval, new_driver->name);
++ goto out;
+ }
+ EXPORT_SYMBOL_GPL(usb_register_driver);
+
+@@ -806,6 +887,7 @@ void usb_deregister(struct usb_driver *driver)
+ pr_info("%s: deregistering interface driver %s\n",
+ usbcore_name, driver->name);
+
++ usb_remove_removeid_file(driver);
+ usb_remove_newid_file(driver);
+ usb_free_dynids(driver);
+ driver_unregister(&driver->drvwrap.driver);
+ commit 97e7e4f391cac2b00417b581b432533d245d4fd0
+Author: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
+Date: Tue Mar 17 21:15:44 2009 +0100
+
+ tracing: optimization of branch tracer
+
+ Impact: better performance for if branch tracer
+
+ Use an array to count the hit and misses of a conditional instead
+ of using another conditional. This cuts down on saturation of branch
+ predictions and increases performance of modern pipelined architectures.
+
+ Signed-off-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
+ Signed-off-by: Steven Rostedt <srostedt@redhat.com>
+
+diff --git a/include/linux/compiler.h b/include/linux/compiler.h
+index d95da1020f1c..6faa7e549de4 100644
+--- a/include/linux/compiler.h
++++ b/include/linux/compiler.h
+@@ -68,6 +68,7 @@ struct ftrace_branch_data {
+ unsigned long miss;
+ unsigned long hit;
+ };
++ unsigned long miss_hit[2];
+ };
+ };
+
+@@ -125,10 +126,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ .line = __LINE__, \
+ }; \
+ ______r = !!(cond); \
+- if (______r) \
+- ______f.hit++; \
+- else \
+- ______f.miss++; \
++ ______f.miss_hit[______r]++; \
+ ______r; \
+ }))
+ #endif /* CONFIG_PROFILE_ALL_BRANCHES */
+ commit c6535668798b0644e1af5934c2aec0e912280449
+Author: Robert M. Kenney <rmk@unh.edu>
+Date: Thu Feb 26 14:58:39 2009 -0500
+
+ USB: serial: new cp2101 device id
+
+ From: Robert M. Kenney <rmk@unh.edu>
+ Cc: stable <stable@kernel.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
+index 027f4b7dde86..9b4082b58c5b 100644
+--- a/drivers/usb/serial/cp2101.c
++++ b/drivers/usb/serial/cp2101.c
+@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] = {
+ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
+ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
+ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
++ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
+ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
+ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */
+ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
+ commit 18a4d8c97b841632920c16a6fa9216d1214f3db7
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Mon Jul 20 19:52:40 2020 -0700
+
+ bpf, riscv: Use compressed instructions in the rv64 JIT
+
+ This patch uses the RVC support and encodings from bpf_jit.h to optimize
+ the rv64 jit.
+
+ The optimizations work by replacing emit(rv_X(...)) with a call to a
+ helper function emit_X, which will emit a compressed version of the
+ instruction when possible, and when RVC is enabled.
+
+ The JIT continues to pass all tests in lib/test_bpf.c, and introduces
+ no new failures to test_verifier; both with and without RVC being enabled.
+
+ Most changes are straightforward replacements of emit(rv_X(...), ctx)
+ with emit_X(..., ctx), with the following exceptions bearing mention;
+
+ * Change emit_imm to sign-extend the value in "lower", since the
+ checks for RVC (and the instructions themselves) treat the value as
+ signed. Otherwise, small negative immediates will not be recognized as
+ encodable using an RVC instruction. For example, without this change,
+ emit_imm(rd, -1, ctx) would cause lower to become 4095, which is not a
+ 6b int even though a "c.li rd, -1" instruction suffices.
+
+ * For {BPF_MOV,BPF_ADD} BPF_X, drop using addiw,addw in the 32-bit
+ cases since the values are zero-extended into the upper 32 bits in
+ the following instructions anyways, and the addition commutes with
+ zero-extension. (BPF_SUB BPF_X must still use subw since subtraction
+ does not commute with zero-extension.)
+
+ This patch avoids optimizing branches and jumps to use RVC instructions
+ since surrounding code often makes assumptions about the sizes of
+ emitted instructions. Optimizing these will require changing these
+ functions (e.g., emit_branch) to dynamically compute jump offsets.
+
+ The following are examples of the JITed code for the verifier selftest
+ "direct packet read test#3 for CGROUP_SKB OK", without and with RVC
+ enabled, respectively. The former uses 178 bytes, and the latter uses 112,
+ for a ~37% reduction in code size for this example.
+
+ Without RVC:
+
+ 0: 02000813 addi a6,zero,32
+ 4: fd010113 addi sp,sp,-48
+ 8: 02813423 sd s0,40(sp)
+ c: 02913023 sd s1,32(sp)
+ 10: 01213c23 sd s2,24(sp)
+ 14: 01313823 sd s3,16(sp)
+ 18: 01413423 sd s4,8(sp)
+ 1c: 03010413 addi s0,sp,48
+ 20: 03056683 lwu a3,48(a0)
+ 24: 02069693 slli a3,a3,0x20
+ 28: 0206d693 srli a3,a3,0x20
+ 2c: 03456703 lwu a4,52(a0)
+ 30: 02071713 slli a4,a4,0x20
+ 34: 02075713 srli a4,a4,0x20
+ 38: 03856483 lwu s1,56(a0)
+ 3c: 02049493 slli s1,s1,0x20
+ 40: 0204d493 srli s1,s1,0x20
+ 44: 03c56903 lwu s2,60(a0)
+ 48: 02091913 slli s2,s2,0x20
+ 4c: 02095913 srli s2,s2,0x20
+ 50: 04056983 lwu s3,64(a0)
+ 54: 02099993 slli s3,s3,0x20
+ 58: 0209d993 srli s3,s3,0x20
+ 5c: 09056a03 lwu s4,144(a0)
+ 60: 020a1a13 slli s4,s4,0x20
+ 64: 020a5a13 srli s4,s4,0x20
+ 68: 00900313 addi t1,zero,9
+ 6c: 006a7463 bgeu s4,t1,0x74
+ 70: 00000a13 addi s4,zero,0
+ 74: 02d52823 sw a3,48(a0)
+ 78: 02e52a23 sw a4,52(a0)
+ 7c: 02952c23 sw s1,56(a0)
+ 80: 03252e23 sw s2,60(a0)
+ 84: 05352023 sw s3,64(a0)
+ 88: 00000793 addi a5,zero,0
+ 8c: 02813403 ld s0,40(sp)
+ 90: 02013483 ld s1,32(sp)
+ 94: 01813903 ld s2,24(sp)
+ 98: 01013983 ld s3,16(sp)
+ 9c: 00813a03 ld s4,8(sp)
+ a0: 03010113 addi sp,sp,48
+ a4: 00078513 addi a0,a5,0
+ a8: 00008067 jalr zero,0(ra)
+
+ With RVC:
+
+ 0: 02000813 addi a6,zero,32
+ 4: 7179 c.addi16sp sp,-48
+ 6: f422 c.sdsp s0,40(sp)
+ 8: f026 c.sdsp s1,32(sp)
+ a: ec4a c.sdsp s2,24(sp)
+ c: e84e c.sdsp s3,16(sp)
+ e: e452 c.sdsp s4,8(sp)
+ 10: 1800 c.addi4spn s0,sp,48
+ 12: 03056683 lwu a3,48(a0)
+ 16: 1682 c.slli a3,0x20
+ 18: 9281 c.srli a3,0x20
+ 1a: 03456703 lwu a4,52(a0)
+ 1e: 1702 c.slli a4,0x20
+ 20: 9301 c.srli a4,0x20
+ 22: 03856483 lwu s1,56(a0)
+ 26: 1482 c.slli s1,0x20
+ 28: 9081 c.srli s1,0x20
+ 2a: 03c56903 lwu s2,60(a0)
+ 2e: 1902 c.slli s2,0x20
+ 30: 02095913 srli s2,s2,0x20
+ 34: 04056983 lwu s3,64(a0)
+ 38: 1982 c.slli s3,0x20
+ 3a: 0209d993 srli s3,s3,0x20
+ 3e: 09056a03 lwu s4,144(a0)
+ 42: 1a02 c.slli s4,0x20
+ 44: 020a5a13 srli s4,s4,0x20
+ 48: 4325 c.li t1,9
+ 4a: 006a7363 bgeu s4,t1,0x50
+ 4e: 4a01 c.li s4,0
+ 50: d914 c.sw a3,48(a0)
+ 52: d958 c.sw a4,52(a0)
+ 54: dd04 c.sw s1,56(a0)
+ 56: 03252e23 sw s2,60(a0)
+ 5a: 05352023 sw s3,64(a0)
+ 5e: 4781 c.li a5,0
+ 60: 7422 c.ldsp s0,40(sp)
+ 62: 7482 c.ldsp s1,32(sp)
+ 64: 6962 c.ldsp s2,24(sp)
+ 66: 69c2 c.ldsp s3,16(sp)
+ 68: 6a22 c.ldsp s4,8(sp)
+ 6a: 6145 c.addi16sp sp,48
+ 6c: 853e c.mv a0,a5
+ 6e: 8082 c.jr ra
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Cc: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200721025241.8077-4-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index 55861269da2a..8a56b5293117 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -132,19 +132,23 @@ static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)
+ *
+ * This also means that we need to process LSB to MSB.
+ */
+- s64 upper = (val + (1 << 11)) >> 12, lower = val & 0xfff;
++ s64 upper = (val + (1 << 11)) >> 12;
++ /* Sign-extend lower 12 bits to 64 bits since immediates for li, addiw,
++ * and addi are signed and RVC checks will perform signed comparisons.
++ */
++ s64 lower = ((val & 0xfff) << 52) >> 52;
+ int shift;
+
+ if (is_32b_int(val)) {
+ if (upper)
+- emit(rv_lui(rd, upper), ctx);
++ emit_lui(rd, upper, ctx);
+
+ if (!upper) {
+- emit(rv_addi(rd, RV_REG_ZERO, lower), ctx);
++ emit_li(rd, lower, ctx);
+ return;
+ }
+
+- emit(rv_addiw(rd, rd, lower), ctx);
++ emit_addiw(rd, rd, lower, ctx);
+ return;
+ }
+
+@@ -154,9 +158,9 @@ static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)
+
+ emit_imm(rd, upper, ctx);
+
+- emit(rv_slli(rd, rd, shift), ctx);
++ emit_slli(rd, rd, shift, ctx);
+ if (lower)
+- emit(rv_addi(rd, rd, lower), ctx);
++ emit_addi(rd, rd, lower, ctx);
+ }
+
+ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+@@ -164,43 +168,43 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+ int stack_adjust = ctx->stack_size, store_offset = stack_adjust - 8;
+
+ if (seen_reg(RV_REG_RA, ctx)) {
+- emit(rv_ld(RV_REG_RA, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_RA, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+- emit(rv_ld(RV_REG_FP, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_FP, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ if (seen_reg(RV_REG_S1, ctx)) {
+- emit(rv_ld(RV_REG_S1, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S1, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S2, ctx)) {
+- emit(rv_ld(RV_REG_S2, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S2, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S3, ctx)) {
+- emit(rv_ld(RV_REG_S3, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S3, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S4, ctx)) {
+- emit(rv_ld(RV_REG_S4, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S4, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S5, ctx)) {
+- emit(rv_ld(RV_REG_S5, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S5, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S6, ctx)) {
+- emit(rv_ld(RV_REG_S6, store_offset, RV_REG_SP), ctx);
++ emit_ld(RV_REG_S6, store_offset, RV_REG_SP, ctx);
+ store_offset -= 8;
+ }
+
+- emit(rv_addi(RV_REG_SP, RV_REG_SP, stack_adjust), ctx);
++ emit_addi(RV_REG_SP, RV_REG_SP, stack_adjust, ctx);
+ /* Set return value. */
+ if (!is_tail_call)
+- emit(rv_addi(RV_REG_A0, RV_REG_A5, 0), ctx);
+- emit(rv_jalr(RV_REG_ZERO, is_tail_call ? RV_REG_T3 : RV_REG_RA,
+- is_tail_call ? 4 : 0), /* skip TCC init */
+- ctx);
++ emit_mv(RV_REG_A0, RV_REG_A5, ctx);
++ emit_jalr(RV_REG_ZERO, is_tail_call ? RV_REG_T3 : RV_REG_RA,
++ is_tail_call ? 4 : 0, /* skip TCC init */
++ ctx);
+ }
+
+ static void emit_bcc(u8 cond, u8 rd, u8 rs, int rvoff,
+@@ -280,8 +284,8 @@ static void emit_branch(u8 cond, u8 rd, u8 rs, int rvoff,
+
+ static void emit_zext_32(u8 reg, struct rv_jit_context *ctx)
+ {
+- emit(rv_slli(reg, reg, 32), ctx);
+- emit(rv_srli(reg, reg, 32), ctx);
++ emit_slli(reg, reg, 32, ctx);
++ emit_srli(reg, reg, 32, ctx);
+ }
+
+ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+@@ -310,7 +314,7 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ /* if (TCC-- < 0)
+ * goto out;
+ */
+- emit(rv_addi(RV_REG_T1, tcc, -1), ctx);
++ emit_addi(RV_REG_T1, tcc, -1, ctx);
+ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_branch(BPF_JSLT, tcc, RV_REG_ZERO, off, ctx);
+
+@@ -318,12 +322,12 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ * if (!prog)
+ * goto out;
+ */
+- emit(rv_slli(RV_REG_T2, RV_REG_A2, 3), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_A1), ctx);
++ emit_slli(RV_REG_T2, RV_REG_A2, 3, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_A1, ctx);
+ off = offsetof(struct bpf_array, ptrs);
+ if (is_12b_check(off, insn))
+ return -1;
+- emit(rv_ld(RV_REG_T2, off, RV_REG_T2), ctx);
++ emit_ld(RV_REG_T2, off, RV_REG_T2, ctx);
+ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_branch(BPF_JEQ, RV_REG_T2, RV_REG_ZERO, off, ctx);
+
+@@ -331,8 +335,8 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ off = offsetof(struct bpf_prog, bpf_func);
+ if (is_12b_check(off, insn))
+ return -1;
+- emit(rv_ld(RV_REG_T3, off, RV_REG_T2), ctx);
+- emit(rv_addi(RV_REG_TCC, RV_REG_T1, 0), ctx);
++ emit_ld(RV_REG_T3, off, RV_REG_T2, ctx);
++ emit_mv(RV_REG_TCC, RV_REG_T1, ctx);
+ __build_epilogue(true, ctx);
+ return 0;
+ }
+@@ -360,9 +364,9 @@ static void init_regs(u8 *rd, u8 *rs, const struct bpf_insn *insn,
+
+ static void emit_zext_32_rd_rs(u8 *rd, u8 *rs, struct rv_jit_context *ctx)
+ {
+- emit(rv_addi(RV_REG_T2, *rd, 0), ctx);
++ emit_mv(RV_REG_T2, *rd, ctx);
+ emit_zext_32(RV_REG_T2, ctx);
+- emit(rv_addi(RV_REG_T1, *rs, 0), ctx);
++ emit_mv(RV_REG_T1, *rs, ctx);
+ emit_zext_32(RV_REG_T1, ctx);
+ *rd = RV_REG_T2;
+ *rs = RV_REG_T1;
+@@ -370,15 +374,15 @@ static void emit_zext_32_rd_rs(u8 *rd, u8 *rs, struct rv_jit_context *ctx)
+
+ static void emit_sext_32_rd_rs(u8 *rd, u8 *rs, struct rv_jit_context *ctx)
+ {
+- emit(rv_addiw(RV_REG_T2, *rd, 0), ctx);
+- emit(rv_addiw(RV_REG_T1, *rs, 0), ctx);
++ emit_addiw(RV_REG_T2, *rd, 0, ctx);
++ emit_addiw(RV_REG_T1, *rs, 0, ctx);
+ *rd = RV_REG_T2;
+ *rs = RV_REG_T1;
+ }
+
+ static void emit_zext_32_rd_t1(u8 *rd, struct rv_jit_context *ctx)
+ {
+- emit(rv_addi(RV_REG_T2, *rd, 0), ctx);
++ emit_mv(RV_REG_T2, *rd, ctx);
+ emit_zext_32(RV_REG_T2, ctx);
+ emit_zext_32(RV_REG_T1, ctx);
+ *rd = RV_REG_T2;
+@@ -386,7 +390,7 @@ static void emit_zext_32_rd_t1(u8 *rd, struct rv_jit_context *ctx)
+
+ static void emit_sext_32_rd(u8 *rd, struct rv_jit_context *ctx)
+ {
+- emit(rv_addiw(RV_REG_T2, *rd, 0), ctx);
++ emit_addiw(RV_REG_T2, *rd, 0, ctx);
+ *rd = RV_REG_T2;
+ }
+
+@@ -432,7 +436,7 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
+ if (ret)
+ return ret;
+ rd = bpf_to_rv_reg(BPF_REG_0, ctx);
+- emit(rv_addi(rd, RV_REG_A0, 0), ctx);
++ emit_mv(rd, RV_REG_A0, ctx);
+ return 0;
+ }
+
+@@ -458,7 +462,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ emit_zext_32(rd, ctx);
+ break;
+ }
+- emit(is64 ? rv_addi(rd, rs, 0) : rv_addiw(rd, rs, 0), ctx);
++ emit_mv(rd, rs, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+@@ -466,31 +470,35 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ /* dst = dst OP src */
+ case BPF_ALU | BPF_ADD | BPF_X:
+ case BPF_ALU64 | BPF_ADD | BPF_X:
+- emit(is64 ? rv_add(rd, rd, rs) : rv_addw(rd, rd, rs), ctx);
++ emit_add(rd, rd, rs, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_SUB | BPF_X:
+ case BPF_ALU64 | BPF_SUB | BPF_X:
+- emit(is64 ? rv_sub(rd, rd, rs) : rv_subw(rd, rd, rs), ctx);
++ if (is64)
++ emit_sub(rd, rd, rs, ctx);
++ else
++ emit_subw(rd, rd, rs, ctx);
++
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_AND | BPF_X:
+ case BPF_ALU64 | BPF_AND | BPF_X:
+- emit(rv_and(rd, rd, rs), ctx);
++ emit_and(rd, rd, rs, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_OR | BPF_X:
+ case BPF_ALU64 | BPF_OR | BPF_X:
+- emit(rv_or(rd, rd, rs), ctx);
++ emit_or(rd, rd, rs, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_XOR | BPF_X:
+ case BPF_ALU64 | BPF_XOR | BPF_X:
+- emit(rv_xor(rd, rd, rs), ctx);
++ emit_xor(rd, rd, rs, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+@@ -534,8 +542,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ /* dst = -dst */
+ case BPF_ALU | BPF_NEG:
+ case BPF_ALU64 | BPF_NEG:
+- emit(is64 ? rv_sub(rd, RV_REG_ZERO, rd) :
+- rv_subw(rd, RV_REG_ZERO, rd), ctx);
++ emit_sub(rd, RV_REG_ZERO, rd, ctx);
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+@@ -544,8 +551,8 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_END | BPF_FROM_LE:
+ switch (imm) {
+ case 16:
+- emit(rv_slli(rd, rd, 48), ctx);
+- emit(rv_srli(rd, rd, 48), ctx);
++ emit_slli(rd, rd, 48, ctx);
++ emit_srli(rd, rd, 48, ctx);
+ break;
+ case 32:
+ if (!aux->verifier_zext)
+@@ -558,51 +565,51 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ break;
+
+ case BPF_ALU | BPF_END | BPF_FROM_BE:
+- emit(rv_addi(RV_REG_T2, RV_REG_ZERO, 0), ctx);
++ emit_li(RV_REG_T2, 0, ctx);
+
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
+ if (imm == 16)
+ goto out_be;
+
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
+
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
+ if (imm == 32)
+ goto out_be;
+
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
+-
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
+-
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
+-
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
+- emit(rv_slli(RV_REG_T2, RV_REG_T2, 8), ctx);
+- emit(rv_srli(rd, rd, 8), ctx);
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
++
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
++
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
++
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
++ emit_slli(RV_REG_T2, RV_REG_T2, 8, ctx);
++ emit_srli(rd, rd, 8, ctx);
+ out_be:
+- emit(rv_andi(RV_REG_T1, rd, 0xff), ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, RV_REG_T1), ctx);
++ emit_andi(RV_REG_T1, rd, 0xff, ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, RV_REG_T1, ctx);
+
+- emit(rv_addi(rd, RV_REG_T2, 0), ctx);
++ emit_mv(rd, RV_REG_T2, ctx);
+ break;
+
+ /* dst = imm */
+@@ -617,12 +624,10 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_ADD | BPF_K:
+ case BPF_ALU64 | BPF_ADD | BPF_K:
+ if (is_12b_int(imm)) {
+- emit(is64 ? rv_addi(rd, rd, imm) :
+- rv_addiw(rd, rd, imm), ctx);
++ emit_addi(rd, rd, imm, ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(is64 ? rv_add(rd, rd, RV_REG_T1) :
+- rv_addw(rd, rd, RV_REG_T1), ctx);
++ emit_add(rd, rd, RV_REG_T1, ctx);
+ }
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+@@ -630,12 +635,10 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_SUB | BPF_K:
+ case BPF_ALU64 | BPF_SUB | BPF_K:
+ if (is_12b_int(-imm)) {
+- emit(is64 ? rv_addi(rd, rd, -imm) :
+- rv_addiw(rd, rd, -imm), ctx);
++ emit_addi(rd, rd, -imm, ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(is64 ? rv_sub(rd, rd, RV_REG_T1) :
+- rv_subw(rd, rd, RV_REG_T1), ctx);
++ emit_sub(rd, rd, RV_REG_T1, ctx);
+ }
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+@@ -643,10 +646,10 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_AND | BPF_K:
+ case BPF_ALU64 | BPF_AND | BPF_K:
+ if (is_12b_int(imm)) {
+- emit(rv_andi(rd, rd, imm), ctx);
++ emit_andi(rd, rd, imm, ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(rv_and(rd, rd, RV_REG_T1), ctx);
++ emit_and(rd, rd, RV_REG_T1, ctx);
+ }
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+@@ -657,7 +660,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ emit(rv_ori(rd, rd, imm), ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(rv_or(rd, rd, RV_REG_T1), ctx);
++ emit_or(rd, rd, RV_REG_T1, ctx);
+ }
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+@@ -668,7 +671,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ emit(rv_xori(rd, rd, imm), ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(rv_xor(rd, rd, RV_REG_T1), ctx);
++ emit_xor(rd, rd, RV_REG_T1, ctx);
+ }
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+@@ -699,19 +702,28 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ break;
+ case BPF_ALU | BPF_LSH | BPF_K:
+ case BPF_ALU64 | BPF_LSH | BPF_K:
+- emit(is64 ? rv_slli(rd, rd, imm) : rv_slliw(rd, rd, imm), ctx);
++ emit_slli(rd, rd, imm, ctx);
++
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_RSH | BPF_K:
+ case BPF_ALU64 | BPF_RSH | BPF_K:
+- emit(is64 ? rv_srli(rd, rd, imm) : rv_srliw(rd, rd, imm), ctx);
++ if (is64)
++ emit_srli(rd, rd, imm, ctx);
++ else
++ emit(rv_srliw(rd, rd, imm), ctx);
++
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_ARSH | BPF_K:
+ case BPF_ALU64 | BPF_ARSH | BPF_K:
+- emit(is64 ? rv_srai(rd, rd, imm) : rv_sraiw(rd, rd, imm), ctx);
++ if (is64)
++ emit_srai(rd, rd, imm, ctx);
++ else
++ emit(rv_sraiw(rd, rd, imm), ctx);
++
+ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+@@ -763,7 +775,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ if (BPF_OP(code) == BPF_JSET) {
+ /* Adjust for and */
+ rvoff -= 4;
+- emit(rv_and(RV_REG_T1, rd, rs), ctx);
++ emit_and(RV_REG_T1, rd, rs, ctx);
+ emit_branch(BPF_JNE, RV_REG_T1, RV_REG_ZERO, rvoff,
+ ctx);
+ } else {
+@@ -819,17 +831,17 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ rvoff = rv_offset(i, off, ctx);
+ s = ctx->ninsns;
+ if (is_12b_int(imm)) {
+- emit(rv_andi(RV_REG_T1, rd, imm), ctx);
++ emit_andi(RV_REG_T1, rd, imm, ctx);
+ } else {
+ emit_imm(RV_REG_T1, imm, ctx);
+- emit(rv_and(RV_REG_T1, rd, RV_REG_T1), ctx);
++ emit_and(RV_REG_T1, rd, RV_REG_T1, ctx);
+ }
+ /* For jset32, we should clear the upper 32 bits of t1, but
+ * sign-extension is sufficient here and saves one instruction,
+ * as t1 is used only in comparison against zero.
+ */
+ if (!is64 && imm < 0)
+- emit(rv_addiw(RV_REG_T1, RV_REG_T1, 0), ctx);
++ emit_addiw(RV_REG_T1, RV_REG_T1, 0, ctx);
+ e = ctx->ninsns;
+ rvoff -= ninsns_rvoff(e - s);
+ emit_branch(BPF_JNE, RV_REG_T1, RV_REG_ZERO, rvoff, ctx);
+@@ -887,7 +899,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rs), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
+ emit(rv_lbu(rd, 0, RV_REG_T1), ctx);
+ if (insn_is_zext(&insn[1]))
+ return 1;
+@@ -899,7 +911,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rs), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
+ emit(rv_lhu(rd, 0, RV_REG_T1), ctx);
+ if (insn_is_zext(&insn[1]))
+ return 1;
+@@ -911,20 +923,20 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rs), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
+ emit(rv_lwu(rd, 0, RV_REG_T1), ctx);
+ if (insn_is_zext(&insn[1]))
+ return 1;
+ break;
+ case BPF_LDX | BPF_MEM | BPF_DW:
+ if (is_12b_int(off)) {
+- emit(rv_ld(rd, off, rs), ctx);
++ emit_ld(rd, off, rs, ctx);
+ break;
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rs), ctx);
+- emit(rv_ld(rd, 0, RV_REG_T1), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rs, ctx);
++ emit_ld(rd, 0, RV_REG_T1, ctx);
+ break;
+
+ /* ST: *(size *)(dst + off) = imm */
+@@ -936,7 +948,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T2, off, ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, rd), ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, rd, ctx);
+ emit(rv_sb(RV_REG_T2, 0, RV_REG_T1), ctx);
+ break;
+
+@@ -948,30 +960,30 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T2, off, ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, rd), ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, rd, ctx);
+ emit(rv_sh(RV_REG_T2, 0, RV_REG_T1), ctx);
+ break;
+ case BPF_ST | BPF_MEM | BPF_W:
+ emit_imm(RV_REG_T1, imm, ctx);
+ if (is_12b_int(off)) {
+- emit(rv_sw(rd, off, RV_REG_T1), ctx);
++ emit_sw(rd, off, RV_REG_T1, ctx);
+ break;
+ }
+
+ emit_imm(RV_REG_T2, off, ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, rd), ctx);
+- emit(rv_sw(RV_REG_T2, 0, RV_REG_T1), ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, rd, ctx);
++ emit_sw(RV_REG_T2, 0, RV_REG_T1, ctx);
+ break;
+ case BPF_ST | BPF_MEM | BPF_DW:
+ emit_imm(RV_REG_T1, imm, ctx);
+ if (is_12b_int(off)) {
+- emit(rv_sd(rd, off, RV_REG_T1), ctx);
++ emit_sd(rd, off, RV_REG_T1, ctx);
+ break;
+ }
+
+ emit_imm(RV_REG_T2, off, ctx);
+- emit(rv_add(RV_REG_T2, RV_REG_T2, rd), ctx);
+- emit(rv_sd(RV_REG_T2, 0, RV_REG_T1), ctx);
++ emit_add(RV_REG_T2, RV_REG_T2, rd, ctx);
++ emit_sd(RV_REG_T2, 0, RV_REG_T1, ctx);
+ break;
+
+ /* STX: *(size *)(dst + off) = src */
+@@ -982,7 +994,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rd), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rd, ctx);
+ emit(rv_sb(RV_REG_T1, 0, rs), ctx);
+ break;
+ case BPF_STX | BPF_MEM | BPF_H:
+@@ -992,28 +1004,28 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rd), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rd, ctx);
+ emit(rv_sh(RV_REG_T1, 0, rs), ctx);
+ break;
+ case BPF_STX | BPF_MEM | BPF_W:
+ if (is_12b_int(off)) {
+- emit(rv_sw(rd, off, rs), ctx);
++ emit_sw(rd, off, rs, ctx);
+ break;
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rd), ctx);
+- emit(rv_sw(RV_REG_T1, 0, rs), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rd, ctx);
++ emit_sw(RV_REG_T1, 0, rs, ctx);
+ break;
+ case BPF_STX | BPF_MEM | BPF_DW:
+ if (is_12b_int(off)) {
+- emit(rv_sd(rd, off, rs), ctx);
++ emit_sd(rd, off, rs, ctx);
+ break;
+ }
+
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rd), ctx);
+- emit(rv_sd(RV_REG_T1, 0, rs), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rd, ctx);
++ emit_sd(RV_REG_T1, 0, rs, ctx);
+ break;
+ /* STX XADD: lock *(u32 *)(dst + off) += src */
+ case BPF_STX | BPF_XADD | BPF_W:
+@@ -1021,10 +1033,10 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_STX | BPF_XADD | BPF_DW:
+ if (off) {
+ if (is_12b_int(off)) {
+- emit(rv_addi(RV_REG_T1, rd, off), ctx);
++ emit_addi(RV_REG_T1, rd, off, ctx);
+ } else {
+ emit_imm(RV_REG_T1, off, ctx);
+- emit(rv_add(RV_REG_T1, RV_REG_T1, rd), ctx);
++ emit_add(RV_REG_T1, RV_REG_T1, rd, ctx);
+ }
+
+ rd = RV_REG_T1;
+@@ -1073,52 +1085,53 @@ void bpf_jit_build_prologue(struct rv_jit_context *ctx)
+
+ /* First instruction is always setting the tail-call-counter
+ * (TCC) register. This instruction is skipped for tail calls.
++ * Force using a 4-byte (non-compressed) instruction.
+ */
+ emit(rv_addi(RV_REG_TCC, RV_REG_ZERO, MAX_TAIL_CALL_CNT), ctx);
+
+- emit(rv_addi(RV_REG_SP, RV_REG_SP, -stack_adjust), ctx);
++ emit_addi(RV_REG_SP, RV_REG_SP, -stack_adjust, ctx);
+
+ if (seen_reg(RV_REG_RA, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_RA), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_RA, ctx);
+ store_offset -= 8;
+ }
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_FP), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_FP, ctx);
+ store_offset -= 8;
+ if (seen_reg(RV_REG_S1, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S1), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S1, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S2, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S2), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S2, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S3, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S3), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S3, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S4, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S4), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S4, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S5, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S5), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S5, ctx);
+ store_offset -= 8;
+ }
+ if (seen_reg(RV_REG_S6, ctx)) {
+- emit(rv_sd(RV_REG_SP, store_offset, RV_REG_S6), ctx);
++ emit_sd(RV_REG_SP, store_offset, RV_REG_S6, ctx);
+ store_offset -= 8;
+ }
+
+- emit(rv_addi(RV_REG_FP, RV_REG_SP, stack_adjust), ctx);
++ emit_addi(RV_REG_FP, RV_REG_SP, stack_adjust, ctx);
+
+ if (bpf_stack_adjust)
+- emit(rv_addi(RV_REG_S5, RV_REG_SP, bpf_stack_adjust), ctx);
++ emit_addi(RV_REG_S5, RV_REG_SP, bpf_stack_adjust, ctx);
+
+ /* Program contains calls and tail calls, so RV_REG_TCC need
+ * to be saved across calls.
+ */
+ if (seen_tail_call(ctx) && seen_call(ctx))
+- emit(rv_addi(RV_REG_TCC_SAVED, RV_REG_TCC, 0), ctx);
++ emit_mv(RV_REG_TCC_SAVED, RV_REG_TCC, ctx);
+
+ ctx->stack_size = stack_adjust;
+ }commit 804ec72c68c8477b8713a1e8f8eda120d3471031
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Mon Jul 20 19:52:39 2020 -0700
+
+ bpf, riscv: Add encodings for compressed instructions
+
+ This patch adds functions for encoding and emitting compressed riscv
+ (RVC) instructions to the BPF JIT.
+
+ Some regular riscv instructions can be compressed into an RVC instruction
+ if the instruction fields meet some requirements. For example, "add rd,
+ rs1, rs2" can be compressed into "c.add rd, rs2" when rd == rs1.
+
+ To make using RVC encodings simpler, this patch also adds helper
+ functions that selectively emit either a regular instruction or a
+ compressed instruction if possible.
+
+ For example, emit_add will produce a "c.add" if possible and regular
+ "add" otherwise.
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Link: https://lore.kernel.org/bpf/20200721025241.8077-3-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h
+index e90d336a9e5f..75c1e9996867 100644
+--- a/arch/riscv/net/bpf_jit.h
++++ b/arch/riscv/net/bpf_jit.h
+@@ -53,6 +53,18 @@ enum {
+ RV_REG_T6 = 31,
+ };
+
++static inline bool is_creg(u8 reg)
++{
++ return (1 << reg) & (BIT(RV_REG_FP) |
++ BIT(RV_REG_S1) |
++ BIT(RV_REG_A0) |
++ BIT(RV_REG_A1) |
++ BIT(RV_REG_A2) |
++ BIT(RV_REG_A3) |
++ BIT(RV_REG_A4) |
++ BIT(RV_REG_A5));
++}
++
+ struct rv_jit_context {
+ struct bpf_prog *prog;
+ u16 *insns; /* RV insns */
+@@ -142,6 +154,36 @@ static inline int invert_bpf_cond(u8 cond)
+ return -1;
+ }
+
++static inline bool is_6b_int(long val)
++{
++ return -(1L << 5) <= val && val < (1L << 5);
++}
++
++static inline bool is_7b_uint(unsigned long val)
++{
++ return val < (1UL << 7);
++}
++
++static inline bool is_8b_uint(unsigned long val)
++{
++ return val < (1UL << 8);
++}
++
++static inline bool is_9b_uint(unsigned long val)
++{
++ return val < (1UL << 9);
++}
++
++static inline bool is_10b_int(long val)
++{
++ return -(1L << 9) <= val && val < (1L << 9);
++}
++
++static inline bool is_10b_uint(unsigned long val)
++{
++ return val < (1UL << 10);
++}
++
+ static inline bool is_12b_int(long val)
+ {
+ return -(1L << 11) <= val && val < (1L << 11);
+@@ -232,6 +274,59 @@ static inline u32 rv_amo_insn(u8 funct5, u8 aq, u8 rl, u8 rs2, u8 rs1,
+ return rv_r_insn(funct7, rs2, rs1, funct3, rd, opcode);
+ }
+
++/* RISC-V compressed instruction formats. */
++
++static inline u16 rv_cr_insn(u8 funct4, u8 rd, u8 rs2, u8 op)
++{
++ return (funct4 << 12) | (rd << 7) | (rs2 << 2) | op;
++}
++
++static inline u16 rv_ci_insn(u8 funct3, u32 imm6, u8 rd, u8 op)
++{
++ u32 imm;
++
++ imm = ((imm6 & 0x20) << 7) | ((imm6 & 0x1f) << 2);
++ return (funct3 << 13) | (rd << 7) | op | imm;
++}
++
++static inline u16 rv_css_insn(u8 funct3, u32 uimm, u8 rs2, u8 op)
++{
++ return (funct3 << 13) | (uimm << 7) | (rs2 << 2) | op;
++}
++
++static inline u16 rv_ciw_insn(u8 funct3, u32 uimm, u8 rd, u8 op)
++{
++ return (funct3 << 13) | (uimm << 5) | ((rd & 0x7) << 2) | op;
++}
++
++static inline u16 rv_cl_insn(u8 funct3, u32 imm_hi, u8 rs1, u32 imm_lo, u8 rd,
++ u8 op)
++{
++ return (funct3 << 13) | (imm_hi << 10) | ((rs1 & 0x7) << 7) |
++ (imm_lo << 5) | ((rd & 0x7) << 2) | op;
++}
++
++static inline u16 rv_cs_insn(u8 funct3, u32 imm_hi, u8 rs1, u32 imm_lo, u8 rs2,
++ u8 op)
++{
++ return (funct3 << 13) | (imm_hi << 10) | ((rs1 & 0x7) << 7) |
++ (imm_lo << 5) | ((rs2 & 0x7) << 2) | op;
++}
++
++static inline u16 rv_ca_insn(u8 funct6, u8 rd, u8 funct2, u8 rs2, u8 op)
++{
++ return (funct6 << 10) | ((rd & 0x7) << 7) | (funct2 << 5) |
++ ((rs2 & 0x7) << 2) | op;
++}
++
++static inline u16 rv_cb_insn(u8 funct3, u32 imm6, u8 funct2, u8 rd, u8 op)
++{
++ u32 imm;
++
++ imm = ((imm6 & 0x20) << 7) | ((imm6 & 0x1f) << 2);
++ return (funct3 << 13) | (funct2 << 10) | ((rd & 0x7) << 7) | op | imm;
++}
++
+ /* Instructions shared by both RV32 and RV64. */
+
+ static inline u32 rv_addi(u8 rd, u8 rs1, u16 imm11_0)
+@@ -439,6 +534,135 @@ static inline u32 rv_amoadd_w(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+ return rv_amo_insn(0, aq, rl, rs2, rs1, 2, rd, 0x2f);
+ }
+
++/* RVC instrutions. */
++
++static inline u16 rvc_addi4spn(u8 rd, u32 imm10)
++{
++ u32 imm;
++
++ imm = ((imm10 & 0x30) << 2) | ((imm10 & 0x3c0) >> 4) |
++ ((imm10 & 0x4) >> 1) | ((imm10 & 0x8) >> 3);
++ return rv_ciw_insn(0x0, imm, rd, 0x0);
++}
++
++static inline u16 rvc_lw(u8 rd, u32 imm7, u8 rs1)
++{
++ u32 imm_hi, imm_lo;
++
++ imm_hi = (imm7 & 0x38) >> 3;
++ imm_lo = ((imm7 & 0x4) >> 1) | ((imm7 & 0x40) >> 6);
++ return rv_cl_insn(0x2, imm_hi, rs1, imm_lo, rd, 0x0);
++}
++
++static inline u16 rvc_sw(u8 rs1, u32 imm7, u8 rs2)
++{
++ u32 imm_hi, imm_lo;
++
++ imm_hi = (imm7 & 0x38) >> 3;
++ imm_lo = ((imm7 & 0x4) >> 1) | ((imm7 & 0x40) >> 6);
++ return rv_cs_insn(0x6, imm_hi, rs1, imm_lo, rs2, 0x0);
++}
++
++static inline u16 rvc_addi(u8 rd, u32 imm6)
++{
++ return rv_ci_insn(0, imm6, rd, 0x1);
++}
++
++static inline u16 rvc_li(u8 rd, u32 imm6)
++{
++ return rv_ci_insn(0x2, imm6, rd, 0x1);
++}
++
++static inline u16 rvc_addi16sp(u32 imm10)
++{
++ u32 imm;
++
++ imm = ((imm10 & 0x200) >> 4) | (imm10 & 0x10) | ((imm10 & 0x40) >> 3) |
++ ((imm10 & 0x180) >> 6) | ((imm10 & 0x20) >> 5);
++ return rv_ci_insn(0x3, imm, RV_REG_SP, 0x1);
++}
++
++static inline u16 rvc_lui(u8 rd, u32 imm6)
++{
++ return rv_ci_insn(0x3, imm6, rd, 0x1);
++}
++
++static inline u16 rvc_srli(u8 rd, u32 imm6)
++{
++ return rv_cb_insn(0x4, imm6, 0, rd, 0x1);
++}
++
++static inline u16 rvc_srai(u8 rd, u32 imm6)
++{
++ return rv_cb_insn(0x4, imm6, 0x1, rd, 0x1);
++}
++
++static inline u16 rvc_andi(u8 rd, u32 imm6)
++{
++ return rv_cb_insn(0x4, imm6, 0x2, rd, 0x1);
++}
++
++static inline u16 rvc_sub(u8 rd, u8 rs)
++{
++ return rv_ca_insn(0x23, rd, 0, rs, 0x1);
++}
++
++static inline u16 rvc_xor(u8 rd, u8 rs)
++{
++ return rv_ca_insn(0x23, rd, 0x1, rs, 0x1);
++}
++
++static inline u16 rvc_or(u8 rd, u8 rs)
++{
++ return rv_ca_insn(0x23, rd, 0x2, rs, 0x1);
++}
++
++static inline u16 rvc_and(u8 rd, u8 rs)
++{
++ return rv_ca_insn(0x23, rd, 0x3, rs, 0x1);
++}
++
++static inline u16 rvc_slli(u8 rd, u32 imm6)
++{
++ return rv_ci_insn(0, imm6, rd, 0x2);
++}
++
++static inline u16 rvc_lwsp(u8 rd, u32 imm8)
++{
++ u32 imm;
++
++ imm = ((imm8 & 0xc0) >> 6) | (imm8 & 0x3c);
++ return rv_ci_insn(0x2, imm, rd, 0x2);
++}
++
++static inline u16 rvc_jr(u8 rs1)
++{
++ return rv_cr_insn(0x8, rs1, RV_REG_ZERO, 0x2);
++}
++
++static inline u16 rvc_mv(u8 rd, u8 rs)
++{
++ return rv_cr_insn(0x8, rd, rs, 0x2);
++}
++
++static inline u16 rvc_jalr(u8 rs1)
++{
++ return rv_cr_insn(0x9, rs1, RV_REG_ZERO, 0x2);
++}
++
++static inline u16 rvc_add(u8 rd, u8 rs)
++{
++ return rv_cr_insn(0x9, rd, rs, 0x2);
++}
++
++static inline u16 rvc_swsp(u32 imm8, u8 rs2)
++{
++ u32 imm;
++
++ imm = (imm8 & 0x3c) | ((imm8 & 0xc0) >> 6);
++ return rv_css_insn(0x6, imm, rs2, 0x2);
++}
++
+ /*
+ * RV64-only instructions.
+ *
+@@ -528,6 +752,234 @@ static inline u32 rv_amoadd_d(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+ return rv_amo_insn(0, aq, rl, rs2, rs1, 3, rd, 0x2f);
+ }
+
++/* RV64-only RVC instructions. */
++
++static inline u16 rvc_ld(u8 rd, u32 imm8, u8 rs1)
++{
++ u32 imm_hi, imm_lo;
++
++ imm_hi = (imm8 & 0x38) >> 3;
++ imm_lo = (imm8 & 0xc0) >> 6;
++ return rv_cl_insn(0x3, imm_hi, rs1, imm_lo, rd, 0x0);
++}
++
++static inline u16 rvc_sd(u8 rs1, u32 imm8, u8 rs2)
++{
++ u32 imm_hi, imm_lo;
++
++ imm_hi = (imm8 & 0x38) >> 3;
++ imm_lo = (imm8 & 0xc0) >> 6;
++ return rv_cs_insn(0x7, imm_hi, rs1, imm_lo, rs2, 0x0);
++}
++
++static inline u16 rvc_subw(u8 rd, u8 rs)
++{
++ return rv_ca_insn(0x27, rd, 0, rs, 0x1);
++}
++
++static inline u16 rvc_addiw(u8 rd, u32 imm6)
++{
++ return rv_ci_insn(0x1, imm6, rd, 0x1);
++}
++
++static inline u16 rvc_ldsp(u8 rd, u32 imm9)
++{
++ u32 imm;
++
++ imm = ((imm9 & 0x1c0) >> 6) | (imm9 & 0x38);
++ return rv_ci_insn(0x3, imm, rd, 0x2);
++}
++
++static inline u16 rvc_sdsp(u32 imm9, u8 rs2)
++{
++ u32 imm;
++
++ imm = (imm9 & 0x38) | ((imm9 & 0x1c0) >> 6);
++ return rv_css_insn(0x7, imm, rs2, 0x2);
++}
++
++#endif /* __riscv_xlen == 64 */
++
++/* Helper functions that emit RVC instructions when possible. */
++
++static inline void emit_jalr(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd == RV_REG_RA && rs && !imm)
++ emitc(rvc_jalr(rs), ctx);
++ else if (rvc_enabled() && !rd && rs && !imm)
++ emitc(rvc_jr(rs), ctx);
++ else
++ emit(rv_jalr(rd, rs, imm), ctx);
++}
++
++static inline void emit_mv(u8 rd, u8 rs, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && rs)
++ emitc(rvc_mv(rd, rs), ctx);
++ else
++ emit(rv_addi(rd, rs, 0), ctx);
++}
++
++static inline void emit_add(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && rd == rs1 && rs2)
++ emitc(rvc_add(rd, rs2), ctx);
++ else
++ emit(rv_add(rd, rs1, rs2), ctx);
++}
++
++static inline void emit_addi(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd == RV_REG_SP && rd == rs && is_10b_int(imm) && imm && !(imm & 0xf))
++ emitc(rvc_addi16sp(imm), ctx);
++ else if (rvc_enabled() && is_creg(rd) && rs == RV_REG_SP && is_10b_uint(imm) &&
++ !(imm & 0x3) && imm)
++ emitc(rvc_addi4spn(rd, imm), ctx);
++ else if (rvc_enabled() && rd && rd == rs && imm && is_6b_int(imm))
++ emitc(rvc_addi(rd, imm), ctx);
++ else
++ emit(rv_addi(rd, rs, imm), ctx);
++}
++
++static inline void emit_li(u8 rd, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && is_6b_int(imm))
++ emitc(rvc_li(rd, imm), ctx);
++ else
++ emit(rv_addi(rd, RV_REG_ZERO, imm), ctx);
++}
++
++static inline void emit_lui(u8 rd, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && rd != RV_REG_SP && is_6b_int(imm) && imm)
++ emitc(rvc_lui(rd, imm), ctx);
++ else
++ emit(rv_lui(rd, imm), ctx);
++}
++
++static inline void emit_slli(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && rd == rs && imm && (u32)imm < __riscv_xlen)
++ emitc(rvc_slli(rd, imm), ctx);
++ else
++ emit(rv_slli(rd, rs, imm), ctx);
++}
++
++static inline void emit_andi(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs && is_6b_int(imm))
++ emitc(rvc_andi(rd, imm), ctx);
++ else
++ emit(rv_andi(rd, rs, imm), ctx);
++}
++
++static inline void emit_srli(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs && imm && (u32)imm < __riscv_xlen)
++ emitc(rvc_srli(rd, imm), ctx);
++ else
++ emit(rv_srli(rd, rs, imm), ctx);
++}
++
++static inline void emit_srai(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs && imm && (u32)imm < __riscv_xlen)
++ emitc(rvc_srai(rd, imm), ctx);
++ else
++ emit(rv_srai(rd, rs, imm), ctx);
++}
++
++static inline void emit_sub(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs1 && is_creg(rs2))
++ emitc(rvc_sub(rd, rs2), ctx);
++ else
++ emit(rv_sub(rd, rs1, rs2), ctx);
++}
++
++static inline void emit_or(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs1 && is_creg(rs2))
++ emitc(rvc_or(rd, rs2), ctx);
++ else
++ emit(rv_or(rd, rs1, rs2), ctx);
++}
++
++static inline void emit_and(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs1 && is_creg(rs2))
++ emitc(rvc_and(rd, rs2), ctx);
++ else
++ emit(rv_and(rd, rs1, rs2), ctx);
++}
++
++static inline void emit_xor(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs1 && is_creg(rs2))
++ emitc(rvc_xor(rd, rs2), ctx);
++ else
++ emit(rv_xor(rd, rs1, rs2), ctx);
++}
++
++static inline void emit_lw(u8 rd, s32 off, u8 rs1, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rs1 == RV_REG_SP && rd && is_8b_uint(off) && !(off & 0x3))
++ emitc(rvc_lwsp(rd, off), ctx);
++ else if (rvc_enabled() && is_creg(rd) && is_creg(rs1) && is_7b_uint(off) && !(off & 0x3))
++ emitc(rvc_lw(rd, off, rs1), ctx);
++ else
++ emit(rv_lw(rd, off, rs1), ctx);
++}
++
++static inline void emit_sw(u8 rs1, s32 off, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rs1 == RV_REG_SP && is_8b_uint(off) && !(off & 0x3))
++ emitc(rvc_swsp(off, rs2), ctx);
++ else if (rvc_enabled() && is_creg(rs1) && is_creg(rs2) && is_7b_uint(off) && !(off & 0x3))
++ emitc(rvc_sw(rs1, off, rs2), ctx);
++ else
++ emit(rv_sw(rs1, off, rs2), ctx);
++}
++
++/* RV64-only helper functions. */
++#if __riscv_xlen == 64
++
++static inline void emit_addiw(u8 rd, u8 rs, s32 imm, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rd && rd == rs && is_6b_int(imm))
++ emitc(rvc_addiw(rd, imm), ctx);
++ else
++ emit(rv_addiw(rd, rs, imm), ctx);
++}
++
++static inline void emit_ld(u8 rd, s32 off, u8 rs1, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rs1 == RV_REG_SP && rd && is_9b_uint(off) && !(off & 0x7))
++ emitc(rvc_ldsp(rd, off), ctx);
++ else if (rvc_enabled() && is_creg(rd) && is_creg(rs1) && is_8b_uint(off) && !(off & 0x7))
++ emitc(rvc_ld(rd, off, rs1), ctx);
++ else
++ emit(rv_ld(rd, off, rs1), ctx);
++}
++
++static inline void emit_sd(u8 rs1, s32 off, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && rs1 == RV_REG_SP && is_9b_uint(off) && !(off & 0x7))
++ emitc(rvc_sdsp(off, rs2), ctx);
++ else if (rvc_enabled() && is_creg(rs1) && is_creg(rs2) && is_8b_uint(off) && !(off & 0x7))
++ emitc(rvc_sd(rs1, off, rs2), ctx);
++ else
++ emit(rv_sd(rs1, off, rs2), ctx);
++}
++
++static inline void emit_subw(u8 rd, u8 rs1, u8 rs2, struct rv_jit_context *ctx)
++{
++ if (rvc_enabled() && is_creg(rd) && rd == rs1 && is_creg(rs2))
++ emitc(rvc_subw(rd, rs2), ctx);
++ else
++ emit(rv_subw(rd, rs1, rs2), ctx);
++}
++
+ #endif /* __riscv_xlen == 64 */
+
+ void bpf_jit_build_prologue(struct rv_jit_context *ctx);commit bfabff3cb0fef366086c64f24be8ab316a355b99
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Mon Jul 20 19:52:38 2020 -0700
+
+ bpf, riscv: Modify JIT ctx to support compressed instructions
+
+ This patch makes the necessary changes to struct rv_jit_context and to
+ bpf_int_jit_compile to support compressed riscv (RVC) instructions in
+ the BPF JIT.
+
+ It changes the JIT image to be u16 instead of u32, since RVC instructions
+ are 2 bytes as opposed to 4.
+
+ It also changes ctx->offset and ctx->ninsns to refer to 2-byte
+ instructions rather than 4-byte ones. The riscv PC is required to be
+ 16-bit aligned with or without RVC, so this is sufficient to refer to
+ any valid riscv offset.
+
+ The code for computing jump offsets in bytes is updated accordingly,
+ and factored into a new "ninsns_rvoff" function to simplify the code.
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Link: https://lore.kernel.org/bpf/20200721025241.8077-2-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h
+index 20e235d06f66..e90d336a9e5f 100644
+--- a/arch/riscv/net/bpf_jit.h
++++ b/arch/riscv/net/bpf_jit.h
+@@ -13,6 +13,11 @@
+ #include <linux/filter.h>
+ #include <asm/cacheflush.h>
+
++static inline bool rvc_enabled(void)
++{
++ return IS_ENABLED(CONFIG_RISCV_ISA_C);
++}
++
+ enum {
+ RV_REG_ZERO = 0, /* The constant value 0 */
+ RV_REG_RA = 1, /* Return address */
+@@ -50,7 +55,7 @@ enum {
+
+ struct rv_jit_context {
+ struct bpf_prog *prog;
+- u32 *insns; /* RV insns */
++ u16 *insns; /* RV insns */
+ int ninsns;
+ int epilogue_offset;
+ int *offset; /* BPF to RV */
+@@ -58,6 +63,12 @@ struct rv_jit_context {
+ int stack_size;
+ };
+
++/* Convert from ninsns to bytes. */
++static inline int ninsns_rvoff(int ninsns)
++{
++ return ninsns << 1;
++}
++
+ struct rv_jit_data {
+ struct bpf_binary_header *header;
+ u8 *image;
+@@ -74,8 +85,22 @@ static inline void bpf_flush_icache(void *start, void *end)
+ flush_icache_range((unsigned long)start, (unsigned long)end);
+ }
+
++/* Emit a 4-byte riscv instruction. */
+ static inline void emit(const u32 insn, struct rv_jit_context *ctx)
+ {
++ if (ctx->insns) {
++ ctx->insns[ctx->ninsns] = insn;
++ ctx->insns[ctx->ninsns + 1] = (insn >> 16);
++ }
++
++ ctx->ninsns += 2;
++}
++
++/* Emit a 2-byte riscv compressed instruction. */
++static inline void emitc(const u16 insn, struct rv_jit_context *ctx)
++{
++ BUILD_BUG_ON(!rvc_enabled());
++
+ if (ctx->insns)
+ ctx->insns[ctx->ninsns] = insn;
+
+@@ -86,7 +111,7 @@ static inline int epilogue_offset(struct rv_jit_context *ctx)
+ {
+ int to = ctx->epilogue_offset, from = ctx->ninsns;
+
+- return (to - from) << 2;
++ return ninsns_rvoff(to - from);
+ }
+
+ /* Return -1 or inverted cond. */
+@@ -149,7 +174,7 @@ static inline int rv_offset(int insn, int off, struct rv_jit_context *ctx)
+ off++; /* BPF branch is from PC+1, RV is from PC */
+ from = (insn > 0) ? ctx->offset[insn - 1] : 0;
+ to = (insn + off > 0) ? ctx->offset[insn + off - 1] : 0;
+- return (to - from) << 2;
++ return ninsns_rvoff(to - from);
+ }
+
+ /* Instruction formats. */
+diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp32.c
+index b198eaa74456..bc5f2204693f 100644
+--- a/arch/riscv/net/bpf_jit_comp32.c
++++ b/arch/riscv/net/bpf_jit_comp32.c
+@@ -644,7 +644,7 @@ static int emit_branch_r64(const s8 *src1, const s8 *src2, s32 rvoff,
+
+ e = ctx->ninsns;
+ /* Adjust for extra insns. */
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
+ return 0;
+ }
+@@ -713,7 +713,7 @@ static int emit_bcc(u8 op, u8 rd, u8 rs, int rvoff, struct rv_jit_context *ctx)
+ if (far) {
+ e = ctx->ninsns;
+ /* Adjust for extra insns. */
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
+ }
+ return 0;
+@@ -731,7 +731,7 @@ static int emit_branch_r32(const s8 *src1, const s8 *src2, s32 rvoff,
+
+ e = ctx->ninsns;
+ /* Adjust for extra insns. */
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+
+ if (emit_bcc(op, lo(rs1), lo(rs2), rvoff, ctx))
+ return -1;
+@@ -795,7 +795,7 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ * if (index >= max_entries)
+ * goto out;
+ */
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_bcc(BPF_JGE, lo(idx_reg), RV_REG_T1, off, ctx);
+
+ /*
+@@ -804,7 +804,7 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ * goto out;
+ */
+ emit(rv_addi(RV_REG_T1, RV_REG_TCC, -1), ctx);
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_bcc(BPF_JSLT, RV_REG_TCC, RV_REG_ZERO, off, ctx);
+
+ /*
+@@ -818,7 +818,7 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ if (is_12b_check(off, insn))
+ return -1;
+ emit(rv_lw(RV_REG_T0, off, RV_REG_T0), ctx);
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_bcc(BPF_JEQ, RV_REG_T0, RV_REG_ZERO, off, ctx);
+
+ /*
+@@ -1214,7 +1214,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ emit_imm32(tmp2, imm, ctx);
+ src = tmp2;
+ e = ctx->ninsns;
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ }
+
+ if (is64)
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index 6cfd164cbe88..55861269da2a 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -304,14 +304,14 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ if (is_12b_check(off, insn))
+ return -1;
+ emit(rv_lwu(RV_REG_T1, off, RV_REG_A1), ctx);
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_branch(BPF_JGE, RV_REG_A2, RV_REG_T1, off, ctx);
+
+ /* if (TCC-- < 0)
+ * goto out;
+ */
+ emit(rv_addi(RV_REG_T1, tcc, -1), ctx);
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_branch(BPF_JSLT, tcc, RV_REG_ZERO, off, ctx);
+
+ /* prog = array->ptrs[index];
+@@ -324,7 +324,7 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ if (is_12b_check(off, insn))
+ return -1;
+ emit(rv_ld(RV_REG_T2, off, RV_REG_T2), ctx);
+- off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ off = ninsns_rvoff(tc_ninsn - (ctx->ninsns - start_insn));
+ emit_branch(BPF_JEQ, RV_REG_T2, RV_REG_ZERO, off, ctx);
+
+ /* goto *(prog->bpf_func + 4); */
+@@ -757,7 +757,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ e = ctx->ninsns;
+
+ /* Adjust for extra insns */
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ }
+
+ if (BPF_OP(code) == BPF_JSET) {
+@@ -810,7 +810,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ e = ctx->ninsns;
+
+ /* Adjust for extra insns */
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ emit_branch(BPF_OP(code), rd, rs, rvoff, ctx);
+ break;
+
+@@ -831,7 +831,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ if (!is64 && imm < 0)
+ emit(rv_addiw(RV_REG_T1, RV_REG_T1, 0), ctx);
+ e = ctx->ninsns;
+- rvoff -= (e - s) << 2;
++ rvoff -= ninsns_rvoff(e - s);
+ emit_branch(BPF_JNE, RV_REG_T1, RV_REG_ZERO, rvoff, ctx);
+ break;
+
+diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c
+index 709b94ece3ed..3630d447352c 100644
+--- a/arch/riscv/net/bpf_jit_core.c
++++ b/arch/riscv/net/bpf_jit_core.c
+@@ -73,7 +73,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+
+ if (ctx->offset) {
+ extra_pass = true;
+- image_size = sizeof(u32) * ctx->ninsns;
++ image_size = sizeof(*ctx->insns) * ctx->ninsns;
+ goto skip_init_ctx;
+ }
+
+@@ -103,7 +103,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ if (jit_data->header)
+ break;
+
+- image_size = sizeof(u32) * ctx->ninsns;
++ image_size = sizeof(*ctx->insns) * ctx->ninsns;
+ jit_data->header =
+ bpf_jit_binary_alloc(image_size,
+ &jit_data->image,
+@@ -114,7 +114,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+ goto out_offset;
+ }
+
+- ctx->insns = (u32 *)jit_data->image;
++ ctx->insns = (u16 *)jit_data->image;
+ /*
+ * Now, when the image is allocated, the image can
+ * potentially shrink more (auipc/jalr -> jal).commit fd868f14818901821699988fdac680ebd80cd360
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri May 8 11:15:46 2020 -0700
+
+ bpf, arm64: Optimize ADD,SUB,JMP BPF_K using arm64 add/sub immediates
+
+ The current code for BPF_{ADD,SUB} BPF_K loads the BPF immediate to a
+ temporary register before performing the addition/subtraction. Similarly,
+ BPF_JMP BPF_K cases load the immediate to a temporary register before
+ comparison.
+
+ This patch introduces optimizations that use arm64 immediate add, sub,
+ cmn, or cmp instructions when the BPF immediate fits. If the immediate
+ does not fit, it falls back to using a temporary register.
+
+ Example of generated code for BPF_ALU64_IMM(BPF_ADD, R0, 2):
+
+ without optimization:
+
+ 24: mov x10, #0x2
+ 28: add x7, x7, x10
+
+ with optimization:
+
+ 24: add x7, x7, #0x2
+
+ The code could use A64_{ADD,SUB}_I directly and check if it returns
+ AARCH64_BREAK_FAULT, similar to how logical immediates are handled.
+ However, aarch64_insn_gen_add_sub_imm from insn.c prints error messages
+ when the immediate does not fit, and it's simpler to check if the
+ immediate fits ahead of time.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Acked-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/r/20200508181547.24783-4-luke.r.nels@gmail.com
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/arch/arm64/net/bpf_jit.h b/arch/arm64/net/bpf_jit.h
+index f36a779949e6..923ae7ff68c8 100644
+--- a/arch/arm64/net/bpf_jit.h
++++ b/arch/arm64/net/bpf_jit.h
+@@ -100,6 +100,14 @@
+ /* Rd = Rn OP imm12 */
+ #define A64_ADD_I(sf, Rd, Rn, imm12) A64_ADDSUB_IMM(sf, Rd, Rn, imm12, ADD)
+ #define A64_SUB_I(sf, Rd, Rn, imm12) A64_ADDSUB_IMM(sf, Rd, Rn, imm12, SUB)
++#define A64_ADDS_I(sf, Rd, Rn, imm12) \
++ A64_ADDSUB_IMM(sf, Rd, Rn, imm12, ADD_SETFLAGS)
++#define A64_SUBS_I(sf, Rd, Rn, imm12) \
++ A64_ADDSUB_IMM(sf, Rd, Rn, imm12, SUB_SETFLAGS)
++/* Rn + imm12; set condition flags */
++#define A64_CMN_I(sf, Rn, imm12) A64_ADDS_I(sf, A64_ZR, Rn, imm12)
++/* Rn - imm12; set condition flags */
++#define A64_CMP_I(sf, Rn, imm12) A64_SUBS_I(sf, A64_ZR, Rn, imm12)
+ /* Rd = Rn */
+ #define A64_MOV(sf, Rd, Rn) A64_ADD_I(sf, Rd, Rn, 0)
+
+diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
+index 083e5d8a5e2c..561a2fea9cdd 100644
+--- a/arch/arm64/net/bpf_jit_comp.c
++++ b/arch/arm64/net/bpf_jit_comp.c
+@@ -167,6 +167,12 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)
+ return to - from;
+ }
+
++static bool is_addsub_imm(u32 imm)
++{
++ /* Either imm12 or shifted imm12. */
++ return !(imm & ~0xfff) || !(imm & ~0xfff000);
++}
++
+ /* Stack must be multiples of 16B */
+ #define STACK_ALIGN(sz) (((sz) + 15) & ~15)
+
+@@ -479,13 +485,25 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
+ /* dst = dst OP imm */
+ case BPF_ALU | BPF_ADD | BPF_K:
+ case BPF_ALU64 | BPF_ADD | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_ADD(is64, dst, dst, tmp), ctx);
++ if (is_addsub_imm(imm)) {
++ emit(A64_ADD_I(is64, dst, dst, imm), ctx);
++ } else if (is_addsub_imm(-imm)) {
++ emit(A64_SUB_I(is64, dst, dst, -imm), ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_ADD(is64, dst, dst, tmp), ctx);
++ }
+ break;
+ case BPF_ALU | BPF_SUB | BPF_K:
+ case BPF_ALU64 | BPF_SUB | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_SUB(is64, dst, dst, tmp), ctx);
++ if (is_addsub_imm(imm)) {
++ emit(A64_SUB_I(is64, dst, dst, imm), ctx);
++ } else if (is_addsub_imm(-imm)) {
++ emit(A64_ADD_I(is64, dst, dst, -imm), ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_SUB(is64, dst, dst, tmp), ctx);
++ }
+ break;
+ case BPF_ALU | BPF_AND | BPF_K:
+ case BPF_ALU64 | BPF_AND | BPF_K:
+@@ -639,8 +657,14 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
+ case BPF_JMP32 | BPF_JSLT | BPF_K:
+ case BPF_JMP32 | BPF_JSGE | BPF_K:
+ case BPF_JMP32 | BPF_JSLE | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_CMP(is64, dst, tmp), ctx);
++ if (is_addsub_imm(imm)) {
++ emit(A64_CMP_I(is64, dst, imm), ctx);
++ } else if (is_addsub_imm(-imm)) {
++ emit(A64_CMN_I(is64, dst, -imm), ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_CMP(is64, dst, tmp), ctx);
++ }
+ goto emit_cond_jmp;
+ case BPF_JMP | BPF_JSET | BPF_K:
+ case BPF_JMP32 | BPF_JSET | BPF_K:commit fd49591cb49b72abd1b665222a635ccb17df7923
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri May 8 11:15:45 2020 -0700
+
+ bpf, arm64: Optimize AND,OR,XOR,JSET BPF_K using arm64 logical immediates
+
+ The current code for BPF_{AND,OR,XOR,JSET} BPF_K loads the immediate to
+ a temporary register before use.
+
+ This patch changes the code to avoid using a temporary register
+ when the BPF immediate is encodable using an arm64 logical immediate
+ instruction. If the encoding fails (due to the immediate not being
+ encodable), it falls back to using a temporary register.
+
+ Example of generated code for BPF_ALU32_IMM(BPF_AND, R0, 0x80000001):
+
+ without optimization:
+
+ 24: mov w10, #0x8000ffff
+ 28: movk w10, #0x1
+ 2c: and w7, w7, w10
+
+ with optimization:
+
+ 24: and w7, w7, #0x80000001
+
+ Since the encoding process is quite complex, the JIT reuses existing
+ functionality in arch/arm64/kernel/insn.c for encoding logical immediates
+ rather than duplicate it in the JIT.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Acked-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/r/20200508181547.24783-3-luke.r.nels@gmail.com
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/arch/arm64/net/bpf_jit.h b/arch/arm64/net/bpf_jit.h
+index eb73f9f72c46..f36a779949e6 100644
+--- a/arch/arm64/net/bpf_jit.h
++++ b/arch/arm64/net/bpf_jit.h
+@@ -189,4 +189,18 @@
+ /* Rn & Rm; set condition flags */
+ #define A64_TST(sf, Rn, Rm) A64_ANDS(sf, A64_ZR, Rn, Rm)
+
++/* Logical (immediate) */
++#define A64_LOGIC_IMM(sf, Rd, Rn, imm, type) ({ \
++ u64 imm64 = (sf) ? (u64)imm : (u64)(u32)imm; \
++ aarch64_insn_gen_logical_immediate(AARCH64_INSN_LOGIC_##type, \
++ A64_VARIANT(sf), Rn, Rd, imm64); \
++})
++/* Rd = Rn OP imm */
++#define A64_AND_I(sf, Rd, Rn, imm) A64_LOGIC_IMM(sf, Rd, Rn, imm, AND)
++#define A64_ORR_I(sf, Rd, Rn, imm) A64_LOGIC_IMM(sf, Rd, Rn, imm, ORR)
++#define A64_EOR_I(sf, Rd, Rn, imm) A64_LOGIC_IMM(sf, Rd, Rn, imm, EOR)
++#define A64_ANDS_I(sf, Rd, Rn, imm) A64_LOGIC_IMM(sf, Rd, Rn, imm, AND_SETFLAGS)
++/* Rn & imm; set condition flags */
++#define A64_TST_I(sf, Rn, imm) A64_ANDS_I(sf, A64_ZR, Rn, imm)
++
+ #endif /* _BPF_JIT_H */
+diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
+index cdc79de0c794..083e5d8a5e2c 100644
+--- a/arch/arm64/net/bpf_jit_comp.c
++++ b/arch/arm64/net/bpf_jit_comp.c
+@@ -356,6 +356,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
+ const bool isdw = BPF_SIZE(code) == BPF_DW;
+ u8 jmp_cond, reg;
+ s32 jmp_offset;
++ u32 a64_insn;
+
+ #define check_imm(bits, imm) do { \
+ if ((((imm) > 0) && ((imm) >> (bits))) || \
+@@ -488,18 +489,33 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
+ break;
+ case BPF_ALU | BPF_AND | BPF_K:
+ case BPF_ALU64 | BPF_AND | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_AND(is64, dst, dst, tmp), ctx);
++ a64_insn = A64_AND_I(is64, dst, dst, imm);
++ if (a64_insn != AARCH64_BREAK_FAULT) {
++ emit(a64_insn, ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_AND(is64, dst, dst, tmp), ctx);
++ }
+ break;
+ case BPF_ALU | BPF_OR | BPF_K:
+ case BPF_ALU64 | BPF_OR | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_ORR(is64, dst, dst, tmp), ctx);
++ a64_insn = A64_ORR_I(is64, dst, dst, imm);
++ if (a64_insn != AARCH64_BREAK_FAULT) {
++ emit(a64_insn, ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_ORR(is64, dst, dst, tmp), ctx);
++ }
+ break;
+ case BPF_ALU | BPF_XOR | BPF_K:
+ case BPF_ALU64 | BPF_XOR | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_EOR(is64, dst, dst, tmp), ctx);
++ a64_insn = A64_EOR_I(is64, dst, dst, imm);
++ if (a64_insn != AARCH64_BREAK_FAULT) {
++ emit(a64_insn, ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_EOR(is64, dst, dst, tmp), ctx);
++ }
+ break;
+ case BPF_ALU | BPF_MUL | BPF_K:
+ case BPF_ALU64 | BPF_MUL | BPF_K:
+@@ -628,8 +644,13 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
+ goto emit_cond_jmp;
+ case BPF_JMP | BPF_JSET | BPF_K:
+ case BPF_JMP32 | BPF_JSET | BPF_K:
+- emit_a64_mov_i(is64, tmp, imm, ctx);
+- emit(A64_TST(is64, dst, tmp), ctx);
++ a64_insn = A64_TST_I(is64, dst, imm);
++ if (a64_insn != AARCH64_BREAK_FAULT) {
++ emit(a64_insn, ctx);
++ } else {
++ emit_a64_mov_i(is64, tmp, imm, ctx);
++ emit(A64_TST(is64, dst, tmp), ctx);
++ }
+ goto emit_cond_jmp;
+ /* function call */
+ case BPF_JMP | BPF_CALL:commit 579d1b3faa3735e781ff74aac0afd598515dbc63
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri May 8 11:15:44 2020 -0700
+
+ arm64: insn: Fix two bugs in encoding 32-bit logical immediates
+
+ This patch fixes two issues present in the current function for encoding
+ arm64 logical immediates when using the 32-bit variants of instructions.
+
+ First, the code does not correctly reject an all-ones 32-bit immediate,
+ and returns an undefined instruction encoding.
+
+ Second, the code incorrectly rejects some 32-bit immediates that are
+ actually encodable as logical immediates. The root cause is that the code
+ uses a default mask of 64-bit all-ones, even for 32-bit immediates.
+ This causes an issue later on when the default mask is used to fill the
+ top bits of the immediate with ones, shown here:
+
+ /*
+ * Pattern: 0..01..10..01..1
+ *
+ * Fill the unused top bits with ones, and check if
+ * the result is a valid immediate (all ones with a
+ * contiguous ranges of zeroes).
+ */
+ imm |= ~mask;
+ if (!range_of_ones(~imm))
+ return AARCH64_BREAK_FAULT;
+
+ To see the problem, consider an immediate of the form 0..01..10..01..1,
+ where the upper 32 bits are zero, such as 0x80000001. The code checks
+ if ~(imm | ~mask) contains a range of ones: the incorrect mask yields
+ 1..10..01..10..0, which fails the check; the correct mask yields
+ 0..01..10..0, which succeeds.
+
+ The fix for both issues is to generate a correct mask based on the
+ instruction immediate size, and use the mask to check for all-ones,
+ all-zeroes, and values wider than the mask.
+
+ Currently, arch/arm64/kvm/va_layout.c is the only user of this function,
+ which uses 64-bit immediates and therefore won't trigger these bugs.
+
+ We tested the new code against llvm-mc with all 1,302 encodable 32-bit
+ logical immediates and all 5,334 encodable 64-bit logical immediates.
+
+ Fixes: ef3935eeebff ("arm64: insn: Add encoder for bitwise operations using literals")
+ Suggested-by: Will Deacon <will@kernel.org>
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Reviewed-by: Marc Zyngier <maz@kernel.org>
+ Link: https://lore.kernel.org/r/20200508181547.24783-2-luke.r.nels@gmail.com
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c
+index 4a9e773a177f..cc2f3d901c91 100644
+--- a/arch/arm64/kernel/insn.c
++++ b/arch/arm64/kernel/insn.c
+@@ -1535,16 +1535,10 @@ static u32 aarch64_encode_immediate(u64 imm,
+ u32 insn)
+ {
+ unsigned int immr, imms, n, ones, ror, esz, tmp;
+- u64 mask = ~0UL;
+-
+- /* Can't encode full zeroes or full ones */
+- if (!imm || !~imm)
+- return AARCH64_BREAK_FAULT;
++ u64 mask;
+
+ switch (variant) {
+ case AARCH64_INSN_VARIANT_32BIT:
+- if (upper_32_bits(imm))
+- return AARCH64_BREAK_FAULT;
+ esz = 32;
+ break;
+ case AARCH64_INSN_VARIANT_64BIT:
+@@ -1556,6 +1550,12 @@ static u32 aarch64_encode_immediate(u64 imm,
+ return AARCH64_BREAK_FAULT;
+ }
+
++ mask = GENMASK(esz - 1, 0);
++
++ /* Can't encode full zeroes, full ones, or value wider than the mask */
++ if (!imm || imm == mask || imm & ~mask)
++ return AARCH64_BREAK_FAULT;
++
+ /*
+ * Inverse of Replicate(). Try to spot a repeating pattern
+ * with a pow2 stride.commit 073ca6a0369e09c586a103e665f2dd67f1c71444
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Tue May 5 17:03:20 2020 -0700
+
+ bpf, riscv: Optimize BPF_JSET BPF_K using andi on RV64
+
+ This patch optimizes BPF_JSET BPF_K by using a RISC-V andi instruction
+ when the BPF immediate fits in 12 bits, instead of first loading the
+ immediate to a temporary register.
+
+ Examples of generated code with and without this optimization:
+
+ BPF_JMP_IMM(BPF_JSET, R1, 2, 1) without optimization:
+
+ 20: li t1,2
+ 24: and t1,a0,t1
+ 28: bnez t1,0x30
+
+ BPF_JMP_IMM(BPF_JSET, R1, 2, 1) with optimization:
+
+ 20: andi t1,a0,2
+ 24: bnez t1,0x2c
+
+ BPF_JMP32_IMM(BPF_JSET, R1, 2, 1) without optimization:
+
+ 20: li t1,2
+ 24: mv t2,a0
+ 28: slli t2,t2,0x20
+ 2c: srli t2,t2,0x20
+ 30: slli t1,t1,0x20
+ 34: srli t1,t1,0x20
+ 38: and t1,t2,t1
+ 3c: bnez t1,0x44
+
+ BPF_JMP32_IMM(BPF_JSET, R1, 2, 1) with optimization:
+
+ 20: andi t1,a0,2
+ 24: bnez t1,0x2c
+
+ In these examples, because the upper 32 bits of the sign-extended
+ immediate are 0, BPF_JMP BPF_JSET and BPF_JMP32 BPF_JSET are equivalent
+ and therefore the JIT produces identical code for them.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200506000320.28965-5-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index b07cef952019..6cfd164cbe88 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -792,8 +792,6 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_JMP32 | BPF_JSGE | BPF_K:
+ case BPF_JMP | BPF_JSLE | BPF_K:
+ case BPF_JMP32 | BPF_JSLE | BPF_K:
+- case BPF_JMP | BPF_JSET | BPF_K:
+- case BPF_JMP32 | BPF_JSET | BPF_K:
+ rvoff = rv_offset(i, off, ctx);
+ s = ctx->ninsns;
+ if (imm) {
+@@ -813,15 +811,28 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+
+ /* Adjust for extra insns */
+ rvoff -= (e - s) << 2;
++ emit_branch(BPF_OP(code), rd, rs, rvoff, ctx);
++ break;
+
+- if (BPF_OP(code) == BPF_JSET) {
+- /* Adjust for and */
+- rvoff -= 4;
+- emit(rv_and(rs, rd, rs), ctx);
+- emit_branch(BPF_JNE, rs, RV_REG_ZERO, rvoff, ctx);
++ case BPF_JMP | BPF_JSET | BPF_K:
++ case BPF_JMP32 | BPF_JSET | BPF_K:
++ rvoff = rv_offset(i, off, ctx);
++ s = ctx->ninsns;
++ if (is_12b_int(imm)) {
++ emit(rv_andi(RV_REG_T1, rd, imm), ctx);
+ } else {
+- emit_branch(BPF_OP(code), rd, rs, rvoff, ctx);
++ emit_imm(RV_REG_T1, imm, ctx);
++ emit(rv_and(RV_REG_T1, rd, RV_REG_T1), ctx);
+ }
++ /* For jset32, we should clear the upper 32 bits of t1, but
++ * sign-extension is sufficient here and saves one instruction,
++ * as t1 is used only in comparison against zero.
++ */
++ if (!is64 && imm < 0)
++ emit(rv_addiw(RV_REG_T1, RV_REG_T1, 0), ctx);
++ e = ctx->ninsns;
++ rvoff -= (e - s) << 2;
++ emit_branch(BPF_JNE, RV_REG_T1, RV_REG_ZERO, rvoff, ctx);
+ break;
+
+ /* function call */commit ca349a6a104e58479defdc08ce56472a48f7cb81
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Tue May 5 17:03:19 2020 -0700
+
+ bpf, riscv: Optimize BPF_JMP BPF_K when imm == 0 on RV64
+
+ This patch adds an optimization to BPF_JMP (32- and 64-bit) BPF_K for
+ when the BPF immediate is zero.
+
+ When the immediate is zero, the code can directly use the RISC-V zero
+ register instead of loading a zero immediate to a temporary register
+ first.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200506000320.28965-4-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index c3ce9a911b66..b07cef952019 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -796,7 +796,13 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_JMP32 | BPF_JSET | BPF_K:
+ rvoff = rv_offset(i, off, ctx);
+ s = ctx->ninsns;
+- emit_imm(RV_REG_T1, imm, ctx);
++ if (imm) {
++ emit_imm(RV_REG_T1, imm, ctx);
++ rs = RV_REG_T1;
++ } else {
++ /* If imm is 0, simply use zero register. */
++ rs = RV_REG_ZERO;
++ }
+ if (!is64) {
+ if (is_signed_bpf_cond(BPF_OP(code)))
+ emit_sext_32_rd(&rd, ctx);
+@@ -811,11 +817,10 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ if (BPF_OP(code) == BPF_JSET) {
+ /* Adjust for and */
+ rvoff -= 4;
+- emit(rv_and(RV_REG_T1, rd, RV_REG_T1), ctx);
+- emit_branch(BPF_JNE, RV_REG_T1, RV_REG_ZERO, rvoff,
+- ctx);
++ emit(rv_and(rs, rd, rs), ctx);
++ emit_branch(BPF_JNE, rs, RV_REG_ZERO, rvoff, ctx);
+ } else {
+- emit_branch(BPF_OP(code), rd, RV_REG_T1, rvoff, ctx);
++ emit_branch(BPF_OP(code), rd, rs, rvoff, ctx);
+ }
+ break;
+ commit 21a099abb765c3754689e1f7ca4536fa560112d0
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Tue May 5 17:03:18 2020 -0700
+
+ bpf, riscv: Optimize FROM_LE using verifier_zext on RV64
+
+ This patch adds two optimizations for BPF_ALU BPF_END BPF_FROM_LE in
+ the RV64 BPF JIT.
+
+ First, it enables the verifier zero-extension optimization to avoid zero
+ extension when imm == 32. Second, it avoids generating code for imm ==
+ 64, since it is equivalent to a no-op.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200506000320.28965-3-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index e2636902a74e..c3ce9a911b66 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -542,13 +542,21 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+
+ /* dst = BSWAP##imm(dst) */
+ case BPF_ALU | BPF_END | BPF_FROM_LE:
+- {
+- int shift = 64 - imm;
+-
+- emit(rv_slli(rd, rd, shift), ctx);
+- emit(rv_srli(rd, rd, shift), ctx);
++ switch (imm) {
++ case 16:
++ emit(rv_slli(rd, rd, 48), ctx);
++ emit(rv_srli(rd, rd, 48), ctx);
++ break;
++ case 32:
++ if (!aux->verifier_zext)
++ emit_zext_32(rd, ctx);
++ break;
++ case 64:
++ /* Do nothing */
++ break;
++ }
+ break;
+- }
++
+ case BPF_ALU | BPF_END | BPF_FROM_BE:
+ emit(rv_addi(RV_REG_T2, RV_REG_ZERO, 0), ctx);
+ commit 0224b2acea0f9e3908d33e27b2dcb4e04686e997
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Tue May 5 17:03:17 2020 -0700
+
+ bpf, riscv: Enable missing verifier_zext optimizations on RV64
+
+ Commit 66d0d5a854a6 ("riscv: bpf: eliminate zero extension code-gen")
+ added support for the verifier zero-extension optimization on RV64 and
+ commit 46dd3d7d287b ("bpf, riscv: Enable zext optimization for more
+ RV64G ALU ops") enabled it for more instruction cases.
+
+ However, BPF_LSH BPF_X and BPF_{LSH,RSH,ARSH} BPF_K are still missing
+ the optimization.
+
+ This patch enables the zero-extension optimization for these remaining
+ cases.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200506000320.28965-2-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index d208a9fd6c52..e2636902a74e 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -515,7 +515,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_LSH | BPF_X:
+ case BPF_ALU64 | BPF_LSH | BPF_X:
+ emit(is64 ? rv_sll(rd, rd, rs) : rv_sllw(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_RSH | BPF_X:
+@@ -692,19 +692,19 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_LSH | BPF_K:
+ case BPF_ALU64 | BPF_LSH | BPF_K:
+ emit(is64 ? rv_slli(rd, rd, imm) : rv_slliw(rd, rd, imm), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_RSH | BPF_K:
+ case BPF_ALU64 | BPF_RSH | BPF_K:
+ emit(is64 ? rv_srli(rd, rd, imm) : rv_srliw(rd, rd, imm), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_ARSH | BPF_K:
+ case BPF_ALU64 | BPF_ARSH | BPF_K:
+ emit(is64 ? rv_srai(rd, rd, imm) : rv_sraiw(rd, rd, imm), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+
+ commit c648c9c7429e979ca081359f39b6902aed92d490
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Thu Apr 30 19:02:10 2020 -0700
+
+ bpf, arm: Optimize ALU ARSH K using asr immediate instruction
+
+ This patch adds an optimization that uses the asr immediate instruction
+ for BPF_ALU BPF_ARSH BPF_K, rather than loading the immediate to
+ a temporary register. This is similar to existing code for handling
+ BPF_ALU BPF_{LSH,RSH} BPF_K. This optimization saves two instructions
+ and is more consistent with LSH and RSH.
+
+ Example of the code generated for BPF_ALU32_IMM(BPF_ARSH, BPF_REG_0, 5)
+ before the optimization:
+
+ 2c: mov r8, #5
+ 30: mov r9, #0
+ 34: asr r0, r0, r8
+
+ and after optimization:
+
+ 2c: asr r0, r0, #5
+
+ Tested on QEMU using lib/test_bpf and test_verifier.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200501020210.32294-3-luke.r.nels@gmail.com
+
+diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
+index 48b89211ee5c..0207b6ea6e8a 100644
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -795,6 +795,9 @@ static inline void emit_a32_alu_i(const s8 dst, const u32 val,
+ case BPF_RSH:
+ emit(ARM_LSR_I(rd, rd, val), ctx);
+ break;
++ case BPF_ARSH:
++ emit(ARM_ASR_I(rd, rd, val), ctx);
++ break;
+ case BPF_NEG:
+ emit(ARM_RSB_I(rd, rd, val), ctx);
+ break;
+@@ -1408,7 +1411,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
+ case BPF_ALU | BPF_MUL | BPF_X:
+ case BPF_ALU | BPF_LSH | BPF_X:
+ case BPF_ALU | BPF_RSH | BPF_X:
+- case BPF_ALU | BPF_ARSH | BPF_K:
+ case BPF_ALU | BPF_ARSH | BPF_X:
+ case BPF_ALU64 | BPF_ADD | BPF_K:
+ case BPF_ALU64 | BPF_ADD | BPF_X:
+@@ -1465,10 +1467,12 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
+ case BPF_ALU64 | BPF_MOD | BPF_K:
+ case BPF_ALU64 | BPF_MOD | BPF_X:
+ goto notyet;
+- /* dst = dst >> imm */
+ /* dst = dst << imm */
+- case BPF_ALU | BPF_RSH | BPF_K:
++ /* dst = dst >> imm */
++ /* dst = dst >> imm (signed) */
+ case BPF_ALU | BPF_LSH | BPF_K:
++ case BPF_ALU | BPF_RSH | BPF_K:
++ case BPF_ALU | BPF_ARSH | BPF_K:
+ if (unlikely(imm > 31))
+ return -EINVAL;
+ if (imm)
+diff --git a/arch/arm/net/bpf_jit_32.h b/arch/arm/net/bpf_jit_32.h
+index fb67cbc589e0..e0b593a1498d 100644
+--- a/arch/arm/net/bpf_jit_32.h
++++ b/arch/arm/net/bpf_jit_32.h
+@@ -94,6 +94,9 @@
+ #define ARM_INST_LSR_I 0x01a00020
+ #define ARM_INST_LSR_R 0x01a00030
+
++#define ARM_INST_ASR_I 0x01a00040
++#define ARM_INST_ASR_R 0x01a00050
++
+ #define ARM_INST_MOV_R 0x01a00000
+ #define ARM_INST_MOVS_R 0x01b00000
+ #define ARM_INST_MOV_I 0x03a00000commit cf48db69bdfad2930b95fd51d64444e5a7b469ae +Author: Luke Nelson <lukenels@cs.washington.edu> +Date: Thu Apr 30 19:02:09 2020 -0700 + + bpf, arm: Optimize ALU64 ARSH X using orrpl conditional instruction + + This patch optimizes the code generated by emit_a32_arsh_r64, which + handles the BPF_ALU64 BPF_ARSH BPF_X instruction. + + The original code uses a conditional B followed by an unconditional ORR. + The optimization saves one instruction by removing the B instruction + and using a conditional ORR (with an inverted condition). + + Example of the code generated for BPF_ALU64_REG(BPF_ARSH, BPF_REG_0, + BPF_REG_1), before optimization: + + 34: rsb ip, r2, #32 + 38: subs r9, r2, #32 + 3c: lsr lr, r0, r2 + 40: orr lr, lr, r1, lsl ip + 44: bmi 0x4c + 48: orr lr, lr, r1, asr r9 + 4c: asr ip, r1, r2 + 50: mov r0, lr + 54: mov r1, ip + + and after optimization: + + 34: rsb ip, r2, #32 + 38: subs r9, r2, #32 + 3c: lsr lr, r0, r2 + 40: orr lr, lr, r1, lsl ip + 44: orrpl lr, lr, r1, asr r9 + 48: asr ip, r1, r2 + 4c: mov r0, lr + 50: mov r1, ip + + Tested on QEMU using lib/test_bpf and test_verifier. + + Co-developed-by: Xi Wang <xi.wang@gmail.com> + Signed-off-by: Xi Wang <xi.wang@gmail.com> + Signed-off-by: Luke Nelson <luke.r.nels@gmail.com> + Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> + Link: https://lore.kernel.org/bpf/20200501020210.32294-2-luke.r.nels@gmail.com + +diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c +index bf85d6db4931..48b89211ee5c 100644 +--- a/arch/arm/net/bpf_jit_32.c ++++ b/arch/arm/net/bpf_jit_32.c +@@ -860,8 +860,8 @@ static inline void emit_a32_arsh_r64(const s8 dst[], const s8 src[], + emit(ARM_SUBS_I(tmp2[0], rt, 32), ctx); + emit(ARM_MOV_SR(ARM_LR, rd[1], SRTYPE_LSR, rt), ctx); + emit(ARM_ORR_SR(ARM_LR, ARM_LR, rd[0], SRTYPE_ASL, ARM_IP), ctx); +- _emit(ARM_COND_MI, ARM_B(0), ctx); +- emit(ARM_ORR_SR(ARM_LR, ARM_LR, rd[0], SRTYPE_ASR, tmp2[0]), ctx); ++ _emit(ARM_COND_PL, ++ ARM_ORR_SR(ARM_LR, ARM_LR, rd[0], SRTYPE_ASR, tmp2[0]), ctx); + emit(ARM_MOV_SR(ARM_IP, rd[0], SRTYPE_ASR, rt), ctx); + + arm_bpf_put_reg32(dst_lo, ARM_LR, ctx);
commit 91f658587a962378a410cc7dc90e122a4ccd7cf3
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Apr 29 17:51:27 2020 -0700
+
+ bpf, riscv: Fix stack layout of JITed code on RV32
+
+ This patch fixes issues with stackframe unwinding and alignment in the
+ current stack layout for BPF programs on RV32.
+
+ In the current layout, RV32 fp points to the JIT scratch registers, rather
+ than to the callee-saved registers. This breaks stackframe unwinding,
+ which expects fp to point just above the saved ra and fp registers.
+
+ This patch fixes the issue by moving the callee-saved registers to be
+ stored on the top of the stack, pointed to by fp. This satisfies the
+ assumptions of stackframe unwinding.
+
+ This patch also fixes an issue with the old layout that the stack was
+ not aligned to 16 bytes.
+
+ Stacktrace from JITed code using the old stack layout:
+
+ [ 12.196249 ] [<c0402200>] walk_stackframe+0x0/0x96
+
+ Stacktrace using the new stack layout:
+
+ [ 13.062888 ] [<c0402200>] walk_stackframe+0x0/0x96
+ [ 13.063028 ] [<c04023c6>] show_stack+0x28/0x32
+ [ 13.063253 ] [<a403e778>] bpf_prog_82b916b2dfa00464+0x80/0x908
+ [ 13.063417 ] [<c09270b2>] bpf_test_run+0x124/0x39a
+ [ 13.063553 ] [<c09276c0>] bpf_prog_test_run_skb+0x234/0x448
+ [ 13.063704 ] [<c048510e>] __do_sys_bpf+0x766/0x13b4
+ [ 13.063840 ] [<c0485d82>] sys_bpf+0xc/0x14
+ [ 13.063961 ] [<c04010f0>] ret_from_syscall+0x0/0x2
+
+ The new code is also simpler to understand and includes an ASCII diagram
+ of the stack layout.
+
+ Tested on riscv32 QEMU virt machine.
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Acked-by: Xi Wang <xi.wang@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200430005127.2205-1-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp32.c
+index 11083d4d5f2d..b198eaa74456 100644
+--- a/arch/riscv/net/bpf_jit_comp32.c
++++ b/arch/riscv/net/bpf_jit_comp32.c
+@@ -13,8 +13,35 @@
+ #include <linux/filter.h>
+ #include "bpf_jit.h"
+
++/*
++ * Stack layout during BPF program execution:
++ *
++ * high
++ * RV32 fp => +----------+
++ * | saved ra |
++ * | saved fp | RV32 callee-saved registers
++ * | ... |
++ * +----------+ <= (fp - 4 * NR_SAVED_REGISTERS)
++ * | hi(R6) |
++ * | lo(R6) |
++ * | hi(R7) | JIT scratch space for BPF registers
++ * | lo(R7) |
++ * | ... |
++ * BPF_REG_FP => +----------+ <= (fp - 4 * NR_SAVED_REGISTERS
++ * | | - 4 * BPF_JIT_SCRATCH_REGS)
++ * | |
++ * | ... | BPF program stack
++ * | |
++ * RV32 sp => +----------+
++ * | |
++ * | ... | Function call stack
++ * | |
++ * +----------+
++ * low
++ */
++
+ enum {
+- /* Stack layout - these are offsets from (top of stack - 4). */
++ /* Stack layout - these are offsets from top of JIT scratch space. */
+ BPF_R6_HI,
+ BPF_R6_LO,
+ BPF_R7_HI,
+@@ -29,7 +56,11 @@ enum {
+ BPF_JIT_SCRATCH_REGS,
+ };
+
+-#define STACK_OFFSET(k) (-4 - ((k) * 4))
++/* Number of callee-saved registers stored to stack: ra, fp, s1--s7. */
++#define NR_SAVED_REGISTERS 9
++
++/* Offset from fp for BPF registers stored on stack. */
++#define STACK_OFFSET(k) (-4 - (4 * NR_SAVED_REGISTERS) - (4 * (k)))
+
+ #define TMP_REG_1 (MAX_BPF_JIT_REG + 0)
+ #define TMP_REG_2 (MAX_BPF_JIT_REG + 1)
+@@ -111,11 +142,9 @@ static void emit_imm64(const s8 *rd, s32 imm_hi, s32 imm_lo,
+
+ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+ {
+- int stack_adjust = ctx->stack_size, store_offset = stack_adjust - 4;
++ int stack_adjust = ctx->stack_size;
+ const s8 *r0 = bpf2rv32[BPF_REG_0];
+
+- store_offset -= 4 * BPF_JIT_SCRATCH_REGS;
+-
+ /* Set return value if not tail call. */
+ if (!is_tail_call) {
+ emit(rv_addi(RV_REG_A0, lo(r0), 0), ctx);
+@@ -123,15 +152,15 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+ }
+
+ /* Restore callee-saved registers. */
+- emit(rv_lw(RV_REG_RA, store_offset - 0, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_FP, store_offset - 4, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S1, store_offset - 8, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S2, store_offset - 12, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S3, store_offset - 16, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S4, store_offset - 20, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S5, store_offset - 24, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S6, store_offset - 28, RV_REG_SP), ctx);
+- emit(rv_lw(RV_REG_S7, store_offset - 32, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_RA, stack_adjust - 4, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_FP, stack_adjust - 8, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S1, stack_adjust - 12, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S2, stack_adjust - 16, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S3, stack_adjust - 20, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S4, stack_adjust - 24, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S5, stack_adjust - 28, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S6, stack_adjust - 32, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S7, stack_adjust - 36, RV_REG_SP), ctx);
+
+ emit(rv_addi(RV_REG_SP, RV_REG_SP, stack_adjust), ctx);
+
+@@ -1260,17 +1289,20 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+
+ void bpf_jit_build_prologue(struct rv_jit_context *ctx)
+ {
+- /* Make space to save 9 registers: ra, fp, s1--s7. */
+- int stack_adjust = 9 * sizeof(u32), store_offset, bpf_stack_adjust;
+ const s8 *fp = bpf2rv32[BPF_REG_FP];
+ const s8 *r1 = bpf2rv32[BPF_REG_1];
+-
+- bpf_stack_adjust = round_up(ctx->prog->aux->stack_depth, 16);
++ int stack_adjust = 0;
++ int bpf_stack_adjust =
++ round_up(ctx->prog->aux->stack_depth, STACK_ALIGN);
++
++ /* Make space for callee-saved registers. */
++ stack_adjust += NR_SAVED_REGISTERS * sizeof(u32);
++ /* Make space for BPF registers on stack. */
++ stack_adjust += BPF_JIT_SCRATCH_REGS * sizeof(u32);
++ /* Make space for BPF stack. */
+ stack_adjust += bpf_stack_adjust;
+-
+- store_offset = stack_adjust - 4;
+-
+- stack_adjust += 4 * BPF_JIT_SCRATCH_REGS;
++ /* Round up for stack alignment. */
++ stack_adjust = round_up(stack_adjust, STACK_ALIGN);
+
+ /*
+ * The first instruction sets the tail-call-counter (TCC) register.
+@@ -1281,24 +1313,24 @@ void bpf_jit_build_prologue(struct rv_jit_context *ctx)
+ emit(rv_addi(RV_REG_SP, RV_REG_SP, -stack_adjust), ctx);
+
+ /* Save callee-save registers. */
+- emit(rv_sw(RV_REG_SP, store_offset - 0, RV_REG_RA), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 4, RV_REG_FP), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 8, RV_REG_S1), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 12, RV_REG_S2), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 16, RV_REG_S3), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 20, RV_REG_S4), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 24, RV_REG_S5), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 28, RV_REG_S6), ctx);
+- emit(rv_sw(RV_REG_SP, store_offset - 32, RV_REG_S7), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 4, RV_REG_RA), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 8, RV_REG_FP), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 12, RV_REG_S1), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 16, RV_REG_S2), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 20, RV_REG_S3), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 24, RV_REG_S4), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 28, RV_REG_S5), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 32, RV_REG_S6), ctx);
++ emit(rv_sw(RV_REG_SP, stack_adjust - 36, RV_REG_S7), ctx);
+
+ /* Set fp: used as the base address for stacked BPF registers. */
+ emit(rv_addi(RV_REG_FP, RV_REG_SP, stack_adjust), ctx);
+
+- /* Set up BPF stack pointer. */
++ /* Set up BPF frame pointer. */
+ emit(rv_addi(lo(fp), RV_REG_SP, bpf_stack_adjust), ctx);
+ emit(rv_addi(hi(fp), RV_REG_ZERO, 0), ctx);
+
+- /* Set up context pointer. */
++ /* Set up BPF context pointer. */
+ emit(rv_addi(lo(r1), RV_REG_A0, 0), ctx);
+ emit(rv_addi(hi(r1), RV_REG_ZERO, 0), ctx);
+ commit 745abfaa9eafa597d31fdf24a3249e5206a98768
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Mon Apr 20 17:28:04 2020 -0700
+
+ bpf, riscv: Fix tail call count off by one in RV32 BPF JIT
+
+ This patch fixes an off by one error in the RV32 JIT handling for BPF
+ tail call. Currently, the code decrements TCC before checking if it
+ is less than zero. This limits the maximum number of tail calls to 32
+ instead of 33 as in other JITs. The fix is to instead check the old
+ value of TCC before decrementing.
+
+ Fixes: 5f316b65e99f ("riscv, bpf: Add RV32G eBPF JIT")
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Acked-by: Xi Wang <xi.wang@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200421002804.5118-1-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp32.c
+index 302934177760..11083d4d5f2d 100644
+--- a/arch/riscv/net/bpf_jit_comp32.c
++++ b/arch/riscv/net/bpf_jit_comp32.c
+@@ -770,12 +770,13 @@ static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
+ emit_bcc(BPF_JGE, lo(idx_reg), RV_REG_T1, off, ctx);
+
+ /*
+- * if ((temp_tcc = tcc - 1) < 0)
++ * temp_tcc = tcc - 1;
++ * if (tcc < 0)
+ * goto out;
+ */
+ emit(rv_addi(RV_REG_T1, RV_REG_TCC, -1), ctx);
+ off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
+- emit_bcc(BPF_JSLT, RV_REG_T1, RV_REG_ZERO, off, ctx);
++ emit_bcc(BPF_JSLT, RV_REG_TCC, RV_REG_ZERO, off, ctx);
+
+ /*
+ * prog = array->ptrs[index];commit 50fe7ebb6475711c15b3397467e6424e20026d94
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Apr 22 10:36:30 2020 -0700
+
+ bpf, x86_32: Fix clobbering of dst for BPF_JSET
+
+ The current JIT clobbers the destination register for BPF_JSET BPF_X
+ and BPF_K by using "and" and "or" instructions. This is fine when the
+ destination register is a temporary loaded from a register stored on
+ the stack but not otherwise.
+
+ This patch fixes the problem (for both BPF_K and BPF_X) by always loading
+ the destination register into temporaries since BPF_JSET should not
+ modify the destination register.
+
+ This bug may not be currently triggerable as BPF_REG_AX is the only
+ register not stored on the stack and the verifier uses it in a limited
+ way.
+
+ Fixes: 03f5781be2c7b ("bpf, x86_32: add eBPF JIT compiler for ia32")
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Acked-by: Wang YanQing <udknight@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200422173630.8351-2-luke.r.nels@gmail.com
+
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index cc9ad3892ea6..ba7d9ccfc662 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -2015,8 +2015,8 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ case BPF_JMP | BPF_JSET | BPF_X:
+ case BPF_JMP32 | BPF_JSET | BPF_X: {
+ bool is_jmp64 = BPF_CLASS(insn->code) == BPF_JMP;
+- u8 dreg_lo = dstk ? IA32_EAX : dst_lo;
+- u8 dreg_hi = dstk ? IA32_EDX : dst_hi;
++ u8 dreg_lo = IA32_EAX;
++ u8 dreg_hi = IA32_EDX;
+ u8 sreg_lo = sstk ? IA32_ECX : src_lo;
+ u8 sreg_hi = sstk ? IA32_EBX : src_hi;
+
+@@ -2028,6 +2028,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ add_2reg(0x40, IA32_EBP,
+ IA32_EDX),
+ STACK_VAR(dst_hi));
++ } else {
++ /* mov dreg_lo,dst_lo */
++ EMIT2(0x89, add_2reg(0xC0, dreg_lo, dst_lo));
++ if (is_jmp64)
++ /* mov dreg_hi,dst_hi */
++ EMIT2(0x89,
++ add_2reg(0xC0, dreg_hi, dst_hi));
+ }
+
+ if (sstk) {
+@@ -2052,8 +2059,8 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ case BPF_JMP | BPF_JSET | BPF_K:
+ case BPF_JMP32 | BPF_JSET | BPF_K: {
+ bool is_jmp64 = BPF_CLASS(insn->code) == BPF_JMP;
+- u8 dreg_lo = dstk ? IA32_EAX : dst_lo;
+- u8 dreg_hi = dstk ? IA32_EDX : dst_hi;
++ u8 dreg_lo = IA32_EAX;
++ u8 dreg_hi = IA32_EDX;
+ u8 sreg_lo = IA32_ECX;
+ u8 sreg_hi = IA32_EBX;
+ u32 hi;
+@@ -2066,6 +2073,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ add_2reg(0x40, IA32_EBP,
+ IA32_EDX),
+ STACK_VAR(dst_hi));
++ } else {
++ /* mov dreg_lo,dst_lo */
++ EMIT2(0x89, add_2reg(0xC0, dreg_lo, dst_lo));
++ if (is_jmp64)
++ /* mov dreg_hi,dst_hi */
++ EMIT2(0x89,
++ add_2reg(0xC0, dreg_hi, dst_hi));
+ }
+
+ /* mov ecx,imm32 */commit 5fa9a98fb10380e48a398998cd36a85e4ef711d6
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Apr 22 10:36:29 2020 -0700
+
+ bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension
+
+ The current JIT uses the following sequence to zero-extend into the
+ upper 32 bits of the destination register for BPF_LDX BPF_{B,H,W},
+ when the destination register is not on the stack:
+
+ EMIT3(0xC7, add_1reg(0xC0, dst_hi), 0);
+
+ The problem is that C7 /0 encodes a MOV instruction that requires a 4-byte
+ immediate; the current code emits only 1 byte of the immediate. This
+ means that the first 3 bytes of the next instruction will be treated as
+ the rest of the immediate, breaking the stream of instructions.
+
+ This patch fixes the problem by instead emitting "xor dst_hi,dst_hi"
+ to clear the upper 32 bits. This fixes the problem and is more efficient
+ than using MOV to load a zero immediate.
+
+ This bug may not be currently triggerable as BPF_REG_AX is the only
+ register not stored on the stack and the verifier uses it in a limited
+ way, and the verifier implements a zero-extension optimization. But the
+ JIT should avoid emitting incorrect encodings regardless.
+
+ Fixes: 03f5781be2c7b ("bpf, x86_32: add eBPF JIT compiler for ia32")
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com>
+ Acked-by: Wang YanQing <udknight@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200422173630.8351-1-luke.r.nels@gmail.com
+
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index 4d2a7a764602..cc9ad3892ea6 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -1854,7 +1854,9 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ STACK_VAR(dst_hi));
+ EMIT(0x0, 4);
+ } else {
+- EMIT3(0xC7, add_1reg(0xC0, dst_hi), 0);
++ /* xor dst_hi,dst_hi */
++ EMIT2(0x33,
++ add_2reg(0xC0, dst_hi, dst_hi));
+ }
+ break;
+ case BPF_DW:commit d2b6c3ab70dbc0069a69c57edd8c96f365f06b7c
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Sat Apr 18 16:26:54 2020 -0700
+
+ bpf, selftests: Add test for BPF_STX BPF_B storing R10
+
+ This patch adds a test to test_verifier that writes the lower 8 bits of
+ R10 (aka FP) using BPF_B to an array map and reads the result back. The
+ expected behavior is that the result should be the same as first copying
+ R10 to R9, and then storing / loading the lower 8 bits of R9.
+
+ This test catches a bug that was present in the x86-64 JIT that caused
+ an incorrect encoding for BPF_STX BPF_B when the source operand is R10.
+
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Link: https://lore.kernel.org/bpf/20200418232655.23870-2-luke.r.nels@gmail.com
+
+diff --git a/tools/testing/selftests/bpf/verifier/stack_ptr.c b/tools/testing/selftests/bpf/verifier/stack_ptr.c
+index 7276620ef242..8bfeb77c60bd 100644
+--- a/tools/testing/selftests/bpf/verifier/stack_ptr.c
++++ b/tools/testing/selftests/bpf/verifier/stack_ptr.c
+@@ -315,3 +315,43 @@
+ },
+ .result = ACCEPT,
+ },
++{
++ "store PTR_TO_STACK in R10 to array map using BPF_B",
++ .insns = {
++ /* Load pointer to map. */
++ BPF_MOV64_REG(BPF_REG_2, BPF_REG_10),
++ BPF_ALU64_IMM(BPF_ADD, BPF_REG_2, -8),
++ BPF_ST_MEM(BPF_DW, BPF_REG_2, 0, 0),
++ BPF_LD_MAP_FD(BPF_REG_1, 0),
++ BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
++ BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 2),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
++ /* Copy R10 to R9. */
++ BPF_MOV64_REG(BPF_REG_9, BPF_REG_10),
++ /* Pollute other registers with unaligned values. */
++ BPF_MOV64_IMM(BPF_REG_2, -1),
++ BPF_MOV64_IMM(BPF_REG_3, -1),
++ BPF_MOV64_IMM(BPF_REG_4, -1),
++ BPF_MOV64_IMM(BPF_REG_5, -1),
++ BPF_MOV64_IMM(BPF_REG_6, -1),
++ BPF_MOV64_IMM(BPF_REG_7, -1),
++ BPF_MOV64_IMM(BPF_REG_8, -1),
++ /* Store both R9 and R10 with BPF_B and read back. */
++ BPF_STX_MEM(BPF_B, BPF_REG_1, BPF_REG_10, 0),
++ BPF_LDX_MEM(BPF_B, BPF_REG_2, BPF_REG_1, 0),
++ BPF_STX_MEM(BPF_B, BPF_REG_1, BPF_REG_9, 0),
++ BPF_LDX_MEM(BPF_B, BPF_REG_3, BPF_REG_1, 0),
++ /* Should read back as same value. */
++ BPF_JMP_REG(BPF_JEQ, BPF_REG_2, BPF_REG_3, 2),
++ BPF_MOV64_IMM(BPF_REG_0, 1),
++ BPF_EXIT_INSN(),
++ BPF_MOV64_IMM(BPF_REG_0, 42),
++ BPF_EXIT_INSN(),
++ },
++ .fixup_map_array_48b = { 3 },
++ .result = ACCEPT,
++ .retval = 42,
++ .prog_type = BPF_PROG_TYPE_SCHED_CLS,
++},commit aee194b14dd2b2bde6252b3acf57d36dccfc743a
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Sat Apr 18 16:26:53 2020 -0700
+
+ bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B
+
+ This patch fixes an encoding bug in emit_stx for BPF_B when the source
+ register is BPF_REG_FP.
+
+ The current implementation for BPF_STX BPF_B in emit_stx saves one REX
+ byte when the operands can be encoded using Mod-R/M alone. The lower 8
+ bits of registers %rax, %rbx, %rcx, and %rdx can be accessed without using
+ a REX prefix via %al, %bl, %cl, and %dl, respectively. Other registers,
+ (e.g., %rsi, %rdi, %rbp, %rsp) require a REX prefix to use their 8-bit
+ equivalents (%sil, %dil, %bpl, %spl).
+
+ The current code checks if the source for BPF_STX BPF_B is BPF_REG_1
+ or BPF_REG_2 (which map to %rdi and %rsi), in which case it emits the
+ required REX prefix. However, it misses the case when the source is
+ BPF_REG_FP (mapped to %rbp).
+
+ The result is that BPF_STX BPF_B with BPF_REG_FP as the source operand
+ will read from register %ch instead of the correct %bpl. This patch fixes
+ the problem by fixing and refactoring the check on which registers need
+ the extra REX byte. Since no BPF registers map to %rsp, there is no need
+ to handle %spl.
+
+ Fixes: 622582786c9e0 ("net: filter: x86: internal BPF JIT")
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
+ Link: https://lore.kernel.org/bpf/20200418232655.23870-1-luke.r.nels@gmail.com
+
+diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
+index 5ea7c2cf7ab4..42b6709e6dc7 100644
+--- a/arch/x86/net/bpf_jit_comp.c
++++ b/arch/x86/net/bpf_jit_comp.c
+@@ -158,6 +158,19 @@ static bool is_ereg(u32 reg)
+ BIT(BPF_REG_AX));
+ }
+
++/*
++ * is_ereg_8l() == true if BPF register 'reg' is mapped to access x86-64
++ * lower 8-bit registers dil,sil,bpl,spl,r8b..r15b, which need extra byte
++ * of encoding. al,cl,dl,bl have simpler encoding.
++ */
++static bool is_ereg_8l(u32 reg)
++{
++ return is_ereg(reg) ||
++ (1 << reg) & (BIT(BPF_REG_1) |
++ BIT(BPF_REG_2) |
++ BIT(BPF_REG_FP));
++}
++
+ static bool is_axreg(u32 reg)
+ {
+ return reg == BPF_REG_0;
+@@ -598,9 +611,8 @@ static void emit_stx(u8 **pprog, u32 size, u32 dst_reg, u32 src_reg, int off)
+ switch (size) {
+ case BPF_B:
+ /* Emit 'mov byte ptr [rax + off], al' */
+- if (is_ereg(dst_reg) || is_ereg(src_reg) ||
+- /* We have to add extra byte for x86 SIL, DIL regs */
+- src_reg == BPF_REG_1 || src_reg == BPF_REG_2)
++ if (is_ereg(dst_reg) || is_ereg_8l(src_reg))
++ /* Add extra byte for eregs or SIL,DIL,BPL in src_reg */
+ EMIT2(add_2mod(0x40, dst_reg, src_reg), 0x88);
+ else
+ EMIT1(0x88);commit 4178417cc5359c329790a4a8f4a6604612338cca
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Thu Apr 9 15:17:52 2020 -0700
+
+ arm, bpf: Fix offset overflow for BPF_MEM BPF_DW
+
+ This patch fixes an incorrect check in how immediate memory offsets are
+ computed for BPF_DW on arm.
+
+ For BPF_LDX/ST/STX + BPF_DW, the 32-bit arm JIT breaks down an 8-byte
+ access into two separate 4-byte accesses using off+0 and off+4. If off
+ fits in imm12, the JIT emits a ldr/str instruction with the immediate
+ and avoids the use of a temporary register. While the current check off
+ <= 0xfff ensures that the first immediate off+0 doesn't overflow imm12,
+ it's not sufficient for the second immediate off+4, which may cause the
+ second access of BPF_DW to read/write the wrong address.
+
+ This patch fixes the problem by changing the check to
+ off <= 0xfff - 4 for BPF_DW, ensuring off+4 will never overflow.
+
+ A side effect of simplifying the check is that it now allows using
+ negative immediate offsets in ldr/str. This means that small negative
+ offsets can also avoid the use of a temporary register.
+
+ This patch introduces no new failures in test_verifier or test_bpf.c.
+
+ Fixes: c5eae692571d6 ("ARM: net: bpf: improve 64-bit store implementation")
+ Fixes: ec19e02b343db ("ARM: net: bpf: fix LDX instructions")
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200409221752.28448-1-luke.r.nels@gmail.com
+
+diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
+index d124f78e20ac..bf85d6db4931 100644
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -1000,21 +1000,35 @@ static inline void emit_a32_mul_r64(const s8 dst[], const s8 src[],
+ arm_bpf_put_reg32(dst_hi, rd[0], ctx);
+ }
+
++static bool is_ldst_imm(s16 off, const u8 size)
++{
++ s16 off_max = 0;
++
++ switch (size) {
++ case BPF_B:
++ case BPF_W:
++ off_max = 0xfff;
++ break;
++ case BPF_H:
++ off_max = 0xff;
++ break;
++ case BPF_DW:
++ /* Need to make sure off+4 does not overflow. */
++ off_max = 0xfff - 4;
++ break;
++ }
++ return -off_max <= off && off <= off_max;
++}
++
+ /* *(size *)(dst + off) = src */
+ static inline void emit_str_r(const s8 dst, const s8 src[],
+- s32 off, struct jit_ctx *ctx, const u8 sz){
++ s16 off, struct jit_ctx *ctx, const u8 sz){
+ const s8 *tmp = bpf2a32[TMP_REG_1];
+- s32 off_max;
+ s8 rd;
+
+ rd = arm_bpf_get_reg32(dst, tmp[1], ctx);
+
+- if (sz == BPF_H)
+- off_max = 0xff;
+- else
+- off_max = 0xfff;
+-
+- if (off < 0 || off > off_max) {
++ if (!is_ldst_imm(off, sz)) {
+ emit_a32_mov_i(tmp[0], off, ctx);
+ emit(ARM_ADD_R(tmp[0], tmp[0], rd), ctx);
+ rd = tmp[0];
+@@ -1043,18 +1057,12 @@ static inline void emit_str_r(const s8 dst, const s8 src[],
+
+ /* dst = *(size*)(src + off) */
+ static inline void emit_ldx_r(const s8 dst[], const s8 src,
+- s32 off, struct jit_ctx *ctx, const u8 sz){
++ s16 off, struct jit_ctx *ctx, const u8 sz){
+ const s8 *tmp = bpf2a32[TMP_REG_1];
+ const s8 *rd = is_stacked(dst_lo) ? tmp : dst;
+ s8 rm = src;
+- s32 off_max;
+-
+- if (sz == BPF_H)
+- off_max = 0xff;
+- else
+- off_max = 0xfff;
+
+- if (off < 0 || off > off_max) {
++ if (!is_ldst_imm(off, sz)) {
+ emit_a32_mov_i(tmp[0], off, ctx);
+ emit(ARM_ADD_R(tmp[0], tmp[0], src), ctx);
+ rm = tmp[0];commit bb9562cf5c67813034c96afb50bd21130a504441
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Apr 8 18:12:29 2020 +0000
+
+ arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0
+
+ The current arm BPF JIT does not correctly compile RSH or ARSH when the
+ immediate shift amount is 0. This causes the "rsh64 by 0 imm" and "arsh64
+ by 0 imm" BPF selftests to hang the kernel by reaching an instruction
+ the verifier determines to be unreachable.
+
+ The root cause is in how immediate right shifts are encoded on arm.
+ For LSR and ASR (logical and arithmetic right shift), a bit-pattern
+ of 00000 in the immediate encodes a shift amount of 32. When the BPF
+ immediate is 0, the generated code shifts by 32 instead of the expected
+ behavior (a no-op).
+
+ This patch fixes the bugs by adding an additional check if the BPF
+ immediate is 0. After the change, the above mentioned BPF selftests pass.
+
+ Fixes: 39c13c204bb11 ("arm: eBPF JIT compiler")
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200408181229.10909-1-luke.r.nels@gmail.com
+
+diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
+index cc29869d12a3..d124f78e20ac 100644
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -929,7 +929,11 @@ static inline void emit_a32_rsh_i64(const s8 dst[],
+ rd = arm_bpf_get_reg64(dst, tmp, ctx);
+
+ /* Do LSR operation */
+- if (val < 32) {
++ if (val == 0) {
++ /* An immediate value of 0 encodes a shift amount of 32
++ * for LSR. To shift by 0, don't do anything.
++ */
++ } else if (val < 32) {
+ emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);
+ emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);
+ emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_LSR, val), ctx);
+@@ -955,7 +959,11 @@ static inline void emit_a32_arsh_i64(const s8 dst[],
+ rd = arm_bpf_get_reg64(dst, tmp, ctx);
+
+ /* Do ARSH operation */
+- if (val < 32) {
++ if (val == 0) {
++ /* An immediate value of 0 encodes a shift amount of 32
++ * for ASR. To shift by 0, don't do anything.
++ */
++ } else if (val < 32) {
+ emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);
+ emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);
+ emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_ASR, val), ctx);
+ commit 489553dd13a88d8a882db10622ba8b9b58582ce4
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Mon Apr 6 22:16:04 2020 +0000
+
+ riscv, bpf: Fix offset range checking for auipc+jalr on RV64
+
+ The existing code in emit_call on RV64 checks that the PC-relative offset
+ to the function fits in 32 bits before calling emit_jump_and_link to emit
+ an auipc+jalr pair. However, this check is incorrect because offsets in
+ the range [2^31 - 2^11, 2^31 - 1] cannot be encoded using auipc+jalr on
+ RV64 (see discussion [1]). The RISC-V spec has recently been updated
+ to reflect this fact [2, 3].
+
+ This patch fixes the problem by moving the check on the offset into
+ emit_jump_and_link and modifying it to the correct range of encodable
+ offsets, which is [-2^31 - 2^11, 2^31 - 2^11). This also enforces the
+ check on the offset to other uses of emit_jump_and_link (e.g., BPF_JA)
+ as well.
+
+ Currently, this bug is unlikely to be triggered, because the memory
+ region from which JITed images are allocated is close enough to kernel
+ text for the offsets to not become too large; and because the bounds on
+ BPF program size are small enough. This patch prevents this problem from
+ becoming an issue if either of these change.
+
+ [1]: https://groups.google.com/a/groups.riscv.org/forum/#!topic/isa-dev/bwWFhBnnZFQ
+ [2]: https://github.com/riscv/riscv-isa-manual/commit/b1e42e09ac55116dbf9de5e4fb326a5a90e4a993
+ [3]: https://github.com/riscv/riscv-isa-manual/commit/4c1b2066ebd2965a422e41eb262d0a208a7fea07
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200406221604.18547-1-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c
+index cc1985d8750a..d208a9fd6c52 100644
+--- a/arch/riscv/net/bpf_jit_comp64.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -110,6 +110,16 @@ static bool is_32b_int(s64 val)
+ return -(1L << 31) <= val && val < (1L << 31);
+ }
+
++static bool in_auipc_jalr_range(s64 val)
++{
++ /*
++ * auipc+jalr can reach any signed PC-relative offset in the range
++ * [-2^31 - 2^11, 2^31 - 2^11).
++ */
++ return (-(1L << 31) - (1L << 11)) <= val &&
++ val < ((1L << 31) - (1L << 11));
++}
++
+ static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)
+ {
+ /* Note that the immediate from the add is sign-extended,
+@@ -380,20 +390,24 @@ static void emit_sext_32_rd(u8 *rd, struct rv_jit_context *ctx)
+ *rd = RV_REG_T2;
+ }
+
+-static void emit_jump_and_link(u8 rd, s64 rvoff, bool force_jalr,
+- struct rv_jit_context *ctx)
++static int emit_jump_and_link(u8 rd, s64 rvoff, bool force_jalr,
++ struct rv_jit_context *ctx)
+ {
+ s64 upper, lower;
+
+ if (rvoff && is_21b_int(rvoff) && !force_jalr) {
+ emit(rv_jal(rd, rvoff >> 1), ctx);
+- return;
++ return 0;
++ } else if (in_auipc_jalr_range(rvoff)) {
++ upper = (rvoff + (1 << 11)) >> 12;
++ lower = rvoff & 0xfff;
++ emit(rv_auipc(RV_REG_T1, upper), ctx);
++ emit(rv_jalr(rd, RV_REG_T1, lower), ctx);
++ return 0;
+ }
+
+- upper = (rvoff + (1 << 11)) >> 12;
+- lower = rvoff & 0xfff;
+- emit(rv_auipc(RV_REG_T1, upper), ctx);
+- emit(rv_jalr(rd, RV_REG_T1, lower), ctx);
++ pr_err("bpf-jit: target offset 0x%llx is out of range\n", rvoff);
++ return -ERANGE;
+ }
+
+ static bool is_signed_bpf_cond(u8 cond)
+@@ -407,18 +421,16 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
+ s64 off = 0;
+ u64 ip;
+ u8 rd;
++ int ret;
+
+ if (addr && ctx->insns) {
+ ip = (u64)(long)(ctx->insns + ctx->ninsns);
+ off = addr - ip;
+- if (!is_32b_int(off)) {
+- pr_err("bpf-jit: target call addr %pK is out of range\n",
+- (void *)addr);
+- return -ERANGE;
+- }
+ }
+
+- emit_jump_and_link(RV_REG_RA, off, !fixed, ctx);
++ ret = emit_jump_and_link(RV_REG_RA, off, !fixed, ctx);
++ if (ret)
++ return ret;
+ rd = bpf_to_rv_reg(BPF_REG_0, ctx);
+ emit(rv_addi(rd, RV_REG_A0, 0), ctx);
+ return 0;
+@@ -429,7 +441,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ {
+ bool is64 = BPF_CLASS(insn->code) == BPF_ALU64 ||
+ BPF_CLASS(insn->code) == BPF_JMP;
+- int s, e, rvoff, i = insn - ctx->prog->insnsi;
++ int s, e, rvoff, ret, i = insn - ctx->prog->insnsi;
+ struct bpf_prog_aux *aux = ctx->prog->aux;
+ u8 rd = -1, rs = -1, code = insn->code;
+ s16 off = insn->off;
+@@ -699,7 +711,9 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ /* JUMP off */
+ case BPF_JMP | BPF_JA:
+ rvoff = rv_offset(i, off, ctx);
+- emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ if (ret)
++ return ret;
+ break;
+
+ /* IF (dst COND src) JUMP off */
+@@ -801,7 +815,6 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_JMP | BPF_CALL:
+ {
+ bool fixed;
+- int ret;
+ u64 addr;
+
+ mark_call(ctx);
+@@ -826,7 +839,9 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ break;
+
+ rvoff = epilogue_offset(ctx);
+- emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ if (ret)
++ return ret;
+ break;
+
+ /* dst = imm64 */commit 93e5fbb18cec70b3b5c614f67b65388829113bdd
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Thu Mar 5 15:44:13 2020 -0800
+
+ selftests: bpf: Add test for JMP32 JSET BPF_X with upper bits set
+
+ The existing tests attempt to check that JMP32 JSET ignores the upper
+ bits in the operand registers. However, the tests missed one such bug in
+ the x32 JIT that is only uncovered when a previous instruction pollutes
+ the upper 32 bits of the registers.
+
+ This patch adds a new test case that catches the bug by first executing
+ a 64-bit JSET to pollute the upper 32-bits of the temporary registers,
+ followed by a 32-bit JSET which should ignore the upper 32 bits.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200305234416.31597-2-luke.r.nels@gmail.com
+
+diff --git a/tools/testing/selftests/bpf/verifier/jmp32.c b/tools/testing/selftests/bpf/verifier/jmp32.c
+index bf0322eb5346..bd5cae4a7f73 100644
+--- a/tools/testing/selftests/bpf/verifier/jmp32.c
++++ b/tools/testing/selftests/bpf/verifier/jmp32.c
+@@ -61,6 +61,21 @@
+ },
+ .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
+ },
++{
++ "jset32: ignores upper bits",
++ .insns = {
++ BPF_MOV64_IMM(BPF_REG_0, 0),
++ BPF_LD_IMM64(BPF_REG_7, 0x8000000000000000),
++ BPF_LD_IMM64(BPF_REG_8, 0x8000000000000000),
++ BPF_JMP_REG(BPF_JSET, BPF_REG_7, BPF_REG_8, 1),
++ BPF_EXIT_INSN(),
++ BPF_JMP32_REG(BPF_JSET, BPF_REG_7, BPF_REG_8, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 2,
++},
+ {
+ "jset32: min/max deduction",
+ .insns = {commit 80f1f85036355e5581ec0b99913410345ad3491b
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Thu Mar 5 15:44:12 2020 -0800
+
+ bpf, x32: Fix bug with JMP32 JSET BPF_X checking upper bits
+
+ The current x32 BPF JIT is incorrect for JMP32 JSET BPF_X when the upper
+ 32 bits of operand registers are non-zero in certain situations.
+
+ The problem is in the following code:
+
+ case BPF_JMP | BPF_JSET | BPF_X:
+ case BPF_JMP32 | BPF_JSET | BPF_X:
+ ...
+
+ /* and dreg_lo,sreg_lo */
+ EMIT2(0x23, add_2reg(0xC0, sreg_lo, dreg_lo));
+ /* and dreg_hi,sreg_hi */
+ EMIT2(0x23, add_2reg(0xC0, sreg_hi, dreg_hi));
+ /* or dreg_lo,dreg_hi */
+ EMIT2(0x09, add_2reg(0xC0, dreg_lo, dreg_hi));
+
+ This code checks the upper bits of the operand registers regardless if
+ the BPF instruction is BPF_JMP32 or BPF_JMP64. Registers dreg_hi and
+ dreg_lo are not loaded from the stack for BPF_JMP32, however, they can
+ still be polluted with values from previous instructions.
+
+ The following BPF program demonstrates the bug. The jset64 instruction
+ loads the temporary registers and performs the jump, since ((u64)r7 &
+ (u64)r8) is non-zero. The jset32 should _not_ be taken, as the lower
+ 32 bits are all zero, however, the current JIT will take the branch due
+ the pollution of temporary registers from the earlier jset64.
+
+ mov64 r0, 0
+ ld64 r7, 0x8000000000000000
+ ld64 r8, 0x8000000000000000
+ jset64 r7, r8, 1
+ exit
+ jset32 r7, r8, 1
+ mov64 r0, 2
+ exit
+
+ The expected return value of this program is 2; under the buggy x32 JIT
+ it returns 0. The fix is to skip using the upper 32 bits for jset32 and
+ compare the upper 32 bits for jset64 only.
+
+ All tests in test_bpf.ko and selftests/bpf/test_verifier continue to
+ pass with this change.
+
+ We found this bug using our automated verification tool, Serval.
+
+ Fixes: 69f827eb6e14 ("x32: bpf: implement jitting of JMP32")
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Link: https://lore.kernel.org/bpf/20200305234416.31597-1-luke.r.nels@gmail.com
+
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index 393d251798c0..4d2a7a764602 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -2039,10 +2039,12 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
+ }
+ /* and dreg_lo,sreg_lo */
+ EMIT2(0x23, add_2reg(0xC0, sreg_lo, dreg_lo));
+- /* and dreg_hi,sreg_hi */
+- EMIT2(0x23, add_2reg(0xC0, sreg_hi, dreg_hi));
+- /* or dreg_lo,dreg_hi */
+- EMIT2(0x09, add_2reg(0xC0, dreg_lo, dreg_hi));
++ if (is_jmp64) {
++ /* and dreg_hi,sreg_hi */
++ EMIT2(0x23, add_2reg(0xC0, sreg_hi, dreg_hi));
++ /* or dreg_lo,dreg_hi */
++ EMIT2(0x09, add_2reg(0xC0, dreg_lo, dreg_hi));
++ }
+ goto emit_cond_jmp;
+ }
+ case BPF_JMP | BPF_JSET | BPF_K:commit dad737c926b5b286b9c91abbda66811a8a6618e9
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Mar 4 21:02:07 2020 -0800
+
+ MAINTAINERS: Add entry for RV32G BPF JIT
+
+ Add a new entry for the 32-bit RISC-V JIT to MAINTAINERS and change
+ mailing list to netdev and bpf following the guidelines from
+ commit e42da4c62abb ("docs/bpf: Update bpf development Q/A file").
+
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200305050207.4159-5-luke.r.nels@gmail.com
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 8f27f40d22bb..c23884e084be 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -3213,11 +3213,22 @@ L: bpf@vger.kernel.org
+ S: Maintained
+ F: arch/powerpc/net/
+
+-BPF JIT for RISC-V (RV64G)
++BPF JIT for RISC-V (32-bit)
++M: Luke Nelson <luke.r.nels@gmail.com>
++M: Xi Wang <xi.wang@gmail.com>
++L: netdev@vger.kernel.org
++L: bpf@vger.kernel.org
++S: Maintained
++F: arch/riscv/net/
++X: arch/riscv/net/bpf_jit_comp64.c
++
++BPF JIT for RISC-V (64-bit)
+ M: Björn Töpel <bjorn.topel@gmail.com>
+ L: netdev@vger.kernel.org
++L: bpf@vger.kernel.org
+ S: Maintained
+ F: arch/riscv/net/
++X: arch/riscv/net/bpf_jit_comp32.c
+
+ BPF JIT for S390
+ M: Ilya Leoshkevich <iii@linux.ibm.com>commit 06b741521622331eb01b67123e8cdda6ca8be187 +Author: Luke Nelson <lukenels@cs.washington.edu> +Date: Wed Mar 4 21:02:06 2020 -0800 + + bpf, doc: Add BPF JIT for RV32G to BPF documentation + + Update filter.txt and admin-guide to mention the BPF JIT for RV32G. + + Co-developed-by: Xi Wang <xi.wang@gmail.com> + Signed-off-by: Xi Wang <xi.wang@gmail.com> + Signed-off-by: Luke Nelson <luke.r.nels@gmail.com> + Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> + Reviewed-by: Björn Töpel <bjorn.topel@gmail.com> + Acked-by: Björn Töpel <bjorn.topel@gmail.com> + Link: https://lore.kernel.org/bpf/20200305050207.4159-4-luke.r.nels@gmail.com + +diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst +index 287b98708a40..e043c9213388 100644 +--- a/Documentation/admin-guide/sysctl/net.rst ++++ b/Documentation/admin-guide/sysctl/net.rst +@@ -67,7 +67,8 @@ two flavors of JITs, the newer eBPF JIT currently supported on: + - sparc64 + - mips64 + - s390x +- - riscv ++ - riscv64 ++ - riscv32 + + And the older cBPF JIT supported on the following archs: + +diff --git a/Documentation/networking/filter.txt b/Documentation/networking/filter.txt +index c4a328f2d57a..2f0f8b17dade 100644 +--- a/Documentation/networking/filter.txt ++++ b/Documentation/networking/filter.txt +@@ -606,7 +606,7 @@ before a conversion to the new layout is being done behind the scenes! + + Currently, the classic BPF format is being used for JITing on most + 32-bit architectures, whereas x86-64, aarch64, s390x, powerpc64, +-sparc64, arm32, riscv (RV64G) perform JIT compilation from eBPF ++sparc64, arm32, riscv64, riscv32 perform JIT compilation from eBPF + instruction set. + + Some core changes of the new internal format:
commit 5f316b65e99f109942c556dc8790abd4c75bcb34
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Mar 4 21:02:05 2020 -0800
+
+ riscv, bpf: Add RV32G eBPF JIT
+
+ This is an eBPF JIT for RV32G, adapted from the JIT for RV64G and
+ the 32-bit ARM JIT.
+
+ There are two main changes required for this to work compared to
+ the RV64 JIT.
+
+ First, eBPF registers are 64-bit, while RV32G registers are 32-bit.
+ BPF registers either map directly to 2 RISC-V registers, or reside
+ in stack scratch space and are saved and restored when used.
+
+ Second, many 64-bit ALU operations do not trivially map to 32-bit
+ operations. Operations that move bits between high and low words,
+ such as ADD, LSH, MUL, and others must emulate the 64-bit behavior
+ in terms of 32-bit instructions.
+
+ This patch also makes related changes to bpf_jit.h, such
+ as adding RISC-V instructions required by the RV32 JIT.
+
+ Supported features:
+
+ The RV32 JIT supports the same features and instructions as the
+ RV64 JIT, with the following exceptions:
+
+ - ALU64 DIV/MOD: Requires loops to implement on 32-bit hardware.
+
+ - BPF_XADD | BPF_DW: There's no 8-byte atomic instruction in RV32.
+
+ These features are also unsupported on other BPF JITs for 32-bit
+ architectures.
+
+ Testing:
+
+ - lib/test_bpf.c
+ test_bpf: Summary: 378 PASSED, 0 FAILED, [349/366 JIT'ed]
+ test_bpf: test_skb_segment: Summary: 2 PASSED, 0 FAILED
+
+ The tests that are not JITed are all due to use of 64-bit div/mod
+ or 64-bit xadd.
+
+ - tools/testing/selftests/bpf/test_verifier.c
+ Summary: 1415 PASSED, 122 SKIPPED, 43 FAILED
+
+ Tested both with and without BPF JIT hardening.
+
+ This is the same set of tests that pass using the BPF interpreter
+ with the JIT disabled.
+
+ Verification and synthesis:
+
+ We developed the RV32 JIT using our automated verification tool,
+ Serval. We have used Serval in the past to verify patches to the
+ RV64 JIT. We also used Serval to superoptimize the resulting code
+ through program synthesis.
+
+ You can find the tool and a guide to the approach and results here:
+ https://github.com/uw-unsat/serval-bpf/tree/rv32-jit-v5
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200305050207.4159-3-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
+index 73f029eae0cc..e9791717e006 100644
+--- a/arch/riscv/Kconfig
++++ b/arch/riscv/Kconfig
+@@ -56,7 +56,7 @@ config RISCV
+ select ARCH_HAS_PTE_SPECIAL
+ select ARCH_HAS_MMIOWB
+ select ARCH_HAS_DEBUG_VIRTUAL
+- select HAVE_EBPF_JIT if 64BIT
++ select HAVE_EBPF_JIT
+ select EDAC_SUPPORT
+ select ARCH_HAS_GIGANTIC_PAGE
+ select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
+diff --git a/arch/riscv/net/Makefile b/arch/riscv/net/Makefile
+index 018074dbf986..9a1e5f0a94e5 100644
+--- a/arch/riscv/net/Makefile
++++ b/arch/riscv/net/Makefile
+@@ -1,3 +1,9 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+
+-obj-$(CONFIG_BPF_JIT) += bpf_jit_core.o bpf_jit_comp64.o
++obj-$(CONFIG_BPF_JIT) += bpf_jit_core.o
++
++ifeq ($(CONFIG_ARCH_RV64I),y)
++ obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o
++else
++ obj-$(CONFIG_BPF_JIT) += bpf_jit_comp32.o
++endif
+diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h
+index 23c123331f94..20e235d06f66 100644
+--- a/arch/riscv/net/bpf_jit.h
++++ b/arch/riscv/net/bpf_jit.h
+@@ -207,6 +207,8 @@ static inline u32 rv_amo_insn(u8 funct5, u8 aq, u8 rl, u8 rs2, u8 rs1,
+ return rv_r_insn(funct7, rs2, rs1, funct3, rd, opcode);
+ }
+
++/* Instructions shared by both RV32 and RV64. */
++
+ static inline u32 rv_addi(u8 rd, u8 rs1, u16 imm11_0)
+ {
+ return rv_i_insn(imm11_0, rs1, 0, rd, 0x13);
+@@ -262,6 +264,11 @@ static inline u32 rv_sub(u8 rd, u8 rs1, u8 rs2)
+ return rv_r_insn(0x20, rs2, rs1, 0, rd, 0x33);
+ }
+
++static inline u32 rv_sltu(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 3, rd, 0x33);
++}
++
+ static inline u32 rv_and(u8 rd, u8 rs1, u8 rs2)
+ {
+ return rv_r_insn(0, rs2, rs1, 7, rd, 0x33);
+@@ -297,6 +304,11 @@ static inline u32 rv_mul(u8 rd, u8 rs1, u8 rs2)
+ return rv_r_insn(1, rs2, rs1, 0, rd, 0x33);
+ }
+
++static inline u32 rv_mulhu(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 3, rd, 0x33);
++}
++
+ static inline u32 rv_divu(u8 rd, u8 rs1, u8 rs2)
+ {
+ return rv_r_insn(1, rs2, rs1, 5, rd, 0x33);
+@@ -332,21 +344,46 @@ static inline u32 rv_bltu(u8 rs1, u8 rs2, u16 imm12_1)
+ return rv_b_insn(imm12_1, rs2, rs1, 6, 0x63);
+ }
+
++static inline u32 rv_bgtu(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_bltu(rs2, rs1, imm12_1);
++}
++
+ static inline u32 rv_bgeu(u8 rs1, u8 rs2, u16 imm12_1)
+ {
+ return rv_b_insn(imm12_1, rs2, rs1, 7, 0x63);
+ }
+
++static inline u32 rv_bleu(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_bgeu(rs2, rs1, imm12_1);
++}
++
+ static inline u32 rv_blt(u8 rs1, u8 rs2, u16 imm12_1)
+ {
+ return rv_b_insn(imm12_1, rs2, rs1, 4, 0x63);
+ }
+
++static inline u32 rv_bgt(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_blt(rs2, rs1, imm12_1);
++}
++
+ static inline u32 rv_bge(u8 rs1, u8 rs2, u16 imm12_1)
+ {
+ return rv_b_insn(imm12_1, rs2, rs1, 5, 0x63);
+ }
+
++static inline u32 rv_ble(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_bge(rs2, rs1, imm12_1);
++}
++
++static inline u32 rv_lw(u8 rd, u16 imm11_0, u8 rs1)
++{
++ return rv_i_insn(imm11_0, rs1, 2, rd, 0x03);
++}
++
+ static inline u32 rv_lbu(u8 rd, u16 imm11_0, u8 rs1)
+ {
+ return rv_i_insn(imm11_0, rs1, 4, rd, 0x03);
+@@ -377,6 +414,15 @@ static inline u32 rv_amoadd_w(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+ return rv_amo_insn(0, aq, rl, rs2, rs1, 2, rd, 0x2f);
+ }
+
++/*
++ * RV64-only instructions.
++ *
++ * These instructions are not available on RV32. Wrap them below a #if to
++ * ensure that the RV32 JIT doesn't emit any of these instructions.
++ */
++
++#if __riscv_xlen == 64
++
+ static inline u32 rv_addiw(u8 rd, u8 rs1, u16 imm11_0)
+ {
+ return rv_i_insn(imm11_0, rs1, 0, rd, 0x1b);
+@@ -457,6 +503,8 @@ static inline u32 rv_amoadd_d(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+ return rv_amo_insn(0, aq, rl, rs2, rs1, 3, rd, 0x2f);
+ }
+
++#endif /* __riscv_xlen == 64 */
++
+ void bpf_jit_build_prologue(struct rv_jit_context *ctx);
+ void bpf_jit_build_epilogue(struct rv_jit_context *ctx);
+
+diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp32.c
+new file mode 100644
+index 000000000000..302934177760
+--- /dev/null
++++ b/arch/riscv/net/bpf_jit_comp32.c
+@@ -0,0 +1,1310 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * BPF JIT compiler for RV32G
++ *
++ * Copyright (c) 2020 Luke Nelson <luke.r.nels@gmail.com>
++ * Copyright (c) 2020 Xi Wang <xi.wang@gmail.com>
++ *
++ * The code is based on the BPF JIT compiler for RV64G by Björn Töpel and
++ * the BPF JIT compiler for 32-bit ARM by Shubham Bansal and Mircea Gherzan.
++ */
++
++#include <linux/bpf.h>
++#include <linux/filter.h>
++#include "bpf_jit.h"
++
++enum {
++ /* Stack layout - these are offsets from (top of stack - 4). */
++ BPF_R6_HI,
++ BPF_R6_LO,
++ BPF_R7_HI,
++ BPF_R7_LO,
++ BPF_R8_HI,
++ BPF_R8_LO,
++ BPF_R9_HI,
++ BPF_R9_LO,
++ BPF_AX_HI,
++ BPF_AX_LO,
++ /* Stack space for BPF_REG_6 through BPF_REG_9 and BPF_REG_AX. */
++ BPF_JIT_SCRATCH_REGS,
++};
++
++#define STACK_OFFSET(k) (-4 - ((k) * 4))
++
++#define TMP_REG_1 (MAX_BPF_JIT_REG + 0)
++#define TMP_REG_2 (MAX_BPF_JIT_REG + 1)
++
++#define RV_REG_TCC RV_REG_T6
++#define RV_REG_TCC_SAVED RV_REG_S7
++
++static const s8 bpf2rv32[][2] = {
++ /* Return value from in-kernel function, and exit value from eBPF. */
++ [BPF_REG_0] = {RV_REG_S2, RV_REG_S1},
++ /* Arguments from eBPF program to in-kernel function. */
++ [BPF_REG_1] = {RV_REG_A1, RV_REG_A0},
++ [BPF_REG_2] = {RV_REG_A3, RV_REG_A2},
++ [BPF_REG_3] = {RV_REG_A5, RV_REG_A4},
++ [BPF_REG_4] = {RV_REG_A7, RV_REG_A6},
++ [BPF_REG_5] = {RV_REG_S4, RV_REG_S3},
++ /*
++ * Callee-saved registers that in-kernel function will preserve.
++ * Stored on the stack.
++ */
++ [BPF_REG_6] = {STACK_OFFSET(BPF_R6_HI), STACK_OFFSET(BPF_R6_LO)},
++ [BPF_REG_7] = {STACK_OFFSET(BPF_R7_HI), STACK_OFFSET(BPF_R7_LO)},
++ [BPF_REG_8] = {STACK_OFFSET(BPF_R8_HI), STACK_OFFSET(BPF_R8_LO)},
++ [BPF_REG_9] = {STACK_OFFSET(BPF_R9_HI), STACK_OFFSET(BPF_R9_LO)},
++ /* Read-only frame pointer to access BPF stack. */
++ [BPF_REG_FP] = {RV_REG_S6, RV_REG_S5},
++ /* Temporary register for blinding constants. Stored on the stack. */
++ [BPF_REG_AX] = {STACK_OFFSET(BPF_AX_HI), STACK_OFFSET(BPF_AX_LO)},
++ /*
++ * Temporary registers used by the JIT to operate on registers stored
++ * on the stack. Save t0 and t1 to be used as temporaries in generated
++ * code.
++ */
++ [TMP_REG_1] = {RV_REG_T3, RV_REG_T2},
++ [TMP_REG_2] = {RV_REG_T5, RV_REG_T4},
++};
++
++static s8 hi(const s8 *r)
++{
++ return r[0];
++}
++
++static s8 lo(const s8 *r)
++{
++ return r[1];
++}
++
++static void emit_imm(const s8 rd, s32 imm, struct rv_jit_context *ctx)
++{
++ u32 upper = (imm + (1 << 11)) >> 12;
++ u32 lower = imm & 0xfff;
++
++ if (upper) {
++ emit(rv_lui(rd, upper), ctx);
++ emit(rv_addi(rd, rd, lower), ctx);
++ } else {
++ emit(rv_addi(rd, RV_REG_ZERO, lower), ctx);
++ }
++}
++
++static void emit_imm32(const s8 *rd, s32 imm, struct rv_jit_context *ctx)
++{
++ /* Emit immediate into lower bits. */
++ emit_imm(lo(rd), imm, ctx);
++
++ /* Sign-extend into upper bits. */
++ if (imm >= 0)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ else
++ emit(rv_addi(hi(rd), RV_REG_ZERO, -1), ctx);
++}
++
++static void emit_imm64(const s8 *rd, s32 imm_hi, s32 imm_lo,
++ struct rv_jit_context *ctx)
++{
++ emit_imm(lo(rd), imm_lo, ctx);
++ emit_imm(hi(rd), imm_hi, ctx);
++}
++
++static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
++{
++ int stack_adjust = ctx->stack_size, store_offset = stack_adjust - 4;
++ const s8 *r0 = bpf2rv32[BPF_REG_0];
++
++ store_offset -= 4 * BPF_JIT_SCRATCH_REGS;
++
++ /* Set return value if not tail call. */
++ if (!is_tail_call) {
++ emit(rv_addi(RV_REG_A0, lo(r0), 0), ctx);
++ emit(rv_addi(RV_REG_A1, hi(r0), 0), ctx);
++ }
++
++ /* Restore callee-saved registers. */
++ emit(rv_lw(RV_REG_RA, store_offset - 0, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_FP, store_offset - 4, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S1, store_offset - 8, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S2, store_offset - 12, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S3, store_offset - 16, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S4, store_offset - 20, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S5, store_offset - 24, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S6, store_offset - 28, RV_REG_SP), ctx);
++ emit(rv_lw(RV_REG_S7, store_offset - 32, RV_REG_SP), ctx);
++
++ emit(rv_addi(RV_REG_SP, RV_REG_SP, stack_adjust), ctx);
++
++ if (is_tail_call) {
++ /*
++ * goto *(t0 + 4);
++ * Skips first instruction of prologue which initializes tail
++ * call counter. Assumes t0 contains address of target program,
++ * see emit_bpf_tail_call.
++ */
++ emit(rv_jalr(RV_REG_ZERO, RV_REG_T0, 4), ctx);
++ } else {
++ emit(rv_jalr(RV_REG_ZERO, RV_REG_RA, 0), ctx);
++ }
++}
++
++static bool is_stacked(s8 reg)
++{
++ return reg < 0;
++}
++
++static const s8 *bpf_get_reg64(const s8 *reg, const s8 *tmp,
++ struct rv_jit_context *ctx)
++{
++ if (is_stacked(hi(reg))) {
++ emit(rv_lw(hi(tmp), hi(reg), RV_REG_FP), ctx);
++ emit(rv_lw(lo(tmp), lo(reg), RV_REG_FP), ctx);
++ reg = tmp;
++ }
++ return reg;
++}
++
++static void bpf_put_reg64(const s8 *reg, const s8 *src,
++ struct rv_jit_context *ctx)
++{
++ if (is_stacked(hi(reg))) {
++ emit(rv_sw(RV_REG_FP, hi(reg), hi(src)), ctx);
++ emit(rv_sw(RV_REG_FP, lo(reg), lo(src)), ctx);
++ }
++}
++
++static const s8 *bpf_get_reg32(const s8 *reg, const s8 *tmp,
++ struct rv_jit_context *ctx)
++{
++ if (is_stacked(lo(reg))) {
++ emit(rv_lw(lo(tmp), lo(reg), RV_REG_FP), ctx);
++ reg = tmp;
++ }
++ return reg;
++}
++
++static void bpf_put_reg32(const s8 *reg, const s8 *src,
++ struct rv_jit_context *ctx)
++{
++ if (is_stacked(lo(reg))) {
++ emit(rv_sw(RV_REG_FP, lo(reg), lo(src)), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_sw(RV_REG_FP, hi(reg), RV_REG_ZERO), ctx);
++ } else if (!ctx->prog->aux->verifier_zext) {
++ emit(rv_addi(hi(reg), RV_REG_ZERO, 0), ctx);
++ }
++}
++
++static void emit_jump_and_link(u8 rd, s32 rvoff, bool force_jalr,
++ struct rv_jit_context *ctx)
++{
++ s32 upper, lower;
++
++ if (rvoff && is_21b_int(rvoff) && !force_jalr) {
++ emit(rv_jal(rd, rvoff >> 1), ctx);
++ return;
++ }
++
++ upper = (rvoff + (1 << 11)) >> 12;
++ lower = rvoff & 0xfff;
++ emit(rv_auipc(RV_REG_T1, upper), ctx);
++ emit(rv_jalr(rd, RV_REG_T1, lower), ctx);
++}
++
++static void emit_alu_i64(const s8 *dst, s32 imm,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++
++ switch (op) {
++ case BPF_MOV:
++ emit_imm32(rd, imm, ctx);
++ break;
++ case BPF_AND:
++ if (is_12b_int(imm)) {
++ emit(rv_andi(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_and(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ if (imm >= 0)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case BPF_OR:
++ if (is_12b_int(imm)) {
++ emit(rv_ori(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_or(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ if (imm < 0)
++ emit(rv_ori(hi(rd), RV_REG_ZERO, -1), ctx);
++ break;
++ case BPF_XOR:
++ if (is_12b_int(imm)) {
++ emit(rv_xori(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_xor(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ if (imm < 0)
++ emit(rv_xori(hi(rd), hi(rd), -1), ctx);
++ break;
++ case BPF_LSH:
++ if (imm >= 32) {
++ emit(rv_slli(hi(rd), lo(rd), imm - 32), ctx);
++ emit(rv_addi(lo(rd), RV_REG_ZERO, 0), ctx);
++ } else if (imm == 0) {
++ /* Do nothing. */
++ } else {
++ emit(rv_srli(RV_REG_T0, lo(rd), 32 - imm), ctx);
++ emit(rv_slli(hi(rd), hi(rd), imm), ctx);
++ emit(rv_or(hi(rd), RV_REG_T0, hi(rd)), ctx);
++ emit(rv_slli(lo(rd), lo(rd), imm), ctx);
++ }
++ break;
++ case BPF_RSH:
++ if (imm >= 32) {
++ emit(rv_srli(lo(rd), hi(rd), imm - 32), ctx);
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ } else if (imm == 0) {
++ /* Do nothing. */
++ } else {
++ emit(rv_slli(RV_REG_T0, hi(rd), 32 - imm), ctx);
++ emit(rv_srli(lo(rd), lo(rd), imm), ctx);
++ emit(rv_or(lo(rd), RV_REG_T0, lo(rd)), ctx);
++ emit(rv_srli(hi(rd), hi(rd), imm), ctx);
++ }
++ break;
++ case BPF_ARSH:
++ if (imm >= 32) {
++ emit(rv_srai(lo(rd), hi(rd), imm - 32), ctx);
++ emit(rv_srai(hi(rd), hi(rd), 31), ctx);
++ } else if (imm == 0) {
++ /* Do nothing. */
++ } else {
++ emit(rv_slli(RV_REG_T0, hi(rd), 32 - imm), ctx);
++ emit(rv_srli(lo(rd), lo(rd), imm), ctx);
++ emit(rv_or(lo(rd), RV_REG_T0, lo(rd)), ctx);
++ emit(rv_srai(hi(rd), hi(rd), imm), ctx);
++ }
++ break;
++ }
++
++ bpf_put_reg64(dst, rd, ctx);
++}
++
++static void emit_alu_i32(const s8 *dst, s32 imm,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *rd = bpf_get_reg32(dst, tmp1, ctx);
++
++ switch (op) {
++ case BPF_MOV:
++ emit_imm(lo(rd), imm, ctx);
++ break;
++ case BPF_ADD:
++ if (is_12b_int(imm)) {
++ emit(rv_addi(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_add(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_SUB:
++ if (is_12b_int(-imm)) {
++ emit(rv_addi(lo(rd), lo(rd), -imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_sub(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_AND:
++ if (is_12b_int(imm)) {
++ emit(rv_andi(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_and(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_OR:
++ if (is_12b_int(imm)) {
++ emit(rv_ori(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_or(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_XOR:
++ if (is_12b_int(imm)) {
++ emit(rv_xori(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_xor(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_LSH:
++ if (is_12b_int(imm)) {
++ emit(rv_slli(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_sll(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_RSH:
++ if (is_12b_int(imm)) {
++ emit(rv_srli(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_srl(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_ARSH:
++ if (is_12b_int(imm)) {
++ emit(rv_srai(lo(rd), lo(rd), imm), ctx);
++ } else {
++ emit_imm(RV_REG_T0, imm, ctx);
++ emit(rv_sra(lo(rd), lo(rd), RV_REG_T0), ctx);
++ }
++ break;
++ }
++
++ bpf_put_reg32(dst, rd, ctx);
++}
++
++static void emit_alu_r64(const s8 *dst, const s8 *src,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++ const s8 *rs = bpf_get_reg64(src, tmp2, ctx);
++
++ switch (op) {
++ case BPF_MOV:
++ emit(rv_addi(lo(rd), lo(rs), 0), ctx);
++ emit(rv_addi(hi(rd), hi(rs), 0), ctx);
++ break;
++ case BPF_ADD:
++ if (rd == rs) {
++ emit(rv_srli(RV_REG_T0, lo(rd), 31), ctx);
++ emit(rv_slli(hi(rd), hi(rd), 1), ctx);
++ emit(rv_or(hi(rd), RV_REG_T0, hi(rd)), ctx);
++ emit(rv_slli(lo(rd), lo(rd), 1), ctx);
++ } else {
++ emit(rv_add(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_sltu(RV_REG_T0, lo(rd), lo(rs)), ctx);
++ emit(rv_add(hi(rd), hi(rd), hi(rs)), ctx);
++ emit(rv_add(hi(rd), hi(rd), RV_REG_T0), ctx);
++ }
++ break;
++ case BPF_SUB:
++ emit(rv_sub(RV_REG_T1, hi(rd), hi(rs)), ctx);
++ emit(rv_sltu(RV_REG_T0, lo(rd), lo(rs)), ctx);
++ emit(rv_sub(hi(rd), RV_REG_T1, RV_REG_T0), ctx);
++ emit(rv_sub(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_AND:
++ emit(rv_and(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_and(hi(rd), hi(rd), hi(rs)), ctx);
++ break;
++ case BPF_OR:
++ emit(rv_or(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_or(hi(rd), hi(rd), hi(rs)), ctx);
++ break;
++ case BPF_XOR:
++ emit(rv_xor(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_xor(hi(rd), hi(rd), hi(rs)), ctx);
++ break;
++ case BPF_MUL:
++ emit(rv_mul(RV_REG_T0, hi(rs), lo(rd)), ctx);
++ emit(rv_mul(hi(rd), hi(rd), lo(rs)), ctx);
++ emit(rv_mulhu(RV_REG_T1, lo(rd), lo(rs)), ctx);
++ emit(rv_add(hi(rd), hi(rd), RV_REG_T0), ctx);
++ emit(rv_mul(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_add(hi(rd), hi(rd), RV_REG_T1), ctx);
++ break;
++ case BPF_LSH:
++ emit(rv_addi(RV_REG_T0, lo(rs), -32), ctx);
++ emit(rv_blt(RV_REG_T0, RV_REG_ZERO, 8), ctx);
++ emit(rv_sll(hi(rd), lo(rd), RV_REG_T0), ctx);
++ emit(rv_addi(lo(rd), RV_REG_ZERO, 0), ctx);
++ emit(rv_jal(RV_REG_ZERO, 16), ctx);
++ emit(rv_addi(RV_REG_T1, RV_REG_ZERO, 31), ctx);
++ emit(rv_srli(RV_REG_T0, lo(rd), 1), ctx);
++ emit(rv_sub(RV_REG_T1, RV_REG_T1, lo(rs)), ctx);
++ emit(rv_srl(RV_REG_T0, RV_REG_T0, RV_REG_T1), ctx);
++ emit(rv_sll(hi(rd), hi(rd), lo(rs)), ctx);
++ emit(rv_or(hi(rd), RV_REG_T0, hi(rd)), ctx);
++ emit(rv_sll(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_RSH:
++ emit(rv_addi(RV_REG_T0, lo(rs), -32), ctx);
++ emit(rv_blt(RV_REG_T0, RV_REG_ZERO, 8), ctx);
++ emit(rv_srl(lo(rd), hi(rd), RV_REG_T0), ctx);
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ emit(rv_jal(RV_REG_ZERO, 16), ctx);
++ emit(rv_addi(RV_REG_T1, RV_REG_ZERO, 31), ctx);
++ emit(rv_slli(RV_REG_T0, hi(rd), 1), ctx);
++ emit(rv_sub(RV_REG_T1, RV_REG_T1, lo(rs)), ctx);
++ emit(rv_sll(RV_REG_T0, RV_REG_T0, RV_REG_T1), ctx);
++ emit(rv_srl(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_or(lo(rd), RV_REG_T0, lo(rd)), ctx);
++ emit(rv_srl(hi(rd), hi(rd), lo(rs)), ctx);
++ break;
++ case BPF_ARSH:
++ emit(rv_addi(RV_REG_T0, lo(rs), -32), ctx);
++ emit(rv_blt(RV_REG_T0, RV_REG_ZERO, 8), ctx);
++ emit(rv_sra(lo(rd), hi(rd), RV_REG_T0), ctx);
++ emit(rv_srai(hi(rd), hi(rd), 31), ctx);
++ emit(rv_jal(RV_REG_ZERO, 16), ctx);
++ emit(rv_addi(RV_REG_T1, RV_REG_ZERO, 31), ctx);
++ emit(rv_slli(RV_REG_T0, hi(rd), 1), ctx);
++ emit(rv_sub(RV_REG_T1, RV_REG_T1, lo(rs)), ctx);
++ emit(rv_sll(RV_REG_T0, RV_REG_T0, RV_REG_T1), ctx);
++ emit(rv_srl(lo(rd), lo(rd), lo(rs)), ctx);
++ emit(rv_or(lo(rd), RV_REG_T0, lo(rd)), ctx);
++ emit(rv_sra(hi(rd), hi(rd), lo(rs)), ctx);
++ break;
++ case BPF_NEG:
++ emit(rv_sub(lo(rd), RV_REG_ZERO, lo(rd)), ctx);
++ emit(rv_sltu(RV_REG_T0, RV_REG_ZERO, lo(rd)), ctx);
++ emit(rv_sub(hi(rd), RV_REG_ZERO, hi(rd)), ctx);
++ emit(rv_sub(hi(rd), hi(rd), RV_REG_T0), ctx);
++ break;
++ }
++
++ bpf_put_reg64(dst, rd, ctx);
++}
++
++static void emit_alu_r32(const s8 *dst, const s8 *src,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++ const s8 *rd = bpf_get_reg32(dst, tmp1, ctx);
++ const s8 *rs = bpf_get_reg32(src, tmp2, ctx);
++
++ switch (op) {
++ case BPF_MOV:
++ emit(rv_addi(lo(rd), lo(rs), 0), ctx);
++ break;
++ case BPF_ADD:
++ emit(rv_add(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_SUB:
++ emit(rv_sub(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_AND:
++ emit(rv_and(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_OR:
++ emit(rv_or(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_XOR:
++ emit(rv_xor(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_MUL:
++ emit(rv_mul(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_DIV:
++ emit(rv_divu(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_MOD:
++ emit(rv_remu(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_LSH:
++ emit(rv_sll(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_RSH:
++ emit(rv_srl(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_ARSH:
++ emit(rv_sra(lo(rd), lo(rd), lo(rs)), ctx);
++ break;
++ case BPF_NEG:
++ emit(rv_sub(lo(rd), RV_REG_ZERO, lo(rd)), ctx);
++ break;
++ }
++
++ bpf_put_reg32(dst, rd, ctx);
++}
++
++static int emit_branch_r64(const s8 *src1, const s8 *src2, s32 rvoff,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ int e, s = ctx->ninsns;
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++
++ const s8 *rs1 = bpf_get_reg64(src1, tmp1, ctx);
++ const s8 *rs2 = bpf_get_reg64(src2, tmp2, ctx);
++
++ /*
++ * NO_JUMP skips over the rest of the instructions and the
++ * emit_jump_and_link, meaning the BPF branch is not taken.
++ * JUMP skips directly to the emit_jump_and_link, meaning
++ * the BPF branch is taken.
++ *
++ * The fallthrough case results in the BPF branch being taken.
++ */
++#define NO_JUMP(idx) (6 + (2 * (idx)))
++#define JUMP(idx) (2 + (2 * (idx)))
++
++ switch (op) {
++ case BPF_JEQ:
++ emit(rv_bne(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bne(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JGT:
++ emit(rv_bgtu(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bltu(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bleu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JLT:
++ emit(rv_bltu(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bgtu(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bgeu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JGE:
++ emit(rv_bgtu(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bltu(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bltu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JLE:
++ emit(rv_bltu(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bgtu(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bgtu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JNE:
++ emit(rv_bne(hi(rs1), hi(rs2), JUMP(1)), ctx);
++ emit(rv_beq(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JSGT:
++ emit(rv_bgt(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_blt(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bleu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JSLT:
++ emit(rv_blt(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bgt(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bgeu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JSGE:
++ emit(rv_bgt(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_blt(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bltu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JSLE:
++ emit(rv_blt(hi(rs1), hi(rs2), JUMP(2)), ctx);
++ emit(rv_bgt(hi(rs1), hi(rs2), NO_JUMP(1)), ctx);
++ emit(rv_bgtu(lo(rs1), lo(rs2), NO_JUMP(0)), ctx);
++ break;
++ case BPF_JSET:
++ emit(rv_and(RV_REG_T0, hi(rs1), hi(rs2)), ctx);
++ emit(rv_bne(RV_REG_T0, RV_REG_ZERO, JUMP(2)), ctx);
++ emit(rv_and(RV_REG_T0, lo(rs1), lo(rs2)), ctx);
++ emit(rv_beq(RV_REG_T0, RV_REG_ZERO, NO_JUMP(0)), ctx);
++ break;
++ }
++
++#undef NO_JUMP
++#undef JUMP
++
++ e = ctx->ninsns;
++ /* Adjust for extra insns. */
++ rvoff -= (e - s) << 2;
++ emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
++ return 0;
++}
++
++static int emit_bcc(u8 op, u8 rd, u8 rs, int rvoff, struct rv_jit_context *ctx)
++{
++ int e, s = ctx->ninsns;
++ bool far = false;
++ int off;
++
++ if (op == BPF_JSET) {
++ /*
++ * BPF_JSET is a special case: it has no inverse so we always
++ * treat it as a far branch.
++ */
++ far = true;
++ } else if (!is_13b_int(rvoff)) {
++ op = invert_bpf_cond(op);
++ far = true;
++ }
++
++ /*
++ * For a far branch, the condition is negated and we jump over the
++ * branch itself, and the two instructions from emit_jump_and_link.
++ * For a near branch, just use rvoff.
++ */
++ off = far ? 6 : (rvoff >> 1);
++
++ switch (op) {
++ case BPF_JEQ:
++ emit(rv_beq(rd, rs, off), ctx);
++ break;
++ case BPF_JGT:
++ emit(rv_bgtu(rd, rs, off), ctx);
++ break;
++ case BPF_JLT:
++ emit(rv_bltu(rd, rs, off), ctx);
++ break;
++ case BPF_JGE:
++ emit(rv_bgeu(rd, rs, off), ctx);
++ break;
++ case BPF_JLE:
++ emit(rv_bleu(rd, rs, off), ctx);
++ break;
++ case BPF_JNE:
++ emit(rv_bne(rd, rs, off), ctx);
++ break;
++ case BPF_JSGT:
++ emit(rv_bgt(rd, rs, off), ctx);
++ break;
++ case BPF_JSLT:
++ emit(rv_blt(rd, rs, off), ctx);
++ break;
++ case BPF_JSGE:
++ emit(rv_bge(rd, rs, off), ctx);
++ break;
++ case BPF_JSLE:
++ emit(rv_ble(rd, rs, off), ctx);
++ break;
++ case BPF_JSET:
++ emit(rv_and(RV_REG_T0, rd, rs), ctx);
++ emit(rv_beq(RV_REG_T0, RV_REG_ZERO, off), ctx);
++ break;
++ }
++
++ if (far) {
++ e = ctx->ninsns;
++ /* Adjust for extra insns. */
++ rvoff -= (e - s) << 2;
++ emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
++ }
++ return 0;
++}
++
++static int emit_branch_r32(const s8 *src1, const s8 *src2, s32 rvoff,
++ struct rv_jit_context *ctx, const u8 op)
++{
++ int e, s = ctx->ninsns;
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++
++ const s8 *rs1 = bpf_get_reg32(src1, tmp1, ctx);
++ const s8 *rs2 = bpf_get_reg32(src2, tmp2, ctx);
++
++ e = ctx->ninsns;
++ /* Adjust for extra insns. */
++ rvoff -= (e - s) << 2;
++
++ if (emit_bcc(op, lo(rs1), lo(rs2), rvoff, ctx))
++ return -1;
++
++ return 0;
++}
++
++static void emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
++{
++ const s8 *r0 = bpf2rv32[BPF_REG_0];
++ const s8 *r5 = bpf2rv32[BPF_REG_5];
++ u32 upper = ((u32)addr + (1 << 11)) >> 12;
++ u32 lower = addr & 0xfff;
++
++ /* R1-R4 already in correct registers---need to push R5 to stack. */
++ emit(rv_addi(RV_REG_SP, RV_REG_SP, -16), ctx);
++ emit(rv_sw(RV_REG_SP, 0, lo(r5)), ctx);
++ emit(rv_sw(RV_REG_SP, 4, hi(r5)), ctx);
++
++ /* Backup TCC. */
++ emit(rv_addi(RV_REG_TCC_SAVED, RV_REG_TCC, 0), ctx);
++
++ /*
++ * Use lui/jalr pair to jump to absolute address. Don't use emit_imm as
++ * the number of emitted instructions should not depend on the value of
++ * addr.
++ */
++ emit(rv_lui(RV_REG_T1, upper), ctx);
++ emit(rv_jalr(RV_REG_RA, RV_REG_T1, lower), ctx);
++
++ /* Restore TCC. */
++ emit(rv_addi(RV_REG_TCC, RV_REG_TCC_SAVED, 0), ctx);
++
++ /* Set return value and restore stack. */
++ emit(rv_addi(lo(r0), RV_REG_A0, 0), ctx);
++ emit(rv_addi(hi(r0), RV_REG_A1, 0), ctx);
++ emit(rv_addi(RV_REG_SP, RV_REG_SP, 16), ctx);
++}
++
++static int emit_bpf_tail_call(int insn, struct rv_jit_context *ctx)
++{
++ /*
++ * R1 -> &ctx
++ * R2 -> &array
++ * R3 -> index
++ */
++ int tc_ninsn, off, start_insn = ctx->ninsns;
++ const s8 *arr_reg = bpf2rv32[BPF_REG_2];
++ const s8 *idx_reg = bpf2rv32[BPF_REG_3];
++
++ tc_ninsn = insn ? ctx->offset[insn] - ctx->offset[insn - 1] :
++ ctx->offset[0];
++
++ /* max_entries = array->map.max_entries; */
++ off = offsetof(struct bpf_array, map.max_entries);
++ if (is_12b_check(off, insn))
++ return -1;
++ emit(rv_lw(RV_REG_T1, off, lo(arr_reg)), ctx);
++
++ /*
++ * if (index >= max_entries)
++ * goto out;
++ */
++ off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ emit_bcc(BPF_JGE, lo(idx_reg), RV_REG_T1, off, ctx);
++
++ /*
++ * if ((temp_tcc = tcc - 1) < 0)
++ * goto out;
++ */
++ emit(rv_addi(RV_REG_T1, RV_REG_TCC, -1), ctx);
++ off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ emit_bcc(BPF_JSLT, RV_REG_T1, RV_REG_ZERO, off, ctx);
++
++ /*
++ * prog = array->ptrs[index];
++ * if (!prog)
++ * goto out;
++ */
++ emit(rv_slli(RV_REG_T0, lo(idx_reg), 2), ctx);
++ emit(rv_add(RV_REG_T0, RV_REG_T0, lo(arr_reg)), ctx);
++ off = offsetof(struct bpf_array, ptrs);
++ if (is_12b_check(off, insn))
++ return -1;
++ emit(rv_lw(RV_REG_T0, off, RV_REG_T0), ctx);
++ off = (tc_ninsn - (ctx->ninsns - start_insn)) << 2;
++ emit_bcc(BPF_JEQ, RV_REG_T0, RV_REG_ZERO, off, ctx);
++
++ /*
++ * tcc = temp_tcc;
++ * goto *(prog->bpf_func + 4);
++ */
++ off = offsetof(struct bpf_prog, bpf_func);
++ if (is_12b_check(off, insn))
++ return -1;
++ emit(rv_lw(RV_REG_T0, off, RV_REG_T0), ctx);
++ emit(rv_addi(RV_REG_TCC, RV_REG_T1, 0), ctx);
++ /* Epilogue jumps to *(t0 + 4). */
++ __build_epilogue(true, ctx);
++ return 0;
++}
++
++static int emit_load_r64(const s8 *dst, const s8 *src, s16 off,
++ struct rv_jit_context *ctx, const u8 size)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++ const s8 *rs = bpf_get_reg64(src, tmp2, ctx);
++
++ emit_imm(RV_REG_T0, off, ctx);
++ emit(rv_add(RV_REG_T0, RV_REG_T0, lo(rs)), ctx);
++
++ switch (size) {
++ case BPF_B:
++ emit(rv_lbu(lo(rd), 0, RV_REG_T0), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case BPF_H:
++ emit(rv_lhu(lo(rd), 0, RV_REG_T0), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case BPF_W:
++ emit(rv_lw(lo(rd), 0, RV_REG_T0), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case BPF_DW:
++ emit(rv_lw(lo(rd), 0, RV_REG_T0), ctx);
++ emit(rv_lw(hi(rd), 4, RV_REG_T0), ctx);
++ break;
++ }
++
++ bpf_put_reg64(dst, rd, ctx);
++ return 0;
++}
++
++static int emit_store_r64(const s8 *dst, const s8 *src, s16 off,
++ struct rv_jit_context *ctx, const u8 size,
++ const u8 mode)
++{
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++ const s8 *rs = bpf_get_reg64(src, tmp2, ctx);
++
++ if (mode == BPF_XADD && size != BPF_W)
++ return -1;
++
++ emit_imm(RV_REG_T0, off, ctx);
++ emit(rv_add(RV_REG_T0, RV_REG_T0, lo(rd)), ctx);
++
++ switch (size) {
++ case BPF_B:
++ emit(rv_sb(RV_REG_T0, 0, lo(rs)), ctx);
++ break;
++ case BPF_H:
++ emit(rv_sh(RV_REG_T0, 0, lo(rs)), ctx);
++ break;
++ case BPF_W:
++ switch (mode) {
++ case BPF_MEM:
++ emit(rv_sw(RV_REG_T0, 0, lo(rs)), ctx);
++ break;
++ case BPF_XADD:
++ emit(rv_amoadd_w(RV_REG_ZERO, lo(rs), RV_REG_T0, 0, 0),
++ ctx);
++ break;
++ }
++ break;
++ case BPF_DW:
++ emit(rv_sw(RV_REG_T0, 0, lo(rs)), ctx);
++ emit(rv_sw(RV_REG_T0, 4, hi(rs)), ctx);
++ break;
++ }
++
++ return 0;
++}
++
++static void emit_rev16(const s8 rd, struct rv_jit_context *ctx)
++{
++ emit(rv_slli(rd, rd, 16), ctx);
++ emit(rv_slli(RV_REG_T1, rd, 8), ctx);
++ emit(rv_srli(rd, rd, 8), ctx);
++ emit(rv_add(RV_REG_T1, rd, RV_REG_T1), ctx);
++ emit(rv_srli(rd, RV_REG_T1, 16), ctx);
++}
++
++static void emit_rev32(const s8 rd, struct rv_jit_context *ctx)
++{
++ emit(rv_addi(RV_REG_T1, RV_REG_ZERO, 0), ctx);
++ emit(rv_andi(RV_REG_T0, rd, 255), ctx);
++ emit(rv_add(RV_REG_T1, RV_REG_T1, RV_REG_T0), ctx);
++ emit(rv_slli(RV_REG_T1, RV_REG_T1, 8), ctx);
++ emit(rv_srli(rd, rd, 8), ctx);
++ emit(rv_andi(RV_REG_T0, rd, 255), ctx);
++ emit(rv_add(RV_REG_T1, RV_REG_T1, RV_REG_T0), ctx);
++ emit(rv_slli(RV_REG_T1, RV_REG_T1, 8), ctx);
++ emit(rv_srli(rd, rd, 8), ctx);
++ emit(rv_andi(RV_REG_T0, rd, 255), ctx);
++ emit(rv_add(RV_REG_T1, RV_REG_T1, RV_REG_T0), ctx);
++ emit(rv_slli(RV_REG_T1, RV_REG_T1, 8), ctx);
++ emit(rv_srli(rd, rd, 8), ctx);
++ emit(rv_andi(RV_REG_T0, rd, 255), ctx);
++ emit(rv_add(RV_REG_T1, RV_REG_T1, RV_REG_T0), ctx);
++ emit(rv_addi(rd, RV_REG_T1, 0), ctx);
++}
++
++static void emit_zext64(const s8 *dst, struct rv_jit_context *ctx)
++{
++ const s8 *rd;
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++
++ rd = bpf_get_reg64(dst, tmp1, ctx);
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ bpf_put_reg64(dst, rd, ctx);
++}
++
++int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
++ bool extra_pass)
++{
++ bool is64 = BPF_CLASS(insn->code) == BPF_ALU64 ||
++ BPF_CLASS(insn->code) == BPF_JMP;
++ int s, e, rvoff, i = insn - ctx->prog->insnsi;
++ u8 code = insn->code;
++ s16 off = insn->off;
++ s32 imm = insn->imm;
++
++ const s8 *dst = bpf2rv32[insn->dst_reg];
++ const s8 *src = bpf2rv32[insn->src_reg];
++ const s8 *tmp1 = bpf2rv32[TMP_REG_1];
++ const s8 *tmp2 = bpf2rv32[TMP_REG_2];
++
++ switch (code) {
++ case BPF_ALU64 | BPF_MOV | BPF_X:
++
++ case BPF_ALU64 | BPF_ADD | BPF_X:
++ case BPF_ALU64 | BPF_ADD | BPF_K:
++
++ case BPF_ALU64 | BPF_SUB | BPF_X:
++ case BPF_ALU64 | BPF_SUB | BPF_K:
++
++ case BPF_ALU64 | BPF_AND | BPF_X:
++ case BPF_ALU64 | BPF_OR | BPF_X:
++ case BPF_ALU64 | BPF_XOR | BPF_X:
++
++ case BPF_ALU64 | BPF_MUL | BPF_X:
++ case BPF_ALU64 | BPF_MUL | BPF_K:
++
++ case BPF_ALU64 | BPF_LSH | BPF_X:
++ case BPF_ALU64 | BPF_RSH | BPF_X:
++ case BPF_ALU64 | BPF_ARSH | BPF_X:
++ if (BPF_SRC(code) == BPF_K) {
++ emit_imm32(tmp2, imm, ctx);
++ src = tmp2;
++ }
++ emit_alu_r64(dst, src, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU64 | BPF_NEG:
++ emit_alu_r64(dst, tmp2, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU64 | BPF_DIV | BPF_X:
++ case BPF_ALU64 | BPF_DIV | BPF_K:
++ case BPF_ALU64 | BPF_MOD | BPF_X:
++ case BPF_ALU64 | BPF_MOD | BPF_K:
++ goto notsupported;
++
++ case BPF_ALU64 | BPF_MOV | BPF_K:
++ case BPF_ALU64 | BPF_AND | BPF_K:
++ case BPF_ALU64 | BPF_OR | BPF_K:
++ case BPF_ALU64 | BPF_XOR | BPF_K:
++ case BPF_ALU64 | BPF_LSH | BPF_K:
++ case BPF_ALU64 | BPF_RSH | BPF_K:
++ case BPF_ALU64 | BPF_ARSH | BPF_K:
++ emit_alu_i64(dst, imm, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU | BPF_MOV | BPF_X:
++ if (imm == 1) {
++ /* Special mov32 for zext. */
++ emit_zext64(dst, ctx);
++ break;
++ }
++ /* Fallthrough. */
++
++ case BPF_ALU | BPF_ADD | BPF_X:
++ case BPF_ALU | BPF_SUB | BPF_X:
++ case BPF_ALU | BPF_AND | BPF_X:
++ case BPF_ALU | BPF_OR | BPF_X:
++ case BPF_ALU | BPF_XOR | BPF_X:
++
++ case BPF_ALU | BPF_MUL | BPF_X:
++ case BPF_ALU | BPF_MUL | BPF_K:
++
++ case BPF_ALU | BPF_DIV | BPF_X:
++ case BPF_ALU | BPF_DIV | BPF_K:
++
++ case BPF_ALU | BPF_MOD | BPF_X:
++ case BPF_ALU | BPF_MOD | BPF_K:
++
++ case BPF_ALU | BPF_LSH | BPF_X:
++ case BPF_ALU | BPF_RSH | BPF_X:
++ case BPF_ALU | BPF_ARSH | BPF_X:
++ if (BPF_SRC(code) == BPF_K) {
++ emit_imm32(tmp2, imm, ctx);
++ src = tmp2;
++ }
++ emit_alu_r32(dst, src, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU | BPF_MOV | BPF_K:
++ case BPF_ALU | BPF_ADD | BPF_K:
++ case BPF_ALU | BPF_SUB | BPF_K:
++ case BPF_ALU | BPF_AND | BPF_K:
++ case BPF_ALU | BPF_OR | BPF_K:
++ case BPF_ALU | BPF_XOR | BPF_K:
++ case BPF_ALU | BPF_LSH | BPF_K:
++ case BPF_ALU | BPF_RSH | BPF_K:
++ case BPF_ALU | BPF_ARSH | BPF_K:
++ /*
++ * mul,div,mod are handled in the BPF_X case since there are
++ * no RISC-V I-type equivalents.
++ */
++ emit_alu_i32(dst, imm, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU | BPF_NEG:
++ /*
++ * src is ignored---choose tmp2 as a dummy register since it
++ * is not on the stack.
++ */
++ emit_alu_r32(dst, tmp2, ctx, BPF_OP(code));
++ break;
++
++ case BPF_ALU | BPF_END | BPF_FROM_LE:
++ {
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++
++ switch (imm) {
++ case 16:
++ emit(rv_slli(lo(rd), lo(rd), 16), ctx);
++ emit(rv_srli(lo(rd), lo(rd), 16), ctx);
++ /* Fallthrough. */
++ case 32:
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case 64:
++ /* Do nothing. */
++ break;
++ default:
++ pr_err("bpf-jit: BPF_END imm %d invalid\n", imm);
++ return -1;
++ }
++
++ bpf_put_reg64(dst, rd, ctx);
++ break;
++ }
++
++ case BPF_ALU | BPF_END | BPF_FROM_BE:
++ {
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++
++ switch (imm) {
++ case 16:
++ emit_rev16(lo(rd), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case 32:
++ emit_rev32(lo(rd), ctx);
++ if (!ctx->prog->aux->verifier_zext)
++ emit(rv_addi(hi(rd), RV_REG_ZERO, 0), ctx);
++ break;
++ case 64:
++ /* Swap upper and lower halves. */
++ emit(rv_addi(RV_REG_T0, lo(rd), 0), ctx);
++ emit(rv_addi(lo(rd), hi(rd), 0), ctx);
++ emit(rv_addi(hi(rd), RV_REG_T0, 0), ctx);
++
++ /* Swap each half. */
++ emit_rev32(lo(rd), ctx);
++ emit_rev32(hi(rd), ctx);
++ break;
++ default:
++ pr_err("bpf-jit: BPF_END imm %d invalid\n", imm);
++ return -1;
++ }
++
++ bpf_put_reg64(dst, rd, ctx);
++ break;
++ }
++
++ case BPF_JMP | BPF_JA:
++ rvoff = rv_offset(i, off, ctx);
++ emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ break;
++
++ case BPF_JMP | BPF_CALL:
++ {
++ bool fixed;
++ int ret;
++ u64 addr;
++
++ ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass, &addr,
++ &fixed);
++ if (ret < 0)
++ return ret;
++ emit_call(fixed, addr, ctx);
++ break;
++ }
++
++ case BPF_JMP | BPF_TAIL_CALL:
++ if (emit_bpf_tail_call(i, ctx))
++ return -1;
++ break;
++
++ case BPF_JMP | BPF_JEQ | BPF_X:
++ case BPF_JMP | BPF_JEQ | BPF_K:
++ case BPF_JMP32 | BPF_JEQ | BPF_X:
++ case BPF_JMP32 | BPF_JEQ | BPF_K:
++
++ case BPF_JMP | BPF_JNE | BPF_X:
++ case BPF_JMP | BPF_JNE | BPF_K:
++ case BPF_JMP32 | BPF_JNE | BPF_X:
++ case BPF_JMP32 | BPF_JNE | BPF_K:
++
++ case BPF_JMP | BPF_JLE | BPF_X:
++ case BPF_JMP | BPF_JLE | BPF_K:
++ case BPF_JMP32 | BPF_JLE | BPF_X:
++ case BPF_JMP32 | BPF_JLE | BPF_K:
++
++ case BPF_JMP | BPF_JLT | BPF_X:
++ case BPF_JMP | BPF_JLT | BPF_K:
++ case BPF_JMP32 | BPF_JLT | BPF_X:
++ case BPF_JMP32 | BPF_JLT | BPF_K:
++
++ case BPF_JMP | BPF_JGE | BPF_X:
++ case BPF_JMP | BPF_JGE | BPF_K:
++ case BPF_JMP32 | BPF_JGE | BPF_X:
++ case BPF_JMP32 | BPF_JGE | BPF_K:
++
++ case BPF_JMP | BPF_JGT | BPF_X:
++ case BPF_JMP | BPF_JGT | BPF_K:
++ case BPF_JMP32 | BPF_JGT | BPF_X:
++ case BPF_JMP32 | BPF_JGT | BPF_K:
++
++ case BPF_JMP | BPF_JSLE | BPF_X:
++ case BPF_JMP | BPF_JSLE | BPF_K:
++ case BPF_JMP32 | BPF_JSLE | BPF_X:
++ case BPF_JMP32 | BPF_JSLE | BPF_K:
++
++ case BPF_JMP | BPF_JSLT | BPF_X:
++ case BPF_JMP | BPF_JSLT | BPF_K:
++ case BPF_JMP32 | BPF_JSLT | BPF_X:
++ case BPF_JMP32 | BPF_JSLT | BPF_K:
++
++ case BPF_JMP | BPF_JSGE | BPF_X:
++ case BPF_JMP | BPF_JSGE | BPF_K:
++ case BPF_JMP32 | BPF_JSGE | BPF_X:
++ case BPF_JMP32 | BPF_JSGE | BPF_K:
++
++ case BPF_JMP | BPF_JSGT | BPF_X:
++ case BPF_JMP | BPF_JSGT | BPF_K:
++ case BPF_JMP32 | BPF_JSGT | BPF_X:
++ case BPF_JMP32 | BPF_JSGT | BPF_K:
++
++ case BPF_JMP | BPF_JSET | BPF_X:
++ case BPF_JMP | BPF_JSET | BPF_K:
++ case BPF_JMP32 | BPF_JSET | BPF_X:
++ case BPF_JMP32 | BPF_JSET | BPF_K:
++ rvoff = rv_offset(i, off, ctx);
++ if (BPF_SRC(code) == BPF_K) {
++ s = ctx->ninsns;
++ emit_imm32(tmp2, imm, ctx);
++ src = tmp2;
++ e = ctx->ninsns;
++ rvoff -= (e - s) << 2;
++ }
++
++ if (is64)
++ emit_branch_r64(dst, src, rvoff, ctx, BPF_OP(code));
++ else
++ emit_branch_r32(dst, src, rvoff, ctx, BPF_OP(code));
++ break;
++
++ case BPF_JMP | BPF_EXIT:
++ if (i == ctx->prog->len - 1)
++ break;
++
++ rvoff = epilogue_offset(ctx);
++ emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
++ break;
++
++ case BPF_LD | BPF_IMM | BPF_DW:
++ {
++ struct bpf_insn insn1 = insn[1];
++ s32 imm_lo = imm;
++ s32 imm_hi = insn1.imm;
++ const s8 *rd = bpf_get_reg64(dst, tmp1, ctx);
++
++ emit_imm64(rd, imm_hi, imm_lo, ctx);
++ bpf_put_reg64(dst, rd, ctx);
++ return 1;
++ }
++
++ case BPF_LDX | BPF_MEM | BPF_B:
++ case BPF_LDX | BPF_MEM | BPF_H:
++ case BPF_LDX | BPF_MEM | BPF_W:
++ case BPF_LDX | BPF_MEM | BPF_DW:
++ if (emit_load_r64(dst, src, off, ctx, BPF_SIZE(code)))
++ return -1;
++ break;
++
++ case BPF_ST | BPF_MEM | BPF_B:
++ case BPF_ST | BPF_MEM | BPF_H:
++ case BPF_ST | BPF_MEM | BPF_W:
++ case BPF_ST | BPF_MEM | BPF_DW:
++
++ case BPF_STX | BPF_MEM | BPF_B:
++ case BPF_STX | BPF_MEM | BPF_H:
++ case BPF_STX | BPF_MEM | BPF_W:
++ case BPF_STX | BPF_MEM | BPF_DW:
++ case BPF_STX | BPF_XADD | BPF_W:
++ if (BPF_CLASS(code) == BPF_ST) {
++ emit_imm32(tmp2, imm, ctx);
++ src = tmp2;
++ }
++
++ if (emit_store_r64(dst, src, off, ctx, BPF_SIZE(code),
++ BPF_MODE(code)))
++ return -1;
++ break;
++
++ /* No hardware support for 8-byte atomics in RV32. */
++ case BPF_STX | BPF_XADD | BPF_DW:
++ /* Fallthrough. */
++
++notsupported:
++ pr_info_once("bpf-jit: not supported: opcode %02x ***\n", code);
++ return -EFAULT;
++
++ default:
++ pr_err("bpf-jit: unknown opcode %02x\n", code);
++ return -EINVAL;
++ }
++
++ return 0;
++}
++
++void bpf_jit_build_prologue(struct rv_jit_context *ctx)
++{
++ /* Make space to save 9 registers: ra, fp, s1--s7. */
++ int stack_adjust = 9 * sizeof(u32), store_offset, bpf_stack_adjust;
++ const s8 *fp = bpf2rv32[BPF_REG_FP];
++ const s8 *r1 = bpf2rv32[BPF_REG_1];
++
++ bpf_stack_adjust = round_up(ctx->prog->aux->stack_depth, 16);
++ stack_adjust += bpf_stack_adjust;
++
++ store_offset = stack_adjust - 4;
++
++ stack_adjust += 4 * BPF_JIT_SCRATCH_REGS;
++
++ /*
++ * The first instruction sets the tail-call-counter (TCC) register.
++ * This instruction is skipped by tail calls.
++ */
++ emit(rv_addi(RV_REG_TCC, RV_REG_ZERO, MAX_TAIL_CALL_CNT), ctx);
++
++ emit(rv_addi(RV_REG_SP, RV_REG_SP, -stack_adjust), ctx);
++
++ /* Save callee-save registers. */
++ emit(rv_sw(RV_REG_SP, store_offset - 0, RV_REG_RA), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 4, RV_REG_FP), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 8, RV_REG_S1), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 12, RV_REG_S2), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 16, RV_REG_S3), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 20, RV_REG_S4), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 24, RV_REG_S5), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 28, RV_REG_S6), ctx);
++ emit(rv_sw(RV_REG_SP, store_offset - 32, RV_REG_S7), ctx);
++
++ /* Set fp: used as the base address for stacked BPF registers. */
++ emit(rv_addi(RV_REG_FP, RV_REG_SP, stack_adjust), ctx);
++
++ /* Set up BPF stack pointer. */
++ emit(rv_addi(lo(fp), RV_REG_SP, bpf_stack_adjust), ctx);
++ emit(rv_addi(hi(fp), RV_REG_ZERO, 0), ctx);
++
++ /* Set up context pointer. */
++ emit(rv_addi(lo(r1), RV_REG_A0, 0), ctx);
++ emit(rv_addi(hi(r1), RV_REG_ZERO, 0), ctx);
++
++ ctx->stack_size = stack_adjust;
++}
++
++void bpf_jit_build_epilogue(struct rv_jit_context *ctx)
++{
++ __build_epilogue(false, ctx);
++}commit ca6cb5447ceca6a87d6b62c9e5d41042c34f7ffa
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Wed Mar 4 21:02:04 2020 -0800
+
+ riscv, bpf: Factor common RISC-V JIT code
+
+ This patch factors out code that can be used by both the RV64 and RV32
+ BPF JITs to a common bpf_jit.h and bpf_jit_core.c.
+
+ Move struct definitions and macro-like functions to header. Rename
+ rv_sb_insn/rv_uj_insn to rv_b_insn/rv_j_insn to match the RISC-V
+ specification.
+
+ Move reusable functions emit_body() and bpf_int_jit_compile() to
+ bpf_jit_core.c with minor simplifications. Rename emit_insn() and
+ build_{prologue,epilogue}() to be prefixed with "bpf_jit_" as they are
+ no longer static.
+
+ Rename bpf_jit_comp.c to bpf_jit_comp64.c to be more explicit.
+
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Link: https://lore.kernel.org/bpf/20200305050207.4159-2-luke.r.nels@gmail.com
+
+diff --git a/arch/riscv/net/Makefile b/arch/riscv/net/Makefile
+index ec5b14763316..018074dbf986 100644
+--- a/arch/riscv/net/Makefile
++++ b/arch/riscv/net/Makefile
+@@ -1,2 +1,3 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+-obj-$(CONFIG_BPF_JIT) += bpf_jit_comp.o
++
++obj-$(CONFIG_BPF_JIT) += bpf_jit_core.o bpf_jit_comp64.o
+diff --git a/arch/riscv/net/bpf_jit.h b/arch/riscv/net/bpf_jit.h
+new file mode 100644
+index 000000000000..23c123331f94
+--- /dev/null
++++ b/arch/riscv/net/bpf_jit.h
+@@ -0,0 +1,466 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * Common functionality for RV32 and RV64 BPF JIT compilers
++ *
++ * Copyright (c) 2019 Björn Töpel <bjorn.topel@gmail.com>
++ *
++ */
++
++#ifndef _BPF_JIT_H
++#define _BPF_JIT_H
++
++#include <linux/bpf.h>
++#include <linux/filter.h>
++#include <asm/cacheflush.h>
++
++enum {
++ RV_REG_ZERO = 0, /* The constant value 0 */
++ RV_REG_RA = 1, /* Return address */
++ RV_REG_SP = 2, /* Stack pointer */
++ RV_REG_GP = 3, /* Global pointer */
++ RV_REG_TP = 4, /* Thread pointer */
++ RV_REG_T0 = 5, /* Temporaries */
++ RV_REG_T1 = 6,
++ RV_REG_T2 = 7,
++ RV_REG_FP = 8, /* Saved register/frame pointer */
++ RV_REG_S1 = 9, /* Saved register */
++ RV_REG_A0 = 10, /* Function argument/return values */
++ RV_REG_A1 = 11, /* Function arguments */
++ RV_REG_A2 = 12,
++ RV_REG_A3 = 13,
++ RV_REG_A4 = 14,
++ RV_REG_A5 = 15,
++ RV_REG_A6 = 16,
++ RV_REG_A7 = 17,
++ RV_REG_S2 = 18, /* Saved registers */
++ RV_REG_S3 = 19,
++ RV_REG_S4 = 20,
++ RV_REG_S5 = 21,
++ RV_REG_S6 = 22,
++ RV_REG_S7 = 23,
++ RV_REG_S8 = 24,
++ RV_REG_S9 = 25,
++ RV_REG_S10 = 26,
++ RV_REG_S11 = 27,
++ RV_REG_T3 = 28, /* Temporaries */
++ RV_REG_T4 = 29,
++ RV_REG_T5 = 30,
++ RV_REG_T6 = 31,
++};
++
++struct rv_jit_context {
++ struct bpf_prog *prog;
++ u32 *insns; /* RV insns */
++ int ninsns;
++ int epilogue_offset;
++ int *offset; /* BPF to RV */
++ unsigned long flags;
++ int stack_size;
++};
++
++struct rv_jit_data {
++ struct bpf_binary_header *header;
++ u8 *image;
++ struct rv_jit_context ctx;
++};
++
++static inline void bpf_fill_ill_insns(void *area, unsigned int size)
++{
++ memset(area, 0, size);
++}
++
++static inline void bpf_flush_icache(void *start, void *end)
++{
++ flush_icache_range((unsigned long)start, (unsigned long)end);
++}
++
++static inline void emit(const u32 insn, struct rv_jit_context *ctx)
++{
++ if (ctx->insns)
++ ctx->insns[ctx->ninsns] = insn;
++
++ ctx->ninsns++;
++}
++
++static inline int epilogue_offset(struct rv_jit_context *ctx)
++{
++ int to = ctx->epilogue_offset, from = ctx->ninsns;
++
++ return (to - from) << 2;
++}
++
++/* Return -1 or inverted cond. */
++static inline int invert_bpf_cond(u8 cond)
++{
++ switch (cond) {
++ case BPF_JEQ:
++ return BPF_JNE;
++ case BPF_JGT:
++ return BPF_JLE;
++ case BPF_JLT:
++ return BPF_JGE;
++ case BPF_JGE:
++ return BPF_JLT;
++ case BPF_JLE:
++ return BPF_JGT;
++ case BPF_JNE:
++ return BPF_JEQ;
++ case BPF_JSGT:
++ return BPF_JSLE;
++ case BPF_JSLT:
++ return BPF_JSGE;
++ case BPF_JSGE:
++ return BPF_JSLT;
++ case BPF_JSLE:
++ return BPF_JSGT;
++ }
++ return -1;
++}
++
++static inline bool is_12b_int(long val)
++{
++ return -(1L << 11) <= val && val < (1L << 11);
++}
++
++static inline int is_12b_check(int off, int insn)
++{
++ if (!is_12b_int(off)) {
++ pr_err("bpf-jit: insn=%d 12b < offset=%d not supported yet!\n",
++ insn, (int)off);
++ return -1;
++ }
++ return 0;
++}
++
++static inline bool is_13b_int(long val)
++{
++ return -(1L << 12) <= val && val < (1L << 12);
++}
++
++static inline bool is_21b_int(long val)
++{
++ return -(1L << 20) <= val && val < (1L << 20);
++}
++
++static inline int rv_offset(int insn, int off, struct rv_jit_context *ctx)
++{
++ int from, to;
++
++ off++; /* BPF branch is from PC+1, RV is from PC */
++ from = (insn > 0) ? ctx->offset[insn - 1] : 0;
++ to = (insn + off > 0) ? ctx->offset[insn + off - 1] : 0;
++ return (to - from) << 2;
++}
++
++/* Instruction formats. */
++
++static inline u32 rv_r_insn(u8 funct7, u8 rs2, u8 rs1, u8 funct3, u8 rd,
++ u8 opcode)
++{
++ return (funct7 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
++ (rd << 7) | opcode;
++}
++
++static inline u32 rv_i_insn(u16 imm11_0, u8 rs1, u8 funct3, u8 rd, u8 opcode)
++{
++ return (imm11_0 << 20) | (rs1 << 15) | (funct3 << 12) | (rd << 7) |
++ opcode;
++}
++
++static inline u32 rv_s_insn(u16 imm11_0, u8 rs2, u8 rs1, u8 funct3, u8 opcode)
++{
++ u8 imm11_5 = imm11_0 >> 5, imm4_0 = imm11_0 & 0x1f;
++
++ return (imm11_5 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
++ (imm4_0 << 7) | opcode;
++}
++
++static inline u32 rv_b_insn(u16 imm12_1, u8 rs2, u8 rs1, u8 funct3, u8 opcode)
++{
++ u8 imm12 = ((imm12_1 & 0x800) >> 5) | ((imm12_1 & 0x3f0) >> 4);
++ u8 imm4_1 = ((imm12_1 & 0xf) << 1) | ((imm12_1 & 0x400) >> 10);
++
++ return (imm12 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
++ (imm4_1 << 7) | opcode;
++}
++
++static inline u32 rv_u_insn(u32 imm31_12, u8 rd, u8 opcode)
++{
++ return (imm31_12 << 12) | (rd << 7) | opcode;
++}
++
++static inline u32 rv_j_insn(u32 imm20_1, u8 rd, u8 opcode)
++{
++ u32 imm;
++
++ imm = (imm20_1 & 0x80000) | ((imm20_1 & 0x3ff) << 9) |
++ ((imm20_1 & 0x400) >> 2) | ((imm20_1 & 0x7f800) >> 11);
++
++ return (imm << 12) | (rd << 7) | opcode;
++}
++
++static inline u32 rv_amo_insn(u8 funct5, u8 aq, u8 rl, u8 rs2, u8 rs1,
++ u8 funct3, u8 rd, u8 opcode)
++{
++ u8 funct7 = (funct5 << 2) | (aq << 1) | rl;
++
++ return rv_r_insn(funct7, rs2, rs1, funct3, rd, opcode);
++}
++
++static inline u32 rv_addi(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 0, rd, 0x13);
++}
++
++static inline u32 rv_andi(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 7, rd, 0x13);
++}
++
++static inline u32 rv_ori(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 6, rd, 0x13);
++}
++
++static inline u32 rv_xori(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 4, rd, 0x13);
++}
++
++static inline u32 rv_slli(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 1, rd, 0x13);
++}
++
++static inline u32 rv_srli(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 5, rd, 0x13);
++}
++
++static inline u32 rv_srai(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(0x400 | imm11_0, rs1, 5, rd, 0x13);
++}
++
++static inline u32 rv_lui(u8 rd, u32 imm31_12)
++{
++ return rv_u_insn(imm31_12, rd, 0x37);
++}
++
++static inline u32 rv_auipc(u8 rd, u32 imm31_12)
++{
++ return rv_u_insn(imm31_12, rd, 0x17);
++}
++
++static inline u32 rv_add(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 0, rd, 0x33);
++}
++
++static inline u32 rv_sub(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0x20, rs2, rs1, 0, rd, 0x33);
++}
++
++static inline u32 rv_and(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 7, rd, 0x33);
++}
++
++static inline u32 rv_or(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 6, rd, 0x33);
++}
++
++static inline u32 rv_xor(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 4, rd, 0x33);
++}
++
++static inline u32 rv_sll(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 1, rd, 0x33);
++}
++
++static inline u32 rv_srl(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 5, rd, 0x33);
++}
++
++static inline u32 rv_sra(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0x20, rs2, rs1, 5, rd, 0x33);
++}
++
++static inline u32 rv_mul(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 0, rd, 0x33);
++}
++
++static inline u32 rv_divu(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 5, rd, 0x33);
++}
++
++static inline u32 rv_remu(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 7, rd, 0x33);
++}
++
++static inline u32 rv_jal(u8 rd, u32 imm20_1)
++{
++ return rv_j_insn(imm20_1, rd, 0x6f);
++}
++
++static inline u32 rv_jalr(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 0, rd, 0x67);
++}
++
++static inline u32 rv_beq(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 0, 0x63);
++}
++
++static inline u32 rv_bne(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 1, 0x63);
++}
++
++static inline u32 rv_bltu(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 6, 0x63);
++}
++
++static inline u32 rv_bgeu(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 7, 0x63);
++}
++
++static inline u32 rv_blt(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 4, 0x63);
++}
++
++static inline u32 rv_bge(u8 rs1, u8 rs2, u16 imm12_1)
++{
++ return rv_b_insn(imm12_1, rs2, rs1, 5, 0x63);
++}
++
++static inline u32 rv_lbu(u8 rd, u16 imm11_0, u8 rs1)
++{
++ return rv_i_insn(imm11_0, rs1, 4, rd, 0x03);
++}
++
++static inline u32 rv_lhu(u8 rd, u16 imm11_0, u8 rs1)
++{
++ return rv_i_insn(imm11_0, rs1, 5, rd, 0x03);
++}
++
++static inline u32 rv_sb(u8 rs1, u16 imm11_0, u8 rs2)
++{
++ return rv_s_insn(imm11_0, rs2, rs1, 0, 0x23);
++}
++
++static inline u32 rv_sh(u8 rs1, u16 imm11_0, u8 rs2)
++{
++ return rv_s_insn(imm11_0, rs2, rs1, 1, 0x23);
++}
++
++static inline u32 rv_sw(u8 rs1, u16 imm11_0, u8 rs2)
++{
++ return rv_s_insn(imm11_0, rs2, rs1, 2, 0x23);
++}
++
++static inline u32 rv_amoadd_w(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
++{
++ return rv_amo_insn(0, aq, rl, rs2, rs1, 2, rd, 0x2f);
++}
++
++static inline u32 rv_addiw(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 0, rd, 0x1b);
++}
++
++static inline u32 rv_slliw(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 1, rd, 0x1b);
++}
++
++static inline u32 rv_srliw(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(imm11_0, rs1, 5, rd, 0x1b);
++}
++
++static inline u32 rv_sraiw(u8 rd, u8 rs1, u16 imm11_0)
++{
++ return rv_i_insn(0x400 | imm11_0, rs1, 5, rd, 0x1b);
++}
++
++static inline u32 rv_addw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 0, rd, 0x3b);
++}
++
++static inline u32 rv_subw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0x20, rs2, rs1, 0, rd, 0x3b);
++}
++
++static inline u32 rv_sllw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 1, rd, 0x3b);
++}
++
++static inline u32 rv_srlw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0, rs2, rs1, 5, rd, 0x3b);
++}
++
++static inline u32 rv_sraw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(0x20, rs2, rs1, 5, rd, 0x3b);
++}
++
++static inline u32 rv_mulw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 0, rd, 0x3b);
++}
++
++static inline u32 rv_divuw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 5, rd, 0x3b);
++}
++
++static inline u32 rv_remuw(u8 rd, u8 rs1, u8 rs2)
++{
++ return rv_r_insn(1, rs2, rs1, 7, rd, 0x3b);
++}
++
++static inline u32 rv_ld(u8 rd, u16 imm11_0, u8 rs1)
++{
++ return rv_i_insn(imm11_0, rs1, 3, rd, 0x03);
++}
++
++static inline u32 rv_lwu(u8 rd, u16 imm11_0, u8 rs1)
++{
++ return rv_i_insn(imm11_0, rs1, 6, rd, 0x03);
++}
++
++static inline u32 rv_sd(u8 rs1, u16 imm11_0, u8 rs2)
++{
++ return rv_s_insn(imm11_0, rs2, rs1, 3, 0x23);
++}
++
++static inline u32 rv_amoadd_d(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
++{
++ return rv_amo_insn(0, aq, rl, rs2, rs1, 3, rd, 0x2f);
++}
++
++void bpf_jit_build_prologue(struct rv_jit_context *ctx);
++void bpf_jit_build_epilogue(struct rv_jit_context *ctx);
++
++int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
++ bool extra_pass);
++
++#endif /* _BPF_JIT_H */
+diff --git a/arch/riscv/net/bpf_jit_comp.c b/arch/riscv/net/bpf_jit_comp64.c
+similarity index 69%
+rename from arch/riscv/net/bpf_jit_comp.c
+rename to arch/riscv/net/bpf_jit_comp64.c
+index 483f4ad7f4dc..cc1985d8750a 100644
+--- a/arch/riscv/net/bpf_jit_comp.c
++++ b/arch/riscv/net/bpf_jit_comp64.c
+@@ -7,42 +7,7 @@
+
+ #include <linux/bpf.h>
+ #include <linux/filter.h>
+-#include <asm/cacheflush.h>
+-
+-enum {
+- RV_REG_ZERO = 0, /* The constant value 0 */
+- RV_REG_RA = 1, /* Return address */
+- RV_REG_SP = 2, /* Stack pointer */
+- RV_REG_GP = 3, /* Global pointer */
+- RV_REG_TP = 4, /* Thread pointer */
+- RV_REG_T0 = 5, /* Temporaries */
+- RV_REG_T1 = 6,
+- RV_REG_T2 = 7,
+- RV_REG_FP = 8,
+- RV_REG_S1 = 9, /* Saved registers */
+- RV_REG_A0 = 10, /* Function argument/return values */
+- RV_REG_A1 = 11, /* Function arguments */
+- RV_REG_A2 = 12,
+- RV_REG_A3 = 13,
+- RV_REG_A4 = 14,
+- RV_REG_A5 = 15,
+- RV_REG_A6 = 16,
+- RV_REG_A7 = 17,
+- RV_REG_S2 = 18, /* Saved registers */
+- RV_REG_S3 = 19,
+- RV_REG_S4 = 20,
+- RV_REG_S5 = 21,
+- RV_REG_S6 = 22,
+- RV_REG_S7 = 23,
+- RV_REG_S8 = 24,
+- RV_REG_S9 = 25,
+- RV_REG_S10 = 26,
+- RV_REG_S11 = 27,
+- RV_REG_T3 = 28, /* Temporaries */
+- RV_REG_T4 = 29,
+- RV_REG_T5 = 30,
+- RV_REG_T6 = 31,
+-};
++#include "bpf_jit.h"
+
+ #define RV_REG_TCC RV_REG_A6
+ #define RV_REG_TCC_SAVED RV_REG_S6 /* Store A6 in S6 if program do calls */
+@@ -73,22 +38,6 @@ enum {
+ RV_CTX_F_SEEN_S6 = RV_REG_S6,
+ };
+
+-struct rv_jit_context {
+- struct bpf_prog *prog;
+- u32 *insns; /* RV insns */
+- int ninsns;
+- int epilogue_offset;
+- int *offset; /* BPF to RV */
+- unsigned long flags;
+- int stack_size;
+-};
+-
+-struct rv_jit_data {
+- struct bpf_binary_header *header;
+- u8 *image;
+- struct rv_jit_context ctx;
+-};
+-
+ static u8 bpf_to_rv_reg(int bpf_reg, struct rv_jit_context *ctx)
+ {
+ u8 reg = regmap[bpf_reg];
+@@ -156,346 +105,11 @@ static u8 rv_tail_call_reg(struct rv_jit_context *ctx)
+ return RV_REG_A6;
+ }
+
+-static void emit(const u32 insn, struct rv_jit_context *ctx)
+-{
+- if (ctx->insns)
+- ctx->insns[ctx->ninsns] = insn;
+-
+- ctx->ninsns++;
+-}
+-
+-static u32 rv_r_insn(u8 funct7, u8 rs2, u8 rs1, u8 funct3, u8 rd, u8 opcode)
+-{
+- return (funct7 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
+- (rd << 7) | opcode;
+-}
+-
+-static u32 rv_i_insn(u16 imm11_0, u8 rs1, u8 funct3, u8 rd, u8 opcode)
+-{
+- return (imm11_0 << 20) | (rs1 << 15) | (funct3 << 12) | (rd << 7) |
+- opcode;
+-}
+-
+-static u32 rv_s_insn(u16 imm11_0, u8 rs2, u8 rs1, u8 funct3, u8 opcode)
+-{
+- u8 imm11_5 = imm11_0 >> 5, imm4_0 = imm11_0 & 0x1f;
+-
+- return (imm11_5 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
+- (imm4_0 << 7) | opcode;
+-}
+-
+-static u32 rv_sb_insn(u16 imm12_1, u8 rs2, u8 rs1, u8 funct3, u8 opcode)
+-{
+- u8 imm12 = ((imm12_1 & 0x800) >> 5) | ((imm12_1 & 0x3f0) >> 4);
+- u8 imm4_1 = ((imm12_1 & 0xf) << 1) | ((imm12_1 & 0x400) >> 10);
+-
+- return (imm12 << 25) | (rs2 << 20) | (rs1 << 15) | (funct3 << 12) |
+- (imm4_1 << 7) | opcode;
+-}
+-
+-static u32 rv_u_insn(u32 imm31_12, u8 rd, u8 opcode)
+-{
+- return (imm31_12 << 12) | (rd << 7) | opcode;
+-}
+-
+-static u32 rv_uj_insn(u32 imm20_1, u8 rd, u8 opcode)
+-{
+- u32 imm;
+-
+- imm = (imm20_1 & 0x80000) | ((imm20_1 & 0x3ff) << 9) |
+- ((imm20_1 & 0x400) >> 2) | ((imm20_1 & 0x7f800) >> 11);
+-
+- return (imm << 12) | (rd << 7) | opcode;
+-}
+-
+-static u32 rv_amo_insn(u8 funct5, u8 aq, u8 rl, u8 rs2, u8 rs1,
+- u8 funct3, u8 rd, u8 opcode)
+-{
+- u8 funct7 = (funct5 << 2) | (aq << 1) | rl;
+-
+- return rv_r_insn(funct7, rs2, rs1, funct3, rd, opcode);
+-}
+-
+-static u32 rv_addiw(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 0, rd, 0x1b);
+-}
+-
+-static u32 rv_addi(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 0, rd, 0x13);
+-}
+-
+-static u32 rv_addw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 0, rd, 0x3b);
+-}
+-
+-static u32 rv_add(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 0, rd, 0x33);
+-}
+-
+-static u32 rv_subw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0x20, rs2, rs1, 0, rd, 0x3b);
+-}
+-
+-static u32 rv_sub(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0x20, rs2, rs1, 0, rd, 0x33);
+-}
+-
+-static u32 rv_and(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 7, rd, 0x33);
+-}
+-
+-static u32 rv_or(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 6, rd, 0x33);
+-}
+-
+-static u32 rv_xor(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 4, rd, 0x33);
+-}
+-
+-static u32 rv_mulw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 0, rd, 0x3b);
+-}
+-
+-static u32 rv_mul(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 0, rd, 0x33);
+-}
+-
+-static u32 rv_divuw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 5, rd, 0x3b);
+-}
+-
+-static u32 rv_divu(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 5, rd, 0x33);
+-}
+-
+-static u32 rv_remuw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 7, rd, 0x3b);
+-}
+-
+-static u32 rv_remu(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(1, rs2, rs1, 7, rd, 0x33);
+-}
+-
+-static u32 rv_sllw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 1, rd, 0x3b);
+-}
+-
+-static u32 rv_sll(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 1, rd, 0x33);
+-}
+-
+-static u32 rv_srlw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 5, rd, 0x3b);
+-}
+-
+-static u32 rv_srl(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0, rs2, rs1, 5, rd, 0x33);
+-}
+-
+-static u32 rv_sraw(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0x20, rs2, rs1, 5, rd, 0x3b);
+-}
+-
+-static u32 rv_sra(u8 rd, u8 rs1, u8 rs2)
+-{
+- return rv_r_insn(0x20, rs2, rs1, 5, rd, 0x33);
+-}
+-
+-static u32 rv_lui(u8 rd, u32 imm31_12)
+-{
+- return rv_u_insn(imm31_12, rd, 0x37);
+-}
+-
+-static u32 rv_slli(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 1, rd, 0x13);
+-}
+-
+-static u32 rv_andi(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 7, rd, 0x13);
+-}
+-
+-static u32 rv_ori(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 6, rd, 0x13);
+-}
+-
+-static u32 rv_xori(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 4, rd, 0x13);
+-}
+-
+-static u32 rv_slliw(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 1, rd, 0x1b);
+-}
+-
+-static u32 rv_srliw(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 5, rd, 0x1b);
+-}
+-
+-static u32 rv_srli(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 5, rd, 0x13);
+-}
+-
+-static u32 rv_sraiw(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(0x400 | imm11_0, rs1, 5, rd, 0x1b);
+-}
+-
+-static u32 rv_srai(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(0x400 | imm11_0, rs1, 5, rd, 0x13);
+-}
+-
+-static u32 rv_jal(u8 rd, u32 imm20_1)
+-{
+- return rv_uj_insn(imm20_1, rd, 0x6f);
+-}
+-
+-static u32 rv_jalr(u8 rd, u8 rs1, u16 imm11_0)
+-{
+- return rv_i_insn(imm11_0, rs1, 0, rd, 0x67);
+-}
+-
+-static u32 rv_beq(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 0, 0x63);
+-}
+-
+-static u32 rv_bltu(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 6, 0x63);
+-}
+-
+-static u32 rv_bgeu(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 7, 0x63);
+-}
+-
+-static u32 rv_bne(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 1, 0x63);
+-}
+-
+-static u32 rv_blt(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 4, 0x63);
+-}
+-
+-static u32 rv_bge(u8 rs1, u8 rs2, u16 imm12_1)
+-{
+- return rv_sb_insn(imm12_1, rs2, rs1, 5, 0x63);
+-}
+-
+-static u32 rv_sb(u8 rs1, u16 imm11_0, u8 rs2)
+-{
+- return rv_s_insn(imm11_0, rs2, rs1, 0, 0x23);
+-}
+-
+-static u32 rv_sh(u8 rs1, u16 imm11_0, u8 rs2)
+-{
+- return rv_s_insn(imm11_0, rs2, rs1, 1, 0x23);
+-}
+-
+-static u32 rv_sw(u8 rs1, u16 imm11_0, u8 rs2)
+-{
+- return rv_s_insn(imm11_0, rs2, rs1, 2, 0x23);
+-}
+-
+-static u32 rv_sd(u8 rs1, u16 imm11_0, u8 rs2)
+-{
+- return rv_s_insn(imm11_0, rs2, rs1, 3, 0x23);
+-}
+-
+-static u32 rv_lbu(u8 rd, u16 imm11_0, u8 rs1)
+-{
+- return rv_i_insn(imm11_0, rs1, 4, rd, 0x03);
+-}
+-
+-static u32 rv_lhu(u8 rd, u16 imm11_0, u8 rs1)
+-{
+- return rv_i_insn(imm11_0, rs1, 5, rd, 0x03);
+-}
+-
+-static u32 rv_lwu(u8 rd, u16 imm11_0, u8 rs1)
+-{
+- return rv_i_insn(imm11_0, rs1, 6, rd, 0x03);
+-}
+-
+-static u32 rv_ld(u8 rd, u16 imm11_0, u8 rs1)
+-{
+- return rv_i_insn(imm11_0, rs1, 3, rd, 0x03);
+-}
+-
+-static u32 rv_amoadd_w(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+-{
+- return rv_amo_insn(0, aq, rl, rs2, rs1, 2, rd, 0x2f);
+-}
+-
+-static u32 rv_amoadd_d(u8 rd, u8 rs2, u8 rs1, u8 aq, u8 rl)
+-{
+- return rv_amo_insn(0, aq, rl, rs2, rs1, 3, rd, 0x2f);
+-}
+-
+-static u32 rv_auipc(u8 rd, u32 imm31_12)
+-{
+- return rv_u_insn(imm31_12, rd, 0x17);
+-}
+-
+-static bool is_12b_int(s64 val)
+-{
+- return -(1 << 11) <= val && val < (1 << 11);
+-}
+-
+-static bool is_13b_int(s64 val)
+-{
+- return -(1 << 12) <= val && val < (1 << 12);
+-}
+-
+-static bool is_21b_int(s64 val)
+-{
+- return -(1L << 20) <= val && val < (1L << 20);
+-}
+-
+ static bool is_32b_int(s64 val)
+ {
+ return -(1L << 31) <= val && val < (1L << 31);
+ }
+
+-static int is_12b_check(int off, int insn)
+-{
+- if (!is_12b_int(off)) {
+- pr_err("bpf-jit: insn=%d 12b < offset=%d not supported yet!\n",
+- insn, (int)off);
+- return -1;
+- }
+- return 0;
+-}
+-
+ static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)
+ {
+ /* Note that the immediate from the add is sign-extended,
+@@ -535,23 +149,6 @@ static void emit_imm(u8 rd, s64 val, struct rv_jit_context *ctx)
+ emit(rv_addi(rd, rd, lower), ctx);
+ }
+
+-static int rv_offset(int insn, int off, struct rv_jit_context *ctx)
+-{
+- int from, to;
+-
+- off++; /* BPF branch is from PC+1, RV is from PC */
+- from = (insn > 0) ? ctx->offset[insn - 1] : 0;
+- to = (insn + off > 0) ? ctx->offset[insn + off - 1] : 0;
+- return (to - from) << 2;
+-}
+-
+-static int epilogue_offset(struct rv_jit_context *ctx)
+-{
+- int to = ctx->epilogue_offset, from = ctx->ninsns;
+-
+- return (to - from) << 2;
+-}
+-
+ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+ {
+ int stack_adjust = ctx->stack_size, store_offset = stack_adjust - 8;
+@@ -596,34 +193,6 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
+ ctx);
+ }
+
+-/* return -1 or inverted cond */
+-static int invert_bpf_cond(u8 cond)
+-{
+- switch (cond) {
+- case BPF_JEQ:
+- return BPF_JNE;
+- case BPF_JGT:
+- return BPF_JLE;
+- case BPF_JLT:
+- return BPF_JGE;
+- case BPF_JGE:
+- return BPF_JLT;
+- case BPF_JLE:
+- return BPF_JGT;
+- case BPF_JNE:
+- return BPF_JEQ;
+- case BPF_JSGT:
+- return BPF_JSLE;
+- case BPF_JSLT:
+- return BPF_JSGE;
+- case BPF_JSGE:
+- return BPF_JSLT;
+- case BPF_JSLE:
+- return BPF_JSGT;
+- }
+- return -1;
+-}
+-
+ static void emit_bcc(u8 cond, u8 rd, u8 rs, int rvoff,
+ struct rv_jit_context *ctx)
+ {
+@@ -855,8 +424,8 @@ static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
+ return 0;
+ }
+
+-static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+- bool extra_pass)
++int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
++ bool extra_pass)
+ {
+ bool is64 = BPF_CLASS(insn->code) == BPF_ALU64 ||
+ BPF_CLASS(insn->code) == BPF_JMP;
+@@ -1434,7 +1003,7 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ return 0;
+ }
+
+-static void build_prologue(struct rv_jit_context *ctx)
++void bpf_jit_build_prologue(struct rv_jit_context *ctx)
+ {
+ int stack_adjust = 0, store_offset, bpf_stack_adjust;
+
+@@ -1515,175 +1084,11 @@ static void build_prologue(struct rv_jit_context *ctx)
+ ctx->stack_size = stack_adjust;
+ }
+
+-static void build_epilogue(struct rv_jit_context *ctx)
++void bpf_jit_build_epilogue(struct rv_jit_context *ctx)
+ {
+ __build_epilogue(false, ctx);
+ }
+
+-static int build_body(struct rv_jit_context *ctx, bool extra_pass, int *offset)
+-{
+- const struct bpf_prog *prog = ctx->prog;
+- int i;
+-
+- for (i = 0; i < prog->len; i++) {
+- const struct bpf_insn *insn = &prog->insnsi[i];
+- int ret;
+-
+- ret = emit_insn(insn, ctx, extra_pass);
+- if (ret > 0) {
+- i++;
+- if (offset)
+- offset[i] = ctx->ninsns;
+- continue;
+- }
+- if (offset)
+- offset[i] = ctx->ninsns;
+- if (ret)
+- return ret;
+- }
+- return 0;
+-}
+-
+-static void bpf_fill_ill_insns(void *area, unsigned int size)
+-{
+- memset(area, 0, size);
+-}
+-
+-static void bpf_flush_icache(void *start, void *end)
+-{
+- flush_icache_range((unsigned long)start, (unsigned long)end);
+-}
+-
+-bool bpf_jit_needs_zext(void)
+-{
+- return true;
+-}
+-
+-struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
+-{
+- bool tmp_blinded = false, extra_pass = false;
+- struct bpf_prog *tmp, *orig_prog = prog;
+- int pass = 0, prev_ninsns = 0, i;
+- struct rv_jit_data *jit_data;
+- unsigned int image_size = 0;
+- struct rv_jit_context *ctx;
+-
+- if (!prog->jit_requested)
+- return orig_prog;
+-
+- tmp = bpf_jit_blind_constants(prog);
+- if (IS_ERR(tmp))
+- return orig_prog;
+- if (tmp != prog) {
+- tmp_blinded = true;
+- prog = tmp;
+- }
+-
+- jit_data = prog->aux->jit_data;
+- if (!jit_data) {
+- jit_data = kzalloc(sizeof(*jit_data), GFP_KERNEL);
+- if (!jit_data) {
+- prog = orig_prog;
+- goto out;
+- }
+- prog->aux->jit_data = jit_data;
+- }
+-
+- ctx = &jit_data->ctx;
+-
+- if (ctx->offset) {
+- extra_pass = true;
+- image_size = sizeof(u32) * ctx->ninsns;
+- goto skip_init_ctx;
+- }
+-
+- ctx->prog = prog;
+- ctx->offset = kcalloc(prog->len, sizeof(int), GFP_KERNEL);
+- if (!ctx->offset) {
+- prog = orig_prog;
+- goto out_offset;
+- }
+- for (i = 0; i < prog->len; i++) {
+- prev_ninsns += 32;
+- ctx->offset[i] = prev_ninsns;
+- }
+-
+- for (i = 0; i < 16; i++) {
+- pass++;
+- ctx->ninsns = 0;
+- if (build_body(ctx, extra_pass, ctx->offset)) {
+- prog = orig_prog;
+- goto out_offset;
+- }
+- build_prologue(ctx);
+- ctx->epilogue_offset = ctx->ninsns;
+- build_epilogue(ctx);
+-
+- if (ctx->ninsns == prev_ninsns) {
+- if (jit_data->header)
+- break;
+-
+- image_size = sizeof(u32) * ctx->ninsns;
+- jit_data->header =
+- bpf_jit_binary_alloc(image_size,
+- &jit_data->image,
+- sizeof(u32),
+- bpf_fill_ill_insns);
+- if (!jit_data->header) {
+- prog = orig_prog;
+- goto out_offset;
+- }
+-
+- ctx->insns = (u32 *)jit_data->image;
+- /* Now, when the image is allocated, the image
+- * can potentially shrink more (auipc/jalr ->
+- * jal).
+- */
+- }
+- prev_ninsns = ctx->ninsns;
+- }
+-
+- if (i == 16) {
+- pr_err("bpf-jit: image did not converge in <%d passes!\n", i);
+- bpf_jit_binary_free(jit_data->header);
+- prog = orig_prog;
+- goto out_offset;
+- }
+-
+-skip_init_ctx:
+- pass++;
+- ctx->ninsns = 0;
+-
+- build_prologue(ctx);
+- if (build_body(ctx, extra_pass, NULL)) {
+- bpf_jit_binary_free(jit_data->header);
+- prog = orig_prog;
+- goto out_offset;
+- }
+- build_epilogue(ctx);
+-
+- if (bpf_jit_enable > 1)
+- bpf_jit_dump(prog->len, image_size, pass, ctx->insns);
+-
+- prog->bpf_func = (void *)ctx->insns;
+- prog->jited = 1;
+- prog->jited_len = image_size;
+-
+- bpf_flush_icache(jit_data->header, ctx->insns + ctx->ninsns);
+-
+- if (!prog->is_func || extra_pass) {
+-out_offset:
+- kfree(ctx->offset);
+- kfree(jit_data);
+- prog->aux->jit_data = NULL;
+- }
+-out:
+- if (tmp_blinded)
+- bpf_jit_prog_release_other(prog, prog == orig_prog ?
+- tmp : orig_prog);
+- return prog;
+-}
+-
+ void *bpf_jit_alloc_exec(unsigned long size)
+ {
+ return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
+diff --git a/arch/riscv/net/bpf_jit_core.c b/arch/riscv/net/bpf_jit_core.c
+new file mode 100644
+index 000000000000..709b94ece3ed
+--- /dev/null
++++ b/arch/riscv/net/bpf_jit_core.c
+@@ -0,0 +1,166 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Common functionality for RV32 and RV64 BPF JIT compilers
++ *
++ * Copyright (c) 2019 Björn Töpel <bjorn.topel@gmail.com>
++ *
++ */
++
++#include <linux/bpf.h>
++#include <linux/filter.h>
++#include "bpf_jit.h"
++
++/* Number of iterations to try until offsets converge. */
++#define NR_JIT_ITERATIONS 16
++
++static int build_body(struct rv_jit_context *ctx, bool extra_pass, int *offset)
++{
++ const struct bpf_prog *prog = ctx->prog;
++ int i;
++
++ for (i = 0; i < prog->len; i++) {
++ const struct bpf_insn *insn = &prog->insnsi[i];
++ int ret;
++
++ ret = bpf_jit_emit_insn(insn, ctx, extra_pass);
++ /* BPF_LD | BPF_IMM | BPF_DW: skip the next instruction. */
++ if (ret > 0)
++ i++;
++ if (offset)
++ offset[i] = ctx->ninsns;
++ if (ret < 0)
++ return ret;
++ }
++ return 0;
++}
++
++bool bpf_jit_needs_zext(void)
++{
++ return true;
++}
++
++struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
++{
++ bool tmp_blinded = false, extra_pass = false;
++ struct bpf_prog *tmp, *orig_prog = prog;
++ int pass = 0, prev_ninsns = 0, i;
++ struct rv_jit_data *jit_data;
++ struct rv_jit_context *ctx;
++ unsigned int image_size = 0;
++
++ if (!prog->jit_requested)
++ return orig_prog;
++
++ tmp = bpf_jit_blind_constants(prog);
++ if (IS_ERR(tmp))
++ return orig_prog;
++ if (tmp != prog) {
++ tmp_blinded = true;
++ prog = tmp;
++ }
++
++ jit_data = prog->aux->jit_data;
++ if (!jit_data) {
++ jit_data = kzalloc(sizeof(*jit_data), GFP_KERNEL);
++ if (!jit_data) {
++ prog = orig_prog;
++ goto out;
++ }
++ prog->aux->jit_data = jit_data;
++ }
++
++ ctx = &jit_data->ctx;
++
++ if (ctx->offset) {
++ extra_pass = true;
++ image_size = sizeof(u32) * ctx->ninsns;
++ goto skip_init_ctx;
++ }
++
++ ctx->prog = prog;
++ ctx->offset = kcalloc(prog->len, sizeof(int), GFP_KERNEL);
++ if (!ctx->offset) {
++ prog = orig_prog;
++ goto out_offset;
++ }
++ for (i = 0; i < prog->len; i++) {
++ prev_ninsns += 32;
++ ctx->offset[i] = prev_ninsns;
++ }
++
++ for (i = 0; i < NR_JIT_ITERATIONS; i++) {
++ pass++;
++ ctx->ninsns = 0;
++ if (build_body(ctx, extra_pass, ctx->offset)) {
++ prog = orig_prog;
++ goto out_offset;
++ }
++ bpf_jit_build_prologue(ctx);
++ ctx->epilogue_offset = ctx->ninsns;
++ bpf_jit_build_epilogue(ctx);
++
++ if (ctx->ninsns == prev_ninsns) {
++ if (jit_data->header)
++ break;
++
++ image_size = sizeof(u32) * ctx->ninsns;
++ jit_data->header =
++ bpf_jit_binary_alloc(image_size,
++ &jit_data->image,
++ sizeof(u32),
++ bpf_fill_ill_insns);
++ if (!jit_data->header) {
++ prog = orig_prog;
++ goto out_offset;
++ }
++
++ ctx->insns = (u32 *)jit_data->image;
++ /*
++ * Now, when the image is allocated, the image can
++ * potentially shrink more (auipc/jalr -> jal).
++ */
++ }
++ prev_ninsns = ctx->ninsns;
++ }
++
++ if (i == NR_JIT_ITERATIONS) {
++ pr_err("bpf-jit: image did not converge in <%d passes!\n", i);
++ bpf_jit_binary_free(jit_data->header);
++ prog = orig_prog;
++ goto out_offset;
++ }
++
++skip_init_ctx:
++ pass++;
++ ctx->ninsns = 0;
++
++ bpf_jit_build_prologue(ctx);
++ if (build_body(ctx, extra_pass, NULL)) {
++ bpf_jit_binary_free(jit_data->header);
++ prog = orig_prog;
++ goto out_offset;
++ }
++ bpf_jit_build_epilogue(ctx);
++
++ if (bpf_jit_enable > 1)
++ bpf_jit_dump(prog->len, image_size, pass, ctx->insns);
++
++ prog->bpf_func = (void *)ctx->insns;
++ prog->jited = 1;
++ prog->jited_len = image_size;
++
++ bpf_flush_icache(jit_data->header, ctx->insns + ctx->ninsns);
++
++ if (!prog->is_func || extra_pass) {
++out_offset:
++ kfree(ctx->offset);
++ kfree(jit_data);
++ prog->aux->jit_data = NULL;
++ }
++out:
++
++ if (tmp_blinded)
++ bpf_jit_prog_release_other(prog, prog == orig_prog ?
++ tmp : orig_prog);
++ return prog;
++}commit 46dd3d7d287b4f1850a4fe02d74587b5375ec4ab
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Thu Jul 4 17:18:02 2019 -0700
+
+ bpf, riscv: Enable zext optimization for more RV64G ALU ops
+
+ Commit 66d0d5a854a6 ("riscv: bpf: eliminate zero extension code-gen")
+ added the new zero-extension optimization for some BPF ALU operations.
+
+ Since then, bugs in the JIT that have been fixed in the bpf tree require
+ this optimization to be added to other operations: commit 1e692f09e091
+ ("bpf, riscv: clear high 32 bits for ALU32 add/sub/neg/lsh/rsh/arsh"),
+ and commit fe121ee531d1 ("bpf, riscv: clear target register high 32-bits
+ for and/or/xor on ALU32").
+
+ Now that these have been merged to bpf-next, the zext optimization can
+ be enabled for the fixed operations.
+
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Cc: Song Liu <liu.song.a23@gmail.com>
+ Cc: Jiong Wang <jiong.wang@netronome.com>
+ Cc: Xi Wang <xi.wang@gmail.com>
+ Acked-by: Björn Töpel <bjorn.topel@gmail.com>
+ Acked-by: Jiong Wang <jiong.wang@netronome.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+
+diff --git a/arch/riscv/net/bpf_jit_comp.c b/arch/riscv/net/bpf_jit_comp.c
+index 876cb9c705ce..5451ef3845f2 100644
+--- a/arch/riscv/net/bpf_jit_comp.c
++++ b/arch/riscv/net/bpf_jit_comp.c
+@@ -757,31 +757,31 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_ADD | BPF_X:
+ case BPF_ALU64 | BPF_ADD | BPF_X:
+ emit(is64 ? rv_add(rd, rd, rs) : rv_addw(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_SUB | BPF_X:
+ case BPF_ALU64 | BPF_SUB | BPF_X:
+ emit(is64 ? rv_sub(rd, rd, rs) : rv_subw(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_AND | BPF_X:
+ case BPF_ALU64 | BPF_AND | BPF_X:
+ emit(rv_and(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_OR | BPF_X:
+ case BPF_ALU64 | BPF_OR | BPF_X:
+ emit(rv_or(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_XOR | BPF_X:
+ case BPF_ALU64 | BPF_XOR | BPF_X:
+ emit(rv_xor(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_MUL | BPF_X:
+@@ -811,13 +811,13 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU | BPF_RSH | BPF_X:
+ case BPF_ALU64 | BPF_RSH | BPF_X:
+ emit(is64 ? rv_srl(rd, rd, rs) : rv_srlw(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ case BPF_ALU | BPF_ARSH | BPF_X:
+ case BPF_ALU64 | BPF_ARSH | BPF_X:
+ emit(is64 ? rv_sra(rd, rd, rs) : rv_sraw(rd, rd, rs), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+
+@@ -826,7 +826,7 @@ static int emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
+ case BPF_ALU64 | BPF_NEG:
+ emit(is64 ? rv_sub(rd, RV_REG_ZERO, rd) :
+ rv_subw(rd, RV_REG_ZERO, rd), ctx);
+- if (!is64)
++ if (!is64 && !aux->verifier_zext)
+ emit_zext_32(rd, ctx);
+ break;
+ commit ac8786c72eba67dfc8ae751a75c586289a1b9b1b
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri Jun 28 22:57:51 2019 -0700
+
+ selftests: bpf: add tests for shifts by zero
+
+ There are currently no tests for ALU64 shift operations when the shift
+ amount is 0. This adds 6 new tests to make sure they are equivalent
+ to a no-op. The x32 JIT had such bugs that could have been caught by
+ these tests.
+
+ Cc: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+
+diff --git a/tools/testing/selftests/bpf/verifier/basic_instr.c b/tools/testing/selftests/bpf/verifier/basic_instr.c
+index ed91a7b9a456..071dbc889e8c 100644
+--- a/tools/testing/selftests/bpf/verifier/basic_instr.c
++++ b/tools/testing/selftests/bpf/verifier/basic_instr.c
+@@ -90,6 +90,91 @@
+ },
+ .result = ACCEPT,
+ },
++{
++ "lsh64 by 0 imm",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 1),
++ BPF_ALU64_IMM(BPF_LSH, BPF_REG_1, 0),
++ BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 1, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
++{
++ "rsh64 by 0 imm",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 0x100000000LL),
++ BPF_ALU64_REG(BPF_MOV, BPF_REG_2, BPF_REG_1),
++ BPF_ALU64_IMM(BPF_RSH, BPF_REG_1, 0),
++ BPF_JMP_REG(BPF_JEQ, BPF_REG_1, BPF_REG_2, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
++{
++ "arsh64 by 0 imm",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 0x100000000LL),
++ BPF_ALU64_REG(BPF_MOV, BPF_REG_2, BPF_REG_1),
++ BPF_ALU64_IMM(BPF_ARSH, BPF_REG_1, 0),
++ BPF_JMP_REG(BPF_JEQ, BPF_REG_1, BPF_REG_2, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
++{
++ "lsh64 by 0 reg",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 1),
++ BPF_LD_IMM64(BPF_REG_2, 0),
++ BPF_ALU64_REG(BPF_LSH, BPF_REG_1, BPF_REG_2),
++ BPF_JMP_IMM(BPF_JEQ, BPF_REG_1, 1, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
++{
++ "rsh64 by 0 reg",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 0x100000000LL),
++ BPF_ALU64_REG(BPF_MOV, BPF_REG_2, BPF_REG_1),
++ BPF_LD_IMM64(BPF_REG_3, 0),
++ BPF_ALU64_REG(BPF_RSH, BPF_REG_1, BPF_REG_3),
++ BPF_JMP_REG(BPF_JEQ, BPF_REG_1, BPF_REG_2, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
++{
++ "arsh64 by 0 reg",
++ .insns = {
++ BPF_LD_IMM64(BPF_REG_0, 1),
++ BPF_LD_IMM64(BPF_REG_1, 0x100000000LL),
++ BPF_ALU64_REG(BPF_MOV, BPF_REG_2, BPF_REG_1),
++ BPF_LD_IMM64(BPF_REG_3, 0),
++ BPF_ALU64_REG(BPF_ARSH, BPF_REG_1, BPF_REG_3),
++ BPF_JMP_REG(BPF_JEQ, BPF_REG_1, BPF_REG_2, 1),
++ BPF_MOV64_IMM(BPF_REG_0, 2),
++ BPF_EXIT_INSN(),
++ },
++ .result = ACCEPT,
++ .retval = 1,
++},
+ {
+ "invalid 64-bit BPF_END",
+ .insns = {commit 6fa632e719eec4d1b1ebf3ddc0b2d667997b057b
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri Jun 28 22:57:50 2019 -0700
+
+ bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_K shift by 0
+
+ The current x32 BPF JIT does not correctly compile shift operations when
+ the immediate shift amount is 0. The expected behavior is for this to
+ be a no-op.
+
+ The following program demonstrates the bug. The expexceted result is 1,
+ but the current JITed code returns 2.
+
+ r0 = 1
+ r1 = 1
+ r1 <<= 0
+ if r1 == 1 goto end
+ r0 = 2
+ end:
+ exit
+
+ This patch simplifies the code and fixes the bug.
+
+ Fixes: 03f5781be2c7 ("bpf, x86_32: add eBPF JIT compiler for ia32")
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index f34ef513f4f9..1d12d2174085 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -894,27 +894,10 @@ static inline void emit_ia32_lsh_i64(const u8 dst[], const u32 val,
+ }
+ /* Do LSH operation */
+ if (val < 32) {
+- /* shl dreg_hi,imm8 */
+- EMIT3(0xC1, add_1reg(0xE0, dreg_hi), val);
+- /* mov ebx,dreg_lo */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_lo, IA32_EBX));
++ /* shld dreg_hi,dreg_lo,imm8 */
++ EMIT4(0x0F, 0xA4, add_2reg(0xC0, dreg_hi, dreg_lo), val);
+ /* shl dreg_lo,imm8 */
+ EMIT3(0xC1, add_1reg(0xE0, dreg_lo), val);
+-
+- /* IA32_ECX = 32 - val */
+- /* mov ecx,val */
+- EMIT2(0xB1, val);
+- /* movzx ecx,ecx */
+- EMIT3(0x0F, 0xB6, add_2reg(0xC0, IA32_ECX, IA32_ECX));
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shr ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE8, IA32_EBX));
+- /* or dreg_hi,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_hi, IA32_EBX));
+ } else if (val >= 32 && val < 64) {
+ u32 value = val - 32;
+
+@@ -960,27 +943,10 @@ static inline void emit_ia32_rsh_i64(const u8 dst[], const u32 val,
+
+ /* Do RSH operation */
+ if (val < 32) {
+- /* shr dreg_lo,imm8 */
+- EMIT3(0xC1, add_1reg(0xE8, dreg_lo), val);
+- /* mov ebx,dreg_hi */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_hi, IA32_EBX));
++ /* shrd dreg_lo,dreg_hi,imm8 */
++ EMIT4(0x0F, 0xAC, add_2reg(0xC0, dreg_lo, dreg_hi), val);
+ /* shr dreg_hi,imm8 */
+ EMIT3(0xC1, add_1reg(0xE8, dreg_hi), val);
+-
+- /* IA32_ECX = 32 - val */
+- /* mov ecx,val */
+- EMIT2(0xB1, val);
+- /* movzx ecx,ecx */
+- EMIT3(0x0F, 0xB6, add_2reg(0xC0, IA32_ECX, IA32_ECX));
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shl ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE0, IA32_EBX));
+- /* or dreg_lo,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_lo, IA32_EBX));
+ } else if (val >= 32 && val < 64) {
+ u32 value = val - 32;
+
+@@ -1025,27 +991,10 @@ static inline void emit_ia32_arsh_i64(const u8 dst[], const u32 val,
+ }
+ /* Do RSH operation */
+ if (val < 32) {
+- /* shr dreg_lo,imm8 */
+- EMIT3(0xC1, add_1reg(0xE8, dreg_lo), val);
+- /* mov ebx,dreg_hi */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_hi, IA32_EBX));
++ /* shrd dreg_lo,dreg_hi,imm8 */
++ EMIT4(0x0F, 0xAC, add_2reg(0xC0, dreg_lo, dreg_hi), val);
+ /* ashr dreg_hi,imm8 */
+ EMIT3(0xC1, add_1reg(0xF8, dreg_hi), val);
+-
+- /* IA32_ECX = 32 - val */
+- /* mov ecx,val */
+- EMIT2(0xB1, val);
+- /* movzx ecx,ecx */
+- EMIT3(0x0F, 0xB6, add_2reg(0xC0, IA32_ECX, IA32_ECX));
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shl ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE0, IA32_EBX));
+- /* or dreg_lo,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_lo, IA32_EBX));
+ } else if (val >= 32 && val < 64) {
+ u32 value = val - 32;
+
+ commit 68a8357ec15bdce55266e9fba8b8b3b8143fa7d2
+Author: Luke Nelson <lukenels@cs.washington.edu>
+Date: Fri Jun 28 22:57:49 2019 -0700
+
+ bpf, x32: Fix bug with ALU64 {LSH, RSH, ARSH} BPF_X shift by 0
+
+ The current x32 BPF JIT for shift operations is not correct when the
+ shift amount in a register is 0. The expected behavior is a no-op, whereas
+ the current implementation changes bits in the destination register.
+
+ The following example demonstrates the bug. The expected result of this
+ program is 1, but the current JITed code returns 2.
+
+ r0 = 1
+ r1 = 1
+ r2 = 0
+ r1 <<= r2
+ if r1 == 1 goto end
+ r0 = 2
+ end:
+ exit
+
+ The bug is caused by an incorrect assumption by the JIT that a shift by
+ 32 clear the register. On x32 however, shifts use the lower 5 bits of
+ the source, making a shift by 32 equivalent to a shift by 0.
+
+ This patch fixes the bug using double-precision shifts, which also
+ simplifies the code.
+
+ Fixes: 03f5781be2c7 ("bpf, x86_32: add eBPF JIT compiler for ia32")
+ Co-developed-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Xi Wang <xi.wang@gmail.com>
+ Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+
+diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
+index b29e82f190c7..f34ef513f4f9 100644
+--- a/arch/x86/net/bpf_jit_comp32.c
++++ b/arch/x86/net/bpf_jit_comp32.c
+@@ -724,9 +724,6 @@ static inline void emit_ia32_lsh_r64(const u8 dst[], const u8 src[],
+ {
+ u8 *prog = *pprog;
+ int cnt = 0;
+- static int jmp_label1 = -1;
+- static int jmp_label2 = -1;
+- static int jmp_label3 = -1;
+ u8 dreg_lo = dstk ? IA32_EAX : dst_lo;
+ u8 dreg_hi = dstk ? IA32_EDX : dst_hi;
+
+@@ -745,79 +742,23 @@ static inline void emit_ia32_lsh_r64(const u8 dst[], const u8 src[],
+ /* mov ecx,src_lo */
+ EMIT2(0x8B, add_2reg(0xC0, src_lo, IA32_ECX));
+
+- /* cmp ecx,32 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
+- /* Jumps when >= 32 */
+- if (is_imm8(jmp_label(jmp_label1, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label1, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label1, 6));
+-
+- /* < 32 */
+- /* shl dreg_hi,cl */
+- EMIT2(0xD3, add_1reg(0xE0, dreg_hi));
+- /* mov ebx,dreg_lo */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_lo, IA32_EBX));
++ /* shld dreg_hi,dreg_lo,cl */
++ EMIT3(0x0F, 0xA5, add_2reg(0xC0, dreg_hi, dreg_lo));
+ /* shl dreg_lo,cl */
+ EMIT2(0xD3, add_1reg(0xE0, dreg_lo));
+
+- /* IA32_ECX = -IA32_ECX + 32 */
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shr ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE8, IA32_EBX));
+- /* or dreg_hi,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_hi, IA32_EBX));
+-
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 32 */
+- if (jmp_label1 == -1)
+- jmp_label1 = cnt;
++ /* if ecx >= 32, mov dreg_lo into dreg_hi and clear dreg_lo */
+
+- /* cmp ecx,64 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 64);
+- /* Jumps when >= 64 */
+- if (is_imm8(jmp_label(jmp_label2, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label2, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label2, 6));
++ /* cmp ecx,32 */
++ EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
++ /* skip the next two instructions (4 bytes) when < 32 */
++ EMIT2(IA32_JB, 4);
+
+- /* >= 32 && < 64 */
+- /* sub ecx,32 */
+- EMIT3(0x83, add_1reg(0xE8, IA32_ECX), 32);
+- /* shl dreg_lo,cl */
+- EMIT2(0xD3, add_1reg(0xE0, dreg_lo));
+ /* mov dreg_hi,dreg_lo */
+ EMIT2(0x89, add_2reg(0xC0, dreg_hi, dreg_lo));
+-
+ /* xor dreg_lo,dreg_lo */
+ EMIT2(0x33, add_2reg(0xC0, dreg_lo, dreg_lo));
+
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 64 */
+- if (jmp_label2 == -1)
+- jmp_label2 = cnt;
+- /* xor dreg_lo,dreg_lo */
+- EMIT2(0x33, add_2reg(0xC0, dreg_lo, dreg_lo));
+- /* xor dreg_hi,dreg_hi */
+- EMIT2(0x33, add_2reg(0xC0, dreg_hi, dreg_hi));
+-
+- if (jmp_label3 == -1)
+- jmp_label3 = cnt;
+-
+ if (dstk) {
+ /* mov dword ptr [ebp+off],dreg_lo */
+ EMIT3(0x89, add_2reg(0x40, IA32_EBP, dreg_lo),
+@@ -836,9 +777,6 @@ static inline void emit_ia32_arsh_r64(const u8 dst[], const u8 src[],
+ {
+ u8 *prog = *pprog;
+ int cnt = 0;
+- static int jmp_label1 = -1;
+- static int jmp_label2 = -1;
+- static int jmp_label3 = -1;
+ u8 dreg_lo = dstk ? IA32_EAX : dst_lo;
+ u8 dreg_hi = dstk ? IA32_EDX : dst_hi;
+
+@@ -857,78 +795,22 @@ static inline void emit_ia32_arsh_r64(const u8 dst[], const u8 src[],
+ /* mov ecx,src_lo */
+ EMIT2(0x8B, add_2reg(0xC0, src_lo, IA32_ECX));
+
+- /* cmp ecx,32 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
+- /* Jumps when >= 32 */
+- if (is_imm8(jmp_label(jmp_label1, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label1, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label1, 6));
+-
+- /* < 32 */
+- /* lshr dreg_lo,cl */
+- EMIT2(0xD3, add_1reg(0xE8, dreg_lo));
+- /* mov ebx,dreg_hi */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_hi, IA32_EBX));
+- /* ashr dreg_hi,cl */
++ /* shrd dreg_lo,dreg_hi,cl */
++ EMIT3(0x0F, 0xAD, add_2reg(0xC0, dreg_lo, dreg_hi));
++ /* sar dreg_hi,cl */
+ EMIT2(0xD3, add_1reg(0xF8, dreg_hi));
+
+- /* IA32_ECX = -IA32_ECX + 32 */
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shl ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE0, IA32_EBX));
+- /* or dreg_lo,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_lo, IA32_EBX));
+-
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 32 */
+- if (jmp_label1 == -1)
+- jmp_label1 = cnt;
++ /* if ecx >= 32, mov dreg_hi to dreg_lo and set/clear dreg_hi depending on sign */
+
+- /* cmp ecx,64 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 64);
+- /* Jumps when >= 64 */
+- if (is_imm8(jmp_label(jmp_label2, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label2, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label2, 6));
++ /* cmp ecx,32 */
++ EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
++ /* skip the next two instructions (5 bytes) when < 32 */
++ EMIT2(IA32_JB, 5);
+
+- /* >= 32 && < 64 */
+- /* sub ecx,32 */
+- EMIT3(0x83, add_1reg(0xE8, IA32_ECX), 32);
+- /* ashr dreg_hi,cl */
+- EMIT2(0xD3, add_1reg(0xF8, dreg_hi));
+ /* mov dreg_lo,dreg_hi */
+ EMIT2(0x89, add_2reg(0xC0, dreg_lo, dreg_hi));
+-
+- /* ashr dreg_hi,imm8 */
+- EMIT3(0xC1, add_1reg(0xF8, dreg_hi), 31);
+-
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 64 */
+- if (jmp_label2 == -1)
+- jmp_label2 = cnt;
+- /* ashr dreg_hi,imm8 */
++ /* sar dreg_hi,31 */
+ EMIT3(0xC1, add_1reg(0xF8, dreg_hi), 31);
+- /* mov dreg_lo,dreg_hi */
+- EMIT2(0x89, add_2reg(0xC0, dreg_lo, dreg_hi));
+-
+- if (jmp_label3 == -1)
+- jmp_label3 = cnt;
+
+ if (dstk) {
+ /* mov dword ptr [ebp+off],dreg_lo */
+@@ -948,9 +830,6 @@ static inline void emit_ia32_rsh_r64(const u8 dst[], const u8 src[], bool dstk,
+ {
+ u8 *prog = *pprog;
+ int cnt = 0;
+- static int jmp_label1 = -1;
+- static int jmp_label2 = -1;
+- static int jmp_label3 = -1;
+ u8 dreg_lo = dstk ? IA32_EAX : dst_lo;
+ u8 dreg_hi = dstk ? IA32_EDX : dst_hi;
+
+@@ -969,77 +848,23 @@ static inline void emit_ia32_rsh_r64(const u8 dst[], const u8 src[], bool dstk,
+ /* mov ecx,src_lo */
+ EMIT2(0x8B, add_2reg(0xC0, src_lo, IA32_ECX));
+
+- /* cmp ecx,32 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
+- /* Jumps when >= 32 */
+- if (is_imm8(jmp_label(jmp_label1, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label1, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label1, 6));
+-
+- /* < 32 */
+- /* lshr dreg_lo,cl */
+- EMIT2(0xD3, add_1reg(0xE8, dreg_lo));
+- /* mov ebx,dreg_hi */
+- EMIT2(0x8B, add_2reg(0xC0, dreg_hi, IA32_EBX));
++ /* shrd dreg_lo,dreg_hi,cl */
++ EMIT3(0x0F, 0xAD, add_2reg(0xC0, dreg_lo, dreg_hi));
+ /* shr dreg_hi,cl */
+ EMIT2(0xD3, add_1reg(0xE8, dreg_hi));
+
+- /* IA32_ECX = -IA32_ECX + 32 */
+- /* neg ecx */
+- EMIT2(0xF7, add_1reg(0xD8, IA32_ECX));
+- /* add ecx,32 */
+- EMIT3(0x83, add_1reg(0xC0, IA32_ECX), 32);
+-
+- /* shl ebx,cl */
+- EMIT2(0xD3, add_1reg(0xE0, IA32_EBX));
+- /* or dreg_lo,ebx */
+- EMIT2(0x09, add_2reg(0xC0, dreg_lo, IA32_EBX));
++ /* if ecx >= 32, mov dreg_hi to dreg_lo and clear dreg_hi */
+
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 32 */
+- if (jmp_label1 == -1)
+- jmp_label1 = cnt;
+- /* cmp ecx,64 */
+- EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 64);
+- /* Jumps when >= 64 */
+- if (is_imm8(jmp_label(jmp_label2, 2)))
+- EMIT2(IA32_JAE, jmp_label(jmp_label2, 2));
+- else
+- EMIT2_off32(0x0F, IA32_JAE + 0x10, jmp_label(jmp_label2, 6));
++ /* cmp ecx,32 */
++ EMIT3(0x83, add_1reg(0xF8, IA32_ECX), 32);
++ /* skip the next two instructions (4 bytes) when < 32 */
++ EMIT2(IA32_JB, 4);
+
+- /* >= 32 && < 64 */
+- /* sub ecx,32 */
+- EMIT3(0x83, add_1reg(0xE8, IA32_ECX), 32);
+- /* shr dreg_hi,cl */
+- EMIT2(0xD3, add_1reg(0xE8, dreg_hi));
+ /* mov dreg_lo,dreg_hi */
+ EMIT2(0x89, add_2reg(0xC0, dreg_lo, dreg_hi));
+ /* xor dreg_hi,dreg_hi */
+ EMIT2(0x33, add_2reg(0xC0, dreg_hi, dreg_hi));
+
+- /* goto out; */
+- if (is_imm8(jmp_label(jmp_label3, 2)))
+- EMIT2(0xEB, jmp_label(jmp_label3, 2));
+- else
+- EMIT1_off32(0xE9, jmp_label(jmp_label3, 5));
+-
+- /* >= 64 */
+- if (jmp_label2 == -1)
+- jmp_label2 = cnt;
+- /* xor dreg_lo,dreg_lo */
+- EMIT2(0x33, add_2reg(0xC0, dreg_lo, dreg_lo));
+- /* xor dreg_hi,dreg_hi */
+- EMIT2(0x33, add_2reg(0xC0, dreg_hi, dreg_hi));
+-
+- if (jmp_label3 == -1)
+- jmp_label3 = cnt;
+-
+ if (dstk) {
+ /* mov dword ptr [ebp+off],dreg_lo */
+ EMIT3(0x89, add_2reg(0x40, IA32_EBP, dreg_lo),commit 39d84a58ad6290a43e6503acc8b54ebb7e4ecc54
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Mon Jun 18 11:04:55 2012 +0000
+
+ sctp: fix warning when compiling without IPv6
+
+ net/sctp/protocol.c: In function ‘sctp_addr_wq_timeout_handler’:
+ net/sctp/protocol.c:676: warning: label ‘free_next’ defined but not used
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
+index 5942d27b1444..9c90811d1134 100644
+--- a/net/sctp/protocol.c
++++ b/net/sctp/protocol.c
+@@ -673,7 +673,9 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)
+ SCTP_DEBUG_PRINTK("sctp_addrwq_timo_handler: sctp_asconf_mgmt failed\n");
+ sctp_bh_unlock_sock(sk);
+ }
++#if IS_ENABLED(CONFIG_IPV6)
+ free_next:
++#endif
+ list_del(&addrw->list);
+ kfree(addrw);
+ }commit faa85aa24286a9e14ae7cc797352350c3ac39986
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Tue Jan 3 13:53:16 2012 -0500
+
+ skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP
+
+ drivers/net/ethernet/marvell/skge.c:4046: warning: ‘skge_suspend’ defined but not used
+ drivers/net/ethernet/marvell/skge.c:4071: warning: ‘skge_resume’ defined but not used
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Cc: Stephen Hemminger <shemminger@linux-foundation.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
+index b3f636813089..18a87a57fc0a 100644
+--- a/drivers/net/ethernet/marvell/skge.c
++++ b/drivers/net/ethernet/marvell/skge.c
+@@ -4042,7 +4042,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
+ pci_set_drvdata(pdev, NULL);
+ }
+
+-#ifdef CONFIG_PM
++#ifdef CONFIG_PM_SLEEP
+ static int skge_suspend(struct device *dev)
+ {
+ struct pci_dev *pdev = to_pci_dev(dev);
+@@ -4104,7 +4104,7 @@ static SIMPLE_DEV_PM_OPS(skge_pm_ops, skge_suspend, skge_resume);
+ #else
+
+ #define SKGE_PM_OPS NULL
+-#endif
++#endif /* CONFIG_PM_SLEEP */
+
+ static void skge_shutdown(struct pci_dev *pdev)
+ {commit f090fba305658fe6e464e2fbd25fad81957ece26
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Thu Aug 25 23:11:15 2011 -0700
+
+ iwlagn: fix compile warnings when CONFIG_PM_SLEEP is not set
+
+ CC [M] drivers/net/wireless/iwlwifi/iwl-pci.o
+ drivers/net/wireless/iwlwifi/iwl-pci.c:506: warning: iwl_pci_suspend defined but not used
+ drivers/net/wireless/iwlwifi/iwl-pci.c:519: warning: iwl_pci_resume defined but not used
+
+ These are only used if CONFIG_PM_SLEEP is enabled. CONFIG_PM depends
+ (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME), so it can be set without
+ CONFIG_PM_SLEEP selected.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
+index 17f3fb241b6f..62c35a5fea80 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
++++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
+@@ -506,7 +506,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
+ iwl_pci_down(bus);
+ }
+
+-#ifdef CONFIG_PM
++#ifdef CONFIG_PM_SLEEP
+
+ static int iwl_pci_suspend(struct device *device)
+ {commit 2e5d04dad1934d97057cbecce59834f78dafc067
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Fri May 27 08:40:28 2011 -0700
+
+ iwlwifi: disambiguate invalid DMA index warnings
+
+ The exact same error message is used in three different functions in
+ iwlagn. Add the function name to the error string to disambiguate where
+ the error is coming from.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+index f803fb62f8bc..4ab77c8a584c 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+@@ -408,9 +408,9 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,
+ unsigned long flags;
+
+ if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
+- IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
+- "is out of range [0-%d] %d %d\n", txq_id,
+- index, txq->q.n_bd, txq->q.write_ptr,
++ IWL_ERR(priv, "%s: Read index for DMA queue txq_id (%d) "
++ "index %d is out of range [0-%d] %d %d\n", __func__,
++ txq_id, index, txq->q.n_bd, txq->q.write_ptr,
+ txq->q.read_ptr);
+ return;
+ }
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+index 4974cd7837cb..ce7b49139030 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -1236,9 +1236,9 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
+ struct ieee80211_hdr *hdr;
+
+ if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
+- IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "
+- "is out of range [0-%d] %d %d.\n", txq_id,
+- index, q->n_bd, q->write_ptr, q->read_ptr);
++ IWL_ERR(priv, "%s: Read index for DMA queue txq id (%d), "
++ "index %d is out of range [0-%d] %d %d.\n", __func__,
++ txq_id, index, q->n_bd, q->write_ptr, q->read_ptr);
+ return 0;
+ }
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
+index 686e176b5ebd..1084fe0e8a86 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
+@@ -753,9 +753,9 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int idx)
+ int nfreed = 0;
+
+ if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) {
+- IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "
+- "is out of range [0-%d] %d %d.\n", txq_id,
+- idx, q->n_bd, q->write_ptr, q->read_ptr);
++ IWL_ERR(priv, "%s: Read index for DMA queue txq id (%d), "
++ "index %d is out of range [0-%d] %d %d.\n", __func__,
++ txq_id, idx, q->n_bd, q->write_ptr, q->read_ptr);
+ return;
+ }
+ commit 21fdc87248d1d28492c775e05fa92b3c8c7bc8db +Author: Daniel Halperin <dhalperi@cs.washington.edu> +Date: Tue May 31 11:59:30 2011 -0700 + + ath9k: fix two more bugs in tx power + + This is the same fix as + + commit 841051602e3fa18ea468fe5a177aa92b6eb44b56 + Author: Matteo Croce <technoboy85@gmail.com> + Date: Fri Dec 3 02:25:08 2010 +0100 + + The ath9k driver subtracts 3 dBm to the txpower as with two radios the + signal power is doubled. + The resulting value is assigned in an u16 which overflows and makes + the card work at full power. + + in two more places. I grepped the ath tree and didn't find any others. + + Cc: stable@kernel.org + Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu> + Signed-off-by: John W. Linville <linville@tuxdriver.com> + +diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +index 0ca7635d0669..ff8150e46f0e 100644 +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +@@ -4645,10 +4645,16 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah, + case 1: + break; + case 2: +- scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; ++ if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN) ++ scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; ++ else ++ scaledPower = 0; + break; + case 3: +- scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; ++ if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN) ++ scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; ++ else ++ scaledPower = 0; + break; + } + +diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c +index 7856f0d4512d..343fc9f946db 100644 +--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c ++++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c +@@ -524,10 +524,16 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, + case 1: + break; + case 2: +- scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; ++ if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN) ++ scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; ++ else ++ scaledPower = 0; + break; + case 3: +- scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; ++ if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN) ++ scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; ++ else ++ scaledPower = 0; + break; + } + scaledPower = max((u16)0, scaledPower);
commit 20ba2861b09ae942398eda6d2dc0bf1019a97ddb
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Mon May 16 21:46:28 2011 -0700
+
+ iwlwifi: remove unused parameter from iwl_hcmd_queue_reclaim
+
+ cmd_index is never used.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
+index 54a935ff38fa..686e176b5ebd 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
+@@ -746,8 +746,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+ * need to be reclaimed. As result, some free space forms. If there is
+ * enough free space (> low mark), wake the stack that feeds us.
+ */
+-static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,
+- int idx, int cmd_idx)
++static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int idx)
+ {
+ struct iwl_tx_queue *txq = &priv->txq[txq_id];
+ struct iwl_queue *q = &txq->q;
+@@ -819,7 +818,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
+
+ spin_lock_irqsave(&priv->hcmd_lock, flags);
+
+- iwl_hcmd_queue_reclaim(priv, txq_id, index, cmd_index);
++ iwl_hcmd_queue_reclaim(priv, txq_id, index);
+
+ if (!(meta->flags & CMD_ASYNC)) {
+ clear_bit(STATUS_HCMD_ACTIVE, &priv->status);commit 8fddddff0ad4ccc2787464207eba9ed3063e69cd
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Tue May 10 19:00:45 2011 -0700
+
+ mac80211: fix contention time computation in minstrel, minstrel_ht
+
+ When transmitting a frame, the transmitter waits a random number of
+ slots between 0 and cw. Thus, the contention time is (cw / 2) * t_slot
+ which we can represent instead as (cw * t_slot) >> 1. Also fix a few
+ other accounting bugs around contention time, and add comments.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
+index 778c604d7939..8adac67395f7 100644
+--- a/net/mac80211/rc80211_minstrel.c
++++ b/net/mac80211/rc80211_minstrel.c
+@@ -417,8 +417,8 @@ minstrel_rate_init(void *priv, struct ieee80211_supported_band *sband,
+ tx_time_single = mr->ack_time + mr->perfect_tx_time;
+
+ /* contention window */
+- tx_time_single += t_slot + min(cw, mp->cw_max);
+- cw = (cw << 1) | 1;
++ tx_time_single += (t_slot * cw) >> 1;
++ cw = min((cw << 1) | 1, mp->cw_max);
+
+ tx_time += tx_time_single;
+ tx_time_cts += tx_time_single + mi->sp_ack_dur;
+diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
+index dbdebeda097f..3d09c58938e2 100644
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -464,6 +464,7 @@ minstrel_calc_retransmit(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
+ const struct mcs_group *group;
+ unsigned int tx_time, tx_time_rtscts, tx_time_data;
+ unsigned int cw = mp->cw_min;
++ unsigned int ctime = 0;
+ unsigned int t_slot = 9; /* FIXME */
+ unsigned int ampdu_len = MINSTREL_TRUNC(mi->avg_ampdu_len);
+
+@@ -480,13 +481,27 @@ minstrel_calc_retransmit(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
+
+ group = &minstrel_mcs_groups[index / MCS_GROUP_RATES];
+ tx_time_data = group->duration[index % MCS_GROUP_RATES] * ampdu_len;
+- tx_time = 2 * (t_slot + mi->overhead + tx_time_data);
+- tx_time_rtscts = 2 * (t_slot + mi->overhead_rtscts + tx_time_data);
++
++ /* Contention time for first 2 tries */
++ ctime = (t_slot * cw) >> 1;
++ cw = min((cw << 1) | 1, mp->cw_max);
++ ctime += (t_slot * cw) >> 1;
++ cw = min((cw << 1) | 1, mp->cw_max);
++
++ /* Total TX time for data and Contention after first 2 tries */
++ tx_time = ctime + 2 * (mi->overhead + tx_time_data);
++ tx_time_rtscts = ctime + 2 * (mi->overhead_rtscts + tx_time_data);
++
++ /* See how many more tries we can fit inside segment size */
+ do {
+- cw = (cw << 1) | 1;
+- cw = min(cw, mp->cw_max);
+- tx_time += cw + t_slot + mi->overhead;
+- tx_time_rtscts += cw + t_slot + mi->overhead_rtscts;
++ /* Contention time for this try */
++ ctime = (t_slot * cw) >> 1;
++ cw = min((cw << 1) | 1, mp->cw_max);
++
++ /* Total TX time after this try */
++ tx_time += ctime + mi->overhead + tx_time_data;
++ tx_time_rtscts += ctime + mi->overhead_rtscts + tx_time_data;
++
+ if (tx_time_rtscts < mp->segment_size)
+ mr->retry_count_rtscts++;
+ } while ((tx_time < mp->segment_size) &&commit 7caa2316bf0434f1150f58cb576542987a0466d7
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Wed Apr 6 12:47:25 2011 -0700
+
+ iwlwifi: fix frame injection for HT channels
+
+ For some reason, sending QoS configuration causes transmission to stop
+ after a single frame on HT channels when not associated. Removing the
+ extra QoS configuration has no effect on station mode, and fixes
+ injection mode.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+index dfdbea6e8f99..fbbde0712fa5 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+@@ -335,7 +335,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
+ struct ieee80211_channel *channel = conf->channel;
+ const struct iwl_channel_info *ch_info;
+ int ret = 0;
+- bool ht_changed[NUM_IWL_RXON_CTX] = {};
+
+ IWL_DEBUG_MAC80211(priv, "changed %#x", changed);
+
+@@ -383,10 +382,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
+
+ for_each_context(priv, ctx) {
+ /* Configure HT40 channels */
+- if (ctx->ht.enabled != conf_is_ht(conf)) {
++ if (ctx->ht.enabled != conf_is_ht(conf))
+ ctx->ht.enabled = conf_is_ht(conf);
+- ht_changed[ctx->ctxid] = true;
+- }
+
+ if (ctx->ht.enabled) {
+ if (conf_is_ht40_minus(conf)) {
+@@ -455,8 +452,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
+ if (!memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))
+ continue;
+ iwlagn_commit_rxon(priv, ctx);
+- if (ht_changed[ctx->ctxid])
+- iwlagn_update_qos(priv, ctx);
+ }
+ out:
+ mutex_unlock(&priv->mutex);commit 499fe9a419d43410be576bcc825658997b6ce822 +Author: Daniel Halperin <dhalperi@cs.washington.edu> +Date: Thu Mar 24 16:01:48 2011 -0700 + + mac80211: fix aggregation frame release during timeout + + Suppose the aggregation reorder buffer looks like this: + + x-T-R1-y-R2, + + where x and y are frames that have not been received, T is a received + frame that has timed out, and R1,R2 are received frames that have not + yet timed out. The proper behavior in this scenario is to move the + window past x (skipping it), release T and R1, and leave the window at y + until y is received or R2 times out. + + As written, this code will instead leave the window at R1, because it + has not yet timed out. Fix this by exiting the reorder loop only when + the frame that has not timed out AND there are skipped frames earlier in + the current valid window. + + Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu> + Signed-off-by: John W. Linville <linville@tuxdriver.com> + +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index 5c1930ba8ebe..aa5cc37b4921 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -612,7 +612,8 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw, + skipped++; + continue; + } +- if (!time_after(jiffies, tid_agg_rx->reorder_time[j] + ++ if (skipped && ++ !time_after(jiffies, tid_agg_rx->reorder_time[j] + + HT_RX_REORDER_BUF_TIMEOUT)) + goto set_release_timer; ++
commit 4263108c2a9028544cf4037fa4e72000ee456c33
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Mon Mar 21 15:27:34 2011 -0700
+
+ iwlwifi: set default aggregation frame limit to 63
+
+ This gives much better performance at fast 3x3 rates (up to ~160 Mbps).
+ The scheduler will still make most decisions about batch size based on
+ available packets and RX parameters.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
+index 288391558afd..cc2151482f31 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
++++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
+@@ -2132,7 +2132,7 @@ struct iwl_link_qual_general_params {
+ #define LINK_QUAL_AGG_DISABLE_START_MAX (255)
+ #define LINK_QUAL_AGG_DISABLE_START_MIN (0)
+
+-#define LINK_QUAL_AGG_FRAME_LIMIT_DEF (31)
++#define LINK_QUAL_AGG_FRAME_LIMIT_DEF (63)
+ #define LINK_QUAL_AGG_FRAME_LIMIT_MAX (63)
+ #define LINK_QUAL_AGG_FRAME_LIMIT_MIN (0)
+ commit 2520546aecc969372080448a2422b39eedb2a528
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Fri Mar 18 18:48:55 2011 -0700
+
+ iwlwifi: add RATE_MCS_RATE_MSK
+
+ Throughout the code we use rate_n_flags & 0xff to extract the lower byte
+ of the rate_n_flags u32 that contains the information about the rate.
+ Add a #define and remove the use of the magic number.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+index 63b58ecb0dc6..e394e49228ba 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+@@ -115,13 +115,18 @@ const struct iwl_rate_info iwl_rates[IWL_RATE_COUNT] = {
+ /* FIXME:RS: ^^ should be INV (legacy) */
+ };
+
++static inline u8 rs_extract_rate(u32 rate_n_flags)
++{
++ return (u8)(rate_n_flags & RATE_MCS_RATE_MSK);
++}
++
+ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)
+ {
+ int idx = 0;
+
+ /* HT rate format */
+ if (rate_n_flags & RATE_MCS_HT_MSK) {
+- idx = (rate_n_flags & 0xff);
++ idx = rs_extract_rate(rate_n_flags);
+
+ if (idx >= IWL_RATE_MIMO3_6M_PLCP)
+ idx = idx - IWL_RATE_MIMO3_6M_PLCP;
+@@ -138,7 +143,8 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)
+ /* legacy rate format, search for match in table */
+ } else {
+ for (idx = 0; idx < ARRAY_SIZE(iwl_rates); idx++)
+- if (iwl_rates[idx].plcp == (rate_n_flags & 0xFF))
++ if (iwl_rates[idx].plcp ==
++ rs_extract_rate(rate_n_flags))
+ return idx;
+ }
+
+@@ -239,11 +245,6 @@ static const struct iwl_rate_mcs_info iwl_rate_mcs[IWL_RATE_COUNT] = {
+
+ #define MCS_INDEX_PER_STREAM (8)
+
+-static inline u8 rs_extract_rate(u32 rate_n_flags)
+-{
+- return (u8)(rate_n_flags & 0xFF);
+-}
+-
+ static void rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)
+ {
+ window->data = 0;
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
+index 4f7c9ce9d8bd..39313acb9cc7 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
+@@ -310,7 +310,7 @@ static inline u32 iwl_ant_idx_to_flags(u8 ant_idx)
+
+ static inline u8 iwl_hw_get_rate(__le32 rate_n_flags)
+ {
+- return le32_to_cpu(rate_n_flags) & 0xFF;
++ return le32_to_cpu(rate_n_flags) & RATE_MCS_RATE_MSK;
+ }
+
+ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags)
+diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
+index ca42ffa63ed7..288391558afd 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
++++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
+@@ -324,6 +324,8 @@ struct iwl3945_power_per_rate {
+ #define RATE_MCS_SPATIAL_MSK 0x18
+ #define RATE_MCS_HT_DUP_POS 5
+ #define RATE_MCS_HT_DUP_MSK 0x20
++/* Both legacy and HT use bits 7:0 as the CCK/OFDM rate or HT MCS */
++#define RATE_MCS_RATE_MSK 0xff
+
+ /* Bit 8: (1) HT format, (0) legacy format in bits 7:0 */
+ #define RATE_MCS_FLAGS_POS 8commit d0eb633431ec922f8f9b2040f46d9b42a4cec193
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Wed Mar 16 17:17:36 2011 -0700
+
+ iwlwifi: cleanup and bugfix tx aggregation code
+
+ Since the driver split, there's no need for no_agg_framecnt_info since
+ all devices have this set to false. Secondly, the compressed block ack
+ handling code was broken. Fix this.
+
+ (1) A shift less than zero simply implies that the buffer wrapped, this
+ is expected. Remove the incorrect comment.
+
+ (2) The (agg->frame_count > (64-sh)) condition can happen if the last
+ frame is dropped. E.g., if I send 7 frames and the 6th is received but
+ the 7th is lost, the other side may only shift the window 6, not 7
+ frames since the last bit is a 0. This is perfectly fine behavior and
+ doesn't invalidate the feedback.
+
+ (3) Store the feedback from a Compressed BA in the first newly received
+ frame, rather than the start of the window. This way it will get
+ processed by the rate selection code. Feedback stored in a non-received
+ frame is likely to get overwritten by the retransmission.
+ This is based on the approach taken by minstrel_ht.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+index fb63a03a395e..cb8eacd5fdb5 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -1263,11 +1263,11 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
+ struct iwl_compressed_ba_resp *ba_resp)
+
+ {
+- int i, sh, ack;
++ int sh;
+ u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
+ u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
+- int successes = 0;
+ struct ieee80211_tx_info *info;
++ u64 bitmap, sent_bitmap;
+
+ if (unlikely(!agg->wait_for_ba)) {
+ if (unlikely(ba_resp->bitmap))
+@@ -1281,70 +1281,42 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
+
+ /* Calculate shift to align block-ack bits with our Tx window bits */
+ sh = agg->start_idx - SEQ_TO_INDEX(seq_ctl >> 4);
+- if (sh < 0) /* tbw something is wrong with indices */
++ if (sh < 0)
+ sh += 0x100;
+
+- if (agg->frame_count > (64 - sh)) {
+- IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");
+- return -1;
+- }
+- if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
++ /*
++ * Check for success or failure according to the
++ * transmitted bitmap and block-ack bitmap
++ */
++ bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
++ sent_bitmap = bitmap & agg->bitmap;
++
++ /* Sanity check values reported by uCode */
++ if (ba_resp->txed_2_done > ba_resp->txed) {
++ IWL_DEBUG_TX_REPLY(priv,
++ "bogus sent(%d) and ack(%d) count\n",
++ ba_resp->txed, ba_resp->txed_2_done);
+ /*
+- * sent and ack information provided by uCode
+- * use it instead of figure out ourself
++ * set txed_2_done = txed,
++ * so it won't impact rate scale
+ */
+- if (ba_resp->txed_2_done > ba_resp->txed) {
+- IWL_DEBUG_TX_REPLY(priv,
+- "bogus sent(%d) and ack(%d) count\n",
+- ba_resp->txed, ba_resp->txed_2_done);
+- /*
+- * set txed_2_done = txed,
+- * so it won't impact rate scale
+- */
+- ba_resp->txed = ba_resp->txed_2_done;
+- }
+- IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
+- ba_resp->txed, ba_resp->txed_2_done);
+- } else {
+- u64 bitmap, sent_bitmap;
+-
+- /* don't use 64-bit values for now */
+- bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
+-
+- /* check for success or failure according to the
+- * transmitted bitmap and block-ack bitmap */
+- sent_bitmap = bitmap & agg->bitmap;
+-
+- /* For each frame attempted in aggregation,
+- * update driver's record of tx frame's status. */
+- i = 0;
+- while (sent_bitmap) {
+- ack = sent_bitmap & 1ULL;
+- successes += ack;
+- IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
+- ack ? "ACK" : "NACK", i,
+- (agg->start_idx + i) & 0xff,
+- agg->start_idx + i);
+- sent_bitmap >>= 1;
+- ++i;
+- }
++ ba_resp->txed = ba_resp->txed_2_done;
++ }
++ IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
++ ba_resp->txed, ba_resp->txed_2_done);
+
+- IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n",
+- (unsigned long long)bitmap);
++ /* Find the first ACKed frame to store the TX status */
++ while (sent_bitmap && !(sent_bitmap & 1)) {
++ agg->start_idx = (agg->start_idx + 1) & 0xff;
++ sent_bitmap >>= 1;
+ }
+
+ info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb);
+ memset(&info->status, 0, sizeof(info->status));
+ info->flags |= IEEE80211_TX_STAT_ACK;
+ info->flags |= IEEE80211_TX_STAT_AMPDU;
+- if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
+- info->status.ampdu_ack_len = ba_resp->txed_2_done;
+- info->status.ampdu_len = ba_resp->txed;
+-
+- } else {
+- info->status.ampdu_ack_len = successes;
+- info->status.ampdu_len = agg->frame_count;
+- }
++ info->status.ampdu_ack_len = ba_resp->txed_2_done;
++ info->status.ampdu_len = ba_resp->txed;
+ iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
+
+ return 0;
+diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
+index 1f4f6dd18009..3e680af7ff70 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-core.h
++++ b/drivers/net/wireless/iwlwifi/iwl-core.h
+@@ -281,8 +281,6 @@ struct iwl_mod_params {
+ * @chain_noise_calib_by_driver: driver has the capability to perform
+ * chain noise calibration operation
+ * @shadow_reg_enable: HW shadhow register bit
+- * @no_agg_framecnt_info: uCode do not provide aggregation frame count
+- * information
+ */
+ struct iwl_base_params {
+ int eeprom_size;
+@@ -312,7 +310,6 @@ struct iwl_base_params {
+ const bool sensitivity_calib_by_driver;
+ const bool chain_noise_calib_by_driver;
+ const bool shadow_reg_enable;
+- const bool no_agg_framecnt_info;
+ };
+ /*
+ * @advanced_bt_coexist: support advanced bt coexistcommit 374920cb0512f5938fdf1f5af4f9afa7502dd0f9
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Wed Mar 16 19:16:36 2011 -0700
+
+ iwlwifi: limit number of attempts for highest HT rate
+
+ When filling out its rate scale table, iwlwifi repeats the first HT rate
+ IWL_HT_NUMBER_TRY times. The hardware scheduler will stop using
+ aggregation for any frame that fails LINK_QUAL_AGG_DISABLE_START_DEF
+ times. Currently, both these constants equal 3.
+
+ If iwlwifi probes a faster rate than the link supports, all frames in a
+ (potentially tens of frames large) batch will fail IWL_HT_NUMBER_TRY
+ times. Because this happens to be as large as
+ LINK_QUAL_AGG_DISABLE_START_DEF, all frames will then be sent
+ individually. This leads to a short, but performance-degrading window
+ where the legacy stop-and-wait MAC takes over.
+
+ Bounding the initial rate by (LINK_QUAL_AGG_DISABLE_START_DEF-1)
+ attempts makes the third try use a lower rate and hence more be likely
+ to succeed. This somewhat mitigates the above described behavior.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+index d03b4734c892..63b58ecb0dc6 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+@@ -2912,7 +2912,8 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
+ ant_toggle_cnt = 1;
+ repeat_rate = IWL_NUMBER_TRY;
+ } else {
+- repeat_rate = IWL_HT_NUMBER_TRY;
++ repeat_rate = min(IWL_HT_NUMBER_TRY,
++ LINK_QUAL_AGG_DISABLE_START_DEF - 1);
+ }
+
+ lq_cmd->general_params.mimo_delimiter =commit 8d5eab5aa676378b4c9daa62d10d08a0bca04677
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Wed Mar 9 03:10:18 2011 -0800
+
+ mac80211: update minstrel_ht sample rate when probe is set
+
+ Waiting until the status is received can cause the same rate to be
+ probed multiple times consecutively.
+
+ Cc: Felix Fietkau <nbd@openwrt.org>
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
+index 775cf155e94b..bce14fbfc3b6 100644
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -415,10 +415,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,
+ mi->sample_count--;
+ }
+
+- if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {
++ if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
+ mi->sample_packets += info->status.ampdu_len;
+- minstrel_next_sample_idx(mi);
+- }
+
+ for (i = 0; !last; i++) {
+ last = (i == IEEE80211_TX_MAX_RATES - 1) ||
+@@ -551,13 +549,14 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
+ sample_idx = sample_table[mg->column][mg->index];
+ mr = &mg->rates[sample_idx];
+ sample_idx += mi->sample_group * MCS_GROUP_RATES;
++ minstrel_next_sample_idx(mi);
+
+ /*
+ * When not using MRR, do not sample if the probability is already
+ * higher than 95% to avoid wasting airtime
+ */
+ if (!mp->has_mrr && (mr->probability > MINSTREL_FRAC(95, 100)))
+- goto next;
++ return -1;
+
+ /*
+ * Make sure that lower rates get sampled only occasionally,
+@@ -566,17 +565,13 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
+ if (minstrel_get_duration(sample_idx) >
+ minstrel_get_duration(mi->max_tp_rate)) {
+ if (mr->sample_skipped < 20)
+- goto next;
++ return -1;
+
+ if (mi->sample_slow++ > 2)
+- goto next;
++ return -1;
+ }
+
+ return sample_idx;
+-
+-next:
+- minstrel_next_sample_idx(mi);
+- return -1;
+ }
+
+ static voidcommit 278c2f6faafebe28b9776918ce5fbaef9795c141
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Mon Jun 14 13:10:29 2010 -0700
+
+ iwlwifi: update LQ for bcast station on channel change
+
+ The rate table in the bcast LQ is computed only when the station is
+ allocated, and chooses the lowest rate for the band. Because of when this
+ occurs, this is the 2.4 GHz band and uses the 0x420a (CCK, 1 Mbps) rate. In 5 GHz
+ beaconing mode, this rate will prevent beacons from being sent and any other
+ packets from being received.
+
+ We can fix this by re-initializing the bcast station's LQ command when the
+ channel is changed.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
+index 24743b97ba35..1daf159914ad 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
+@@ -217,6 +217,7 @@ static struct iwl_lib_ops iwl1000_lib = {
+ .set_ct_kill = iwl1000_set_ct_threshold,
+ },
+ .manage_ibss_station = iwlagn_manage_ibss_station,
++ .update_bcast_station = iwl_update_bcast_station,
+ .debugfs_ops = {
+ .rx_stats_read = iwl_ucode_rx_stats_read,
+ .tx_stats_read = iwl_ucode_tx_stats_read,
+diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
+index 67526a1be025..1dd3bc4c107e 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
++++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
+@@ -2280,6 +2280,7 @@ static struct iwl_lib_ops iwl4965_lib = {
+ .set_ct_kill = iwl4965_set_ct_threshold,
+ },
+ .manage_ibss_station = iwlagn_manage_ibss_station,
++ .update_bcast_station = iwl_update_bcast_station,
+ .debugfs_ops = {
+ .rx_stats_read = iwl_ucode_rx_stats_read,
+ .tx_stats_read = iwl_ucode_tx_stats_read,
+diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
+index fa2dbb56177c..b8f3e20f2c80 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
+@@ -393,6 +393,7 @@ static struct iwl_lib_ops iwl5000_lib = {
+ .set_ct_kill = iwl5000_set_ct_threshold,
+ },
+ .manage_ibss_station = iwlagn_manage_ibss_station,
++ .update_bcast_station = iwl_update_bcast_station,
+ .debugfs_ops = {
+ .rx_stats_read = iwl_ucode_rx_stats_read,
+ .tx_stats_read = iwl_ucode_tx_stats_read,
+@@ -455,6 +456,7 @@ static struct iwl_lib_ops iwl5150_lib = {
+ .set_ct_kill = iwl5150_set_ct_threshold,
+ },
+ .manage_ibss_station = iwlagn_manage_ibss_station,
++ .update_bcast_station = iwl_update_bcast_station,
+ .debugfs_ops = {
+ .rx_stats_read = iwl_ucode_rx_stats_read,
+ .tx_stats_read = iwl_ucode_tx_stats_read,
+diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
+index c909a9c5e5e1..61cf0b3e88c2 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
++++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
+@@ -318,6 +318,7 @@ static struct iwl_lib_ops iwl6000_lib = {
+ .set_calib_version = iwl6000_set_calib_version,
+ },
+ .manage_ibss_station = iwlagn_manage_ibss_station,
++ .update_bcast_station = iwl_update_bcast_station,
+ .debugfs_ops = {
+ .rx_stats_read = iwl_ucode_rx_stats_read,
+ .tx_stats_read = iwl_ucode_tx_stats_read,
+diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
+index 329e5107b5c3..f47a58ff3252 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-core.c
++++ b/drivers/net/wireless/iwlwifi/iwl-core.c
+@@ -2110,6 +2110,9 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
+ iwl_set_flags_for_band(priv, conf->channel->band, priv->vif);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
++ if (priv->cfg->ops->lib->update_bcast_station)
++ ret = priv->cfg->ops->lib->update_bcast_station(priv);
++
+ set_ch_out:
+ /* The list of supported rates and rate mask can be different
+ * for each band; since the band may have changed, reset
+diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
+index cdcb51d8bc21..15930e064022 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-core.h
++++ b/drivers/net/wireless/iwlwifi/iwl-core.h
+@@ -196,6 +196,7 @@ struct iwl_lib_ops {
+ /* station management */
+ int (*manage_ibss_station)(struct iwl_priv *priv,
+ struct ieee80211_vif *vif, bool add);
++ int (*update_bcast_station)(struct iwl_priv *priv);
+ /* recover from tx queue stall */
+ void (*recover_from_tx_stall)(unsigned long data);
+ /* check for plcp health */
+diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
+index 6a9cd08bd449..9511f03f07e0 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
++++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
+@@ -1259,6 +1259,36 @@ int iwl_alloc_bcast_station(struct iwl_priv *priv, bool init_lq)
+ }
+ EXPORT_SYMBOL_GPL(iwl_alloc_bcast_station);
+
++/**
++ * iwl_update_bcast_station - update broadcast station's LQ command
++ *
++ * Only used by iwlagn. Placed here to have all bcast station management
++ * code together.
++ */
++int iwl_update_bcast_station(struct iwl_priv *priv)
++{
++ unsigned long flags;
++ struct iwl_link_quality_cmd *link_cmd;
++ u8 sta_id = priv->hw_params.bcast_sta_id;
++
++ link_cmd = iwl_sta_alloc_lq(priv, sta_id);
++ if (!link_cmd) {
++ IWL_ERR(priv, "Unable to initialize rate scaling for bcast station.\n");
++ return -ENOMEM;
++ }
++
++ spin_lock_irqsave(&priv->sta_lock, flags);
++ if (priv->stations[sta_id].lq)
++ kfree(priv->stations[sta_id].lq);
++ else
++ IWL_DEBUG_INFO(priv, "Bcast station rate scaling has not been initialized yet.\n");
++ priv->stations[sta_id].lq = link_cmd;
++ spin_unlock_irqrestore(&priv->sta_lock, flags);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(iwl_update_bcast_station);
++
+ void iwl_dealloc_bcast_station(struct iwl_priv *priv)
+ {
+ unsigned long flags;
+diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h
+index 619bb99d85cf..ba95b1a590a5 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-sta.h
++++ b/drivers/net/wireless/iwlwifi/iwl-sta.h
+@@ -60,6 +60,7 @@ void iwl_restore_stations(struct iwl_priv *priv);
+ void iwl_clear_ucode_stations(struct iwl_priv *priv);
+ int iwl_alloc_bcast_station(struct iwl_priv *priv, bool init_lq);
+ void iwl_dealloc_bcast_station(struct iwl_priv *priv);
++int iwl_update_bcast_station(struct iwl_priv *priv);
+ int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
+ int iwl_send_add_sta(struct iwl_priv *priv,
+ struct iwl_addsta_cmd *sta, u8 flags);commit f668da2f150948a961d359c65b5e9d62da1290e2
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Tue May 25 10:22:49 2010 -0700
+
+ iwlwifi: fix wrapping when handling aggregated batches
+
+ Fairly complex code in iwlagn_tx_status_reply_tx handle the status reports for
+ aggregated packet batches sent by the NIC. This code aims to handle the case
+ where the NIC retransmits failed packets from a previous batch; the status
+ information for these packets can sometimes be inserted in the middle of a
+ batch and are actually not in order by sequence number! (I verified this can
+ happen with printk's in the function.)
+
+ The code in question adaptively identifies the "first" frame of the batch,
+ taking into account that it may not be the one corresponding to the first agg
+ status report, and also handles the case when the set of sent packets wraps the
+ 256-character entry buffer. It generates the agg->bitmap field of sent packets
+ which is later compared to the BlockAck response from the receiver to see which
+ frames of those sent in this batch were ACKed. A small logic error (wrapping by
+ 0xff==255 instead of 0x100==256) was causing the agg->bitmap to be set
+ incorrectly.
+
+ Fix this wrapping code, and add extensive comments to clarify what is going on.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+index d339881e1d8f..3577c1eeb77b 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+@@ -93,6 +93,12 @@ static int iwlagn_tx_status_reply_tx(struct iwl_priv *priv,
+ } else {
+ /* Two or more frames were attempted; expect block-ack */
+ u64 bitmap = 0;
++
++ /*
++ * Start is the lowest frame sent. It may not be the first
++ * frame in the batch; we figure this out dynamically during
++ * the following loop.
++ */
+ int start = agg->start_idx;
+
+ /* Construct bit-map of pending frames within Tx window */
+@@ -131,25 +137,58 @@ static int iwlagn_tx_status_reply_tx(struct iwl_priv *priv,
+ IWL_DEBUG_TX_REPLY(priv, "AGG Frame i=%d idx %d seq=%d\n",
+ i, idx, SEQ_TO_SN(sc));
+
++ /*
++ * sh -> how many frames ahead of the starting frame is
++ * the current one?
++ *
++ * Note that all frames sent in the batch must be in a
++ * 64-frame window, so this number should be in [0,63].
++ * If outside of this window, then we've found a new
++ * "first" frame in the batch and need to change start.
++ */
+ sh = idx - start;
+- if (sh > 64) {
+- sh = (start - idx) + 0xff;
++
++ /*
++ * If >= 64, out of window. start must be at the front
++ * of the circular buffer, idx must be near the end of
++ * the buffer, and idx is the new "first" frame. Shift
++ * the indices around.
++ */
++ if (sh >= 64) {
++ /* Shift bitmap by start - idx, wrapped */
++ sh = 0x100 - idx + start;
+ bitmap = bitmap << sh;
++ /* Now idx is the new start so sh = 0 */
+ sh = 0;
+ start = idx;
+- } else if (sh < -64)
+- sh = 0xff - (start - idx);
+- else if (sh < 0) {
++ /*
++ * If <= -64 then wraps the 256-pkt circular buffer
++ * (e.g., start = 255 and idx = 0, sh should be 1)
++ */
++ } else if (sh <= -64) {
++ sh = 0x100 - start + idx;
++ /*
++ * If < 0 but > -64, out of window. idx is before start
++ * but not wrapped. Shift the indices around.
++ */
++ } else if (sh < 0) {
++ /* Shift by how far start is ahead of idx */
+ sh = start - idx;
+- start = idx;
+ bitmap = bitmap << sh;
++ /* Now idx is the new start so sh = 0 */
++ start = idx;
+ sh = 0;
+ }
++ /* Sequence number start + sh was sent in this batch */
+ bitmap |= 1ULL << sh;
+ IWL_DEBUG_TX_REPLY(priv, "start=%d bitmap=0x%llx\n",
+ start, (unsigned long long)bitmap);
+ }
+
++ /*
++ * Store the bitmap and possibly the new start, if we wrapped
++ * the buffer above
++ */
+ agg->bitmap = bitmap;
+ agg->start_idx = start;
+ IWL_DEBUG_TX_REPLY(priv, "Frames %d start_idx=%d bitmap=0x%llx\n",commit 02cd8dee6e10d6ab7161a3c6f36a60f8894fafdd
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Mon May 24 18:41:30 2010 -0700
+
+ iwlwifi: parse block ack responses correctly
+
+ Compressed BlockAck frames store the ACKs/NACKs in a 64-bit bitmap that starts
+ at the sequence number of the first frame sent in the aggregated batch. Note
+ that this is a selective ACKnowledgement following selective retransmission;
+ e.g., if frames 1,4-5 in a batch are ACKed then the next transmission will
+ include frames 2-3,6-10 (7 frames). In this latter case, the Compressed
+ BlockAck will not have all meaningful information in the low order bits -- the
+ semantically meaningful bits of the BA will be 0x1f3 (where the low-order frame
+ is seq 2).
+
+ The driver code originally just looked at the lower (in this case, 7) bits of
+ the BlockAck. In this case, the lower 7 bits of 0x1f3 => only 5 packets,
+ maximum, could ever be ACKed. In reality it should be looking at all of the
+ bits, filtered by those corresponding to packets that were actually sent. This
+ flaw meant that the number of correctly ACked packets could be significantly
+ underreported and might result in asynchronous state between TX and RX sides as
+ well as driver and uCode.
+
+ Fix this and also add a shortcut that doesn't require the code to loop through
+ all 64 bits of the bitmap but rather stops when no higher packets are ACKed.
+
+ In my experiments this fix greatly reduces throughput swing, making throughput
+ stable and high. It is also likely related to some of the stalls observed in
+ aggregation mode and maybe some of the buffer underruns observed, e.g.,
+
+ http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=1968
+ http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2098
+ http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2018
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+index 0d3e13b2442f..10a0acdb9dd4 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -1208,7 +1208,7 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
+ int i, sh, ack;
+ u16 seq_ctl = le16_to_cpu(ba_resp->seq_ctl);
+ u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
+- u64 bitmap;
++ u64 bitmap, sent_bitmap;
+ int successes = 0;
+ struct ieee80211_tx_info *info;
+
+@@ -1236,16 +1236,19 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
+
+ /* check for success or failure according to the
+ * transmitted bitmap and block-ack bitmap */
+- bitmap &= agg->bitmap;
++ sent_bitmap = bitmap & agg->bitmap;
+
+ /* For each frame attempted in aggregation,
+ * update driver's record of tx frame's status. */
+- for (i = 0; i < agg->frame_count ; i++) {
+- ack = bitmap & (1ULL << i);
+- successes += !!ack;
++ i = 0;
++ while (sent_bitmap) {
++ ack = sent_bitmap & 1ULL;
++ successes += ack;
+ IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
+ ack ? "ACK" : "NACK", i, (agg->start_idx + i) & 0xff,
+ agg->start_idx + i);
++ sent_bitmap >>= 1;
++ ++i;
+ }
+
+ info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb);commit e3a3cd8789e1daf1b5af70d3252cab50cd3824c9
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Sun Apr 18 09:27:58 2010 -0700
+
+ iwlwifi: set AMPDU status variables correctly
+
+ The TX status code is currently abusing the ampdu_ack_map field (a bitmap) to
+ count the number of successfully received frames. The comments in mac80211.h
+ show there are actually three different, relevant variables, of which we are
+ currently using two, both incorrectly. Fix this by making
+
+ - ampdu_ack_len -> the number of ACKed frames (i.e. successes)
+ - ampdu_ack_map -> the bitmap
+ - ampdu_len -> the total number of frames sent (i.e., attempts)
+
+ to match the header file (and verified with ath9k's usage) and updating Intel's
+ RS code to match.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+index 8f8d5e3e688d..f01f242659c3 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+@@ -867,14 +867,14 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
+ rs_get_tbl_info_from_mcs(tx_rate, priv->band, &tbl_type,
+ &rs_index);
+ rs_collect_tx_data(curr_tbl, rs_index,
+- info->status.ampdu_ack_len,
+- info->status.ampdu_ack_map);
++ info->status.ampdu_len,
++ info->status.ampdu_ack_len);
+
+ /* Update success/fail counts if not searching for new mode */
+ if (lq_sta->stay_in_tbl) {
+- lq_sta->total_success += info->status.ampdu_ack_map;
+- lq_sta->total_failed += (info->status.ampdu_ack_len -
+- info->status.ampdu_ack_map);
++ lq_sta->total_success += info->status.ampdu_ack_len;
++ lq_sta->total_failed += (info->status.ampdu_len -
++ info->status.ampdu_ack_len);
+ }
+ } else {
+ /*
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+index 95e263f1d117..c2a5c85542bf 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -1233,8 +1233,9 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
+ memset(&info->status, 0, sizeof(info->status));
+ info->flags |= IEEE80211_TX_STAT_ACK;
+ info->flags |= IEEE80211_TX_STAT_AMPDU;
+- info->status.ampdu_ack_map = successes;
+- info->status.ampdu_ack_len = agg->frame_count;
++ info->status.ampdu_ack_len = successes;
++ info->status.ampdu_ack_map = bitmap;
++ info->status.ampdu_len = agg->frame_count;
+ iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
+
+ IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n", (unsigned long long)bitmap);commit 93d95b12b3ba06e0e1f3e43a370ee61539d8cb90
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Sun Apr 18 09:28:18 2010 -0700
+
+ mac80211: fix typo in comments
+
+ The flag is called IEEE80211_TX_STAT_AMPDU rather than using the whole word
+ STATUS.
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/include/net/mac80211.h b/include/net/mac80211.h
+index 75056dde3817..c49e6adcd8fa 100644
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -397,11 +397,11 @@ struct ieee80211_tx_rate {
+ * @status: union for status data
+ * @driver_data: array of driver_data pointers
+ * @ampdu_ack_len: number of acked aggregated frames.
+- * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
++ * relevant only if IEEE80211_TX_STAT_AMPDU was set.
+ * @ampdu_ack_map: block ack bit map for the aggregation.
+- * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
++ * relevant only if IEEE80211_TX_STAT_AMPDU was set.
+ * @ampdu_len: number of aggregated frames.
+- * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
++ * relevant only if IEEE80211_TX_STAT_AMPDU was set.
+ * @ack_signal: signal strength of the ACK frame
+ */
+ struct ieee80211_tx_info {
+ commit 5e2f75b8993a0d83d469388b50716dd5551f2eb4 +Author: Dan Halperin <dhalperi@cs.washington.edu> +Date: Thu Feb 18 22:01:39 2010 -0800 + + iwlwifi: set HT flags after channel in rxon + + The HT extension channel settings require priv->staging_rxon.channel to be + accurate. However, iwl_set_rxon_ht was being called before iwl_set_rxon_channel + and thus HT40 could be broken unless another call to iwl_mac_config came in. + + This problem was recently introduced by "iwlwifi: Fix to set correct ht + configuration" + + The particular setting in which I noticed this was monitor mode: + + iwconfig wlan0 mode monitor + ifconfig wlan0 up + ./iw wlan0 set channel 64 HT40- + #./iw wlan0 set channel 64 HT40- + tcpdump -i wlan0 -y IEEE802_11_RADIO + + would only catch HT40 packets if I issued the IW command twice. + + From visual inspection, iwl_set_rxon_channel does not depend on + iwl_set_rxon_ht, so simply swapping them should be safe and fixes this problem. + + Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu> + Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> + Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> + CC: stable@kernel.org + Signed-off-by: John W. Linville <linville@tuxdriver.com> + +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c +index d10bea64fce3..f36f804804fc 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-core.c ++++ b/drivers/net/wireless/iwlwifi/iwl-core.c +@@ -2744,8 +2744,8 @@ int iwl_mac_config(struct ieee80211_hw *hw, u32 changed) + if ((le16_to_cpu(priv->staging_rxon.channel) != ch)) + priv->staging_rxon.flags = 0; + +- iwl_set_rxon_ht(priv, ht_conf); + iwl_set_rxon_channel(priv, conf->channel); ++ iwl_set_rxon_ht(priv, ht_conf); + + iwl_set_flags_for_band(priv, conf->channel->band); + spin_unlock_irqrestore(&priv->lock, flags);
commit 49dcc819b077c2d473062e17d5a1373a8b660e02 +Author: Daniel Halperin <dhalperi@cs.washington.edu> +Date: Tue Jan 19 10:22:19 2010 -0800 + + iwlwifi: optimize power saving + + In hostap AP mode, every time the client sends the AP + a packet the STA_NOTIFY_AWAKE code is sent from mac80211. + This results in a command being sent to the uCode even if + the client was not asleep. + + The following simple patch has fixed the issue for me without any + degradation that I can find. + + Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu> + Acked-by: Johannes Berg <johannes@sipsolutions.net> + Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> + +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c +index 4a268927377b..380d2087bf3a 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c +@@ -3007,6 +3007,8 @@ static void iwl_mac_sta_notify(struct ieee80211_hw *hw, + break; + case STA_NOTIFY_AWAKE: + WARN_ON(!sta_priv->client); ++ if (!sta_priv->asleep) ++ break; + sta_priv->asleep = false; + sta_id = iwl_find_station(priv, sta->addr); + if (sta_id != IWL_INVALID_STATION)
commit ff27fabe62d288038b36f41ac6a2190ed7d15993
+Author: Daniel Halperin <dhalperi@cs.washington.edu>
+Date: Fri Jan 22 14:22:58 2010 -0800
+
+ iwlwifi: fix throughput degradation in aggregation mode
+
+ The following commit
+
+ commit e4da8c37af626001ff704fb29ea14eb58f5f7208
+ Author: Johannes Berg <johannes@sipsolutions.net>
+ Date: Wed Dec 23 13:15:43 2009 +0100
+
+ mac80211: make off-channel work generic
+
+ triggered a bug in iwlwifi where HT parameters would not be correctly set in
+ some mac80211 pathways. The aggregation (and possibly other) station flags were
+ not being set, which limited the size of aggregation blocks and reduced
+ throughput at high rates.
+
+ >From Johannes:
+ """
+ Due to Wey-Yi's patch to use the set-channel command when the channel changes
+ while associated, we don't get a full new RXON. Therefore, we don't re-set the
+ rxon-station either. However, under some circumstances that apparently have
+ gotten more likely mac80211 will first set up the BSS info, then add the
+ station and then switch to an HT channel type.
+
+ Therefore, the check for "priv->current_ht_config.is_ht" in
+ iwl_rxon_add_station() will hit false and not fill in the HT information.
+
+ However, that check can just be removed, which is the easiest fix for all this,
+ because the HT capa struct is always there, just could possibly have the
+ ht_supported member set to false.
+ """
+
+ A sample good link in my 3x3 network improves by approximately 25% TCP
+ throughput. This fixes Bug 2144
+ (http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2144).
+
+ Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
+ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
+ Signed-off-by: John W. Linville <linville@tuxdriver.com>
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
+index fcac73cf82bc..e0b13fb78653 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
++++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
+@@ -1045,24 +1045,19 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap)
+ struct ieee80211_sta_ht_cap *cur_ht_config = NULL;
+ u8 sta_id;
+
+- /* Add station to device's station table */
+-
+ /*
+- * XXX: This check is definitely not correct, if we're an AP
+- * it'll always be false which is not what we want, but
+- * it doesn't look like iwlagn is prepared to be an HT
+- * AP anyway.
++ * Set HT capabilities. It is ok to set this struct even if not using
++ * HT config: the priv->current_ht_config.is_ht flag will just be false
+ */
+- if (priv->current_ht_config.is_ht) {
+- rcu_read_lock();
+- sta = ieee80211_find_sta(priv->vif, addr);
+- if (sta) {
+- memcpy(&ht_config, &sta->ht_cap, sizeof(ht_config));
+- cur_ht_config = &ht_config;
+- }
+- rcu_read_unlock();
++ rcu_read_lock();
++ sta = ieee80211_find_sta(priv->vif, addr);
++ if (sta) {
++ memcpy(&ht_config, &sta->ht_cap, sizeof(ht_config));
++ cur_ht_config = &ht_config;
+ }
++ rcu_read_unlock();
+
++ /* Add station to device's station table */
+ sta_id = iwl_add_station(priv, addr, is_ap, CMD_SYNC, cur_ht_config);
+
+ /* Set up default rate scaling table in device's station table */commit 0c875c28649eac0adb8d2e2efac2186c3089e100
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Sun Dec 3 11:55:34 2006 -0800
+
+ PCI quirks: remove redundant check
+
+ Removes redundant check for dev->subordinate; if it is NULL, the function
+ returns before the patch-affected code region.
+
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Acked-by: Brice Goglin <brice@myri.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 9ca9b9bf6160..757186390d83 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -1688,8 +1688,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
+ * a single one having MSI is enough to be sure that MSI are supported.
+ */
+ pdev = pci_get_slot(dev->bus, 0);
+- if (dev->subordinate && !msi_ht_cap_enabled(dev)
+- && !msi_ht_cap_enabled(pdev)) {
++ if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
+ printk(KERN_WARNING "PCI: MSI quirk detected. "
+ "MSI disabled on chipset %s.\n",
+ pci_name(dev));commit b860e73a5488d9e75c2f2907174cb4277c2f9d21
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Fri Dec 8 02:40:19 2006 -0800
+
+ [PATCH] video SiS: remove unnecessary variables in SiS_DDC2Delay
+
+ Remove unnecesary iteration and accumulator variables from SiS_DDC2Delay.
+
+ Originally spotted by Jesper Juhl <jesper.juhl@gmail.com>.
+
+ Cc: Jesper Juhl <jesper.juhl@gmail.com>
+ Cc: Thomas Winischhofer <thomas@winischhofer.net>
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Cc: "Antonino A. Daplas" <adaplas@pol.net>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c
+index f13faddc6181..47e1896cffeb 100644
+--- a/drivers/video/sis/init301.c
++++ b/drivers/video/sis/init301.c
+@@ -445,11 +445,8 @@ SiS_CR36BIOSWord23d(struct SiS_Private *SiS_Pr)
+ void
+ SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime)
+ {
+- unsigned int i, j;
+-
+- for(i = 0; i < delaytime; i++) {
+- j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05);
+- }
++ while (delaytime-- > 0)
++ SiS_GetReg(SiS_Pr->SiS_P3c4, 0x05);
+ }
+
+ #if defined(SIS300) || defined(SIS315H)commit a09c17a6fdad9ae5b5ea1c3383080f84ec76ab20
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Wed Dec 6 20:40:18 2006 -0800
+
+ [PATCH] sys: remove unused variable
+
+ Remove unused 'new_ruid' variable.
+
+ Reported by David Binderman <dcb314@hotmail.com>.
+
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/kernel/sys.c b/kernel/sys.c
+index c87b461de38d..a0c1a29a507f 100644
+--- a/kernel/sys.c
++++ b/kernel/sys.c
+@@ -1102,14 +1102,14 @@ asmlinkage long sys_setreuid(uid_t ruid, uid_t euid)
+ asmlinkage long sys_setuid(uid_t uid)
+ {
+ int old_euid = current->euid;
+- int old_ruid, old_suid, new_ruid, new_suid;
++ int old_ruid, old_suid, new_suid;
+ int retval;
+
+ retval = security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_ID);
+ if (retval)
+ return retval;
+
+- old_ruid = new_ruid = current->uid;
++ old_ruid = current->uid;
+ old_suid = current->suid;
+ new_suid = old_suid;
+ commit 8de61e69c2feb10e5391cca67a3faf1d2bf77ce0
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Wed Dec 6 20:40:16 2006 -0800
+
+ [PATCH] fs: remove unused variable
+
+ Removed unused 'have_pt_gnu_stack' variable.
+
+ Reported by David Binderman <dcb314@hotmail.com>
+
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
+index 14ea630a857c..be5869d34999 100644
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
+@@ -544,7 +544,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+ unsigned long reloc_func_desc = 0;
+ char passed_fileno[6];
+ struct files_struct *files;
+- int have_pt_gnu_stack, executable_stack = EXSTACK_DEFAULT;
++ int executable_stack = EXSTACK_DEFAULT;
+ unsigned long def_flags = 0;
+ struct {
+ struct elfhdr elf_ex;
+@@ -707,7 +707,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+ executable_stack = EXSTACK_DISABLE_X;
+ break;
+ }
+- have_pt_gnu_stack = (i < loc->elf_ex.e_phnum);
+
+ /* Some simple consistency checks for the interpreter */
+ if (elf_interpreter) {commit f475ff352c5e05d473c462b97c3a13a5b803af5a
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Thu Dec 7 02:14:13 2006 +0100
+
+ [PATCH] x86-64: remove unused variable
+
+ Remove unused variable in msr_write().
+
+ Reported by D Binderman <dcb314@hotmail.com>.
+
+ Cc: H. Peter Anvin <hpa@zytor.com>
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+
+diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
+index a773f776c9ea..fd45059c9084 100644
+--- a/arch/i386/kernel/msr.c
++++ b/arch/i386/kernel/msr.c
+@@ -195,7 +195,6 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
+ {
+ const u32 __user *tmp = (const u32 __user *)buf;
+ u32 data[2];
+- size_t rv;
+ u32 reg = *ppos;
+ int cpu = iminor(file->f_dentry->d_inode);
+ int err;
+@@ -203,7 +202,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
+ if (count % 8)
+ return -EINVAL; /* Invalid chunk size */
+
+- for (rv = 0; count; count -= 8) {
++ for (; count; count -= 8) {
+ if (copy_from_user(&data, tmp, 8))
+ return -EFAULT;
+ err = do_wrmsr(cpu, reg, data[0], data[1]);commit 86bd58bf4c383fde4e99b83ce917b091a072040d
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Thu Dec 7 02:14:11 2006 +0100
+
+ [PATCH] x86-64: Remove unused GET_APIC_VERSION call from clear_local_APIC
+
+ Remove unused GET_APIC_VERSION call from clear_local_APIC() and
+ __setup_APIC_LVTT().
+
+ Reported by D Binderman <dcb314@hotmail.com>.
+
+ Cc: Andi Kleen <ak@suse.de>
+ Cc: Ingo Molnar <mingo@redhat.com>
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+
+diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
+index f0b00d8731cb..124b2d27b4ac 100644
+--- a/arch/x86_64/kernel/apic.c
++++ b/arch/x86_64/kernel/apic.c
+@@ -140,7 +140,6 @@ void clear_local_APIC(void)
+ apic_write(APIC_LVTERR, APIC_LVT_MASKED);
+ if (maxlvt >= 4)
+ apic_write(APIC_LVTPC, APIC_LVT_MASKED);
+- v = GET_APIC_VERSION(apic_read(APIC_LVR));
+ apic_write(APIC_ESR, 0);
+ apic_read(APIC_ESR);
+ }
+@@ -736,10 +735,9 @@ void __init init_apic_mappings(void)
+
+ static void __setup_APIC_LVTT(unsigned int clocks)
+ {
+- unsigned int lvtt_value, tmp_value, ver;
++ unsigned int lvtt_value, tmp_value;
+ int cpu = smp_processor_id();
+
+- ver = GET_APIC_VERSION(apic_read(APIC_LVR));
+ lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR;
+
+ if (cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask))commit 3529833f1ca8790df06ce218b5d9d438776696ed
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Thu Dec 7 02:14:07 2006 +0100
+
+ [PATCH] i386: substitute __va lookup with pfn_to_kaddr
+
+ Substitutes allocate_pgdat virtual address lookup with pfn_to_kaddr macro.
+
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Andi Kleen <ak@suse.de>
+ Cc: Andi Kleen <ak@suse.de>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+
+diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
+index ddbdb0336f28..103b76e56a94 100644
+--- a/arch/i386/mm/discontig.c
++++ b/arch/i386/mm/discontig.c
+@@ -168,7 +168,7 @@ static void __init allocate_pgdat(int nid)
+ if (nid && node_has_online_mem(nid))
+ NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid];
+ else {
+- NODE_DATA(nid) = (pg_data_t *)(__va(min_low_pfn << PAGE_SHIFT));
++ NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn));
+ min_low_pfn += PFN_UP(sizeof(pg_data_t));
+ }
+ }
+ commit 92b1f905637bbd79fcd430a09737fd97061eb405 +Author: David Rientjes <rientjes@cs.washington.edu> +Date: Wed Nov 8 19:49:15 2006 -0800 + + [PATCH] drivers cris: return on NULL dev_alloc_skb() + + If the next descriptor array entry cannot be allocated by dev_alloc_skb(), + return immediately so it is not dereferenced later. We cannot register the + device with a partial descriptor list. + + Cc: Mikael Starvik <starvik@axis.com> + Signed-off-by: David Rientjes <rientjes@cs.washington.edu> + Cc: Jeff Garzik <jeff@garzik.org> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Jeff Garzik <jeff@garzik.org> + +diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c +index 966b563e42bb..a03d781f6d0a 100644 +--- a/drivers/net/cris/eth_v10.c ++++ b/drivers/net/cris/eth_v10.c +@@ -509,6 +509,8 @@ etrax_ethernet_init(void) + * does not share cacheline with any other data (to avoid cache bug) + */ + RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES); ++ if (!RxDescList[i].skb) ++ return -ENOMEM; + RxDescList[i].descr.ctrl = 0; + RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE; + RxDescList[i].descr.next = virt_to_phys(&RxDescList[i + 1]);
commit 2ceaac755423cb93c1bb2f59ebd1a06f027ac095
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Mon Oct 30 14:19:25 2006 -0800
+
+ [PATCH] net s2io: return on NULL dev_alloc_skb()
+
+ Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent
+ dereference.
+
+ Cc: Jeff Garzik <jgarzik@pobox.com>
+ Cc: Christoph Hellwig <hch@infrared.org>
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Signed-off-by: Jeff Garzik <jeff@garzik.org>
+
+diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
+index a231ab7d28dd..33569ec9dbfc 100644
+--- a/drivers/net/s2io.c
++++ b/drivers/net/s2io.c
+@@ -5985,6 +5985,11 @@ static int set_rxd_buffer_pointer(nic_t *sp, RxD_t *rxdp, buffAdd_t *ba,
+ ((RxD3_t*)rxdp)->Buffer1_ptr = *temp1;
+ } else {
+ *skb = dev_alloc_skb(size);
++ if (!(*skb)) {
++ DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",
++ dev->name);
++ return -ENOMEM;
++ }
+ ((RxD3_t*)rxdp)->Buffer2_ptr = *temp2 =
+ pci_map_single(sp->pdev, (*skb)->data,
+ dev->mtu + 4,
+@@ -6007,7 +6012,11 @@ static int set_rxd_buffer_pointer(nic_t *sp, RxD_t *rxdp, buffAdd_t *ba,
+ ((RxD3_t*)rxdp)->Buffer2_ptr = *temp2;
+ } else {
+ *skb = dev_alloc_skb(size);
+-
++ if (!(*skb)) {
++ DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb failed\n",
++ dev->name);
++ return -ENOMEM;
++ }
+ ((RxD3_t*)rxdp)->Buffer0_ptr = *temp0 =
+ pci_map_single(sp->pdev, ba->ba_0, BUF0_LEN,
+ PCI_DMA_FROMDEVICE);commit f3ef9ead31ae995251b420ac98398bd7545bf4e1
+Author: David Rientjes <rientjes@cs.washington.edu>
+Date: Mon Sep 25 16:24:57 2006 -0700
+
+ [PATCH] do not free non slab allocated per_cpu_pageset
+
+ Stops panic associated with attempting to free a non slab-allocated
+ per_cpu_pageset.
+
+ Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
+ Acked-by: Christoph Lameter <clameter@sgi.com>
+ Cc: <stable@kernel.org>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 3b5358a0561f..8a52ba9fe693 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -1845,8 +1845,10 @@ static inline void free_zone_pagesets(int cpu)
+ for_each_zone(zone) {
+ struct per_cpu_pageset *pset = zone_pcp(zone, cpu);
+
++ /* Free per_cpu_pageset if it is slab allocated */
++ if (pset != &boot_pageset[cpu])
++ kfree(pset);
+ zone_pcp(zone, cpu) = NULL;
+- kfree(pset);
+ }
+ }
+ commit 62fe78e90dc25b269362034487dc450cd8453e8c
+Author: Sam Revitch <samr7@cs.washington.edu>
+Date: Wed May 10 15:09:17 2006 +0200
+
+ [ALSA] hda-codec - Add support for Apple Mac Mini (early 2006)
+
+ Add support for some audio quirks of the Apple Mac Mini (early 2006)
+
+ Signed-off-by: Sam Revitch <samr7@cs.washington.edu>
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
+index 6d8224dc033b..36f199442fdc 100644
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -41,6 +41,7 @@
+ #define STAC_REF 0
+ #define STAC_D945GTP3 1
+ #define STAC_D945GTP5 2
++#define STAC_MACMINI 3
+
+ struct sigmatel_spec {
+ struct snd_kcontrol_new *mixers[4];
+@@ -52,6 +53,7 @@ struct sigmatel_spec {
+ unsigned int mic_switch: 1;
+ unsigned int alt_switch: 1;
+ unsigned int hp_detect: 1;
++ unsigned int gpio_mute: 1;
+
+ /* playback */
+ struct hda_multi_out multiout;
+@@ -293,6 +295,7 @@ static unsigned int *stac922x_brd_tbl[] = {
+ ref922x_pin_configs,
+ d945gtp3_pin_configs,
+ d945gtp5_pin_configs,
++ NULL, /* STAC_MACMINI */
+ };
+
+ static struct hda_board_config stac922x_cfg_tbl[] = {
+@@ -324,6 +327,9 @@ static struct hda_board_config stac922x_cfg_tbl[] = {
+ { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+ .pci_subdevice = 0x0417,
+ .config = STAC_D945GTP5 }, /* Intel D975XBK - 5 Stack */
++ { .pci_subvendor = 0x8384,
++ .pci_subdevice = 0x7680,
++ .config = STAC_MACMINI }, /* Apple Mac Mini (early 2006) */
+ {} /* terminator */
+ };
+
+@@ -841,6 +847,19 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
+ }
+ }
+
++ if (imux->num_items == 1) {
++ /*
++ * Set the current input for the muxes.
++ * The STAC9221 has two input muxes with identical source
++ * NID lists. Hopefully this won't get confused.
++ */
++ for (i = 0; i < spec->num_muxes; i++) {
++ snd_hda_codec_write(codec, spec->mux_nids[i], 0,
++ AC_VERB_SET_CONNECT_SEL,
++ imux->items[0].index);
++ }
++ }
++
+ return 0;
+ }
+
+@@ -946,6 +965,45 @@ static int stac9200_parse_auto_config(struct hda_codec *codec)
+ return 1;
+ }
+
++/*
++ * Early 2006 Intel Macintoshes with STAC9220X5 codecs seem to have a
++ * funky external mute control using GPIO pins.
++ */
++
++static void stac922x_gpio_mute(struct hda_codec *codec, int pin, int muted)
++{
++ unsigned int gpiostate, gpiomask, gpiodir;
++
++ gpiostate = snd_hda_codec_read(codec, codec->afg, 0,
++ AC_VERB_GET_GPIO_DATA, 0);
++
++ if (!muted)
++ gpiostate |= (1 << pin);
++ else
++ gpiostate &= ~(1 << pin);
++
++ gpiomask = snd_hda_codec_read(codec, codec->afg, 0,
++ AC_VERB_GET_GPIO_MASK, 0);
++ gpiomask |= (1 << pin);
++
++ gpiodir = snd_hda_codec_read(codec, codec->afg, 0,
++ AC_VERB_GET_GPIO_DIRECTION, 0);
++ gpiodir |= (1 << pin);
++
++ /* AppleHDA seems to do this -- WTF is this verb?? */
++ snd_hda_codec_write(codec, codec->afg, 0, 0x7e7, 0);
++
++ snd_hda_codec_write(codec, codec->afg, 0,
++ AC_VERB_SET_GPIO_MASK, gpiomask);
++ snd_hda_codec_write(codec, codec->afg, 0,
++ AC_VERB_SET_GPIO_DIRECTION, gpiodir);
++
++ msleep(1);
++
++ snd_hda_codec_write(codec, codec->afg, 0,
++ AC_VERB_SET_GPIO_DATA, gpiostate);
++}
++
+ static int stac92xx_init(struct hda_codec *codec)
+ {
+ struct sigmatel_spec *spec = codec->spec;
+@@ -982,6 +1040,11 @@ static int stac92xx_init(struct hda_codec *codec)
+ stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
+ AC_PINCTL_IN_EN);
+
++ if (spec->gpio_mute) {
++ stac922x_gpio_mute(codec, 0, 0);
++ stac922x_gpio_mute(codec, 1, 0);
++ }
++
+ return 0;
+ }
+
+@@ -1132,7 +1195,7 @@ static int patch_stac922x(struct hda_codec *codec)
+ spec->board_config = snd_hda_check_board_config(codec, stac922x_cfg_tbl);
+ if (spec->board_config < 0)
+ snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, using BIOS defaults\n");
+- else {
++ else if (stac922x_brd_tbl[spec->board_config] != NULL) {
+ spec->num_pins = 10;
+ spec->pin_nids = stac922x_pin_nids;
+ spec->pin_configs = stac922x_brd_tbl[spec->board_config];
+@@ -1154,6 +1217,9 @@ static int patch_stac922x(struct hda_codec *codec)
+ return err;
+ }
+
++ if (spec->board_config == STAC_MACMINI)
++ spec->gpio_mute = 1;
++
+ codec->patch_ops = stac92xx_patch_ops;
+
+ return 0;commit 9c782e3b2083c33b5a14c9955cf15f32ea88116b +Author: Alex Shepard <ashepard@u.washington.edu> +Date: Sun Jan 15 01:57:00 2006 +0100 + + Spelling fix in IPW2100 and IPW2200 Kconfig entries + + s/remvoed/removed/ + + Signed-off-by: Alex Shepard <ashepard@u.washington.edu> + Signed-off-by: Adrian Bunk <bunk@stusta.de> + +diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig +index c1a6e69f7905..e90687495ccc 100644 +--- a/drivers/net/wireless/Kconfig ++++ b/drivers/net/wireless/Kconfig +@@ -160,7 +160,7 @@ config IPW2100 + <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. + + If you want to compile the driver as a module ( = code which can be +- inserted in and remvoed from the running kernel whenever you want), ++ inserted in and removed from the running kernel whenever you want), + say M here and read <file:Documentation/modules.txt>. The module + will be called ipw2100.ko. + +@@ -213,7 +213,7 @@ config IPW2200 + <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. + + If you want to compile the driver as a module ( = code which can be +- inserted in and remvoed from the running kernel whenever you want), ++ inserted in and removed from the running kernel whenever you want), + say M here and read <file:Documentation/modules.txt>. The module + will be called ipw2200.ko. ++
commit 98d5b61ef5fae7681df27065ad95ee6e30c42243
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:55 2021 -0800
+
+ coda: bump module version to 7.2
+
+ Helps with tracking which patches have been propagated upstream and if
+ users are running the latest known version.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-10-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 7e23cb22d394..b39580ad4ce5 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -384,7 +384,7 @@ MODULE_AUTHOR("Jan Harkes, Peter J. Braam");
+ MODULE_DESCRIPTION("Coda Distributed File System VFS interface");
+ MODULE_ALIAS_CHARDEV_MAJOR(CODA_PSDEV_MAJOR);
+ MODULE_LICENSE("GPL");
+-MODULE_VERSION("7.0");
++MODULE_VERSION("7.2");
+
+ static int __init init_coda(void)
+ {commit 5a646fb3a3e2de8bbab19d41826b3e54b09969bc
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:45 2021 -0800
+
+ coda: avoid doing bad things on inode type changes during revalidation
+
+ When Coda discovers an inconsistent object, it turns it into a symlink.
+ However we can't just follow this change in the kernel on an existing file
+ or directory inode that may still have references.
+
+ This patch removes the inconsistent inode from the inode hash and
+ allocates a new inode for the symlink object.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-7-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
+index 06855f6c7902..62a3d2565c26 100644
+--- a/fs/coda/cnode.c
++++ b/fs/coda/cnode.c
+@@ -63,9 +63,10 @@ struct inode * coda_iget(struct super_block * sb, struct CodaFid * fid,
+ struct inode *inode;
+ struct coda_inode_info *cii;
+ unsigned long hash = coda_f2i(fid);
++ umode_t inode_type = coda_inode_type(attr);
+
++retry:
+ inode = iget5_locked(sb, hash, coda_test_inode, coda_set_inode, fid);
+-
+ if (!inode)
+ return ERR_PTR(-ENOMEM);
+
+@@ -75,11 +76,15 @@ struct inode * coda_iget(struct super_block * sb, struct CodaFid * fid,
+ inode->i_ino = hash;
+ /* inode is locked and unique, no need to grab cii->c_lock */
+ cii->c_mapcount = 0;
++ coda_fill_inode(inode, attr);
+ unlock_new_inode(inode);
++ } else if ((inode->i_mode & S_IFMT) != inode_type) {
++ /* Inode has changed type, mark bad and grab a new one */
++ remove_inode_hash(inode);
++ coda_flag_inode(inode, C_PURGE);
++ iput(inode);
++ goto retry;
+ }
+-
+- /* always replace the attributes, type might have changed */
+- coda_fill_inode(inode, attr);
+ return inode;
+ }
+
+diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
+index 2e1a5a192074..903ca8fa4b9b 100644
+--- a/fs/coda/coda_linux.c
++++ b/fs/coda/coda_linux.c
+@@ -87,28 +87,27 @@ static struct coda_timespec timespec64_to_coda(struct timespec64 ts64)
+ }
+
+ /* utility functions below */
++umode_t coda_inode_type(struct coda_vattr *attr)
++{
++ switch (attr->va_type) {
++ case C_VREG:
++ return S_IFREG;
++ case C_VDIR:
++ return S_IFDIR;
++ case C_VLNK:
++ return S_IFLNK;
++ case C_VNON:
++ default:
++ return 0;
++ }
++}
++
+ void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr)
+ {
+- int inode_type;
+- /* inode's i_flags, i_ino are set by iget
+- XXX: is this all we need ??
+- */
+- switch (attr->va_type) {
+- case C_VNON:
+- inode_type = 0;
+- break;
+- case C_VREG:
+- inode_type = S_IFREG;
+- break;
+- case C_VDIR:
+- inode_type = S_IFDIR;
+- break;
+- case C_VLNK:
+- inode_type = S_IFLNK;
+- break;
+- default:
+- inode_type = 0;
+- }
++ /* inode's i_flags, i_ino are set by iget
++ * XXX: is this all we need ??
++ */
++ umode_t inode_type = coda_inode_type(attr);
+ inode->i_mode |= inode_type;
+
+ if (attr->va_mode != (u_short) -1)
+diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
+index 3c2947bba5e5..9be281bbcc06 100644
+--- a/fs/coda/coda_linux.h
++++ b/fs/coda/coda_linux.h
+@@ -53,10 +53,11 @@ int coda_getattr(struct user_namespace *, const struct path *, struct kstat *,
+ u32, unsigned int);
+ int coda_setattr(struct user_namespace *, struct dentry *, struct iattr *);
+
+-/* this file: heloers */
++/* this file: helpers */
+ char *coda_f2s(struct CodaFid *f);
+ int coda_iscontrol(const char *name, size_t length);
+
++umode_t coda_inode_type(struct coda_vattr *attr);
+ void coda_vattr_to_iattr(struct inode *, struct coda_vattr *);
+ void coda_iattr_to_vattr(struct iattr *, struct coda_vattr *);
+ unsigned short coda_flags_to_cflags(unsigned short);commit b2e36228367a8a097c7d15670fad47d77098f56d
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:42 2021 -0800
+
+ coda: avoid hidden code duplication in rename
+
+ We were actually fixing up the directory mtime in both branches after the
+ negative dentry test, it was just that one branch was only flagging the
+ directory inodes to refresh their attributes while the other branch used
+ the optional optimization to set mtime to the current time and not go back
+ to the Coda client.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-6-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 3fd085009f26..328d7a684b63 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -317,13 +317,10 @@ static int coda_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
+ coda_dir_drop_nlink(old_dir);
+ coda_dir_inc_nlink(new_dir);
+ }
+- coda_dir_update_mtime(old_dir);
+- coda_dir_update_mtime(new_dir);
+ coda_flag_inode(d_inode(new_dentry), C_VATTR);
+- } else {
+- coda_flag_inode(old_dir, C_VATTR);
+- coda_flag_inode(new_dir, C_VATTR);
+ }
++ coda_dir_update_mtime(old_dir);
++ coda_dir_update_mtime(new_dir);
+ }
+ return error;
+ }commit 76097eb7a48a2ddcf4755773bd501c7aa14cbb7d
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:39 2021 -0800
+
+ coda: avoid flagging NULL inodes
+
+ Somehow we hit a negative dentry in coda_rename even after checking with
+ d_really_is_positive. Maybe something raced and turned the new_dentry
+ negative while we were fixing up directory link counts.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-5-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/coda_linux.h b/fs/coda/coda_linux.h
+index e7b27754ce78..3c2947bba5e5 100644
+--- a/fs/coda/coda_linux.h
++++ b/fs/coda/coda_linux.h
+@@ -83,6 +83,9 @@ static __inline__ void coda_flag_inode(struct inode *inode, int flag)
+ {
+ struct coda_inode_info *cii = ITOC(inode);
+
++ if (!inode)
++ return;
++
+ spin_lock(&cii->c_lock);
+ cii->c_flags |= flag;
+ spin_unlock(&cii->c_lock);commit 3d8e72d97411370aab662e85e2c3a7b26555179c
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:33 2021 -0800
+
+ coda: check for async upcall request using local state
+
+ Originally flagged by Smatch because the code implicitly assumed outSize
+ is not NULL for non-async upcalls because of a flag that was (not) set in
+ req->uc_flags.
+
+ However req->uc_flags field is in shared state and although the current
+ code will not allow it to be changed before the async request check the
+ code is more robust when it tests against the local outSize variable.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-3-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index eb3b1898da46..59f6cfd06f96 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -744,7 +744,8 @@ static int coda_upcall(struct venus_comm *vcp,
+ list_add_tail(&req->uc_chain, &vcp->vc_pending);
+ wake_up_interruptible(&vcp->vc_waitq);
+
+- if (req->uc_flags & CODA_REQ_ASYNC) {
++ /* We can return early on asynchronous requests */
++ if (outSize == NULL) {
+ mutex_unlock(&vcp->vc_mutex);
+ return 0;
+ }commit 18319cb478de23340fdcb6385b0cc074a5416da7
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Mon Nov 8 18:34:30 2021 -0800
+
+ coda: avoid NULL pointer dereference from a bad inode
+
+ Patch series "Coda updates for -next".
+
+ The following patch series contains some fixes for the Coda kernel module
+ I've had sitting around and were tested extensively in a development
+ version of the Coda kernel module that lives outside of the main kernel.
+
+ This patch (of 9):
+
+ Avoid accessing coda_inode_info from a dentry with a bad inode.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-1-jaharkes@cs.cmu.edu
+ Link: https://lkml.kernel.org/r/20210908140308.18491-2-jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index d69989c1bac3..3fd085009f26 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -499,15 +499,20 @@ static int coda_dentry_revalidate(struct dentry *de, unsigned int flags)
+ */
+ static int coda_dentry_delete(const struct dentry * dentry)
+ {
+- int flags;
++ struct inode *inode;
++ struct coda_inode_info *cii;
+
+ if (d_really_is_negative(dentry))
+ return 0;
+
+- flags = (ITOC(d_inode(dentry))->c_flags) & C_PURGE;
+- if (is_bad_inode(d_inode(dentry)) || flags) {
++ inode = d_inode(dentry);
++ if (!inode || is_bad_inode(inode))
+ return 1;
+- }
++
++ cii = ITOC(inode);
++ if (cii->c_flags & C_PURGE)
++ return 1;
++
+ return 0;
+ }
+ commit 6dc280ebeed2c96a2fb933103dafe655a922b9c1 +Author: Jan Harkes <jaharkes@cs.cmu.edu> +Date: Tue Jul 16 16:28:51 2019 -0700 + + coda: remove uapi/linux/coda_psdev.h + + Nothing is left in this header that is used by userspace. + + Link: http://lkml.kernel.org/r/bb11378cef94739f2cf89425dd6d302a52c64480.1558117389.git.jaharkes@cs.cmu.edu + Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> + Cc: Arnd Bergmann <arnd@arndb.de> + Cc: Colin Ian King <colin.king@canonical.com> + Cc: Dan Carpenter <dan.carpenter@oracle.com> + Cc: David Howells <dhowells@redhat.com> + Cc: Fabian Frederick <fabf@skynet.be> + Cc: Mikko Rapeli <mikko.rapeli@iki.fi> + Cc: Sam Protsenko <semen.protsenko@linaro.org> + Cc: Yann Droneaud <ydroneaud@opteya.com> + Cc: Zhouyang Jia <jiazhouyang09@gmail.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/fs/coda/coda_psdev.h b/fs/coda/coda_psdev.h +index 012e16f741a6..801423cbbdfc 100644 +--- a/fs/coda/coda_psdev.h ++++ b/fs/coda/coda_psdev.h +@@ -3,8 +3,11 @@ + #define __CODA_PSDEV_H + + #include <linux/backing-dev.h> ++#include <linux/magic.h> + #include <linux/mutex.h> +-#include <linux/coda_psdev.h> ++ ++#define CODA_PSDEV_MAJOR 67 ++#define MAX_CODADEVS 5 /* how many do we allow */ + + struct kstatfs; + +diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h +deleted file mode 100644 +index 3dacb7fad66a..000000000000 +--- a/include/uapi/linux/coda_psdev.h ++++ /dev/null +@@ -1,10 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +-#ifndef _UAPI__CODA_PSDEV_H +-#define _UAPI__CODA_PSDEV_H +- +-#include <linux/magic.h> +- +-#define CODA_PSDEV_MAJOR 67 +-#define MAX_CODADEVS 5 /* how many do we allow */ +- +-#endif /* _UAPI__CODA_PSDEV_H */
commit b6a18c60080fcff0921e81991fec049394fb04e9
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:44 2019 -0700
+
+ coda: bump module version
+
+ The out of tree module version had been bumped several times already,
+ but we haven't kept this in-tree one in sync, partly because most
+ changes go from here to the out-of-tree copy.
+
+ Link: http://lkml.kernel.org/r/8b0ab50a2da2f0180ac32c79d91811b4d1d0bd8b.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 3ac22a2b97e2..e80bda1de6c5 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -389,7 +389,7 @@ MODULE_AUTHOR("Jan Harkes, Peter J. Braam");
+ MODULE_DESCRIPTION("Coda Distributed File System VFS interface");
+ MODULE_ALIAS_CHARDEV_MAJOR(CODA_PSDEV_MAJOR);
+ MODULE_LICENSE("GPL");
+-MODULE_VERSION("6.6");
++MODULE_VERSION("6.11");
+
+ static int __init init_coda(void)
+ {commit 5e7c31dfe74703f428220384b2863525957cc160
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:35 2019 -0700
+
+ coda: change Coda's user api to use 64-bit time_t in timespec
+
+ Move the 32-bit time_t problems to userspace.
+
+ Link: http://lkml.kernel.org/r/8d089068823bfb292a4020f773922fbd82ffad39.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/filesystems/coda.txt b/Documentation/filesystems/coda.txt
+index ea5969068895..545262c167c3 100644
+--- a/Documentation/filesystems/coda.txt
++++ b/Documentation/filesystems/coda.txt
+@@ -481,8 +481,8 @@ kernel support.
+
+
+
+- struct vtimespec {
+- long tv_sec; /* seconds */
++ struct coda_timespec {
++ int64_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+ };
+
+@@ -496,9 +496,9 @@ kernel support.
+ long va_fileid; /* file id */
+ u_quad_t va_size; /* file size in bytes */
+ long va_blocksize; /* blocksize preferred for i/o */
+- struct vtimespec va_atime; /* time of last access */
+- struct vtimespec va_mtime; /* time of last modification */
+- struct vtimespec va_ctime; /* time file changed */
++ struct coda_timespec va_atime; /* time of last access */
++ struct coda_timespec va_mtime; /* time of last modification */
++ struct coda_timespec va_ctime; /* time file changed */
+ u_long va_gen; /* generation number of file */
+ u_long va_flags; /* flags defined for file */
+ dev_t va_rdev; /* device special file represents */
+diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c
+index 8addcd166908..e4b5f02f0dd4 100644
+--- a/fs/coda/coda_linux.c
++++ b/fs/coda/coda_linux.c
+@@ -66,13 +66,8 @@ unsigned short coda_flags_to_cflags(unsigned short flags)
+ return coda_flags;
+ }
+
+-static struct timespec64 coda_to_timespec64(struct vtimespec ts)
++static struct timespec64 coda_to_timespec64(struct coda_timespec ts)
+ {
+- /*
+- * We interpret incoming timestamps as 'signed' to match traditional
+- * usage and support pre-1970 timestamps, but this breaks in y2038
+- * on 32-bit machines.
+- */
+ struct timespec64 ts64 = {
+ .tv_sec = ts.tv_sec,
+ .tv_nsec = ts.tv_nsec,
+@@ -81,12 +76,10 @@ static struct timespec64 coda_to_timespec64(struct vtimespec ts)
+ return ts64;
+ }
+
+-static struct vtimespec timespec64_to_coda(struct timespec64 ts64)
++static struct coda_timespec timespec64_to_coda(struct timespec64 ts64)
+ {
+- /* clamp the timestamps to the maximum range rather than wrapping */
+- struct vtimespec ts = {
+- .tv_sec = lower_32_bits(clamp_t(time64_t, ts64.tv_sec,
+- LONG_MIN, LONG_MAX)),
++ struct coda_timespec ts = {
++ .tv_sec = ts64.tv_sec,
+ .tv_nsec = ts64.tv_nsec,
+ };
+
+@@ -156,11 +149,11 @@ void coda_iattr_to_vattr(struct iattr *iattr, struct coda_vattr *vattr)
+ vattr->va_uid = (vuid_t) -1;
+ vattr->va_gid = (vgid_t) -1;
+ vattr->va_size = (off_t) -1;
+- vattr->va_atime.tv_sec = (long) -1;
++ vattr->va_atime.tv_sec = (int64_t) -1;
+ vattr->va_atime.tv_nsec = (long) -1;
+- vattr->va_mtime.tv_sec = (long) -1;
++ vattr->va_mtime.tv_sec = (int64_t) -1;
+ vattr->va_mtime.tv_nsec = (long) -1;
+- vattr->va_ctime.tv_sec = (long) -1;
++ vattr->va_ctime.tv_sec = (int64_t) -1;
+ vattr->va_ctime.tv_nsec = (long) -1;
+ vattr->va_type = C_VNON;
+ vattr->va_fileid = -1;
+diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
+index fc5f7874208a..5dba636b6e11 100644
+--- a/include/uapi/linux/coda.h
++++ b/include/uapi/linux/coda.h
+@@ -86,10 +86,6 @@ typedef unsigned long long u_quad_t;
+
+ #define inline
+
+-struct timespec {
+- long ts_sec;
+- long ts_nsec;
+-};
+ #else /* DJGPP but not KERNEL */
+ #include <sys/time.h>
+ typedef unsigned long long u_quad_t;
+@@ -110,13 +106,6 @@ typedef unsigned long long u_quad_t;
+ #define cdev_t dev_t
+ #endif
+
+-#ifdef __CYGWIN32__
+-struct timespec {
+- time_t tv_sec; /* seconds */
+- long tv_nsec; /* nanoseconds */
+-};
+-#endif
+-
+ #ifndef __BIT_TYPES_DEFINED__
+ #define __BIT_TYPES_DEFINED__
+ typedef signed char int8_t;
+@@ -211,19 +200,10 @@ struct CodaFid {
+ */
+ enum coda_vtype { C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
+
+-#ifdef __linux__
+-/*
+- * This matches the traditional Linux 'timespec' structure binary layout,
+- * before using 64-bit time_t everywhere. Overflows in y2038 on 32-bit
+- * architectures.
+- */
+-struct vtimespec {
+- long tv_sec; /* seconds */
++struct coda_timespec {
++ int64_t tv_sec; /* seconds */
+ long tv_nsec; /* nanoseconds */
+ };
+-#else
+-#define vtimespec timespec
+-#endif
+
+ struct coda_vattr {
+ long va_type; /* vnode type (for create) */
+@@ -234,9 +214,9 @@ struct coda_vattr {
+ long va_fileid; /* file id */
+ u_quad_t va_size; /* file size in bytes */
+ long va_blocksize; /* blocksize preferred for i/o */
+- struct vtimespec va_atime; /* time of last access */
+- struct vtimespec va_mtime; /* time of last modification */
+- struct vtimespec va_ctime; /* time file changed */
++ struct coda_timespec va_atime; /* time of last access */
++ struct coda_timespec va_mtime; /* time of last modification */
++ struct coda_timespec va_ctime; /* time file changed */
+ u_long va_gen; /* generation number of file */
+ u_long va_flags; /* flags defined for file */
+ cdev_t va_rdev; /* device special file represents */
+@@ -301,7 +281,8 @@ struct coda_statfs {
+
+ #define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
+
+-#define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
++// CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
++#define CODA_KERNEL_VERSION 4 /* 64-bit timespec */
+
+ /*
+ * Venus <-> Coda RPC argumentscommit 2fe7491d219428a32f09948e88bfaf8e71b9a66b
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:26 2019 -0700
+
+ uapi linux/coda_psdev.h: move CODA_REQ_ from uapi to kernel side headers
+
+ These constants only used internally and not exposed to userspace.
+
+ Link: http://lkml.kernel.org/r/baeafc30dad70d8b422ee679420099c2d8aa7da0.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index d1672fd5e638..9487f792770c 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -31,6 +31,11 @@ struct upc_req {
+ wait_queue_head_t uc_sleep; /* process' wait queue */
+ };
+
++#define CODA_REQ_ASYNC 0x1
++#define CODA_REQ_READ 0x2
++#define CODA_REQ_WRITE 0x4
++#define CODA_REQ_ABORT 0x8
++
+ static inline struct venus_comm *coda_vcp(struct super_block *sb)
+ {
+ return (struct venus_comm *)((sb)->s_fs_info);
+diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
+index d50d51a57fe4..3dacb7fad66a 100644
+--- a/include/uapi/linux/coda_psdev.h
++++ b/include/uapi/linux/coda_psdev.h
+@@ -7,9 +7,4 @@
+ #define CODA_PSDEV_MAJOR 67
+ #define MAX_CODADEVS 5 /* how many do we allow */
+
+-#define CODA_REQ_ASYNC 0x1
+-#define CODA_REQ_READ 0x2
+-#define CODA_REQ_WRITE 0x4
+-#define CODA_REQ_ABORT 0x8
+-
+ #endif /* _UAPI__CODA_PSDEV_H */
+ commit 7c99200142c04d0f1ed3f048014591f841efdaed
+Author: Matthew Arnold <Matthew.Arnold-1@uts.edu.au>
+Date: Sat Dec 13 22:42:53 2008 +1100
+
+ USB: add 5372:2303 to pl2303
+
+ This patch adds the "Superial" USB-Serial converter to pl2303 so that it
+ is detected, by the correct driver. Adds the relevant vendor:product
+ (5372:2303) to the device tables in pl2303.c & pl2303.h. The patch has
+ been tested against 2.6.24-22-generic.
+
+ Signed-off-by: Matthew D Arnold <matthew.arnold-1@uts.edu.au>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
+index 491c8857b644..029b314a1fb2 100644
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -91,6 +91,7 @@ static struct usb_device_id id_table [] = {
+ { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) },
+ { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) },
+ { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) },
++ { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) },
+ { } /* Terminating entry */
+ };
+
+diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
+index a3bd039c78e9..05c909aca8e3 100644
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -110,3 +110,7 @@
+ /* Y.C. Cable U.S.A., Inc - USB to RS-232 */
+ #define YCCABLE_VENDOR_ID 0x05ad
+ #define YCCABLE_PRODUCT_ID 0x0fba
++
++/* "Superial" USB - Serial */
++#define SUPERIAL_VENDOR_ID 0x5372
++#define SUPERIAL_PRODUCT_ID 0x2303
+ commit 2fccd2814f8ebc8f1bd325dc46e11c333fc76ab3 +Author: cwm97m <cwm97m@cse.nsysu.edu.tw> +Date: Tue Dec 16 20:28:44 2008 +0000 + + jme: Fixed a typo + + Found a typo. + + Signed-off-by: Wei-Min Chen <cwm97m@cse.nsysu.edu.tw> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/drivers/net/jme.h b/drivers/net/jme.h +index f863aee6648b..3f5d91543246 100644 +--- a/drivers/net/jme.h ++++ b/drivers/net/jme.h +@@ -22,7 +22,7 @@ + */ + + #ifndef __JME_H_INCLUDED__ +-#define __JME_H_INCLUDEE__ ++#define __JME_H_INCLUDED__ + + #define DRV_NAME "jme" + #define DRV_VERSION "1.0.3"+
commit 130de7cebe20a74261a75bb0c6026a3199cdb980
+Author: Benjamin Matthews <bmat@lle.rochester.edu>
+Date: Thu Aug 14 14:55:54 2008 +0800
+
+ Blackfin arch: add support for the BlackStamp board
+
+ Signed-off-by: Benjamin Matthews <bmat@lle.rochester.edu>
+ Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
+ Signed-off-by: Bryan Wu <cooloney@kernel.org>
+
+diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
+index ededf9319f34..f64d25973a37 100644
+--- a/arch/blackfin/Kconfig
++++ b/arch/blackfin/Kconfig
+@@ -249,7 +249,7 @@ config MEM_MT48LC8M32B2B5_7
+
+ config MEM_MT48LC32M16A2TG_75
+ bool
+- depends on (BFIN527_EZKIT || BFIN532_IP0X)
++ depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)
+ default y
+
+ source "arch/blackfin/mach-bf527/Kconfig"
+@@ -292,7 +292,7 @@ config CLKIN_HZ
+ int "Frequency of the crystal on the board in Hz"
+ default "11059200" if BFIN533_STAMP
+ default "27000000" if BFIN533_EZKIT
+- default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS)
++ default "25000000" if (BFIN537_STAMP || BFIN527_EZKIT || H8606_HVSISTEMAS || BLACKSTAMP)
+ default "30000000" if BFIN561_EZKIT
+ default "24576000" if PNAV10
+ default "10000000" if BFIN532_IP0X
+@@ -332,7 +332,7 @@ config VCO_MULT
+ default "22" if BFIN533_BLUETECHNIX_CM
+ default "20" if (BFIN537_BLUETECHNIX_CM || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)
+ default "20" if BFIN561_EZKIT
+- default "16" if H8606_HVSISTEMAS
++ default "16" if (H8606_HVSISTEMAS || BLACKSTAMP)
+ help
+ This controls the frequency of the on-chip PLL. This can be between 1 and 64.
+ PLL Frequency = (Crystal Frequency) * (this setting)
+diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
+new file mode 100644
+index 000000000000..2921f9952d5f
+--- /dev/null
++++ b/arch/blackfin/configs/BlackStamp_defconfig
+@@ -0,0 +1,1195 @@
++#
++# Automatically generated make config: don't edit
++# Linux kernel version: 2.6.26.2
++#
++# CONFIG_MMU is not set
++# CONFIG_FPU is not set
++CONFIG_RWSEM_GENERIC_SPINLOCK=y
++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
++CONFIG_BLACKFIN=y
++CONFIG_ZONE_DMA=y
++CONFIG_GENERIC_FIND_NEXT_BIT=y
++CONFIG_GENERIC_HWEIGHT=y
++CONFIG_GENERIC_HARDIRQS=y
++CONFIG_GENERIC_IRQ_PROBE=y
++CONFIG_GENERIC_GPIO=y
++CONFIG_FORCE_MAX_ZONEORDER=14
++CONFIG_GENERIC_CALIBRATE_DELAY=y
++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
++
++#
++# General setup
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_BROKEN_ON_SMP=y
++CONFIG_INIT_ENV_ARG_LIMIT=32
++CONFIG_LOCALVERSION=""
++CONFIG_LOCALVERSION_AUTO=y
++CONFIG_SYSVIPC=y
++CONFIG_SYSVIPC_SYSCTL=y
++# CONFIG_POSIX_MQUEUE is not set
++# CONFIG_BSD_PROCESS_ACCT is not set
++# CONFIG_TASKSTATS is not set
++# CONFIG_AUDIT is not set
++CONFIG_IKCONFIG=y
++CONFIG_IKCONFIG_PROC=y
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_CGROUPS is not set
++# CONFIG_GROUP_SCHED is not set
++CONFIG_SYSFS_DEPRECATED=y
++CONFIG_SYSFS_DEPRECATED_V2=y
++# CONFIG_RELAY is not set
++# CONFIG_NAMESPACES is not set
++CONFIG_BLK_DEV_INITRD=y
++CONFIG_INITRAMFS_SOURCE=""
++# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
++CONFIG_SYSCTL=y
++CONFIG_EMBEDDED=y
++CONFIG_UID16=y
++CONFIG_SYSCTL_SYSCALL=y
++CONFIG_SYSCTL_SYSCALL_CHECK=y
++CONFIG_KALLSYMS=y
++# CONFIG_KALLSYMS_EXTRA_PASS is not set
++CONFIG_HOTPLUG=y
++CONFIG_PRINTK=y
++CONFIG_BUG=y
++CONFIG_ELF_CORE=y
++CONFIG_COMPAT_BRK=y
++CONFIG_BASE_FULL=y
++CONFIG_FUTEX=y
++CONFIG_ANON_INODES=y
++CONFIG_EPOLL=y
++CONFIG_SIGNALFD=y
++CONFIG_TIMERFD=y
++CONFIG_EVENTFD=y
++CONFIG_VM_EVENT_COUNTERS=y
++CONFIG_SLAB=y
++# CONFIG_SLUB is not set
++# CONFIG_SLOB is not set
++# CONFIG_PROFILING is not set
++# CONFIG_MARKERS is not set
++CONFIG_HAVE_OPROFILE=y
++# CONFIG_HAVE_KPROBES is not set
++# CONFIG_HAVE_KRETPROBES is not set
++# CONFIG_HAVE_DMA_ATTRS is not set
++CONFIG_SLABINFO=y
++CONFIG_RT_MUTEXES=y
++CONFIG_TINY_SHMEM=y
++CONFIG_BASE_SMALL=0
++CONFIG_MODULES=y
++# CONFIG_MODULE_FORCE_LOAD is not set
++CONFIG_MODULE_UNLOAD=y
++CONFIG_MODULE_FORCE_UNLOAD=y
++# CONFIG_MODVERSIONS is not set
++# CONFIG_MODULE_SRCVERSION_ALL is not set
++CONFIG_KMOD=y
++CONFIG_BLOCK=y
++# CONFIG_LBD is not set
++# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_LSF is not set
++# CONFIG_BLK_DEV_BSG is not set
++
++#
++# IO Schedulers
++#
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++# CONFIG_IOSCHED_DEADLINE is not set
++CONFIG_IOSCHED_CFQ=y
++CONFIG_DEFAULT_AS=y
++# CONFIG_DEFAULT_DEADLINE is not set
++# CONFIG_DEFAULT_CFQ is not set
++# CONFIG_DEFAULT_NOOP is not set
++CONFIG_DEFAULT_IOSCHED="anticipatory"
++CONFIG_CLASSIC_RCU=y
++# CONFIG_PREEMPT_NONE is not set
++CONFIG_PREEMPT_VOLUNTARY=y
++# CONFIG_PREEMPT is not set
++
++#
++# Blackfin Processor Options
++#
++
++#
++# Processor and Board Settings
++#
++# CONFIG_BF522 is not set
++# CONFIG_BF523 is not set
++# CONFIG_BF524 is not set
++# CONFIG_BF525 is not set
++# CONFIG_BF526 is not set
++# CONFIG_BF527 is not set
++# CONFIG_BF531 is not set
++CONFIG_BF532=y
++# CONFIG_BF533 is not set
++# CONFIG_BF534 is not set
++# CONFIG_BF536 is not set
++# CONFIG_BF537 is not set
++# CONFIG_BF542 is not set
++# CONFIG_BF544 is not set
++# CONFIG_BF547 is not set
++# CONFIG_BF548 is not set
++# CONFIG_BF549 is not set
++# CONFIG_BF561 is not set
++# CONFIG_BF_REV_0_0 is not set
++# CONFIG_BF_REV_0_1 is not set
++# CONFIG_BF_REV_0_2 is not set
++# CONFIG_BF_REV_0_3 is not set
++# CONFIG_BF_REV_0_4 is not set
++CONFIG_BF_REV_0_5=y
++# CONFIG_BF_REV_ANY is not set
++# CONFIG_BF_REV_NONE is not set
++CONFIG_BF53x=y
++CONFIG_MEM_MT48LC32M16A2TG_75=y
++# CONFIG_BFIN533_EZKIT is not set
++# CONFIG_BFIN533_STAMP is not set
++# CONFIG_BFIN533_BLUETECHNIX_CM is not set
++# CONFIG_H8606_HVSISTEMAS is not set
++# CONFIG_BFIN532_IP0X is not set
++CONFIG_BLACKSTAMP=y
++# CONFIG_GENERIC_BF533_BOARD is not set
++
++#
++# BF533/2/1 Specific Configuration
++#
++
++#
++# Interrupt Priority Assignment
++#
++
++#
++# Priority
++#
++CONFIG_UART_ERROR=7
++CONFIG_SPORT0_ERROR=7
++CONFIG_SPI_ERROR=7
++CONFIG_SPORT1_ERROR=7
++CONFIG_PPI_ERROR=7
++CONFIG_DMA_ERROR=7
++CONFIG_PLLWAKE_ERROR=7
++CONFIG_RTC_ERROR=8
++CONFIG_DMA0_PPI=8
++CONFIG_DMA1_SPORT0RX=9
++CONFIG_DMA2_SPORT0TX=9
++CONFIG_DMA3_SPORT1RX=9
++CONFIG_DMA4_SPORT1TX=9
++CONFIG_DMA5_SPI=10
++CONFIG_DMA6_UARTRX=10
++CONFIG_DMA7_UARTTX=10
++CONFIG_TIMER0=11
++CONFIG_TIMER1=11
++CONFIG_TIMER2=11
++CONFIG_PFA=12
++CONFIG_PFB=12
++CONFIG_MEMDMA0=13
++CONFIG_MEMDMA1=13
++CONFIG_WDTIMER=13
++
++#
++# Board customizations
++#
++# CONFIG_CMDLINE_BOOL is not set
++CONFIG_BOOT_LOAD=0x1000
++
++#
++# Clock/PLL Setup
++#
++CONFIG_CLKIN_HZ=25000000
++# CONFIG_BFIN_KERNEL_CLOCK is not set
++# CONFIG_PLL_BYPASS is not set
++# CONFIG_CLKIN_HALF is not set
++CONFIG_VCO_MULT=16
++CONFIG_CCLK_DIV_1=y
++# CONFIG_CCLK_DIV_2 is not set
++# CONFIG_CCLK_DIV_4 is not set
++# CONFIG_CCLK_DIV_8 is not set
++CONFIG_SCLK_DIV=3
++CONFIG_MAX_MEM_SIZE=64
++CONFIG_MAX_VCO_HZ=400000000
++CONFIG_MIN_VCO_HZ=50000000
++CONFIG_MAX_SCLK_HZ=133333333
++CONFIG_MIN_SCLK_HZ=27000000
++
++#
++# Kernel Timer/Scheduler
++#
++# CONFIG_HZ_100 is not set
++CONFIG_HZ_250=y
++# CONFIG_HZ_300 is not set
++# CONFIG_HZ_1000 is not set
++CONFIG_HZ=250
++# CONFIG_SCHED_HRTICK is not set
++CONFIG_GENERIC_TIME=y
++CONFIG_GENERIC_CLOCKEVENTS=y
++# CONFIG_CYCLES_CLOCKSOURCE is not set
++CONFIG_TICK_ONESHOT=y
++# CONFIG_NO_HZ is not set
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
++
++#
++# Memory Setup
++#
++
++#
++# Misc
++#
++CONFIG_BFIN_SCRATCH_REG_RETN=y
++# CONFIG_BFIN_SCRATCH_REG_RETE is not set
++# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
++
++#
++# Blackfin Kernel Optimizations
++#
++
++#
++# Memory Optimizations
++#
++CONFIG_I_ENTRY_L1=y
++CONFIG_EXCPT_IRQ_SYSC_L1=y
++CONFIG_DO_IRQ_L1=y
++CONFIG_CORE_TIMER_IRQ_L1=y
++CONFIG_IDLE_L1=y
++CONFIG_SCHEDULE_L1=y
++CONFIG_ARITHMETIC_OPS_L1=y
++CONFIG_ACCESS_OK_L1=y
++CONFIG_MEMSET_L1=y
++CONFIG_MEMCPY_L1=y
++CONFIG_SYS_BFIN_SPINLOCK_L1=y
++# CONFIG_IP_CHECKSUM_L1 is not set
++CONFIG_CACHELINE_ALIGNED_L1=y
++# CONFIG_SYSCALL_TAB_L1 is not set
++# CONFIG_CPLB_SWITCH_TAB_L1 is not set
++# CONFIG_RAMKERNEL is not set
++CONFIG_ROMKERNEL=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_SPARSEMEM_STATIC is not set
++# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
++CONFIG_PAGEFLAGS_EXTENDED=y
++CONFIG_SPLIT_PTLOCK_CPUS=4
++# CONFIG_RESOURCES_64BIT is not set
++CONFIG_ZONE_DMA_FLAG=1
++CONFIG_VIRT_TO_BUS=y
++CONFIG_BFIN_GPTIMERS=y
++CONFIG_BFIN_DMA_5XX=y
++# CONFIG_DMA_UNCACHED_4M is not set
++# CONFIG_DMA_UNCACHED_2M is not set
++CONFIG_DMA_UNCACHED_1M=y
++# CONFIG_DMA_UNCACHED_NONE is not set
++
++#
++# Cache Support
++#
++CONFIG_BFIN_ICACHE=y
++CONFIG_BFIN_DCACHE=y
++# CONFIG_BFIN_DCACHE_BANKA is not set
++# CONFIG_BFIN_ICACHE_LOCK is not set
++# CONFIG_BFIN_WB is not set
++CONFIG_BFIN_WT=y
++# CONFIG_MPU is not set
++
++#
++# Asynchonous Memory Configuration
++#
++
++#
++# EBIU_AMGCTL Global Control
++#
++CONFIG_C_AMCKEN=y
++CONFIG_C_CDPRIO=y
++# CONFIG_C_AMBEN is not set
++# CONFIG_C_AMBEN_B0 is not set
++# CONFIG_C_AMBEN_B0_B1 is not set
++# CONFIG_C_AMBEN_B0_B1_B2 is not set
++CONFIG_C_AMBEN_ALL=y
++
++#
++# EBIU_AMBCTL Control
++#
++CONFIG_BANK_0=0x7BB0
++CONFIG_BANK_1=0x7BB0
++CONFIG_BANK_2=0x7BB0
++CONFIG_BANK_3=0xAAC2
++
++#
++# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
++#
++# CONFIG_PCI is not set
++# CONFIG_ARCH_SUPPORTS_MSI is not set
++# CONFIG_PCCARD is not set
++
++#
++# Executable file formats
++#
++CONFIG_BINFMT_ELF_FDPIC=y
++CONFIG_BINFMT_FLAT=y
++CONFIG_BINFMT_ZFLAT=y
++CONFIG_BINFMT_SHARED_FLAT=y
++# CONFIG_BINFMT_MISC is not set
++
++#
++# Power management options
++#
++CONFIG_PM=y
++# CONFIG_PM_DEBUG is not set
++CONFIG_PM_SLEEP=y
++CONFIG_SUSPEND=y
++CONFIG_SUSPEND_FREEZER=y
++CONFIG_ARCH_SUSPEND_POSSIBLE=y
++CONFIG_PM_BFIN_SLEEP_DEEPER=y
++# CONFIG_PM_BFIN_SLEEP is not set
++# CONFIG_PM_WAKEUP_BY_GPIO is not set
++
++#
++# Possible Suspend Mem / Hibernate Wake-Up Sources
++#
++
++#
++# CPU Frequency scaling
++#
++# CONFIG_CPU_FREQ is not set
++
++#
++# Networking
++#
++CONFIG_NET=y
++
++#
++# Networking options
++#
++CONFIG_PACKET=y
++# CONFIG_PACKET_MMAP is not set
++CONFIG_UNIX=y
++CONFIG_XFRM=y
++# CONFIG_XFRM_USER is not set
++# CONFIG_XFRM_SUB_POLICY is not set
++# CONFIG_XFRM_MIGRATE is not set
++# CONFIG_XFRM_STATISTICS is not set
++# CONFIG_NET_KEY is not set
++CONFIG_INET=y
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_IP_ADVANCED_ROUTER is not set
++CONFIG_IP_FIB_HASH=y
++CONFIG_IP_PNP=y
++# CONFIG_IP_PNP_DHCP is not set
++# CONFIG_IP_PNP_BOOTP is not set
++# CONFIG_IP_PNP_RARP is not set
++# CONFIG_NET_IPIP is not set
++# CONFIG_NET_IPGRE is not set
++# CONFIG_ARPD is not set
++CONFIG_SYN_COOKIES=y
++# CONFIG_INET_AH is not set
++# CONFIG_INET_ESP is not set
++# CONFIG_INET_IPCOMP is not set
++# CONFIG_INET_XFRM_TUNNEL is not set
++# CONFIG_INET_TUNNEL is not set
++CONFIG_INET_XFRM_MODE_TRANSPORT=y
++CONFIG_INET_XFRM_MODE_TUNNEL=y
++CONFIG_INET_XFRM_MODE_BEET=y
++# CONFIG_INET_LRO is not set
++CONFIG_INET_DIAG=y
++CONFIG_INET_TCP_DIAG=y
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_CUBIC=y
++CONFIG_DEFAULT_TCP_CONG="cubic"
++# CONFIG_TCP_MD5SIG is not set
++# CONFIG_IPV6 is not set
++# CONFIG_NETLABEL is not set
++# CONFIG_NETWORK_SECMARK is not set
++# CONFIG_NETFILTER is not set
++# CONFIG_IP_DCCP is not set
++# CONFIG_IP_SCTP is not set
++# CONFIG_TIPC is not set
++# CONFIG_ATM is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_DECNET is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_NET_SCHED is not set
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_CAN is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++# CONFIG_AF_RXRPC is not set
++
++#
++# Wireless
++#
++# CONFIG_CFG80211 is not set
++# CONFIG_WIRELESS_EXT is not set
++# CONFIG_MAC80211 is not set
++# CONFIG_IEEE80211 is not set
++# CONFIG_RFKILL is not set
++# CONFIG_NET_9P is not set
++
++#
++# Device Drivers
++#
++
++#
++# Generic Driver Options
++#
++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++CONFIG_STANDALONE=y
++CONFIG_PREVENT_FIRMWARE_BUILD=y
++# CONFIG_FW_LOADER is not set
++# CONFIG_SYS_HYPERVISOR is not set
++# CONFIG_CONNECTOR is not set
++CONFIG_MTD=y
++# CONFIG_MTD_DEBUG is not set
++# CONFIG_MTD_CONCAT is not set
++CONFIG_MTD_PARTITIONS=y
++# CONFIG_MTD_REDBOOT_PARTS is not set
++CONFIG_MTD_CMDLINE_PARTS=y
++# CONFIG_MTD_AR7_PARTS is not set
++
++#
++# User Modules And Translation Layers
++#
++CONFIG_MTD_CHAR=m
++CONFIG_MTD_BLKDEVS=y
++CONFIG_MTD_BLOCK=y
++# CONFIG_FTL is not set
++# CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
++# CONFIG_RFD_FTL is not set
++# CONFIG_SSFDC is not set
++# CONFIG_MTD_OOPS is not set
++
++#
++# RAM/ROM/Flash chip drivers
++#
++CONFIG_MTD_CFI=m
++# CONFIG_MTD_JEDECPROBE is not set
++CONFIG_MTD_GEN_PROBE=m
++# CONFIG_MTD_CFI_ADV_OPTIONS is not set
++CONFIG_MTD_MAP_BANK_WIDTH_1=y
++CONFIG_MTD_MAP_BANK_WIDTH_2=y
++CONFIG_MTD_MAP_BANK_WIDTH_4=y
++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
++CONFIG_MTD_CFI_I1=y
++CONFIG_MTD_CFI_I2=y
++# CONFIG_MTD_CFI_I4 is not set
++# CONFIG_MTD_CFI_I8 is not set
++# CONFIG_MTD_CFI_INTELEXT is not set
++CONFIG_MTD_CFI_AMDSTD=m
++# CONFIG_MTD_CFI_STAA is not set
++CONFIG_MTD_CFI_UTIL=m
++CONFIG_MTD_RAM=y
++CONFIG_MTD_ROM=m
++# CONFIG_MTD_ABSENT is not set
++
++#
++# Mapping drivers for chip access
++#
++CONFIG_MTD_COMPLEX_MAPPINGS=y
++# CONFIG_MTD_PHYSMAP is not set
++# CONFIG_MTD_GPIO_ADDR is not set
++# CONFIG_MTD_UCLINUX is not set
++# CONFIG_MTD_PLATRAM is not set
++
++#
++# Self-contained MTD device drivers
++#
++# CONFIG_MTD_DATAFLASH is not set
++CONFIG_MTD_M25P80=y
++# CONFIG_M25PXX_USE_FAST_READ is not set
++# CONFIG_MTD_SLRAM is not set
++# CONFIG_MTD_PHRAM is not set
++# CONFIG_MTD_MTDRAM is not set
++# CONFIG_MTD_BLOCK2MTD is not set
++
++#
++# Disk-On-Chip Device Drivers
++#
++# CONFIG_MTD_DOC2000 is not set
++# CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
++# CONFIG_MTD_NAND is not set
++# CONFIG_MTD_ONENAND is not set
++
++#
++# UBI - Unsorted block images
++#
++# CONFIG_MTD_UBI is not set
++# CONFIG_PARPORT is not set
++CONFIG_BLK_DEV=y
++# CONFIG_BLK_DEV_COW_COMMON is not set
++CONFIG_BLK_DEV_LOOP=y
++# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++CONFIG_BLK_DEV_NBD=y
++CONFIG_BLK_DEV_RAM=y
++CONFIG_BLK_DEV_RAM_COUNT=16
++CONFIG_BLK_DEV_RAM_SIZE=4096
++# CONFIG_BLK_DEV_XIP is not set
++# CONFIG_CDROM_PKTCDVD is not set
++# CONFIG_ATA_OVER_ETH is not set
++CONFIG_MISC_DEVICES=y
++# CONFIG_EEPROM_93CX6 is not set
++# CONFIG_ENCLOSURE_SERVICES is not set
++CONFIG_HAVE_IDE=y
++# CONFIG_IDE is not set
++
++#
++# SCSI device support
++#
++# CONFIG_RAID_ATTRS is not set
++# CONFIG_SCSI is not set
++# CONFIG_SCSI_DMA is not set
++# CONFIG_SCSI_NETLINK is not set
++# CONFIG_ATA is not set
++# CONFIG_MD is not set
++CONFIG_NETDEVICES=y
++# CONFIG_NETDEVICES_MULTIQUEUE is not set
++# CONFIG_DUMMY is not set
++# CONFIG_BONDING is not set
++# CONFIG_MACVLAN is not set
++# CONFIG_EQUALIZER is not set
++# CONFIG_TUN is not set
++# CONFIG_VETH is not set
++# CONFIG_PHYLIB is not set
++CONFIG_NET_ETHERNET=y
++CONFIG_MII=y
++CONFIG_SMC91X=y
++# CONFIG_SMSC911X is not set
++# CONFIG_DM9000 is not set
++# CONFIG_ENC28J60 is not set
++# CONFIG_IBM_NEW_EMAC_ZMII is not set
++# CONFIG_IBM_NEW_EMAC_RGMII is not set
++# CONFIG_IBM_NEW_EMAC_TAH is not set
++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
++# CONFIG_B44 is not set
++# CONFIG_NETDEV_1000 is not set
++# CONFIG_NETDEV_10000 is not set
++
++#
++# Wireless LAN
++#
++# CONFIG_WLAN_PRE80211 is not set
++# CONFIG_WLAN_80211 is not set
++# CONFIG_IWLWIFI_LEDS is not set
++# CONFIG_WAN is not set
++# CONFIG_PPP is not set
++# CONFIG_SLIP is not set
++# CONFIG_NETCONSOLE is not set
++# CONFIG_NETPOLL is not set
++# CONFIG_NET_POLL_CONTROLLER is not set
++# CONFIG_ISDN is not set
++# CONFIG_PHONE is not set
++
++#
++# Input device support
++#
++CONFIG_INPUT=y
++# CONFIG_INPUT_FF_MEMLESS is not set
++# CONFIG_INPUT_POLLDEV is not set
++
++#
++# Userland interfaces
++#
++# CONFIG_INPUT_MOUSEDEV is not set
++# CONFIG_INPUT_JOYDEV is not set
++CONFIG_INPUT_EVDEV=m
++# CONFIG_INPUT_EVBUG is not set
++
++#
++# Input Device Drivers
++#
++# CONFIG_INPUT_KEYBOARD is not set
++# CONFIG_INPUT_MOUSE is not set
++# CONFIG_INPUT_JOYSTICK is not set
++# CONFIG_INPUT_TABLET is not set
++# CONFIG_INPUT_TOUCHSCREEN is not set
++# CONFIG_INPUT_MISC is not set
++
++#
++# Hardware I/O ports
++#
++# CONFIG_SERIO is not set
++# CONFIG_GAMEPORT is not set
++
++#
++# Character devices
++#
++# CONFIG_AD9960 is not set
++# CONFIG_SPI_ADC_BF533 is not set
++# CONFIG_BF5xx_PPIFCD is not set
++# CONFIG_BFIN_SIMPLE_TIMER is not set
++CONFIG_BF5xx_PPI=y
++CONFIG_BFIN_SPORT=y
++# CONFIG_BFIN_TIMER_LATENCY is not set
++# CONFIG_TWI_LCD is not set
++CONFIG_SIMPLE_GPIO=m
++# CONFIG_VT is not set
++CONFIG_DEVKMEM=y
++# CONFIG_SERIAL_NONSTANDARD is not set
++
++#
++# Serial drivers
++#
++# CONFIG_SERIAL_8250 is not set
++
++#
++# Non-8250 serial port support
++#
++CONFIG_SERIAL_BFIN=y
++CONFIG_SERIAL_BFIN_CONSOLE=y
++CONFIG_SERIAL_BFIN_DMA=y
++# CONFIG_SERIAL_BFIN_PIO is not set
++CONFIG_SERIAL_BFIN_UART0=y
++# CONFIG_BFIN_UART0_CTSRTS is not set
++CONFIG_SERIAL_CORE=y
++CONFIG_SERIAL_CORE_CONSOLE=y
++# CONFIG_SERIAL_BFIN_SPORT is not set
++CONFIG_UNIX98_PTYS=y
++# CONFIG_LEGACY_PTYS is not set
++
++#
++# CAN, the car bus and industrial fieldbus
++#
++# CONFIG_CAN4LINUX is not set
++# CONFIG_IPMI_HANDLER is not set
++CONFIG_HW_RANDOM=y
++# CONFIG_R3964 is not set
++# CONFIG_RAW_DRIVER is not set
++# CONFIG_TCG_TPM is not set
++CONFIG_I2C=m
++CONFIG_I2C_BOARDINFO=y
++CONFIG_I2C_CHARDEV=m
++CONFIG_I2C_ALGOBIT=m
++
++#
++# I2C Hardware Bus support
++#
++CONFIG_I2C_GPIO=m
++# CONFIG_I2C_OCORES is not set
++# CONFIG_I2C_PARPORT_LIGHT is not set
++# CONFIG_I2C_SIMTEC is not set
++# CONFIG_I2C_TAOS_EVM is not set
++# CONFIG_I2C_STUB is not set
++# CONFIG_I2C_PCA_PLATFORM is not set
++
++#
++# Miscellaneous I2C Chip support
++#
++# CONFIG_DS1682 is not set
++# CONFIG_SENSORS_AD5252 is not set
++# CONFIG_SENSORS_EEPROM is not set
++# CONFIG_SENSORS_PCF8574 is not set
++# CONFIG_PCF8575 is not set
++# CONFIG_SENSORS_PCF8591 is not set
++# CONFIG_SENSORS_MAX6875 is not set
++# CONFIG_SENSORS_TSL2550 is not set
++# CONFIG_I2C_DEBUG_CORE is not set
++# CONFIG_I2C_DEBUG_ALGO is not set
++# CONFIG_I2C_DEBUG_BUS is not set
++# CONFIG_I2C_DEBUG_CHIP is not set
++CONFIG_SPI=y
++CONFIG_SPI_MASTER=y
++
++#
++# SPI Master Controller Drivers
++#
++CONFIG_SPI_BFIN=y
++# CONFIG_SPI_BITBANG is not set
++
++#
++# SPI Protocol Masters
++#
++CONFIG_SPI_AT25=y
++CONFIG_SPI_SPIDEV=m
++# CONFIG_SPI_TLE62X0 is not set
++# CONFIG_W1 is not set
++# CONFIG_POWER_SUPPLY is not set
++# CONFIG_HWMON is not set
++# CONFIG_HWMON_VID is not set
++# CONFIG_SENSORS_AD7418 is not set
++# CONFIG_SENSORS_ADM1021 is not set
++# CONFIG_SENSORS_ADM1025 is not set
++# CONFIG_SENSORS_ADM1026 is not set
++# CONFIG_SENSORS_ADM1029 is not set
++# CONFIG_SENSORS_ADM1031 is not set
++# CONFIG_SENSORS_ADM9240 is not set
++# CONFIG_SENSORS_ADT7470 is not set
++# CONFIG_SENSORS_ADT7473 is not set
++# CONFIG_SENSORS_ATXP1 is not set
++# CONFIG_SENSORS_DS1621 is not set
++# CONFIG_SENSORS_F71805F is not set
++# CONFIG_SENSORS_F71882FG is not set
++# CONFIG_SENSORS_F75375S is not set
++# CONFIG_SENSORS_GL518SM is not set
++# CONFIG_SENSORS_GL520SM is not set
++# CONFIG_SENSORS_IT87 is not set
++# CONFIG_SENSORS_LM63 is not set
++# CONFIG_SENSORS_LM70 is not set
++# CONFIG_SENSORS_LM75 is not set
++# CONFIG_SENSORS_LM77 is not set
++# CONFIG_SENSORS_LM78 is not set
++# CONFIG_SENSORS_LM80 is not set
++# CONFIG_SENSORS_LM83 is not set
++# CONFIG_SENSORS_LM85 is not set
++# CONFIG_SENSORS_LM87 is not set
++# CONFIG_SENSORS_LM90 is not set
++# CONFIG_SENSORS_LM92 is not set
++# CONFIG_SENSORS_LM93 is not set
++# CONFIG_SENSORS_MAX1619 is not set
++# CONFIG_SENSORS_MAX6650 is not set
++# CONFIG_SENSORS_PC87360 is not set
++# CONFIG_SENSORS_PC87427 is not set
++# CONFIG_SENSORS_DME1737 is not set
++# CONFIG_SENSORS_SMSC47M1 is not set
++# CONFIG_SENSORS_SMSC47M192 is not set
++# CONFIG_SENSORS_SMSC47B397 is not set
++# CONFIG_SENSORS_ADS7828 is not set
++# CONFIG_SENSORS_THMC50 is not set
++# CONFIG_SENSORS_VT1211 is not set
++# CONFIG_SENSORS_W83781D is not set
++# CONFIG_SENSORS_W83791D is not set
++# CONFIG_SENSORS_W83792D is not set
++# CONFIG_SENSORS_W83793 is not set
++# CONFIG_SENSORS_W83L785TS is not set
++# CONFIG_SENSORS_W83L786NG is not set
++# CONFIG_SENSORS_W83627HF is not set
++# CONFIG_SENSORS_W83627EHF is not set
++# CONFIG_HWMON_DEBUG_CHIP is not set
++# CONFIG_THERMAL is not set
++# CONFIG_THERMAL_HWMON is not set
++CONFIG_WATCHDOG=y
++# CONFIG_WATCHDOG_NOWAYOUT is not set
++
++#
++# Watchdog Device Drivers
++#
++# CONFIG_SOFT_WATCHDOG is not set
++CONFIG_BFIN_WDT=y
++
++#
++# Sonics Silicon Backplane
++#
++CONFIG_SSB_POSSIBLE=y
++# CONFIG_SSB is not set
++
++#
++# Multifunction device drivers
++#
++# CONFIG_MFD_SM501 is not set
++# CONFIG_HTC_PASIC3 is not set
++
++#
++# Multimedia devices
++#
++
++#
++# Multimedia core support
++#
++# CONFIG_VIDEO_DEV is not set
++# CONFIG_DVB_CORE is not set
++# CONFIG_VIDEO_MEDIA is not set
++
++#
++# Multimedia drivers
++#
++# CONFIG_DAB is not set
++
++#
++# Graphics support
++#
++# CONFIG_VGASTATE is not set
++# CONFIG_VIDEO_OUTPUT_CONTROL is not set
++# CONFIG_FB is not set
++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
++
++#
++# Display device support
++#
++# CONFIG_DISPLAY_SUPPORT is not set
++
++#
++# Sound
++#
++# CONFIG_SOUND is not set
++CONFIG_HID_SUPPORT=y
++CONFIG_HID=y
++# CONFIG_HID_DEBUG is not set
++# CONFIG_HIDRAW is not set
++# CONFIG_USB_SUPPORT is not set
++CONFIG_MMC=y
++# CONFIG_MMC_DEBUG is not set
++# CONFIG_MMC_UNSAFE_RESUME is not set
++
++#
++# MMC/SD Card Drivers
++#
++CONFIG_MMC_BLOCK=y
++CONFIG_MMC_BLOCK_BOUNCE=y
++# CONFIG_SDIO_UART is not set
++# CONFIG_MMC_TEST is not set
++
++#
++# MMC/SD Host Controller Drivers
++#
++CONFIG_MMC_SPI=y
++# CONFIG_SPI_MMC is not set
++# CONFIG_MEMSTICK is not set
++# CONFIG_NEW_LEDS is not set
++# CONFIG_ACCESSIBILITY is not set
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_HCTOSYS=y
++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
++# CONFIG_RTC_DEBUG is not set
++
++#
++# RTC interfaces
++#
++CONFIG_RTC_INTF_SYSFS=y
++CONFIG_RTC_INTF_PROC=y
++CONFIG_RTC_INTF_DEV=y
++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
++# CONFIG_RTC_DRV_TEST is not set
++
++#
++# I2C RTC drivers
++#
++# CONFIG_RTC_DRV_DS1307 is not set
++# CONFIG_RTC_DRV_DS1374 is not set
++# CONFIG_RTC_DRV_DS1672 is not set
++# CONFIG_RTC_DRV_MAX6900 is not set
++# CONFIG_RTC_DRV_RS5C372 is not set
++# CONFIG_RTC_DRV_ISL1208 is not set
++# CONFIG_RTC_DRV_X1205 is not set
++# CONFIG_RTC_DRV_PCF8563 is not set
++# CONFIG_RTC_DRV_PCF8583 is not set
++# CONFIG_RTC_DRV_M41T80 is not set
++# CONFIG_RTC_DRV_S35390A is not set
++# CONFIG_RTC_DRV_FM3130 is not set
++
++#
++# SPI RTC drivers
++#
++# CONFIG_RTC_DRV_MAX6902 is not set
++# CONFIG_RTC_DRV_R9701 is not set
++# CONFIG_RTC_DRV_RS5C348 is not set
++
++#
++# Platform RTC drivers
++#
++# CONFIG_RTC_DRV_DS1511 is not set
++# CONFIG_RTC_DRV_DS1553 is not set
++# CONFIG_RTC_DRV_DS1742 is not set
++# CONFIG_RTC_DRV_STK17TA8 is not set
++# CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_V3020 is not set
++
++#
++# on-CPU RTC drivers
++#
++CONFIG_RTC_DRV_BFIN=y
++# CONFIG_UIO is not set
++
++#
++# File systems
++#
++# CONFIG_EXT2_FS is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_EXT4DEV_FS is not set
++# CONFIG_REISERFS_FS is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_FS_POSIX_ACL is not set
++# CONFIG_XFS_FS is not set
++# CONFIG_OCFS2_FS is not set
++# CONFIG_DNOTIFY is not set
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
++# CONFIG_QUOTA is not set
++# CONFIG_AUTOFS_FS is not set
++# CONFIG_AUTOFS4_FS is not set
++# CONFIG_FUSE_FS is not set
++
++#
++# CD-ROM/DVD Filesystems
++#
++# CONFIG_ISO9660_FS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_SYSCTL=y
++CONFIG_SYSFS=y
++# CONFIG_TMPFS is not set
++# CONFIG_HUGETLB_PAGE is not set
++# CONFIG_CONFIGFS_FS is not set
++
++#
++# Miscellaneous filesystems
++#
++# CONFIG_ADFS_FS is not set
++# CONFIG_AFFS_FS is not set
++# CONFIG_HFS_FS is not set
++# CONFIG_HFSPLUS_FS is not set
++# CONFIG_BEFS_FS is not set
++# CONFIG_BFS_FS is not set
++# CONFIG_EFS_FS is not set
++CONFIG_YAFFS_FS=m
++CONFIG_YAFFS_YAFFS1=y
++# CONFIG_YAFFS_9BYTE_TAGS is not set
++# 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_ALWAYS_CHECK_CHUNK_ERASED is not set
++CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
++CONFIG_JFFS2_FS=y
++CONFIG_JFFS2_FS_DEBUG=0
++CONFIG_JFFS2_FS_WRITEBUFFER=y
++# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
++# CONFIG_JFFS2_SUMMARY is not set
++# CONFIG_JFFS2_FS_XATTR is not set
++# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
++CONFIG_JFFS2_ZLIB=y
++# CONFIG_JFFS2_LZO is not set
++CONFIG_JFFS2_RTIME=y
++# CONFIG_JFFS2_RUBIN is not set
++# CONFIG_CRAMFS is not set
++# CONFIG_VXFS_FS is not set
++# CONFIG_MINIX_FS is not set
++# CONFIG_HPFS_FS is not set
++# CONFIG_QNX4FS_FS is not set
++# 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=y
++CONFIG_NFS_V3=y
++# CONFIG_NFS_V3_ACL is not set
++CONFIG_NFS_V4=y
++# CONFIG_NFSD is not set
++# CONFIG_ROOT_NFS is not set
++CONFIG_LOCKD=y
++CONFIG_LOCKD_V4=y
++CONFIG_NFS_COMMON=y
++CONFIG_SUNRPC=y
++CONFIG_SUNRPC_GSS=y
++# CONFIG_SUNRPC_BIND34 is not set
++CONFIG_RPCSEC_GSS_KRB5=y
++# CONFIG_RPCSEC_GSS_SPKM3 is not set
++CONFIG_SMB_FS=y
++# CONFIG_SMB_NLS_DEFAULT is not set
++CONFIG_CIFS=y
++# CONFIG_CIFS_STATS is not set
++# CONFIG_CIFS_WEAK_PW_HASH is not set
++# CONFIG_CIFS_XATTR is not set
++# CONFIG_CIFS_DEBUG2 is not set
++# CONFIG_CIFS_EXPERIMENTAL is not set
++# CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_AFS_FS is not set
++
++#
++# Partition Types
++#
++# CONFIG_PARTITION_ADVANCED is not set
++CONFIG_MSDOS_PARTITION=y
++CONFIG_NLS=y
++CONFIG_NLS_DEFAULT="iso8859-1"
++CONFIG_NLS_CODEPAGE_437=y
++# CONFIG_NLS_CODEPAGE_737 is not set
++# CONFIG_NLS_CODEPAGE_775 is not set
++# CONFIG_NLS_CODEPAGE_850 is not set
++# CONFIG_NLS_CODEPAGE_852 is not set
++# CONFIG_NLS_CODEPAGE_855 is not set
++# CONFIG_NLS_CODEPAGE_857 is not set
++# CONFIG_NLS_CODEPAGE_860 is not set
++# CONFIG_NLS_CODEPAGE_861 is not set
++# CONFIG_NLS_CODEPAGE_862 is not set
++# CONFIG_NLS_CODEPAGE_863 is not set
++# CONFIG_NLS_CODEPAGE_864 is not set
++# CONFIG_NLS_CODEPAGE_865 is not set
++# CONFIG_NLS_CODEPAGE_866 is not set
++# CONFIG_NLS_CODEPAGE_869 is not set
++# CONFIG_NLS_CODEPAGE_936 is not set
++# CONFIG_NLS_CODEPAGE_950 is not set
++# CONFIG_NLS_CODEPAGE_932 is not set
++# CONFIG_NLS_CODEPAGE_949 is not set
++# CONFIG_NLS_CODEPAGE_874 is not set
++# CONFIG_NLS_ISO8859_8 is not set
++# CONFIG_NLS_CODEPAGE_1250 is not set
++# CONFIG_NLS_CODEPAGE_1251 is not set
++CONFIG_NLS_ASCII=y
++# CONFIG_NLS_ISO8859_1 is not set
++# CONFIG_NLS_ISO8859_2 is not set
++# CONFIG_NLS_ISO8859_3 is not set
++# CONFIG_NLS_ISO8859_4 is not set
++# CONFIG_NLS_ISO8859_5 is not set
++# CONFIG_NLS_ISO8859_6 is not set
++# CONFIG_NLS_ISO8859_7 is not set
++# CONFIG_NLS_ISO8859_9 is not set
++# CONFIG_NLS_ISO8859_13 is not set
++# CONFIG_NLS_ISO8859_14 is not set
++# CONFIG_NLS_ISO8859_15 is not set
++# CONFIG_NLS_KOI8_R is not set
++# CONFIG_NLS_KOI8_U is not set
++CONFIG_NLS_UTF8=y
++# CONFIG_DLM is not set
++
++#
++# Kernel hacking
++#
++# CONFIG_PRINTK_TIME is not set
++CONFIG_ENABLE_WARN_DEPRECATED=y
++CONFIG_ENABLE_MUST_CHECK=y
++CONFIG_FRAME_WARN=1024
++# CONFIG_MAGIC_SYSRQ is not set
++# CONFIG_UNUSED_SYMBOLS is not set
++CONFIG_DEBUG_FS=y
++# CONFIG_HEADERS_CHECK is not set
++# CONFIG_DEBUG_KERNEL is not set
++# CONFIG_DEBUG_BUGVERBOSE is not set
++# CONFIG_SAMPLES is not set
++CONFIG_DEBUG_MMRS=y
++CONFIG_DEBUG_HUNT_FOR_ZERO=y
++CONFIG_DEBUG_BFIN_HWTRACE_ON=y
++CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
++# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
++# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
++CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
++# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
++# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
++CONFIG_EARLY_PRINTK=y
++CONFIG_CPLB_INFO=y
++CONFIG_ACCESS_CHECK=y
++
++#
++# Security options
++#
++# CONFIG_KEYS is not set
++CONFIG_SECURITY=y
++# CONFIG_SECURITY_NETWORK is not set
++# CONFIG_SECURITY_CAPABILITIES is not set
++CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
++CONFIG_CRYPTO=y
++
++#
++# Crypto core or helper
++#
++CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_BLKCIPHER=y
++CONFIG_CRYPTO_MANAGER=y
++# CONFIG_CRYPTO_GF128MUL is not set
++# CONFIG_CRYPTO_NULL is not set
++# CONFIG_CRYPTO_CRYPTD is not set
++# CONFIG_CRYPTO_AUTHENC is not set
++# CONFIG_CRYPTO_TEST is not set
++
++#
++# Authenticated Encryption with Associated Data
++#
++# CONFIG_CRYPTO_CCM is not set
++# CONFIG_CRYPTO_GCM is not set
++# CONFIG_CRYPTO_SEQIV is not set
++
++#
++# Block modes
++#
++CONFIG_CRYPTO_CBC=y
++# CONFIG_CRYPTO_CTR is not set
++# CONFIG_CRYPTO_CTS is not set
++# CONFIG_CRYPTO_ECB is not set
++# CONFIG_CRYPTO_LRW is not set
++# CONFIG_CRYPTO_PCBC is not set
++# CONFIG_CRYPTO_XTS is not set
++
++#
++# Hash modes
++#
++# CONFIG_CRYPTO_HMAC is not set
++# CONFIG_CRYPTO_XCBC is not set
++
++#
++# Digest
++#
++# CONFIG_CRYPTO_CRC32C is not set
++# CONFIG_CRYPTO_MD4 is not set
++CONFIG_CRYPTO_MD5=y
++# CONFIG_CRYPTO_MICHAEL_MIC is not set
++# CONFIG_CRYPTO_SHA1 is not set
++# CONFIG_CRYPTO_SHA256 is not set
++# CONFIG_CRYPTO_SHA512 is not set
++# CONFIG_CRYPTO_TGR192 is not set
++# CONFIG_CRYPTO_WP512 is not set
++
++#
++# Ciphers
++#
++# CONFIG_CRYPTO_AES is not set
++# CONFIG_CRYPTO_ANUBIS is not set
++# CONFIG_CRYPTO_ARC4 is not set
++# CONFIG_CRYPTO_BLOWFISH is not set
++# CONFIG_CRYPTO_CAMELLIA is not set
++# CONFIG_CRYPTO_CAST5 is not set
++# CONFIG_CRYPTO_CAST6 is not set
++CONFIG_CRYPTO_DES=y
++# CONFIG_CRYPTO_FCRYPT is not set
++# CONFIG_CRYPTO_KHAZAD is not set
++# CONFIG_CRYPTO_SALSA20 is not set
++# CONFIG_CRYPTO_SEED is not set
++# CONFIG_CRYPTO_SERPENT is not set
++# CONFIG_CRYPTO_TEA is not set
++# CONFIG_CRYPTO_TWOFISH is not set
++
++#
++# Compression
++#
++# CONFIG_CRYPTO_DEFLATE is not set
++# CONFIG_CRYPTO_LZO is not set
++CONFIG_CRYPTO_HW=y
++
++#
++# Library routines
++#
++CONFIG_BITREVERSE=y
++# CONFIG_GENERIC_FIND_FIRST_BIT is not set
++CONFIG_CRC_CCITT=m
++# CONFIG_CRC16 is not set
++CONFIG_CRC_ITU_T=y
++CONFIG_CRC32=y
++CONFIG_CRC7=y
++# CONFIG_LIBCRC32C is not set
++CONFIG_ZLIB_INFLATE=y
++CONFIG_ZLIB_DEFLATE=y
++CONFIG_PLIST=y
++CONFIG_HAS_IOMEM=y
++CONFIG_HAS_IOPORT=y
++CONFIG_HAS_DMA=y
+diff --git a/arch/blackfin/mach-bf533/boards/Kconfig b/arch/blackfin/mach-bf533/boards/Kconfig
+index 840059241fbe..308c98dc5aba 100644
+--- a/arch/blackfin/mach-bf533/boards/Kconfig
++++ b/arch/blackfin/mach-bf533/boards/Kconfig
+@@ -14,6 +14,12 @@ config BFIN533_STAMP
+ help
+ BF533-STAMP board support.
+
++config BLACKSTAMP
++ bool "BlackStamp"
++ help
++ Support for the BlackStamp board. Hardware info available at
++ http://blackfin.uclinux.org/gf/project/blackstamp/
++
+ config BFIN533_BLUETECHNIX_CM
+ bool "Bluetechnix CM-BF533"
+ depends on (BF533)
+diff --git a/arch/blackfin/mach-bf533/boards/Makefile b/arch/blackfin/mach-bf533/boards/Makefile
+index b7a1a1d79bda..9afbe72b484f 100644
+--- a/arch/blackfin/mach-bf533/boards/Makefile
++++ b/arch/blackfin/mach-bf533/boards/Makefile
+@@ -7,4 +7,5 @@ obj-$(CONFIG_BFIN533_STAMP) += stamp.o
+ obj-$(CONFIG_BFIN532_IP0X) += ip0x.o
+ obj-$(CONFIG_BFIN533_EZKIT) += ezkit.o
+ obj-$(CONFIG_BFIN533_BLUETECHNIX_CM) += cm_bf533.o
++obj-$(CONFIG_BLACKSTAMP) += blackstamp.o
+ obj-$(CONFIG_H8606_HVSISTEMAS) += H8606.o
+diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c
+new file mode 100644
+index 000000000000..d064ded87719
+--- /dev/null
++++ b/arch/blackfin/mach-bf533/boards/blackstamp.c
+@@ -0,0 +1,401 @@
++/*
++ * File: arch/blackfin/mach-bf533/blackstamp.c
++ * Based on: arch/blackfin/mach-bf533/stamp.c
++ * Author: Benjamin Matthews <bmat@lle.rochester.edu>
++ * Aidan Williams <aidan@nicta.com.au>
++ *
++ * Created: 2008
++ * Description: Board Info File for the BlackStamp
++ *
++ * Copyright 2005 National ICT Australia (NICTA)
++ * Copyright 2004-2008 Analog Devices Inc.
++ *
++ * Enter bugs at http://blackfin.uclinux.org/
++ *
++ * More info about the BlackStamp at:
++ * http://blackfin.uclinux.org/gf/project/blackstamp/
++ *
++ * Licensed under the GPL-2 or later.
++ */
++
++#include <linux/device.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mtd/physmap.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/flash.h>
++#include <linux/irq.h>
++#include <linux/i2c.h>
++#include <asm/dma.h>
++#include <asm/bfin5xx_spi.h>
++#include <asm/portmux.h>
++#include <asm/dpmc.h>
++
++/*
++ * Name the Board for the /proc/cpuinfo
++ */
++const char bfin_board_name[] = "BlackStamp";
++
++#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
++static struct platform_device rtc_device = {
++ .name = "rtc-bfin",
++ .id = -1,
++};
++#endif
++
++/*
++ * Driver needs to know address, irq and flag pin.
++ */
++#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
++static struct resource smc91x_resources[] = {
++ {
++ .name = "smc91x-regs",
++ .start = 0x20300300,
++ .end = 0x20300300 + 16,
++ .flags = IORESOURCE_MEM,
++ }, {
++ .start = IRQ_PF3,
++ .end = IRQ_PF3,
++ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
++ },
++};
++
++static struct platform_device smc91x_device = {
++ .name = "smc91x",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(smc91x_resources),
++ .resource = smc91x_resources,
++};
++#endif
++
++#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
++static struct mtd_partition bfin_spi_flash_partitions[] = {
++ {
++ .name = "bootloader(spi)",
++ .size = 0x00040000,
++ .offset = 0,
++ .mask_flags = MTD_CAP_ROM
++ }, {
++ .name = "linux kernel(spi)",
++ .size = 0x180000,
++ .offset = MTDPART_OFS_APPEND,
++ }, {
++ .name = "file system(spi)",
++ .size = MTDPART_SIZ_FULL,
++ .offset = MTDPART_OFS_APPEND,
++ }
++};
++
++static struct flash_platform_data bfin_spi_flash_data = {
++ .name = "m25p80",
++ .parts = bfin_spi_flash_partitions,
++ .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),
++ .type = "m25p64",
++};
++
++/* SPI flash chip (m25p64) */
++static struct bfin5xx_spi_chip spi_flash_chip_info = {
++ .enable_dma = 0, /* use dma transfer with this chip*/
++ .bits_per_word = 8,
++};
++#endif
++
++#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
++static struct bfin5xx_spi_chip spi_mmc_chip_info = {
++ .enable_dma = 1,
++ .bits_per_word = 8,
++};
++#endif
++
++#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
++static struct bfin5xx_spi_chip spidev_chip_info = {
++ .enable_dma = 0,
++ .bits_per_word = 8,
++};
++#endif
++
++static struct spi_board_info bfin_spi_board_info[] __initdata = {
++#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
++ {
++ /* the modalias must be the same as spi device driver name */
++ .modalias = "m25p80", /* Name of spi_driver for this device */
++ .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
++ .bus_num = 0, /* Framework bus number */
++ .chip_select = 2, /* Framework chip select. */
++ .platform_data = &bfin_spi_flash_data,
++ .controller_data = &spi_flash_chip_info,
++ .mode = SPI_MODE_3,
++ },
++#endif
++
++#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
++ {
++ .modalias = "spi_mmc_dummy",
++ .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
++ .bus_num = 0,
++ .chip_select = 0,
++ .platform_data = NULL,
++ .controller_data = &spi_mmc_chip_info,
++ .mode = SPI_MODE_3,
++ },
++ {
++ .modalias = "spi_mmc",
++ .max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
++ .bus_num = 0,
++ .chip_select = CONFIG_SPI_MMC_CS_CHAN,
++ .platform_data = NULL,
++ .controller_data = &spi_mmc_chip_info,
++ .mode = SPI_MODE_3,
++ },
++#endif
++
++#if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
++ {
++ .modalias = "spidev",
++ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
++ .bus_num = 0,
++ .chip_select = 7,
++ .controller_data = &spidev_chip_info,
++ },
++#endif
++};
++
++#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
++/* SPI (0) */
++static struct resource bfin_spi0_resource[] = {
++ [0] = {
++ .start = SPI0_REGBASE,
++ .end = SPI0_REGBASE + 0xFF,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = CH_SPI,
++ .end = CH_SPI,
++ .flags = IORESOURCE_IRQ,
++ }
++};
++
++/* SPI controller data */
++static struct bfin5xx_spi_master bfin_spi0_info = {
++ .num_chipselect = 8,
++ .enable_dma = 1, /* master has the ability to do dma transfer */
++ .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
++};
++
++static struct platform_device bfin_spi0_device = {
++ .name = "bfin-spi",
++ .id = 0, /* Bus number */
++ .num_resources = ARRAY_SIZE(bfin_spi0_resource),
++ .resource = bfin_spi0_resource,
++ .dev = {
++ .platform_data = &bfin_spi0_info, /* Passed to driver */
++ },
++};
++#endif /* spi master and devices */
++
++#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
++static struct resource bfin_uart_resources[] = {
++ {
++ .start = 0xFFC00400,
++ .end = 0xFFC004FF,
++ .flags = IORESOURCE_MEM,
++ },
++};
++
++static struct platform_device bfin_uart_device = {
++ .name = "bfin-uart",
++ .id = 1,
++ .num_resources = ARRAY_SIZE(bfin_uart_resources),
++ .resource = bfin_uart_resources,
++};
++#endif
++
++#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
++static struct resource bfin_sir_resources[] = {
++#ifdef CONFIG_BFIN_SIR0
++ {
++ .start = 0xFFC00400,
++ .end = 0xFFC004FF,
++ .flags = IORESOURCE_MEM,
++ },
++#endif
++};
++
++static struct platform_device bfin_sir_device = {
++ .name = "bfin_sir",
++ .id = 0,
++ .num_resources = ARRAY_SIZE(bfin_sir_resources),
++ .resource = bfin_sir_resources,
++};
++#endif
++
++#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
++static struct platform_device bfin_sport0_uart_device = {
++ .name = "bfin-sport-uart",
++ .id = 0,
++};
++
++static struct platform_device bfin_sport1_uart_device = {
++ .name = "bfin-sport-uart",
++ .id = 1,
++};
++#endif
++
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++#include <linux/input.h>
++#include <linux/gpio_keys.h>
++
++static struct gpio_keys_button bfin_gpio_keys_table[] = {
++ {BTN_0, GPIO_PF4, 0, "gpio-keys: BTN0"},
++ {BTN_1, GPIO_PF5, 0, "gpio-keys: BTN1"},
++ {BTN_2, GPIO_PF6, 0, "gpio-keys: BTN2"},
++}; /* Mapped to the first three PF Test Points */
++
++static struct gpio_keys_platform_data bfin_gpio_keys_data = {
++ .buttons = bfin_gpio_keys_table,
++ .nbuttons = ARRAY_SIZE(bfin_gpio_keys_table),
++};
++
++static struct platform_device bfin_device_gpiokeys = {
++ .name = "gpio-keys",
++ .dev = {
++ .platform_data = &bfin_gpio_keys_data,
++ },
++};
++#endif
++
++static struct resource bfin_gpios_resources = {
++ .start = 0,
++ .end = MAX_BLACKFIN_GPIOS - 1,
++ .flags = IORESOURCE_IRQ,
++};
++
++static struct platform_device bfin_gpios_device = {
++ .name = "simple-gpio",
++ .id = -1,
++ .num_resources = 1,
++ .resource = &bfin_gpios_resources,
++};
++
++#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
++#include <linux/i2c-gpio.h>
++
++static struct i2c_gpio_platform_data i2c_gpio_data = {
++ .sda_pin = 8,
++ .scl_pin = 9,
++ .sda_is_open_drain = 0,
++ .scl_is_open_drain = 0,
++ .udelay = 40,
++}; /* This hasn't actually been used these pins
++ * are (currently) free pins on the expansion connector */
++
++static struct platform_device i2c_gpio_device = {
++ .name = "i2c-gpio",
++ .id = 0,
++ .dev = {
++ .platform_data = &i2c_gpio_data,
++ },
++};
++#endif
++
++#ifdef CONFIG_I2C_BOARDINFO
++static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
++};
++#endif
++
++static const unsigned int cclk_vlev_datasheet[] =
++{
++ VRPAIR(VLEV_085, 250000000),
++ VRPAIR(VLEV_090, 376000000),
++ VRPAIR(VLEV_095, 426000000),
++ VRPAIR(VLEV_100, 426000000),
++ VRPAIR(VLEV_105, 476000000),
++ VRPAIR(VLEV_110, 476000000),
++ VRPAIR(VLEV_115, 476000000),
++ VRPAIR(VLEV_120, 600000000),
++ VRPAIR(VLEV_125, 600000000),
++ VRPAIR(VLEV_130, 600000000),
++};
++
++static struct bfin_dpmc_platform_data bfin_dmpc_vreg_data = {
++ .tuple_tab = cclk_vlev_datasheet,
++ .tabsize = ARRAY_SIZE(cclk_vlev_datasheet),
++ .vr_settling_time = 25 /* us */,
++};
++
++static struct platform_device bfin_dpmc = {
++ .name = "bfin dpmc",
++ .dev = {
++ .platform_data = &bfin_dmpc_vreg_data,
++ },
++};
++
++static struct platform_device *stamp_devices[] __initdata = {
++
++ &bfin_dpmc,
++
++#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
++ &rtc_device,
++#endif
++
++#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
++ &smc91x_device,
++#endif
++
++
++#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
++ &bfin_spi0_device,
++#endif
++
++#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
++ &bfin_uart_device,
++#endif
++
++#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
++ &bfin_sir_device,
++#endif
++
++#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
++ &bfin_sport0_uart_device,
++ &bfin_sport1_uart_device,
++#endif
++
++#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
++ &bfin_device_gpiokeys,
++#endif
++
++#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE)
++ &i2c_gpio_device,
++#endif
++
++ &bfin_gpios_device,
++};
++
++static int __init blackstamp_init(void)
++{
++ int ret;
++
++ printk(KERN_INFO "%s(): registering device resources\n", __func__);
++
++#ifdef CONFIG_I2C_BOARDINFO
++ i2c_register_board_info(0, bfin_i2c_board_info,
++ ARRAY_SIZE(bfin_i2c_board_info));
++#endif
++
++ ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
++ if (ret < 0)
++ return ret;
++
++#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
++ /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */
++ bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0);
++ bfin_write_FIO_FLAG_S(PF0);
++ SSYNC();
++#endif
++
++ spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
++ return 0;
++}
++
++arch_initcall(blackstamp_init);
+ commit b0e74640d59efe04a7cd47e9c8250eddd6730232
+Author: Joshua J Bowman <bowmanj@augsburg.edu>
+Date: Sat Oct 27 23:42:13 2007 -0400
+
+ Input: xpad - add more USB IDs
+
+ Add USB IDs of Mad Catz Wired Xbox 360 Controller and
+ Pelican 'TSZ' Wired Xbox 360 Controller.
+
+ Signed-off-by: Joshua J Bowman <bowmanj@augsburg.edu>
+ Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
+
+diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
+index 6dd375825a14..6e9d75bd2b15 100644
+--- a/drivers/input/joystick/xpad.c
++++ b/drivers/input/joystick/xpad.c
+@@ -120,6 +120,7 @@ static const struct xpad_device {
+ { 0x0738, 0x4536, "Mad Catz MicroCON", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0738, 0x4540, "Mad Catz Beat Pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+ { 0x0738, 0x4556, "Mad Catz Lynx Wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
++ { 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+ { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+ { 0x0c12, 0x8802, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0c12, 0x8810, "Zeroplus Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+@@ -129,6 +130,7 @@ static const struct xpad_device {
+ { 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0e6f, 0x0005, "Eclipse wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0e6f, 0x0006, "Edge wireless Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
++ { 0x0e6f, 0x0006, "Pelican 'TSZ' Wired Xbox 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
+ { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0f30, 0x0202, "Joytech Advanced Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
+ commit bce7d5e0e1fc0c1f1251b7f21a19cb48207408b6 +Author: Jeff Norden <jnorden@math.tntech.edu> +Date: Tue Sep 4 11:07:20 2007 -0500 + + pata_it821x: fix lost interrupt with atapi devices + + Fix "lost" interrupt problem when using dma with CD/DVD drives in some + configurations. This problem can make installing linux from media + impossible for distro's that have switched to libata-only configurations. + + The simple fix is to eliminate the use of dma for reading drive status, etc, + by checking the number of bytes to transferred. + + This change will only affect the behavior of atapi devices, not disks. + There is more info at http://bugzilla.redhat.com/show_bug.cgi?id=242229 + This patch is for 2.6.22.1 + + Signed-off-by: Jeff Norden <jnorden@math.tntech.edu> + Reviewed-by: Alan Cox <alan@redhat.com> + Signed-off-by: Jeff Garzik <jeff@garzik.org> + +diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c +index ed637ae33ece..5d8b91e70ecd 100644 +--- a/drivers/ata/pata_it821x.c ++++ b/drivers/ata/pata_it821x.c +@@ -533,6 +533,10 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc) + struct ata_port *ap = qc->ap; + struct it821x_dev *itdev = ap->private_data; + ++ /* Only use dma for transfers to/from the media. */ ++ if (qc->nbytes < 2048) ++ return -EOPNOTSUPP; ++ + /* No ATAPI DMA in smart mode */ + if (itdev->smart) + return -EOPNOTSUPP;+
commit 7109c4429af3640f79a638f177fc5d05b9807149
+Author: Ting Yang <tingy@cs.umass.edu>
+Date: Tue Aug 28 12:53:24 2007 +0200
+
+ sched: call update_curr() in task_tick_fair()
+
+ update the fair-clock before using it for the key value.
+
+ [ mingo@elte.hu: small cleanups. ]
+
+ Signed-off-by: Ting Yang <tingy@cs.umass.edu>
+ Signed-off-by: Ingo Molnar <mingo@elte.hu>
+ Signed-off-by: Mike Galbraith <efault@gmx.de>
+ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+
+diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
+index 721fe7744874..9f06094e5275 100644
+--- a/kernel/sched_fair.c
++++ b/kernel/sched_fair.c
+@@ -1094,10 +1094,11 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr)
+ static void task_new_fair(struct rq *rq, struct task_struct *p)
+ {
+ struct cfs_rq *cfs_rq = task_cfs_rq(p);
+- struct sched_entity *se = &p->se;
++ struct sched_entity *se = &p->se, *curr = cfs_rq_curr(cfs_rq);
+
+ sched_info_queued(p);
+
++ update_curr(cfs_rq);
+ update_stats_enqueue(cfs_rq, se);
+ /*
+ * Child runs first: we let it run before the parent
+@@ -1105,7 +1106,7 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
+ * it will preempt the parent:
+ */
+ p->se.fair_key = current->se.fair_key -
+- niced_granularity(&rq->curr->se, sched_granularity(cfs_rq)) - 1;
++ niced_granularity(curr, sched_granularity(cfs_rq)) - 1;
+ /*
+ * The first wait is dominated by the child-runs-first logic,
+ * so do not credit it with that waiting time yet:
+ commit e8666b2718fdb5bf0ea7c3126f7e292bbbf2946b +Author: Joshua Hoblitt <jhoblitt@ifa.hawaii.edu> +Date: Mon May 21 16:47:43 2007 -1000 + + [CPUFREQ] Kconfig powernow-k8 driver should depend on ACPI P-States driver + + powernow-k8 really needs to use ACPI to function on SMP systems. + The current Kconfig allows us to build kernels which fail mysteriously + for some users due to us trying to automatically enable this, and + getting it wrong. It's easier to just present this as an option + to the user. + + Signed-off-by: Joshua Hoblitt <jhoblitt@ifa.hawaii.edu> + Signed-off-by: Dave Jones <davej@redhat.com> + +diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/i386/kernel/cpu/cpufreq/Kconfig +index e912aae9473c..e77754ca94b4 100644 +--- a/arch/i386/kernel/cpu/cpufreq/Kconfig ++++ b/arch/i386/kernel/cpu/cpufreq/Kconfig +@@ -90,10 +90,17 @@ config X86_POWERNOW_K8 + If in doubt, say N. + + config X86_POWERNOW_K8_ACPI +- bool +- depends on X86_POWERNOW_K8 && ACPI_PROCESSOR +- depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m) ++ bool "ACPI Support" ++ select ACPI_PROCESSOR ++ depends on X86_POWERNOW_K8 + default y ++ help ++ This provides access to the K8s Processor Performance States via ACPI. ++ This driver is probably required for CPUFreq to work with multi-socket and ++ SMP systems. It is not required on at least some single-socket yet ++ multi-core systems, even if SMP is enabled. ++ ++ It is safe to say Y here. + + config X86_GX_SUSPMOD + tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"+
commit b7589ceba035d3f5f1baf69cc67991abd2ce6688
+Author: Tobin Davis <gruemaster@email.uophx.edu>
+Date: Tue Apr 24 17:56:55 2007 +0200
+
+ [ALSA] HDA-Intel: Fix headphone squeal on Conexant audio
+
+ This patch fixes the headphone squeal and noise on Conexant CX20551
+ (Waikiki) audio.
+
+ Signed-off-by: Tobin Davis <gruemaster@email.uophx.edu>
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+ Signed-off-by: Jaroslav Kysela <perex@suse.cz>
+
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
+index 2349b5eb5aaa..ddaa811887a6 100644
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -993,22 +993,10 @@ static struct snd_kcontrol_new cxt5047_mixers[] = {
+ HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
+ HDA_CODEC_VOLUME("PCM-2 Volume", 0x1c, 0x00, HDA_OUTPUT),
+ HDA_CODEC_MUTE("PCM-2 Switch", 0x1c, 0x00, HDA_OUTPUT),
+- {
+- .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+- .name = "Master Playback Volume",
+- .info = snd_hda_mixer_amp_volume_info,
+- .get = snd_hda_mixer_amp_volume_get,
+- .put = cxt5047_hp_master_vol_put,
+- .private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
+- },
+- {
+- .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+- .name = "Master Playback Switch",
+- .info = cxt_eapd_info,
+- .get = cxt_eapd_get,
+- .put = cxt5047_hp_master_sw_put,
+- .private_value = 0x13,
+- },
++ HDA_CODEC_VOLUME("Speaker Playback Volume", 0x1d, 0x00, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x1d, 0x00, HDA_OUTPUT),
++ HDA_CODEC_VOLUME("Headphone Playback Volume", 0x13, 0x00, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Headphone Playback Switch", 0x13, 0x00, HDA_OUTPUT),
+
+ {}
+ };
+@@ -1079,7 +1067,8 @@ static struct hda_verb cxt5047_init_verbs[] = {
+ {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
+ {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN|AC_PINCTL_VREF_50 },
+ /* HP, Speaker */
+- {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
++ {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
++ {0x13, AC_VERB_SET_CONNECT_SEL,0x1},
+ {0x1d, AC_VERB_SET_CONNECT_SEL,0x0},
+ /* Record selector: Mic */
+ {0x12, AC_VERB_SET_CONNECT_SEL,0x03},
+ commit 024a0a3cfb4c98cb3c6c81ec70672c6a925cf164 +Author: Shan Lu <shanlu@cs.uiuc.edu> +Date: Tue Mar 6 02:42:03 2007 -0800 + + network: add the missing phy_device speed information to phy_mii_ioctl + + Function `phy_mii_ioctl' returns physical device's information based on + user requests. When requested to return the basic mode control register + information (BMCR), the original implementation only returns the physical + device's duplex information and forgets to return speed information, which + should not be because BMCR register is used to hold both duplex and speed + information. + + The patch checks the BMCR value against speed-related flags and fills the + return structure's speed field accordingly. + + Signed-off-by: Shan <shanlu@cs.uiuc.edu> + Cc: Jeff Garzik <jeff@garzik.org> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Jeff Garzik <jeff@garzik.org> + +diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c +index a602d06d85ab..eed433d6056a 100644 +--- a/drivers/net/phy/phy.c ++++ b/drivers/net/phy/phy.c +@@ -382,6 +382,12 @@ int phy_mii_ioctl(struct phy_device *phydev, + phydev->duplex = DUPLEX_FULL; + else + phydev->duplex = DUPLEX_HALF; ++ if ((!phydev->autoneg) && ++ (val & BMCR_SPEED1000)) ++ phydev->speed = SPEED_1000; ++ else if ((!phydev->autoneg) && ++ (val & BMCR_SPEED100)) ++ phydev->speed = SPEED_100; + break; + case MII_ADVERTISE: + phydev->advertising = val;+
commit 3d861494729c70d9ebeb7d93caa107897925c355
+Author: Peter Moulder <Peter.Moulder@infotech.monash.edu.au>
+Date: Mon Jun 19 22:47:49 2006 +1000
+
+ [PATCH] USB: Addition of vendor/product id pair for pl2303 driver
+
+ Text from the back of the box, for your information/amusement:
+
+ USB DATA CABLE
+ FOR K700 Series
+
+ The USB Cable is an ideal link between your mobile phone and PC. Employing
+ the user-friendiy [sic] USB standard,its capacity for rapid data transfer enables functions
+ such as synchronization of phone book and calendar,as well as Internet browsing via
+ a modem-enabled phone.Autual [sic] connection speed is dependent on phone capacity.
+
+ MADE IN CHINA
+
+ From: Peter Moulder <Peter.Moulder@infotech.monash.edu.au>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
+index f001cd93b79b..02b0f7beb6d1 100644
+--- a/Documentation/usb/usb-serial.txt
++++ b/Documentation/usb/usb-serial.txt
+@@ -399,10 +399,10 @@ REINER SCT cyberJack pinpad/e-com USB chipcard reader
+
+ Prolific PL2303 Driver
+
+- This driver support any device that has the PL2303 chip from Prolific
++ This driver supports any device that has the PL2303 chip from Prolific
+ in it. This includes a number of single port USB to serial
+ converters and USB GPS devices. Devices from Aten (the UC-232) and
+- IO-Data work with this driver.
++ IO-Data work with this driver, as does the DCU-11 mobile-phone cable.
+
+ For any questions or problems with this driver, please contact Greg
+ Kroah-Hartman at greg@kroah.com
+diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
+index de93a2b909e7..93d623a0d092 100644
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -52,6 +52,7 @@ struct pl2303_buf {
+ static struct usb_device_id id_table [] = {
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },
++ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
+ { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
+diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
+index 7f29e81d3e35..cb2abad3a37e 100644
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -10,6 +10,7 @@
+ #define PL2303_VENDOR_ID 0x067b
+ #define PL2303_PRODUCT_ID 0x2303
+ #define PL2303_PRODUCT_ID_RSAQ2 0x04bb
++#define PL2303_PRODUCT_ID_DCU11 0x1234
+ #define PL2303_PRODUCT_ID_PHAROS 0xaaa0
+ #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2
+
+ commit 9a05671dd8d85cbce6cf1a00727d5919c1e56192
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:23 2019 -0700
+
+ coda: don't try to print names that were considered too long
+
+ Probably safer to just show the unexpected length and debug it from the
+ userspace side.
+
+ Link: http://lkml.kernel.org/r/582ae759a4fdfa31a64c35de489fa4efabac09d6.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 00876ddadb43..7e103eb8ffcd 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -47,8 +47,8 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, unsig
+ int type = 0;
+
+ if (length > CODA_MAXNAMLEN) {
+- pr_err("name too long: lookup, %s (%*s)\n",
+- coda_i2s(dir), (int)length, name);
++ pr_err("name too long: lookup, %s %zu\n",
++ coda_i2s(dir), length);
+ return ERR_PTR(-ENAMETOOLONG);
+ }
+ commit 6e51f8aa76b67d0a6eb168fd41a81e8478ae07a9
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:16 2019 -0700
+
+ coda: potential buffer overflow in coda_psdev_write()
+
+ Add checks to make sure the downcall message we got from the Coda cache
+ manager is large enough to contain the data it is supposed to have.
+ i.e. when we get a CODA_ZAPDIR we can access &out->coda_zapdir.CodaFid.
+
+ Link: http://lkml.kernel.org/r/894fb6b250add09e4e3935f14649f21284a5cb18.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 241f7e04ad04..b4da2812499e 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -100,8 +100,12 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ ssize_t retval = 0, count = 0;
+ int error;
+
++ /* make sure there is enough to copy out the (opcode, unique) values */
++ if (nbytes < (2 * sizeof(u_int32_t)))
++ return -EINVAL;
++
+ /* Peek at the opcode, uniquefier */
+- if (copy_from_user(&hdr, buf, 2 * sizeof(u_long)))
++ if (copy_from_user(&hdr, buf, 2 * sizeof(u_int32_t)))
+ return -EFAULT;
+
+ if (DOWNCALL(hdr.opcode)) {
+@@ -127,7 +131,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ }
+
+ /* what downcall errors does Venus handle ? */
+- error = coda_downcall(vcp, hdr.opcode, dcbuf);
++ error = coda_downcall(vcp, hdr.opcode, dcbuf, nbytes);
+
+ CODA_FREE(dcbuf, nbytes);
+ if (error) {
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 1175a1722411..cf1e662681a5 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -804,12 +804,44 @@ static int coda_upcall(struct venus_comm *vcp,
+ *
+ * CODA_REPLACE -- replace one CodaFid with another throughout the name cache */
+
+-int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out)
++int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out,
++ size_t nbytes)
+ {
+ struct inode *inode = NULL;
+ struct CodaFid *fid = NULL, *newfid;
+ struct super_block *sb;
+
++ /*
++ * Make sure we have received enough data from the cache
++ * manager to populate the necessary fields in the buffer
++ */
++ switch (opcode) {
++ case CODA_PURGEUSER:
++ if (nbytes < sizeof(struct coda_purgeuser_out))
++ return -EINVAL;
++ break;
++
++ case CODA_ZAPDIR:
++ if (nbytes < sizeof(struct coda_zapdir_out))
++ return -EINVAL;
++ break;
++
++ case CODA_ZAPFILE:
++ if (nbytes < sizeof(struct coda_zapfile_out))
++ return -EINVAL;
++ break;
++
++ case CODA_PURGEFID:
++ if (nbytes < sizeof(struct coda_purgefid_out))
++ return -EINVAL;
++ break;
++
++ case CODA_REPLACE:
++ if (nbytes < sizeof(struct coda_replace_out))
++ return -EINVAL;
++ break;
++ }
++
+ /* Handle invalidation requests. */
+ mutex_lock(&vcp->vc_mutex);
+ sb = vcp->vc_sb;
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index 57d2b2faf6a3..d1672fd5e638 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -71,7 +71,8 @@ int venus_symlink(struct super_block *sb, struct CodaFid *fid,
+ int venus_access(struct super_block *sb, struct CodaFid *fid, int mask);
+ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
+ unsigned int cmd, struct PioctlData *data);
+-int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out);
++int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out,
++ size_t nbytes);
+ int venus_fsync(struct super_block *sb, struct CodaFid *fid);
+ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
+ commit 7fa0a1da3dadfd9216df7745a1331fdaa0940d1c
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Tue Jul 16 16:28:04 2019 -0700
+
+ coda: pass the host file in vma->vm_file on mmap
+
+ Patch series "Coda updates".
+
+ The following patch series is a collection of various fixes for Coda,
+ most of which were collected from linux-fsdevel or linux-kernel but
+ which have as yet not found their way upstream.
+
+ This patch (of 22):
+
+ Various file systems expect that vma->vm_file points at their own file
+ handle, several use file_inode(vma->vm_file) to get at their inode or
+ use vma->vm_file->private_data. However the way Coda wrapped mmap on a
+ host file broke this assumption, vm_file was still pointing at the Coda
+ file and the host file systems would scribble over Coda's inode and
+ private file data.
+
+ This patch fixes the incorrect expectation and wraps vm_ops->open and
+ vm_ops->close to allow Coda to track when the vm_area_struct is
+ destroyed so we still release the reference on the Coda file handle at
+ the right time.
+
+ Link: http://lkml.kernel.org/r/0e850c6e59c0b147dc2dcd51a3af004c948c3697.1558117389.git.jaharkes@cs.cmu.edu
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Arnd Bergmann <arnd@arndb.de>
+ Cc: Colin Ian King <colin.king@canonical.com>
+ Cc: Dan Carpenter <dan.carpenter@oracle.com>
+ Cc: David Howells <dhowells@redhat.com>
+ Cc: Fabian Frederick <fabf@skynet.be>
+ Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
+ Cc: Sam Protsenko <semen.protsenko@linaro.org>
+ Cc: Yann Droneaud <ydroneaud@opteya.com>
+ Cc: Zhouyang Jia <jiazhouyang09@gmail.com>
+ Cc: <stable@vger.kernel.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index 1cbc1f2298ee..43d371551d2b 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -27,6 +27,13 @@
+ #include "coda_linux.h"
+ #include "coda_int.h"
+
++struct coda_vm_ops {
++ atomic_t refcnt;
++ struct file *coda_file;
++ const struct vm_operations_struct *host_vm_ops;
++ struct vm_operations_struct vm_ops;
++};
++
+ static ssize_t
+ coda_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
+ {
+@@ -61,6 +68,34 @@ coda_file_write_iter(struct kiocb *iocb, struct iov_iter *to)
+ return ret;
+ }
+
++static void
++coda_vm_open(struct vm_area_struct *vma)
++{
++ struct coda_vm_ops *cvm_ops =
++ container_of(vma->vm_ops, struct coda_vm_ops, vm_ops);
++
++ atomic_inc(&cvm_ops->refcnt);
++
++ if (cvm_ops->host_vm_ops && cvm_ops->host_vm_ops->open)
++ cvm_ops->host_vm_ops->open(vma);
++}
++
++static void
++coda_vm_close(struct vm_area_struct *vma)
++{
++ struct coda_vm_ops *cvm_ops =
++ container_of(vma->vm_ops, struct coda_vm_ops, vm_ops);
++
++ if (cvm_ops->host_vm_ops && cvm_ops->host_vm_ops->close)
++ cvm_ops->host_vm_ops->close(vma);
++
++ if (atomic_dec_and_test(&cvm_ops->refcnt)) {
++ vma->vm_ops = cvm_ops->host_vm_ops;
++ fput(cvm_ops->coda_file);
++ kfree(cvm_ops);
++ }
++}
++
+ static int
+ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ {
+@@ -68,6 +103,8 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ struct coda_inode_info *cii;
+ struct file *host_file;
+ struct inode *coda_inode, *host_inode;
++ struct coda_vm_ops *cvm_ops;
++ int ret;
+
+ cfi = CODA_FTOC(coda_file);
+ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+@@ -76,6 +113,13 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ if (!host_file->f_op->mmap)
+ return -ENODEV;
+
++ if (WARN_ON(coda_file != vma->vm_file))
++ return -EIO;
++
++ cvm_ops = kmalloc(sizeof(struct coda_vm_ops), GFP_KERNEL);
++ if (!cvm_ops)
++ return -ENOMEM;
++
+ coda_inode = file_inode(coda_file);
+ host_inode = file_inode(host_file);
+
+@@ -89,6 +133,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ * the container file on us! */
+ else if (coda_inode->i_mapping != host_inode->i_mapping) {
+ spin_unlock(&cii->c_lock);
++ kfree(cvm_ops);
+ return -EBUSY;
+ }
+
+@@ -97,7 +142,29 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ cfi->cfi_mapcount++;
+ spin_unlock(&cii->c_lock);
+
+- return call_mmap(host_file, vma);
++ vma->vm_file = get_file(host_file);
++ ret = call_mmap(vma->vm_file, vma);
++
++ if (ret) {
++ /* if call_mmap fails, our caller will put coda_file so we
++ * should drop the reference to the host_file that we got.
++ */
++ fput(host_file);
++ kfree(cvm_ops);
++ } else {
++ /* here we add redirects for the open/close vm_operations */
++ cvm_ops->host_vm_ops = vma->vm_ops;
++ if (vma->vm_ops)
++ cvm_ops->vm_ops = *vma->vm_ops;
++
++ cvm_ops->vm_ops.open = coda_vm_open;
++ cvm_ops->vm_ops.close = coda_vm_close;
++ cvm_ops->coda_file = coda_file;
++ atomic_set(&cvm_ops->refcnt, 1);
++
++ vma->vm_ops = &cvm_ops->vm_ops;
++ }
++ return ret;
+ }
+
+ int coda_open(struct inode *coda_inode, struct file *coda_file)
+@@ -207,4 +274,3 @@ const struct file_operations coda_file_operations = {
+ .fsync = coda_fsync,
+ .splice_read = generic_file_splice_read,
+ };
+-commit d337b66a4c52c7b04eec661d86c2ef6e168965a2 +Author: Jan Harkes <jaharkes@cs.cmu.edu> +Date: Wed Sep 27 15:52:12 2017 -0400 + + coda: fix 'kernel memory exposure attempt' in fsync + + When an application called fsync on a file in Coda a small request with + just the file identifier was allocated, but the declared length was set + to the size of union of all possible upcall requests. + + This bug has been around for a very long time and is now caught by the + extra checking in usercopy that was introduced in Linux-4.8. + + The exposure happens when the Coda cache manager process reads the fsync + upcall request at which point it is killed. As a result there is nobody + servicing any further upcalls, trapping any processes that try to access + the mounted Coda filesystem. + + Cc: stable@vger.kernel.org + Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> + Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> + +diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c +index e82357c89979..8cf16d8c5261 100644 +--- a/fs/coda/upcall.c ++++ b/fs/coda/upcall.c +@@ -446,8 +446,7 @@ int venus_fsync(struct super_block *sb, struct CodaFid *fid) + UPARG(CODA_FSYNC); + + inp->coda_fsync.VFid = *fid; +- error = coda_upcall(coda_vcp(sb), sizeof(union inputArgs), +- &outsize, inp); ++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp); + + CODA_FREE(inp, insize); + return error;
commit 3725e9dd5bef376ab87d41e40c437a6b2a20eb59
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Wed Sep 9 15:38:01 2015 -0700
+
+ fs/coda: fix readlink buffer overflow
+
+ Dan Carpenter discovered a buffer overflow in the Coda file system
+ readlink code. A userspace file system daemon can return a 4096 byte
+ result which then triggers a one byte write past the allocated readlink
+ result buffer.
+
+ This does not trigger with an unmodified Coda implementation because Coda
+ has a 1024 byte limit for symbolic links, however other userspace file
+ systems using the Coda kernel module could be affected.
+
+ Although this is an obvious overflow, I don't think this has to be handled
+ as too sensitive from a security perspective because the overflow is on
+ the Coda userspace daemon side which already needs root to open Coda's
+ kernel device and to mount the file system before we get to the point that
+ links can be read.
+
+ [akpm@linux-foundation.org: coding-style fixes]
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 9b1ffaa0572e..f6c6c8adbc01 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -353,7 +353,7 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
+ char *result;
+
+ insize = max_t(unsigned int,
+- INSIZE(readlink), OUTSIZE(readlink)+ *length + 1);
++ INSIZE(readlink), OUTSIZE(readlink)+ *length);
+ UPARG(CODA_READLINK);
+
+ inp->coda_readlink.VFid = *fid;
+@@ -361,8 +361,8 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
+ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error) {
+ retlen = outp->coda_readlink.count;
+- if ( retlen > *length )
+- retlen = *length;
++ if (retlen >= *length)
++ retlen = *length - 1;
+ *length = retlen;
+ result = (char *)outp + (long)outp->coda_readlink.data;
+ memcpy(buffer, result, retlen);commit da47c19e5c746829042933c8f945a71e2b62d6fc
+Author: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+Date: Mon Oct 25 02:03:46 2010 -0400
+
+ Coda: replace BKL with mutex
+
+ Replace the BKL with a mutex to protect the venus_comm structure which
+ binds the mountpoint with the character device and holds the upcall
+ queues.
+
+ Signed-off-by: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index b7fa3e3d772f..7993b96ca348 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -15,7 +15,7 @@
+ #include <linux/stat.h>
+ #include <linux/errno.h>
+ #include <linux/unistd.h>
+-#include <linux/smp_lock.h>
++#include <linux/mutex.h>
+ #include <linux/spinlock.h>
+ #include <linux/file.h>
+ #include <linux/vfs.h>
+@@ -145,7 +145,7 @@ static int get_device_index(struct coda_mount_data *data)
+ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ {
+ struct inode *root = NULL;
+- struct venus_comm *vc = NULL;
++ struct venus_comm *vc;
+ struct CodaFid fid;
+ int error;
+ int idx;
+@@ -159,7 +159,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ printk(KERN_INFO "coda_read_super: device index: %i\n", idx);
+
+ vc = &coda_comms[idx];
+- lock_kernel();
++ mutex_lock(&vc->vc_mutex);
+
+ if (!vc->vc_inuse) {
+ printk("coda_read_super: No pseudo device\n");
+@@ -178,7 +178,7 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ goto unlock_out;
+
+ vc->vc_sb = sb;
+- unlock_kernel();
++ mutex_unlock(&vc->vc_mutex);
+
+ sb->s_fs_info = vc;
+ sb->s_flags |= MS_NOATIME;
+@@ -217,20 +217,23 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ if (root)
+ iput(root);
+
+- lock_kernel();
++ mutex_lock(&vc->vc_mutex);
+ bdi_destroy(&vc->bdi);
+ vc->vc_sb = NULL;
+ sb->s_fs_info = NULL;
+ unlock_out:
+- unlock_kernel();
++ mutex_unlock(&vc->vc_mutex);
+ return error;
+ }
+
+ static void coda_put_super(struct super_block *sb)
+ {
+- bdi_destroy(&coda_vcp(sb)->bdi);
+- coda_vcp(sb)->vc_sb = NULL;
++ struct venus_comm *vcp = coda_vcp(sb);
++ mutex_lock(&vcp->vc_mutex);
++ bdi_destroy(&vcp->bdi);
++ vcp->vc_sb = NULL;
+ sb->s_fs_info = NULL;
++ mutex_unlock(&vcp->vc_mutex);
+
+ printk("Coda: Bye bye.\n");
+ }
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 9a9248e632c6..62647a8595e4 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -35,7 +35,7 @@
+ #include <linux/poll.h>
+ #include <linux/init.h>
+ #include <linux/list.h>
+-#include <linux/smp_lock.h>
++#include <linux/mutex.h>
+ #include <linux/device.h>
+ #include <asm/io.h>
+ #include <asm/system.h>
+@@ -67,8 +67,10 @@ static unsigned int coda_psdev_poll(struct file *file, poll_table * wait)
+ unsigned int mask = POLLOUT | POLLWRNORM;
+
+ poll_wait(file, &vcp->vc_waitq, wait);
++ mutex_lock(&vcp->vc_mutex);
+ if (!list_empty(&vcp->vc_pending))
+ mask |= POLLIN | POLLRDNORM;
++ mutex_unlock(&vcp->vc_mutex);
+
+ return mask;
+ }
+@@ -143,7 +145,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ }
+
+ /* Look for the message on the processing queue. */
+- lock_kernel();
++ mutex_lock(&vcp->vc_mutex);
+ list_for_each(lh, &vcp->vc_processing) {
+ tmp = list_entry(lh, struct upc_req , uc_chain);
+ if (tmp->uc_unique == hdr.unique) {
+@@ -152,7 +154,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ break;
+ }
+ }
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
+
+ if (!req) {
+ printk("psdev_write: msg (%d, %d) not found\n",
+@@ -207,7 +209,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
+ if (nbytes == 0)
+ return 0;
+
+- lock_kernel();
++ mutex_lock(&vcp->vc_mutex);
+
+ add_wait_queue(&vcp->vc_waitq, &wait);
+ set_current_state(TASK_INTERRUPTIBLE);
+@@ -221,7 +223,9 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
+ retval = -ERESTARTSYS;
+ break;
+ }
++ mutex_unlock(&vcp->vc_mutex);
+ schedule();
++ mutex_lock(&vcp->vc_mutex);
+ }
+
+ set_current_state(TASK_RUNNING);
+@@ -254,7 +258,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
+ CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+ kfree(req);
+ out:
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
+ return (count ? count : retval);
+ }
+
+@@ -267,10 +271,10 @@ static int coda_psdev_open(struct inode * inode, struct file * file)
+ if (idx < 0 || idx >= MAX_CODADEVS)
+ return -ENODEV;
+
+- lock_kernel();
+-
+ err = -EBUSY;
+ vcp = &coda_comms[idx];
++ mutex_lock(&vcp->vc_mutex);
++
+ if (!vcp->vc_inuse) {
+ vcp->vc_inuse++;
+
+@@ -284,7 +288,7 @@ static int coda_psdev_open(struct inode * inode, struct file * file)
+ err = 0;
+ }
+
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
+ return err;
+ }
+
+@@ -299,7 +303,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
+ return -1;
+ }
+
+- lock_kernel();
++ mutex_lock(&vcp->vc_mutex);
+
+ /* Wakeup clients so they can return. */
+ list_for_each_entry_safe(req, tmp, &vcp->vc_pending, uc_chain) {
+@@ -324,7 +328,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
+
+ file->private_data = NULL;
+ vcp->vc_inuse--;
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
+ return 0;
+ }
+
+@@ -353,9 +357,11 @@ static int init_coda_psdev(void)
+ err = PTR_ERR(coda_psdev_class);
+ goto out_chrdev;
+ }
+- for (i = 0; i < MAX_CODADEVS; i++)
++ for (i = 0; i < MAX_CODADEVS; i++) {
++ mutex_init(&(&coda_comms[i])->vc_mutex);
+ device_create(coda_psdev_class, NULL,
+ MKDEV(CODA_PSDEV_MAJOR, i), NULL, "cfs%d", i);
++ }
+ coda_sysctl_init();
+ goto out;
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 4c258cb5266d..c3563cab9758 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -27,7 +27,7 @@
+ #include <linux/errno.h>
+ #include <linux/string.h>
+ #include <linux/slab.h>
+-#include <linux/smp_lock.h>
++#include <linux/mutex.h>
+ #include <asm/uaccess.h>
+ #include <linux/vmalloc.h>
+ #include <linux/vfs.h>
+@@ -607,7 +607,8 @@ static void coda_unblock_signals(sigset_t *old)
+ (r)->uc_opcode != CODA_RELEASE) || \
+ (r)->uc_flags & CODA_REQ_READ))
+
+-static inline void coda_waitfor_upcall(struct upc_req *req)
++static inline void coda_waitfor_upcall(struct venus_comm *vcp,
++ struct upc_req *req)
+ {
+ DECLARE_WAITQUEUE(wait, current);
+ unsigned long timeout = jiffies + coda_timeout * HZ;
+@@ -640,10 +641,12 @@ static inline void coda_waitfor_upcall(struct upc_req *req)
+ break;
+ }
+
++ mutex_unlock(&vcp->vc_mutex);
+ if (blocked)
+ schedule_timeout(HZ);
+ else
+ schedule();
++ mutex_lock(&vcp->vc_mutex);
+ }
+ if (blocked)
+ coda_unblock_signals(&old);
+@@ -671,7 +674,7 @@ static int coda_upcall(struct venus_comm *vcp,
+ struct upc_req *req = NULL, *sig_req;
+ int error;
+
+- lock_kernel();
++ mutex_lock(&vcp->vc_mutex);
+
+ if (!vcp->vc_inuse) {
+ printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
+@@ -711,7 +714,7 @@ static int coda_upcall(struct venus_comm *vcp,
+ * ENODEV. */
+
+ /* Go to sleep. Wake up on signals only after the timeout. */
+- coda_waitfor_upcall(req);
++ coda_waitfor_upcall(vcp, req);
+
+ /* Op went through, interrupt or not... */
+ if (req->uc_flags & CODA_REQ_WRITE) {
+@@ -765,7 +768,7 @@ static int coda_upcall(struct venus_comm *vcp,
+
+ exit:
+ kfree(req);
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
+ return error;
+ }
+
+@@ -806,11 +809,11 @@ static int coda_upcall(struct venus_comm *vcp,
+ int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out)
+ {
+ struct inode *inode = NULL;
+- struct CodaFid *fid, *newfid;
++ struct CodaFid *fid = NULL, *newfid;
+ struct super_block *sb;
+
+ /* Handle invalidation requests. */
+- lock_kernel();
++ mutex_lock(&vcp->vc_mutex);
+ sb = vcp->vc_sb;
+ if (!sb || !sb->s_root)
+ goto unlock_out;
+@@ -829,47 +832,53 @@ int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out)
+
+ case CODA_ZAPDIR:
+ fid = &out->coda_zapdir.CodaFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if (inode) {
+- coda_flag_inode_children(inode, C_PURGE);
+- coda_flag_inode(inode, C_VATTR);
+- }
+ break;
+
+ case CODA_ZAPFILE:
+ fid = &out->coda_zapfile.CodaFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if (inode)
+- coda_flag_inode(inode, C_VATTR);
+ break;
+
+ case CODA_PURGEFID:
+ fid = &out->coda_purgefid.CodaFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if (inode) {
+- coda_flag_inode_children(inode, C_PURGE);
+-
+- /* catch the dentries later if some are still busy */
+- coda_flag_inode(inode, C_PURGE);
+- d_prune_aliases(inode);
+-
+- }
+ break;
+
+ case CODA_REPLACE:
+ fid = &out->coda_replace.OldFid;
+- newfid = &out->coda_replace.NewFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if (inode)
+- coda_replace_fid(inode, fid, newfid);
+ break;
+ }
++ if (fid)
++ inode = coda_fid_to_inode(fid, sb);
+
+ unlock_out:
+- unlock_kernel();
++ mutex_unlock(&vcp->vc_mutex);
++
++ if (!inode)
++ return 0;
++
++ switch (opcode) {
++ case CODA_ZAPDIR:
++ coda_flag_inode_children(inode, C_PURGE);
++ coda_flag_inode(inode, C_VATTR);
++ break;
++
++ case CODA_ZAPFILE:
++ coda_flag_inode(inode, C_VATTR);
++ break;
++
++ case CODA_PURGEFID:
++ coda_flag_inode_children(inode, C_PURGE);
+
+- if (inode)
+- iput(inode);
++ /* catch the dentries later if some are still busy */
++ coda_flag_inode(inode, C_PURGE);
++ d_prune_aliases(inode);
++ break;
++
++ case CODA_REPLACE:
++ newfid = &out->coda_replace.NewFid;
++ coda_replace_fid(inode, fid, newfid);
++ break;
++ }
++ iput(inode);
+ return 0;
+ }
+
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index 1e60c5a41a5b..72f2d2f0af91 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -8,6 +8,7 @@
+
+ #ifdef __KERNEL__
+ #include <linux/backing-dev.h>
++#include <linux/mutex.h>
+
+ struct kstatfs;
+
+@@ -20,6 +21,7 @@ struct venus_comm {
+ int vc_inuse;
+ struct super_block *vc_sb;
+ struct backing_dev_info bdi;
++ struct mutex vc_mutex;
+ };
+
+ commit f7cc02b8715618e179242ba9cc10bdc5146ae565
+Author: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+Date: Mon Oct 25 02:03:45 2010 -0400
+
+ Coda: push BKL regions into coda_upcall()
+
+ Now that shared inode state is locked using the cii->c_lock, the BKL is
+ only used to protect the upcall queues used to communicate with the
+ userspace cache manager. The remaining state is all local and we can
+ push the lock further down into coda_upcall().
+
+ Signed-off-by: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 69fbbea75f1b..96fbeab77f2f 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -17,7 +17,6 @@
+ #include <linux/stat.h>
+ #include <linux/errno.h>
+ #include <linux/string.h>
+-#include <linux/smp_lock.h>
+ #include <linux/spinlock.h>
+
+ #include <asm/uaccess.h>
+@@ -117,15 +116,11 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struc
+ goto exit;
+ }
+
+- lock_kernel();
+-
+ error = venus_lookup(dir->i_sb, coda_i2f(dir), name, length,
+ &type, &resfid);
+ if (!error)
+ error = coda_cnode_make(&inode, &resfid, dir->i_sb);
+
+- unlock_kernel();
+-
+ if (error && error != -ENOENT)
+ return ERR_PTR(error);
+
+@@ -141,28 +136,24 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struc
+
+ int coda_permission(struct inode *inode, int mask)
+ {
+- int error = 0;
++ int error;
+
+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
+
+ if (!mask)
+- return 0;
++ return 0;
+
+ if ((mask & MAY_EXEC) && !execute_ok(inode))
+ return -EACCES;
+
+- lock_kernel();
+-
+ if (coda_cache_check(inode, mask))
+- goto out;
++ return 0;
+
+- error = venus_access(inode->i_sb, coda_i2f(inode), mask);
++ error = venus_access(inode->i_sb, coda_i2f(inode), mask);
+
+ if (!error)
+ coda_cache_enter(inode, mask);
+
+- out:
+- unlock_kernel();
+ return error;
+ }
+
+@@ -201,41 +192,34 @@ static inline void coda_dir_drop_nlink(struct inode *dir)
+ /* creation routines: create, mknod, mkdir, link, symlink */
+ static int coda_create(struct inode *dir, struct dentry *de, int mode, struct nameidata *nd)
+ {
+- int error=0;
++ int error;
+ const char *name=de->d_name.name;
+ int length=de->d_name.len;
+ struct inode *inode;
+ struct CodaFid newfid;
+ struct coda_vattr attrs;
+
+- lock_kernel();
+-
+- if (coda_isroot(dir) && coda_iscontrol(name, length)) {
+- unlock_kernel();
++ if (coda_isroot(dir) && coda_iscontrol(name, length))
+ return -EPERM;
+- }
+
+ error = venus_create(dir->i_sb, coda_i2f(dir), name, length,
+ 0, mode, &newfid, &attrs);
+-
+- if ( error ) {
+- unlock_kernel();
+- d_drop(de);
+- return error;
+- }
++ if (error)
++ goto err_out;
+
+ inode = coda_iget(dir->i_sb, &newfid, &attrs);
+- if ( IS_ERR(inode) ) {
+- unlock_kernel();
+- d_drop(de);
+- return PTR_ERR(inode);
++ if (IS_ERR(inode)) {
++ error = PTR_ERR(inode);
++ goto err_out;
+ }
+
+ /* invalidate the directory cnode's attributes */
+ coda_dir_update_mtime(dir);
+- unlock_kernel();
+ d_instantiate(de, inode);
+ return 0;
++err_out:
++ d_drop(de);
++ return error;
+ }
+
+ static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
+@@ -247,36 +231,29 @@ static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
+ int error;
+ struct CodaFid newfid;
+
+- lock_kernel();
+-
+- if (coda_isroot(dir) && coda_iscontrol(name, len)) {
+- unlock_kernel();
++ if (coda_isroot(dir) && coda_iscontrol(name, len))
+ return -EPERM;
+- }
+
+ attrs.va_mode = mode;
+ error = venus_mkdir(dir->i_sb, coda_i2f(dir),
+ name, len, &newfid, &attrs);
+-
+- if ( error ) {
+- unlock_kernel();
+- d_drop(de);
+- return error;
+- }
++ if (error)
++ goto err_out;
+
+ inode = coda_iget(dir->i_sb, &newfid, &attrs);
+- if ( IS_ERR(inode) ) {
+- unlock_kernel();
+- d_drop(de);
+- return PTR_ERR(inode);
++ if (IS_ERR(inode)) {
++ error = PTR_ERR(inode);
++ goto err_out;
+ }
+
+ /* invalidate the directory cnode's attributes */
+ coda_dir_inc_nlink(dir);
+ coda_dir_update_mtime(dir);
+- unlock_kernel();
+ d_instantiate(de, inode);
+ return 0;
++err_out:
++ d_drop(de);
++ return error;
+ }
+
+ /* try to make de an entry in dir_inodde linked to source_de */
+@@ -288,52 +265,38 @@ static int coda_link(struct dentry *source_de, struct inode *dir_inode,
+ int len = de->d_name.len;
+ int error;
+
+- lock_kernel();
+-
+- if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
+- unlock_kernel();
++ if (coda_isroot(dir_inode) && coda_iscontrol(name, len))
+ return -EPERM;
+- }
+
+ error = venus_link(dir_inode->i_sb, coda_i2f(inode),
+ coda_i2f(dir_inode), (const char *)name, len);
+-
+ if (error) {
+ d_drop(de);
+- goto out;
++ return error;
+ }
+
+ coda_dir_update_mtime(dir_inode);
+ atomic_inc(&inode->i_count);
+ d_instantiate(de, inode);
+ inc_nlink(inode);
+-
+-out:
+- unlock_kernel();
+- return(error);
++ return 0;
+ }
+
+
+ static int coda_symlink(struct inode *dir_inode, struct dentry *de,
+ const char *symname)
+ {
+- const char *name = de->d_name.name;
++ const char *name = de->d_name.name;
+ int len = de->d_name.len;
+ int symlen;
+- int error = 0;
+-
+- lock_kernel();
++ int error;
+
+- if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
+- unlock_kernel();
++ if (coda_isroot(dir_inode) && coda_iscontrol(name, len))
+ return -EPERM;
+- }
+
+ symlen = strlen(symname);
+- if ( symlen > CODA_MAXPATHLEN ) {
+- unlock_kernel();
++ if (symlen > CODA_MAXPATHLEN)
+ return -ENAMETOOLONG;
+- }
+
+ /*
+ * This entry is now negative. Since we do not create
+@@ -344,10 +307,9 @@ static int coda_symlink(struct inode *dir_inode, struct dentry *de,
+ symname, symlen);
+
+ /* mtime is no good anymore */
+- if ( !error )
++ if (!error)
+ coda_dir_update_mtime(dir_inode);
+
+- unlock_kernel();
+ return error;
+ }
+
+@@ -358,17 +320,12 @@ static int coda_unlink(struct inode *dir, struct dentry *de)
+ const char *name = de->d_name.name;
+ int len = de->d_name.len;
+
+- lock_kernel();
+-
+ error = venus_remove(dir->i_sb, coda_i2f(dir), name, len);
+- if ( error ) {
+- unlock_kernel();
++ if (error)
+ return error;
+- }
+
+ coda_dir_update_mtime(dir);
+ drop_nlink(de->d_inode);
+- unlock_kernel();
+ return 0;
+ }
+
+@@ -378,8 +335,6 @@ static int coda_rmdir(struct inode *dir, struct dentry *de)
+ int len = de->d_name.len;
+ int error;
+
+- lock_kernel();
+-
+ error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
+ if (!error) {
+ /* VFS may delete the child */
+@@ -390,7 +345,6 @@ static int coda_rmdir(struct inode *dir, struct dentry *de)
+ coda_dir_drop_nlink(dir);
+ coda_dir_update_mtime(dir);
+ }
+- unlock_kernel();
+ return error;
+ }
+
+@@ -404,15 +358,12 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
+ int new_length = new_dentry->d_name.len;
+ int error;
+
+- lock_kernel();
+-
+ error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
+ coda_i2f(new_dir), old_length, new_length,
+ (const char *) old_name, (const char *)new_name);
+-
+- if ( !error ) {
+- if ( new_dentry->d_inode ) {
+- if ( S_ISDIR(new_dentry->d_inode->i_mode) ) {
++ if (!error) {
++ if (new_dentry->d_inode) {
++ if (S_ISDIR(new_dentry->d_inode->i_mode)) {
+ coda_dir_drop_nlink(old_dir);
+ coda_dir_inc_nlink(new_dir);
+ }
+@@ -424,8 +375,6 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
+ coda_flag_inode(new_dir, C_VATTR);
+ }
+ }
+- unlock_kernel();
+-
+ return error;
+ }
+
+@@ -595,10 +544,7 @@ static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd)
+ struct inode *inode = de->d_inode;
+ struct coda_inode_info *cii;
+
+- if (!inode)
+- return 1;
+- lock_kernel();
+- if (coda_isroot(inode))
++ if (!inode || coda_isroot(inode))
+ goto out;
+ if (is_bad_inode(inode))
+ goto bad;
+@@ -621,12 +567,9 @@ static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd)
+ spin_lock(&cii->c_lock);
+ cii->c_flags &= ~(C_VATTR | C_PURGE | C_FLUSH);
+ spin_unlock(&cii->c_lock);
+-
+ bad:
+- unlock_kernel();
+ return 0;
+ out:
+- unlock_kernel();
+ return 1;
+ }
+
+@@ -659,20 +602,19 @@ static int coda_dentry_delete(struct dentry * dentry)
+ int coda_revalidate_inode(struct dentry *dentry)
+ {
+ struct coda_vattr attr;
+- int error = 0;
++ int error;
+ int old_mode;
+ ino_t old_ino;
+ struct inode *inode = dentry->d_inode;
+ struct coda_inode_info *cii = ITOC(inode);
+
+- lock_kernel();
+- if ( !cii->c_flags )
+- goto ok;
++ if (!cii->c_flags)
++ return 0;
+
+ if (cii->c_flags & (C_VATTR | C_PURGE | C_FLUSH)) {
+ error = venus_getattr(inode->i_sb, &(cii->c_fid), &attr);
+- if ( error )
+- goto return_bad;
++ if (error)
++ return -EIO;
+
+ /* this inode may be lost if:
+ - it's ino changed
+@@ -691,7 +633,7 @@ int coda_revalidate_inode(struct dentry *dentry)
+ /* the following can happen when a local fid is replaced
+ with a global one, here we lose and declare the inode bad */
+ if (inode->i_ino != old_ino)
+- goto return_bad;
++ return -EIO;
+
+ coda_flag_inode_children(inode, C_FLUSH);
+
+@@ -699,12 +641,5 @@ int coda_revalidate_inode(struct dentry *dentry)
+ cii->c_flags &= ~(C_VATTR | C_PURGE | C_FLUSH);
+ spin_unlock(&cii->c_lock);
+ }
+-
+-ok:
+- unlock_kernel();
+ return 0;
+-
+-return_bad:
+- unlock_kernel();
+- return -EIO;
+ }
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index c4e395781d41..c8b50ba4366a 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -15,7 +15,6 @@
+ #include <linux/stat.h>
+ #include <linux/cred.h>
+ #include <linux/errno.h>
+-#include <linux/smp_lock.h>
+ #include <linux/spinlock.h>
+ #include <linux/string.h>
+ #include <linux/slab.h>
+@@ -144,8 +143,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+ if (!cfi)
+ return -ENOMEM;
+
+- lock_kernel();
+-
+ error = venus_open(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags,
+ &host_file);
+ if (!host_file)
+@@ -153,7 +150,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+
+ if (error) {
+ kfree(cfi);
+- unlock_kernel();
+ return error;
+ }
+
+@@ -165,8 +161,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+
+ BUG_ON(coda_file->private_data != NULL);
+ coda_file->private_data = cfi;
+-
+- unlock_kernel();
+ return 0;
+ }
+
+@@ -177,9 +171,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ struct coda_file_info *cfi;
+ struct coda_inode_info *cii;
+ struct inode *host_inode;
+- int err = 0;
+-
+- lock_kernel();
++ int err;
+
+ cfi = CODA_FTOC(coda_file);
+ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+@@ -203,8 +195,6 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ kfree(coda_file->private_data);
+ coda_file->private_data = NULL;
+
+- unlock_kernel();
+-
+ /* VFS fput ignores the return value from file_operations->release, so
+ * there is no use returning an error here */
+ return 0;
+@@ -215,7 +205,7 @@ int coda_fsync(struct file *coda_file, int datasync)
+ struct file *host_file;
+ struct inode *coda_inode = coda_file->f_path.dentry->d_inode;
+ struct coda_file_info *cfi;
+- int err = 0;
++ int err;
+
+ if (!(S_ISREG(coda_inode->i_mode) || S_ISDIR(coda_inode->i_mode) ||
+ S_ISLNK(coda_inode->i_mode)))
+@@ -226,11 +216,8 @@ int coda_fsync(struct file *coda_file, int datasync)
+ host_file = cfi->cfi_container;
+
+ err = vfs_fsync(host_file, datasync);
+- if ( !err && !datasync ) {
+- lock_kernel();
++ if (!err && !datasync)
+ err = venus_fsync(coda_inode->i_sb, coda_i2f(coda_inode));
+- unlock_kernel();
+- }
+
+ return err;
+ }
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index 0553f3bd7b1b..b7fa3e3d772f 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -150,8 +150,6 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ int error;
+ int idx;
+
+- lock_kernel();
+-
+ idx = get_device_index((struct coda_mount_data *) data);
+
+ /* Ignore errors in data, for backward compatibility */
+@@ -161,23 +159,26 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ printk(KERN_INFO "coda_read_super: device index: %i\n", idx);
+
+ vc = &coda_comms[idx];
++ lock_kernel();
++
+ if (!vc->vc_inuse) {
+ printk("coda_read_super: No pseudo device\n");
+- unlock_kernel();
+- return -EINVAL;
++ error = -EINVAL;
++ goto unlock_out;
+ }
+
+- if ( vc->vc_sb ) {
++ if (vc->vc_sb) {
+ printk("coda_read_super: Device already mounted\n");
+- unlock_kernel();
+- return -EBUSY;
++ error = -EBUSY;
++ goto unlock_out;
+ }
+
+ error = bdi_setup_and_register(&vc->bdi, "coda", BDI_CAP_MAP_COPY);
+ if (error)
+- goto bdi_err;
++ goto unlock_out;
+
+ vc->vc_sb = sb;
++ unlock_kernel();
+
+ sb->s_fs_info = vc;
+ sb->s_flags |= MS_NOATIME;
+@@ -206,21 +207,23 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ printk("coda_read_super: rootinode is %ld dev %s\n",
+ root->i_ino, root->i_sb->s_id);
+ sb->s_root = d_alloc_root(root);
+- if (!sb->s_root)
++ if (!sb->s_root) {
++ error = -EINVAL;
+ goto error;
+- unlock_kernel();
++ }
+ return 0;
+
+- error:
+- bdi_destroy(&vc->bdi);
+- bdi_err:
++error:
+ if (root)
+ iput(root);
+- if (vc)
+- vc->vc_sb = NULL;
+
++ lock_kernel();
++ bdi_destroy(&vc->bdi);
++ vc->vc_sb = NULL;
++ sb->s_fs_info = NULL;
++unlock_out:
+ unlock_kernel();
+- return -EINVAL;
++ return error;
+ }
+
+ static void coda_put_super(struct super_block *sb)
+@@ -253,8 +256,6 @@ int coda_setattr(struct dentry *de, struct iattr *iattr)
+ struct coda_vattr vattr;
+ int error;
+
+- lock_kernel();
+-
+ memset(&vattr, 0, sizeof(vattr));
+
+ inode->i_ctime = CURRENT_TIME_SEC;
+@@ -264,13 +265,10 @@ int coda_setattr(struct dentry *de, struct iattr *iattr)
+ /* Venus is responsible for truncating the container-file!!! */
+ error = venus_setattr(inode->i_sb, coda_i2f(inode), &vattr);
+
+- if ( !error ) {
++ if (!error) {
+ coda_vattr_to_iattr(inode, &vattr);
+ coda_cache_clear_inode(inode);
+ }
+-
+- unlock_kernel();
+-
+ return error;
+ }
+
+@@ -284,12 +282,8 @@ static int coda_statfs(struct dentry *dentry, struct kstatfs *buf)
+ {
+ int error;
+
+- lock_kernel();
+-
+ error = venus_statfs(dentry, buf);
+
+- unlock_kernel();
+-
+ if (error) {
+ /* fake something like AFS does */
+ buf->f_blocks = 9000000;
+diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c
+index 028a9a0f588b..2fd89b5c5c7b 100644
+--- a/fs/coda/pioctl.c
++++ b/fs/coda/pioctl.c
+@@ -23,8 +23,6 @@
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_psdev.h>
+
+-#include <linux/smp_lock.h>
+-
+ /* pioctl ops */
+ static int coda_ioctl_permission(struct inode *inode, int mask);
+ static long coda_pioctl(struct file *filp, unsigned int cmd,
+@@ -58,13 +56,9 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
+ struct inode *target_inode = NULL;
+ struct coda_inode_info *cnp;
+
+- lock_kernel();
+-
+ /* get the Pioctl data arguments from user space */
+- if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
+- error = -EINVAL;
+- goto out;
+- }
++ if (copy_from_user(&data, (void __user *)user_data, sizeof(data)))
++ return -EINVAL;
+
+ /*
+ * Look up the pathname. Note that the pathname is in
+@@ -76,13 +70,12 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
+ error = user_lpath(data.path, &path);
+
+ if (error)
+- goto out;
+- else
+- target_inode = path.dentry->d_inode;
++ return error;
++
++ target_inode = path.dentry->d_inode;
+
+ /* return if it is not a Coda inode */
+ if (target_inode->i_sb != inode->i_sb) {
+- path_put(&path);
+ error = -EINVAL;
+ goto out;
+ }
+@@ -91,10 +84,7 @@ static long coda_pioctl(struct file *filp, unsigned int cmd,
+ cnp = ITOC(target_inode);
+
+ error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
+-
+- path_put(&path);
+-
+ out:
+- unlock_kernel();
++ path_put(&path);
+ return error;
+ }
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index fdc2f3ef7ecd..9a9248e632c6 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -108,16 +108,9 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ return -EFAULT;
+
+ if (DOWNCALL(hdr.opcode)) {
+- struct super_block *sb = NULL;
+- union outputArgs *dcbuf;
++ union outputArgs *dcbuf;
+ int size = sizeof(*dcbuf);
+
+- sb = vcp->vc_sb;
+- if ( !sb ) {
+- count = nbytes;
+- goto out;
+- }
+-
+ if ( nbytes < sizeof(struct coda_out_hdr) ) {
+ printk("coda_downcall opc %d uniq %d, not enough!\n",
+ hdr.opcode, hdr.unique);
+@@ -137,9 +130,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ }
+
+ /* what downcall errors does Venus handle ? */
+- lock_kernel();
+- error = coda_downcall(hdr.opcode, dcbuf, sb);
+- unlock_kernel();
++ error = coda_downcall(vcp, hdr.opcode, dcbuf);
+
+ CODA_FREE(dcbuf, nbytes);
+ if (error) {
+diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
+index 4513b7258458..af78f007a2b0 100644
+--- a/fs/coda/symlink.c
++++ b/fs/coda/symlink.c
+@@ -14,7 +14,6 @@
+ #include <linux/stat.h>
+ #include <linux/errno.h>
+ #include <linux/pagemap.h>
+-#include <linux/smp_lock.h>
+
+ #include <linux/coda.h>
+ #include <linux/coda_linux.h>
+@@ -29,11 +28,9 @@ static int coda_symlink_filler(struct file *file, struct page *page)
+ unsigned int len = PAGE_SIZE;
+ char *p = kmap(page);
+
+- lock_kernel();
+ cii = ITOC(inode);
+
+ error = venus_readlink(inode->i_sb, &cii->c_fid, p, &len);
+- unlock_kernel();
+ if (error)
+ goto fail;
+ SetPageUptodate(page);
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index b8893ab6f9e6..4c258cb5266d 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -27,6 +27,7 @@
+ #include <linux/errno.h>
+ #include <linux/string.h>
+ #include <linux/slab.h>
++#include <linux/smp_lock.h>
+ #include <asm/uaccess.h>
+ #include <linux/vmalloc.h>
+ #include <linux/vfs.h>
+@@ -667,18 +668,23 @@ static int coda_upcall(struct venus_comm *vcp,
+ {
+ union outputArgs *out;
+ union inputArgs *sig_inputArgs;
+- struct upc_req *req, *sig_req;
+- int error = 0;
++ struct upc_req *req = NULL, *sig_req;
++ int error;
++
++ lock_kernel();
+
+ if (!vcp->vc_inuse) {
+ printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
+- return -ENXIO;
++ error = -ENXIO;
++ goto exit;
+ }
+
+ /* Format the request message. */
+ req = kmalloc(sizeof(struct upc_req), GFP_KERNEL);
+- if (!req)
+- return -ENOMEM;
++ if (!req) {
++ error = -ENOMEM;
++ goto exit;
++ }
+
+ req->uc_data = (void *)buffer;
+ req->uc_flags = 0;
+@@ -759,6 +765,7 @@ static int coda_upcall(struct venus_comm *vcp,
+
+ exit:
+ kfree(req);
++ unlock_kernel();
+ return error;
+ }
+
+@@ -796,21 +803,24 @@ static int coda_upcall(struct venus_comm *vcp,
+ *
+ * CODA_REPLACE -- replace one CodaFid with another throughout the name cache */
+
+-int coda_downcall(int opcode, union outputArgs * out, struct super_block *sb)
++int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out)
+ {
+ struct inode *inode = NULL;
+ struct CodaFid *fid, *newfid;
++ struct super_block *sb;
+
+ /* Handle invalidation requests. */
+- if ( !sb || !sb->s_root)
+- return 0;
++ lock_kernel();
++ sb = vcp->vc_sb;
++ if (!sb || !sb->s_root)
++ goto unlock_out;
+
+ switch (opcode) {
+ case CODA_FLUSH:
+ coda_cache_clear_all(sb);
+ shrink_dcache_sb(sb);
+ if (sb->s_root->d_inode)
+- coda_flag_inode(sb->s_root->d_inode, C_FLUSH);
++ coda_flag_inode(sb->s_root->d_inode, C_FLUSH);
+ break;
+
+ case CODA_PURGEUSER:
+@@ -855,9 +865,11 @@ int coda_downcall(int opcode, union outputArgs * out, struct super_block *sb)
+ break;
+ }
+
++unlock_out:
++ unlock_kernel();
++
+ if (inode)
+ iput(inode);
+-
+ return 0;
+ }
+
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index 284b520934a0..1e60c5a41a5b 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -63,7 +63,7 @@ int venus_symlink(struct super_block *sb, struct CodaFid *fid,
+ int venus_access(struct super_block *sb, struct CodaFid *fid, int mask);
+ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
+ unsigned int cmd, struct PioctlData *data);
+-int coda_downcall(int opcode, union outputArgs *out, struct super_block *sb);
++int coda_downcall(struct venus_comm *vcp, int opcode, union outputArgs *out);
+ int venus_fsync(struct super_block *sb, struct CodaFid *fid);
+ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
+ commit b5ce1d83a62fc109d8e815b1fc71dcdb0d26bc49
+Author: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+Date: Mon Oct 25 02:03:44 2010 -0400
+
+ Coda: add spin lock to protect accesses to struct coda_inode_info.
+
+ We mostly need it to protect cached user permissions. The c_flags field
+ is advisory, reading the wrong value is harmless and in the worst case
+ we hit a slow path where we have to make an extra upcall to the
+ userspace cache manager when revalidating a dentry or inode.
+
+ Signed-off-by: Yoshihisa Abe <yoshiabe@cs.cmu.edu>
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/cache.c b/fs/coda/cache.c
+index a5bf5771a22a..9060f08e70cf 100644
+--- a/fs/coda/cache.c
++++ b/fs/coda/cache.c
+@@ -17,6 +17,7 @@
+ #include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/sched.h>
++#include <linux/spinlock.h>
+
+ #include <linux/coda.h>
+ #include <linux/coda_linux.h>
+@@ -31,19 +32,23 @@ void coda_cache_enter(struct inode *inode, int mask)
+ {
+ struct coda_inode_info *cii = ITOC(inode);
+
++ spin_lock(&cii->c_lock);
+ cii->c_cached_epoch = atomic_read(&permission_epoch);
+ if (cii->c_uid != current_fsuid()) {
+ cii->c_uid = current_fsuid();
+ cii->c_cached_perm = mask;
+ } else
+ cii->c_cached_perm |= mask;
++ spin_unlock(&cii->c_lock);
+ }
+
+ /* remove cached acl from an inode */
+ void coda_cache_clear_inode(struct inode *inode)
+ {
+ struct coda_inode_info *cii = ITOC(inode);
++ spin_lock(&cii->c_lock);
+ cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
++ spin_unlock(&cii->c_lock);
+ }
+
+ /* remove all acl caches */
+@@ -57,13 +62,15 @@ void coda_cache_clear_all(struct super_block *sb)
+ int coda_cache_check(struct inode *inode, int mask)
+ {
+ struct coda_inode_info *cii = ITOC(inode);
+- int hit;
++ int hit;
+
+- hit = (mask & cii->c_cached_perm) == mask &&
+- cii->c_uid == current_fsuid() &&
+- cii->c_cached_epoch == atomic_read(&permission_epoch);
++ spin_lock(&cii->c_lock);
++ hit = (mask & cii->c_cached_perm) == mask &&
++ cii->c_uid == current_fsuid() &&
++ cii->c_cached_epoch == atomic_read(&permission_epoch);
++ spin_unlock(&cii->c_lock);
+
+- return hit;
++ return hit;
+ }
+
+
+diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
+index a7a780929eec..602240569c89 100644
+--- a/fs/coda/cnode.c
++++ b/fs/coda/cnode.c
+@@ -45,13 +45,15 @@ static void coda_fill_inode(struct inode *inode, struct coda_vattr *attr)
+ static int coda_test_inode(struct inode *inode, void *data)
+ {
+ struct CodaFid *fid = (struct CodaFid *)data;
+- return coda_fideq(&(ITOC(inode)->c_fid), fid);
++ struct coda_inode_info *cii = ITOC(inode);
++ return coda_fideq(&cii->c_fid, fid);
+ }
+
+ static int coda_set_inode(struct inode *inode, void *data)
+ {
+ struct CodaFid *fid = (struct CodaFid *)data;
+- ITOC(inode)->c_fid = *fid;
++ struct coda_inode_info *cii = ITOC(inode);
++ cii->c_fid = *fid;
+ return 0;
+ }
+
+@@ -71,6 +73,7 @@ struct inode * coda_iget(struct super_block * sb, struct CodaFid * fid,
+ cii = ITOC(inode);
+ /* we still need to set i_ino for things like stat(2) */
+ inode->i_ino = hash;
++ /* inode is locked and unique, no need to grab cii->c_lock */
+ cii->c_mapcount = 0;
+ unlock_new_inode(inode);
+ }
+@@ -107,14 +110,20 @@ int coda_cnode_make(struct inode **inode, struct CodaFid *fid, struct super_bloc
+ }
+
+
++/* Although we treat Coda file identifiers as immutable, there is one
++ * special case for files created during a disconnection where they may
++ * not be globally unique. When an identifier collision is detected we
++ * first try to flush the cached inode from the kernel and finally
++ * resort to renaming/rehashing in-place. Userspace remembers both old
++ * and new values of the identifier to handle any in-flight upcalls.
++ * The real solution is to use globally unique UUIDs as identifiers, but
++ * retrofitting the existing userspace code for this is non-trivial. */
+ void coda_replace_fid(struct inode *inode, struct CodaFid *oldfid,
+ struct CodaFid *newfid)
+ {
+- struct coda_inode_info *cii;
++ struct coda_inode_info *cii = ITOC(inode);
+ unsigned long hash = coda_f2i(newfid);
+
+- cii = ITOC(inode);
+-
+ BUG_ON(!coda_fideq(&cii->c_fid, oldfid));
+
+ /* replace fid and rehash inode */
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index ccd98b0f2b0b..69fbbea75f1b 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -18,6 +18,7 @@
+ #include <linux/errno.h>
+ #include <linux/string.h>
+ #include <linux/smp_lock.h>
++#include <linux/spinlock.h>
+
+ #include <asm/uaccess.h>
+
+@@ -617,7 +618,9 @@ static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd)
+ goto out;
+
+ /* clear the flags. */
++ spin_lock(&cii->c_lock);
+ cii->c_flags &= ~(C_VATTR | C_PURGE | C_FLUSH);
++ spin_unlock(&cii->c_lock);
+
+ bad:
+ unlock_kernel();
+@@ -691,7 +694,10 @@ int coda_revalidate_inode(struct dentry *dentry)
+ goto return_bad;
+
+ coda_flag_inode_children(inode, C_FLUSH);
++
++ spin_lock(&cii->c_lock);
+ cii->c_flags &= ~(C_VATTR | C_PURGE | C_FLUSH);
++ spin_unlock(&cii->c_lock);
+ }
+
+ ok:
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index ad3cd2abeeb4..c4e395781d41 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -16,6 +16,7 @@
+ #include <linux/cred.h>
+ #include <linux/errno.h>
+ #include <linux/smp_lock.h>
++#include <linux/spinlock.h>
+ #include <linux/string.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
+@@ -109,19 +110,24 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+
+ coda_inode = coda_file->f_path.dentry->d_inode;
+ host_inode = host_file->f_path.dentry->d_inode;
++
++ cii = ITOC(coda_inode);
++ spin_lock(&cii->c_lock);
+ coda_file->f_mapping = host_file->f_mapping;
+ if (coda_inode->i_mapping == &coda_inode->i_data)
+ coda_inode->i_mapping = host_inode->i_mapping;
+
+ /* only allow additional mmaps as long as userspace isn't changing
+ * the container file on us! */
+- else if (coda_inode->i_mapping != host_inode->i_mapping)
++ else if (coda_inode->i_mapping != host_inode->i_mapping) {
++ spin_unlock(&cii->c_lock);
+ return -EBUSY;
++ }
+
+ /* keep track of how often the coda_inode/host_file has been mmapped */
+- cii = ITOC(coda_inode);
+ cii->c_mapcount++;
+ cfi->cfi_mapcount++;
++ spin_unlock(&cii->c_lock);
+
+ return host_file->f_op->mmap(host_file, vma);
+ }
+@@ -185,11 +191,13 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ cii = ITOC(coda_inode);
+
+ /* did we mmap this file? */
++ spin_lock(&cii->c_lock);
+ if (coda_inode->i_mapping == &host_inode->i_data) {
+ cii->c_mapcount -= cfi->cfi_mapcount;
+ if (!cii->c_mapcount)
+ coda_inode->i_mapping = &coda_inode->i_data;
+ }
++ spin_unlock(&cii->c_lock);
+
+ fput(cfi->cfi_container);
+ kfree(coda_file->private_data);
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index bfe8179b1295..0553f3bd7b1b 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -16,6 +16,7 @@
+ #include <linux/errno.h>
+ #include <linux/unistd.h>
+ #include <linux/smp_lock.h>
++#include <linux/spinlock.h>
+ #include <linux/file.h>
+ #include <linux/vfs.h>
+ #include <linux/slab.h>
+@@ -51,6 +52,7 @@ static struct inode *coda_alloc_inode(struct super_block *sb)
+ ei->c_flags = 0;
+ ei->c_uid = 0;
+ ei->c_cached_perm = 0;
++ spin_lock_init(&ei->c_lock);
+ return &ei->vfs_inode;
+ }
+
+diff --git a/include/linux/coda_fs_i.h b/include/linux/coda_fs_i.h
+index b3ef0c461578..e35071b1de0e 100644
+--- a/include/linux/coda_fs_i.h
++++ b/include/linux/coda_fs_i.h
+@@ -10,19 +10,24 @@
+
+ #include <linux/types.h>
+ #include <linux/list.h>
++#include <linux/spinlock.h>
+ #include <linux/coda.h>
+
+ /*
+ * coda fs inode data
++ * c_lock protects accesses to c_flags, c_mapcount, c_cached_epoch, c_uid and
++ * c_cached_perm.
++ * vfs_inode is set only when the inode is created and never changes.
++ * c_fid is set when the inode is created and should be considered immutable.
+ */
+ struct coda_inode_info {
+- struct CodaFid c_fid; /* Coda identifier */
+- u_short c_flags; /* flags (see below) */
+- struct list_head c_cilist; /* list of all coda inodes */
++ struct CodaFid c_fid; /* Coda identifier */
++ u_short c_flags; /* flags (see below) */
+ unsigned int c_mapcount; /* nr of times this inode is mapped */
+ unsigned int c_cached_epoch; /* epoch for cached permissions */
+ vuid_t c_uid; /* fsuid for cached permissions */
+- unsigned int c_cached_perm; /* cached access permissions */
++ unsigned int c_cached_perm; /* cached access permissions */
++ spinlock_t c_lock;
+ struct inode vfs_inode;
+ };
+
+diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
+index dcc228aa335a..2e914d0771b9 100644
+--- a/include/linux/coda_linux.h
++++ b/include/linux/coda_linux.h
+@@ -89,7 +89,11 @@ static __inline__ char *coda_i2s(struct inode *inode)
+ /* this will not zap the inode away */
+ static __inline__ void coda_flag_inode(struct inode *inode, int flag)
+ {
+- ITOC(inode)->c_flags |= flag;
++ struct coda_inode_info *cii = ITOC(inode);
++
++ spin_lock(&cii->c_lock);
++ cii->c_flags |= flag;
++ spin_unlock(&cii->c_lock);
+ }
+
+ #endifcommit 112d421df2fddc0278584b084f4fcfedd144c5f4 +Author: Jan Harkes <jaharkes@cs.cmu.edu> +Date: Fri Sep 17 23:26:01 2010 -0400 + + Coda: mount hangs because of missed REQ_WRITE rename + + Coda's REQ_* defines were renamed to avoid clashes with the block layer + (commit 4aeefdc69f7b: "coda: fixup clash with block layer REQ_* + defines"). + + However one was missed and response messages are no longer matched with + requests and waiting threads are no longer woken up. This patch fixes + this. + + Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> + [ Also fixed up whitespace while at it -Linus ] + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c +index de89645777c7..116af7546cf0 100644 +--- a/fs/coda/psdev.c ++++ b/fs/coda/psdev.c +@@ -184,8 +184,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, + } + + /* adjust outsize. is this useful ?? */ +- req->uc_outSize = nbytes; +- req->uc_flags |= REQ_WRITE; ++ req->uc_outSize = nbytes; ++ req->uc_flags |= CODA_REQ_WRITE; + count = nbytes; + + /* Convert filedescriptor into a file handle */
commit 8ffd1be6779c86ebc2a1013f43fdcee8bdbba2b7
+Author: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+Date: Mon Oct 19 12:58:55 2009 +0900
+
+ crypto: hash - Remove cra_u.{digest,hash}
+
+ Remove unused digest_alg and hash_alg structs from crypto_alg union and
+ kill their definitions. This also ensures that old-style digest/hash
+ algorithms maintained out of tree will break at build time rather than
+ oopsing at runtime.
+
+ Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/include/linux/crypto.h b/include/linux/crypto.h
+index fd929889e8dc..24d2e30f1b46 100644
+--- a/include/linux/crypto.h
++++ b/include/linux/crypto.h
+@@ -250,29 +250,6 @@ struct cipher_alg {
+ void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+ };
+
+-struct digest_alg {
+- unsigned int dia_digestsize;
+- void (*dia_init)(struct crypto_tfm *tfm);
+- void (*dia_update)(struct crypto_tfm *tfm, const u8 *data,
+- unsigned int len);
+- void (*dia_final)(struct crypto_tfm *tfm, u8 *out);
+- int (*dia_setkey)(struct crypto_tfm *tfm, const u8 *key,
+- unsigned int keylen);
+-};
+-
+-struct hash_alg {
+- int (*init)(struct hash_desc *desc);
+- int (*update)(struct hash_desc *desc, struct scatterlist *sg,
+- unsigned int nbytes);
+- int (*final)(struct hash_desc *desc, u8 *out);
+- int (*digest)(struct hash_desc *desc, struct scatterlist *sg,
+- unsigned int nbytes, u8 *out);
+- int (*setkey)(struct crypto_hash *tfm, const u8 *key,
+- unsigned int keylen);
+-
+- unsigned int digestsize;
+-};
+-
+ struct compress_alg {
+ int (*coa_compress)(struct crypto_tfm *tfm, const u8 *src,
+ unsigned int slen, u8 *dst, unsigned int *dlen);
+@@ -293,8 +270,6 @@ struct rng_alg {
+ #define cra_aead cra_u.aead
+ #define cra_blkcipher cra_u.blkcipher
+ #define cra_cipher cra_u.cipher
+-#define cra_digest cra_u.digest
+-#define cra_hash cra_u.hash
+ #define cra_compress cra_u.compress
+ #define cra_rng cra_u.rng
+
+@@ -320,8 +295,6 @@ struct crypto_alg {
+ struct aead_alg aead;
+ struct blkcipher_alg blkcipher;
+ struct cipher_alg cipher;
+- struct digest_alg digest;
+- struct hash_alg hash;
+ struct compress_alg compress;
+ struct rng_alg rng;
+ } cra_u;
+ commit 085751b96897280cc3087920f8c6e7d1283f6d00 +Author: Benjamin Gilbert <bgilbert@cs.cmu.edu> +Date: Mon Oct 19 12:57:20 2009 +0900 + + crypto: api - Remove digest case from procfs show handler + + Remove special handling of old-style digest algorithms from the procfs + show handler. + + Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu> + Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> + +diff --git a/crypto/proc.c b/crypto/proc.c +index 5dc07e442fca..ff4cb4a357f9 100644 +--- a/crypto/proc.c ++++ b/crypto/proc.c +@@ -115,13 +115,6 @@ static int c_show(struct seq_file *m, void *p) + seq_printf(m, "max keysize : %u\n", + alg->cra_cipher.cia_max_keysize); + break; +- +- case CRYPTO_ALG_TYPE_DIGEST: +- seq_printf(m, "type : digest\n"); +- seq_printf(m, "blocksize : %u\n", alg->cra_blocksize); +- seq_printf(m, "digestsize : %u\n", +- alg->cra_digest.dia_digestsize); +- break; + case CRYPTO_ALG_TYPE_COMPRESS: + seq_printf(m, "type : compression\n"); + break;
commit 2141b6309b1fce535329c195cb5e5274a4c84ebc
+Author: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+Date: Mon Oct 19 12:53:37 2009 +0900
+
+ crypto: hash - Remove legacy hash/digest code
+
+ 6941c3a0 disabled compilation of the legacy digest code but didn't
+ actually remove it. Rectify this. Also, remove the crypto_hash_type
+ extern declaration from algapi.h now that the struct is gone.
+
+ Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/crypto/digest.c b/crypto/digest.c
+deleted file mode 100644
+index 5d3f1303da98..000000000000
+--- a/crypto/digest.c
++++ /dev/null
+@@ -1,240 +0,0 @@
+-/*
+- * Cryptographic API.
+- *
+- * Digest operations.
+- *
+- * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+- *
+- * 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 <crypto/internal/hash.h>
+-#include <crypto/scatterwalk.h>
+-#include <linux/mm.h>
+-#include <linux/errno.h>
+-#include <linux/hardirq.h>
+-#include <linux/highmem.h>
+-#include <linux/kernel.h>
+-#include <linux/module.h>
+-#include <linux/scatterlist.h>
+-
+-#include "internal.h"
+-
+-static int init(struct hash_desc *desc)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm);
+-
+- tfm->__crt_alg->cra_digest.dia_init(tfm);
+- return 0;
+-}
+-
+-static int update2(struct hash_desc *desc,
+- struct scatterlist *sg, unsigned int nbytes)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm);
+- unsigned int alignmask = crypto_tfm_alg_alignmask(tfm);
+-
+- if (!nbytes)
+- return 0;
+-
+- for (;;) {
+- struct page *pg = sg_page(sg);
+- unsigned int offset = sg->offset;
+- unsigned int l = sg->length;
+-
+- if (unlikely(l > nbytes))
+- l = nbytes;
+- nbytes -= l;
+-
+- do {
+- unsigned int bytes_from_page = min(l, ((unsigned int)
+- (PAGE_SIZE)) -
+- offset);
+- char *src = crypto_kmap(pg, 0);
+- char *p = src + offset;
+-
+- if (unlikely(offset & alignmask)) {
+- unsigned int bytes =
+- alignmask + 1 - (offset & alignmask);
+- bytes = min(bytes, bytes_from_page);
+- tfm->__crt_alg->cra_digest.dia_update(tfm, p,
+- bytes);
+- p += bytes;
+- bytes_from_page -= bytes;
+- l -= bytes;
+- }
+- tfm->__crt_alg->cra_digest.dia_update(tfm, p,
+- bytes_from_page);
+- crypto_kunmap(src, 0);
+- crypto_yield(desc->flags);
+- offset = 0;
+- pg++;
+- l -= bytes_from_page;
+- } while (l > 0);
+-
+- if (!nbytes)
+- break;
+- sg = scatterwalk_sg_next(sg);
+- }
+-
+- return 0;
+-}
+-
+-static int update(struct hash_desc *desc,
+- struct scatterlist *sg, unsigned int nbytes)
+-{
+- if (WARN_ON_ONCE(in_irq()))
+- return -EDEADLK;
+- return update2(desc, sg, nbytes);
+-}
+-
+-static int final(struct hash_desc *desc, u8 *out)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm);
+- unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);
+- struct digest_alg *digest = &tfm->__crt_alg->cra_digest;
+-
+- if (unlikely((unsigned long)out & alignmask)) {
+- unsigned long align = alignmask + 1;
+- unsigned long addr = (unsigned long)crypto_tfm_ctx(tfm);
+- u8 *dst = (u8 *)ALIGN(addr, align) +
+- ALIGN(tfm->__crt_alg->cra_ctxsize, align);
+-
+- digest->dia_final(tfm, dst);
+- memcpy(out, dst, digest->dia_digestsize);
+- } else
+- digest->dia_final(tfm, out);
+-
+- return 0;
+-}
+-
+-static int nosetkey(struct crypto_hash *tfm, const u8 *key, unsigned int keylen)
+-{
+- crypto_hash_clear_flags(tfm, CRYPTO_TFM_RES_MASK);
+- return -ENOSYS;
+-}
+-
+-static int setkey(struct crypto_hash *hash, const u8 *key, unsigned int keylen)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(hash);
+-
+- crypto_hash_clear_flags(hash, CRYPTO_TFM_RES_MASK);
+- return tfm->__crt_alg->cra_digest.dia_setkey(tfm, key, keylen);
+-}
+-
+-static int digest(struct hash_desc *desc,
+- struct scatterlist *sg, unsigned int nbytes, u8 *out)
+-{
+- if (WARN_ON_ONCE(in_irq()))
+- return -EDEADLK;
+-
+- init(desc);
+- update2(desc, sg, nbytes);
+- return final(desc, out);
+-}
+-
+-int crypto_init_digest_ops(struct crypto_tfm *tfm)
+-{
+- struct hash_tfm *ops = &tfm->crt_hash;
+- struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
+-
+- if (dalg->dia_digestsize > PAGE_SIZE / 8)
+- return -EINVAL;
+-
+- ops->init = init;
+- ops->update = update;
+- ops->final = final;
+- ops->digest = digest;
+- ops->setkey = dalg->dia_setkey ? setkey : nosetkey;
+- ops->digestsize = dalg->dia_digestsize;
+-
+- return 0;
+-}
+-
+-void crypto_exit_digest_ops(struct crypto_tfm *tfm)
+-{
+-}
+-
+-static int digest_async_nosetkey(struct crypto_ahash *tfm_async, const u8 *key,
+- unsigned int keylen)
+-{
+- crypto_ahash_clear_flags(tfm_async, CRYPTO_TFM_RES_MASK);
+- return -ENOSYS;
+-}
+-
+-static int digest_async_setkey(struct crypto_ahash *tfm_async, const u8 *key,
+- unsigned int keylen)
+-{
+- struct crypto_tfm *tfm = crypto_ahash_tfm(tfm_async);
+- struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
+-
+- crypto_ahash_clear_flags(tfm_async, CRYPTO_TFM_RES_MASK);
+- return dalg->dia_setkey(tfm, key, keylen);
+-}
+-
+-static int digest_async_init(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
+-
+- dalg->dia_init(tfm);
+- return 0;
+-}
+-
+-static int digest_async_update(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- update(&desc, req->src, req->nbytes);
+- return 0;
+-}
+-
+-static int digest_async_final(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- final(&desc, req->result);
+- return 0;
+-}
+-
+-static int digest_async_digest(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- return digest(&desc, req->src, req->nbytes, req->result);
+-}
+-
+-int crypto_init_digest_ops_async(struct crypto_tfm *tfm)
+-{
+- struct ahash_tfm *crt = &tfm->crt_ahash;
+- struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
+-
+- if (dalg->dia_digestsize > PAGE_SIZE / 8)
+- return -EINVAL;
+-
+- crt->init = digest_async_init;
+- crt->update = digest_async_update;
+- crt->final = digest_async_final;
+- crt->digest = digest_async_digest;
+- crt->setkey = dalg->dia_setkey ? digest_async_setkey :
+- digest_async_nosetkey;
+- crt->digestsize = dalg->dia_digestsize;
+-
+- return 0;
+-}
+diff --git a/crypto/hash.c b/crypto/hash.c
+deleted file mode 100644
+index cb86b19fd105..000000000000
+--- a/crypto/hash.c
++++ /dev/null
+@@ -1,183 +0,0 @@
+-/*
+- * Cryptographic Hash operations.
+- *
+- * Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
+- *
+- * 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 <crypto/internal/hash.h>
+-#include <linux/errno.h>
+-#include <linux/kernel.h>
+-#include <linux/module.h>
+-#include <linux/slab.h>
+-#include <linux/seq_file.h>
+-
+-#include "internal.h"
+-
+-static unsigned int crypto_hash_ctxsize(struct crypto_alg *alg, u32 type,
+- u32 mask)
+-{
+- return alg->cra_ctxsize;
+-}
+-
+-static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key,
+- unsigned int keylen)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(crt);
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- unsigned long alignmask = crypto_hash_alignmask(crt);
+- int ret;
+- u8 *buffer, *alignbuffer;
+- unsigned long absize;
+-
+- absize = keylen + alignmask;
+- buffer = kmalloc(absize, GFP_ATOMIC);
+- if (!buffer)
+- return -ENOMEM;
+-
+- alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
+- memcpy(alignbuffer, key, keylen);
+- ret = alg->setkey(crt, alignbuffer, keylen);
+- memset(alignbuffer, 0, keylen);
+- kfree(buffer);
+- return ret;
+-}
+-
+-static int hash_setkey(struct crypto_hash *crt, const u8 *key,
+- unsigned int keylen)
+-{
+- struct crypto_tfm *tfm = crypto_hash_tfm(crt);
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- unsigned long alignmask = crypto_hash_alignmask(crt);
+-
+- if ((unsigned long)key & alignmask)
+- return hash_setkey_unaligned(crt, key, keylen);
+-
+- return alg->setkey(crt, key, keylen);
+-}
+-
+-static int hash_async_setkey(struct crypto_ahash *tfm_async, const u8 *key,
+- unsigned int keylen)
+-{
+- struct crypto_tfm *tfm = crypto_ahash_tfm(tfm_async);
+- struct crypto_hash *tfm_hash = __crypto_hash_cast(tfm);
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+-
+- return alg->setkey(tfm_hash, key, keylen);
+-}
+-
+-static int hash_async_init(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- return alg->init(&desc);
+-}
+-
+-static int hash_async_update(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- return alg->update(&desc, req->src, req->nbytes);
+-}
+-
+-static int hash_async_final(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- return alg->final(&desc, req->result);
+-}
+-
+-static int hash_async_digest(struct ahash_request *req)
+-{
+- struct crypto_tfm *tfm = req->base.tfm;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+- struct hash_desc desc = {
+- .tfm = __crypto_hash_cast(tfm),
+- .flags = req->base.flags,
+- };
+-
+- return alg->digest(&desc, req->src, req->nbytes, req->result);
+-}
+-
+-static int crypto_init_hash_ops_async(struct crypto_tfm *tfm)
+-{
+- struct ahash_tfm *crt = &tfm->crt_ahash;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+-
+- crt->init = hash_async_init;
+- crt->update = hash_async_update;
+- crt->final = hash_async_final;
+- crt->digest = hash_async_digest;
+- crt->setkey = hash_async_setkey;
+- crt->digestsize = alg->digestsize;
+-
+- return 0;
+-}
+-
+-static int crypto_init_hash_ops_sync(struct crypto_tfm *tfm)
+-{
+- struct hash_tfm *crt = &tfm->crt_hash;
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+-
+- crt->init = alg->init;
+- crt->update = alg->update;
+- crt->final = alg->final;
+- crt->digest = alg->digest;
+- crt->setkey = hash_setkey;
+- crt->digestsize = alg->digestsize;
+-
+- return 0;
+-}
+-
+-static int crypto_init_hash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
+-{
+- struct hash_alg *alg = &tfm->__crt_alg->cra_hash;
+-
+- if (alg->digestsize > PAGE_SIZE / 8)
+- return -EINVAL;
+-
+- if ((mask & CRYPTO_ALG_TYPE_HASH_MASK) != CRYPTO_ALG_TYPE_HASH_MASK)
+- return crypto_init_hash_ops_async(tfm);
+- else
+- return crypto_init_hash_ops_sync(tfm);
+-}
+-
+-static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
+- __attribute__ ((unused));
+-static void crypto_hash_show(struct seq_file *m, struct crypto_alg *alg)
+-{
+- seq_printf(m, "type : hash\n");
+- seq_printf(m, "blocksize : %u\n", alg->cra_blocksize);
+- seq_printf(m, "digestsize : %u\n", alg->cra_hash.digestsize);
+-}
+-
+-const struct crypto_type crypto_hash_type = {
+- .ctxsize = crypto_hash_ctxsize,
+- .init = crypto_init_hash_ops,
+-#ifdef CONFIG_PROC_FS
+- .show = crypto_hash_show,
+-#endif
+-};
+-EXPORT_SYMBOL_GPL(crypto_hash_type);
+-
+-MODULE_LICENSE("GPL");
+-MODULE_DESCRIPTION("Generic cryptographic hash type");
+diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
+index 1ffb53f74d37..fc0d575c71e0 100644
+--- a/include/crypto/algapi.h
++++ b/include/crypto/algapi.h
+@@ -106,7 +106,6 @@ struct blkcipher_walk {
+ extern const struct crypto_type crypto_ablkcipher_type;
+ extern const struct crypto_type crypto_aead_type;
+ extern const struct crypto_type crypto_blkcipher_type;
+-extern const struct crypto_type crypto_hash_type;
+
+ void crypto_mod_put(struct crypto_alg *alg);
+ commit d3fec424b23c47686efcf3f2004c3f1c1cee4d9c
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Sat Jul 21 04:37:26 2007 -0700
+
+ coda: remove CODA_STORE/CODA_RELEASE upcalls
+
+ This is an variation on the patch sent by Christoph Hellwig which kills
+ file_count abuse by the Coda kernel module by moving the coda_flush
+ functionality into coda_release. However part of reason we were using the
+ coda_flush callback was to allow Coda to pass errors that occur during
+ writeback from the userspace cache manager back to close().
+
+ As Al Viro explained on linux-fsdevel, it is impossible to guarantee that
+ such errors can in fact be returned back to the caller. There are many
+ cases where the last reference to a file is not released by the close
+ system call and it is also impossible to pick some close as a 'last-close'
+ and delay it until all other references have been destroyed.
+
+ The CODA_STORE/CODA_RELEASE upcall combination is clearly a broken design,
+ and it is better to remove it completely.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Christoph Hellwig <hch@lst.de>
+ Cc: Al Viro <viro@ftp.linux.org.uk>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 8e61236abf4a..f89ff083079b 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -86,7 +86,6 @@ const struct file_operations coda_dir_operations = {
+ .read = generic_read_dir,
+ .readdir = coda_readdir,
+ .open = coda_open,
+- .flush = coda_flush,
+ .release = coda_release,
+ .fsync = coda_fsync,
+ };
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index 7594962604c2..29137ff3ca67 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -25,10 +25,6 @@
+
+ #include "coda_int.h"
+
+-/* if CODA_STORE fails with EOPNOTSUPP, venus clearly doesn't support
+- * CODA_STORE/CODA_RELEASE and we fall back on using the CODA_CLOSE upcall */
+-static int use_coda_close;
+-
+ static ssize_t
+ coda_file_read(struct file *coda_file, char __user *buf, size_t count, loff_t *ppos)
+ {
+@@ -163,47 +159,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+ return 0;
+ }
+
+-int coda_flush(struct file *coda_file, fl_owner_t id)
+-{
+- unsigned short flags = coda_file->f_flags & ~O_EXCL;
+- unsigned short coda_flags = coda_flags_to_cflags(flags);
+- struct coda_file_info *cfi;
+- struct inode *coda_inode;
+- int err = 0, fcnt;
+-
+- lock_kernel();
+-
+- /* last close semantics */
+- fcnt = file_count(coda_file);
+- if (fcnt > 1)
+- goto out;
+-
+- /* No need to make an upcall when we have not made any modifications
+- * to the file */
+- if ((coda_file->f_flags & O_ACCMODE) == O_RDONLY)
+- goto out;
+-
+- if (use_coda_close)
+- goto out;
+-
+- cfi = CODA_FTOC(coda_file);
+- BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+-
+- coda_inode = coda_file->f_path.dentry->d_inode;
+-
+- err = venus_store(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags,
+- coda_file->f_uid);
+-
+- if (err == -EOPNOTSUPP) {
+- use_coda_close = 1;
+- err = 0;
+- }
+-
+-out:
+- unlock_kernel();
+- return err;
+-}
+-
+ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ {
+ unsigned short flags = (coda_file->f_flags) & (~O_EXCL);
+@@ -215,21 +170,11 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+
+ lock_kernel();
+
+- if (!use_coda_close) {
+- err = venus_release(coda_inode->i_sb, coda_i2f(coda_inode),
+- coda_flags);
+- if (err == -EOPNOTSUPP) {
+- use_coda_close = 1;
+- err = 0;
+- }
+- }
+-
+ cfi = CODA_FTOC(coda_file);
+ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+
+- if (use_coda_close)
+- err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode),
+- coda_flags, coda_file->f_uid);
++ err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode),
++ coda_flags, coda_file->f_uid);
+
+ host_inode = cfi->cfi_container->f_path.dentry->d_inode;
+ cii = ITOC(coda_inode);
+@@ -246,7 +191,10 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ coda_file->private_data = NULL;
+
+ unlock_kernel();
+- return err;
++
++ /* VFS fput ignores the return value from file_operations->release, so
++ * there is no use returning an error here */
++ return 0;
+ }
+
+ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
+@@ -288,7 +236,6 @@ const struct file_operations coda_file_operations = {
+ .write = coda_file_write,
+ .mmap = coda_file_mmap,
+ .open = coda_open,
+- .flush = coda_flush,
+ .release = coda_release,
+ .fsync = coda_fsync,
+ .splice_read = coda_file_splice_read,
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index cd561d2e90b0..cdb4c07a7870 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -160,55 +160,8 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
+ return error;
+ }
+
+-int venus_store(struct super_block *sb, struct CodaFid *fid, int flags,
+- vuid_t uid)
+-{
+- union inputArgs *inp;
+- union outputArgs *outp;
+- int insize, outsize, error;
+-#ifdef CONFIG_CODA_FS_OLD_API
+- struct coda_cred cred = { 0, };
+- cred.cr_fsuid = uid;
+-#endif
+-
+- insize = SIZE(store);
+- UPARG(CODA_STORE);
+-
+-#ifdef CONFIG_CODA_FS_OLD_API
+- memcpy(&(inp->ih.cred), &cred, sizeof(cred));
+-#else
+- inp->ih.uid = uid;
+-#endif
+-
+- inp->coda_store.VFid = *fid;
+- inp->coda_store.flags = flags;
+-
+- error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+-
+- CODA_FREE(inp, insize);
+- return error;
+-}
+-
+-int venus_release(struct super_block *sb, struct CodaFid *fid, int flags)
+-{
+- union inputArgs *inp;
+- union outputArgs *outp;
+- int insize, outsize, error;
+-
+- insize = SIZE(release);
+- UPARG(CODA_RELEASE);
+-
+- inp->coda_release.VFid = *fid;
+- inp->coda_release.flags = flags;
+-
+- error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+-
+- CODA_FREE(inp, insize);
+- return error;
+-}
+-
+ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
+- vuid_t uid)
++ vuid_t uid)
+ {
+ union inputArgs *inp;
+ union outputArgs *outp;
+diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
+index c4079b403e9e..1c47a34aa794 100644
+--- a/include/linux/coda_linux.h
++++ b/include/linux/coda_linux.h
+@@ -36,7 +36,6 @@ extern const struct file_operations coda_ioctl_operations;
+
+ /* operations shared over more than one file */
+ int coda_open(struct inode *i, struct file *f);
+-int coda_flush(struct file *f, fl_owner_t id);
+ int coda_release(struct inode *i, struct file *f);
+ int coda_permission(struct inode *inode, int mask, struct nameidata *nd);
+ int coda_revalidate_inode(struct dentry *);
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index aa8f454b3b77..07ae8f846055 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -33,9 +33,6 @@ int venus_setattr(struct super_block *, struct CodaFid *, struct coda_vattr *);
+ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
+ const char *name, int length, int *type,
+ struct CodaFid *resfid);
+-int venus_store(struct super_block *sb, struct CodaFid *fid, int flags,
+- vuid_t uid);
+-int venus_release(struct super_block *sb, struct CodaFid *fid, int flags);
+ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
+ vuid_t uid);
+ int venus_open(struct super_block *sb, struct CodaFid *fid, int flags,commit 5b7f13bd26a0c1d394a1a1f2bb6de5130c3a3843
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:52 2007 -0700
+
+ coda: update module information
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index e3a0a4164d5d..dcc6aead70f5 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -373,21 +373,20 @@ static int init_coda_psdev(void)
+ return err;
+ }
+
+-
+-MODULE_AUTHOR("Peter J. Braam <braam@cs.cmu.edu>");
++MODULE_AUTHOR("Jan Harkes, Peter J. Braam");
++MODULE_DESCRIPTION("Coda Distributed File System VFS interface");
++MODULE_ALIAS_CHARDEV_MAJOR(CODA_PSDEV_MAJOR);
+ MODULE_LICENSE("GPL");
++#ifdef CONFIG_CODA_FS_OLD_API
++MODULE_VERSION("5.3.21");
++#else
++MODULE_VERSION("6.6");
++#endif
+
+ static int __init init_coda(void)
+ {
+ int status;
+ int i;
+- printk(KERN_INFO "Coda Kernel/Venus communications, "
+-#ifdef CONFIG_CODA_FS_OLD_API
+- "v5.3.20"
+-#else
+- "v6.0.0"
+-#endif
+- ", coda@cs.cmu.edu\n");
+
+ status = coda_init_inodecache();
+ if (status)commit 3cf01f28c303be34f18cb4f6204cf1bdfe12ba7c
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:51 2007 -0700
+
+ coda: remove statistics counters from /proc/fs/coda
+
+ Similar information can easily be obtained with strace -c.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/coda_int.h b/fs/coda/coda_int.h
+index 9e6338fea514..8ccd5ed81d9c 100644
+--- a/fs/coda/coda_int.h
++++ b/fs/coda/coda_int.h
+@@ -1,12 +1,19 @@
+ #ifndef _CODA_INT_
+ #define _CODA_INT_
+
++struct dentry;
++
+ extern struct file_system_type coda_fs_type;
++extern unsigned long coda_timeout;
++extern int coda_hard;
++extern int coda_fake_statfs;
+
+ void coda_destroy_inodecache(void);
+ int coda_init_inodecache(void);
+ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry,
+ int datasync);
++void coda_sysctl_init(void);
++void coda_sysctl_clean(void);
+
+ #endif /* _CODA_INT_ */
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 0c6c48ca7496..04a3dd84c993 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -25,7 +25,6 @@
+ #include <linux/coda_psdev.h>
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_cache.h>
+-#include <linux/coda_proc.h>
+
+ #include "coda_int.h"
+
+@@ -148,8 +147,6 @@ int coda_permission(struct inode *inode, int mask, struct nameidata *nd)
+
+ lock_kernel();
+
+- coda_vfs_stat.permission++;
+-
+ if (coda_cache_check(inode, mask))
+ goto out;
+
+@@ -206,7 +203,6 @@ static int coda_create(struct inode *dir, struct dentry *de, int mode, struct na
+ struct coda_vattr attrs;
+
+ lock_kernel();
+- coda_vfs_stat.create++;
+
+ if (coda_isroot(dir) && coda_iscontrol(name, length)) {
+ unlock_kernel();
+@@ -246,7 +242,6 @@ static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
+ struct CodaFid newfid;
+
+ lock_kernel();
+- coda_vfs_stat.mkdir++;
+
+ if (coda_isroot(dir) && coda_iscontrol(name, len)) {
+ unlock_kernel();
+@@ -288,7 +283,6 @@ static int coda_link(struct dentry *source_de, struct inode *dir_inode,
+ int error;
+
+ lock_kernel();
+- coda_vfs_stat.link++;
+
+ if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
+ unlock_kernel();
+@@ -320,10 +314,9 @@ static int coda_symlink(struct inode *dir_inode, struct dentry *de,
+ const char *name = de->d_name.name;
+ int len = de->d_name.len;
+ int symlen;
+- int error=0;
+-
++ int error = 0;
++
+ lock_kernel();
+- coda_vfs_stat.symlink++;
+
+ if (coda_isroot(dir_inode) && coda_iscontrol(name, len)) {
+ unlock_kernel();
+@@ -360,7 +353,6 @@ int coda_unlink(struct inode *dir, struct dentry *de)
+ int len = de->d_name.len;
+
+ lock_kernel();
+- coda_vfs_stat.unlink++;
+
+ error = venus_remove(dir->i_sb, coda_i2f(dir), name, len);
+ if ( error ) {
+@@ -381,7 +373,6 @@ int coda_rmdir(struct inode *dir, struct dentry *de)
+ int error;
+
+ lock_kernel();
+- coda_vfs_stat.rmdir++;
+
+ error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
+ if (!error) {
+@@ -408,7 +399,6 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
+ int error;
+
+ lock_kernel();
+- coda_vfs_stat.rename++;
+
+ error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
+ coda_i2f(new_dir), old_length, new_length,
+@@ -445,8 +435,6 @@ int coda_readdir(struct file *coda_file, void *buf, filldir_t filldir)
+ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+ host_file = cfi->cfi_container;
+
+- coda_vfs_stat.readdir++;
+-
+ if (!host_file->f_op)
+ return -ENOTDIR;
+
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index e7d622709c90..7594962604c2 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -22,7 +22,6 @@
+ #include <linux/coda_linux.h>
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_psdev.h>
+-#include <linux/coda_proc.h>
+
+ #include "coda_int.h"
+
+@@ -134,8 +133,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+ unsigned short coda_flags = coda_flags_to_cflags(flags);
+ struct coda_file_info *cfi;
+
+- coda_vfs_stat.open++;
+-
+ cfi = kmalloc(sizeof(struct coda_file_info), GFP_KERNEL);
+ if (!cfi)
+ return -ENOMEM;
+@@ -176,8 +173,6 @@ int coda_flush(struct file *coda_file, fl_owner_t id)
+
+ lock_kernel();
+
+- coda_vfs_stat.flush++;
+-
+ /* last close semantics */
+ fcnt = file_count(coda_file);
+ if (fcnt > 1)
+@@ -219,8 +214,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
+ int err = 0;
+
+ lock_kernel();
+- coda_vfs_stat.release++;
+-
++
+ if (!use_coda_close) {
+ err = venus_release(coda_inode->i_sb, coda_i2f(coda_inode),
+ coda_flags);
+@@ -271,8 +265,6 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
+ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
+ host_file = cfi->cfi_container;
+
+- coda_vfs_stat.fsync++;
+-
+ if (host_file->f_op && host_file->f_op->fsync) {
+ host_dentry = host_file->f_path.dentry;
+ host_inode = host_dentry->d_inode;
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 8a09f19596db..e3a0a4164d5d 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -45,7 +45,6 @@
+ #include <linux/coda_linux.h>
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_psdev.h>
+-#include <linux/coda_proc.h>
+
+ #include "coda_int.h"
+
+diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
+index 76e00a65a75b..4513b7258458 100644
+--- a/fs/coda/symlink.c
++++ b/fs/coda/symlink.c
+@@ -20,7 +20,6 @@
+ #include <linux/coda_linux.h>
+ #include <linux/coda_psdev.h>
+ #include <linux/coda_fs_i.h>
+-#include <linux/coda_proc.h>
+
+ static int coda_symlink_filler(struct file *file, struct page *page)
+ {
+@@ -32,7 +31,6 @@ static int coda_symlink_filler(struct file *file, struct page *page)
+
+ lock_kernel();
+ cii = ITOC(inode);
+- coda_vfs_stat.follow_link++;
+
+ error = venus_readlink(inode->i_sb, &cii->c_fid, p, &len);
+ unlock_kernel();
+diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
+index c57a1fa7cf23..81b7771c6465 100644
+--- a/fs/coda/sysctl.c
++++ b/fs/coda/sysctl.c
+@@ -5,181 +5,14 @@
+ *
+ * Carnegie Mellon encourages users to contribute improvements to
+ * the Coda project. Contact Peter Braam (coda@cs.cmu.edu).
+- *
+- * CODA operation statistics
+- * (c) March, 1998 Zhanyong Wan <zhanyong.wan@yale.edu>
+- *
+ */
+
+-#include <linux/time.h>
+-#include <linux/mm.h>
+ #include <linux/sysctl.h>
+-#include <linux/proc_fs.h>
+-#include <linux/seq_file.h>
+-#include <linux/slab.h>
+-#include <linux/stat.h>
+-#include <linux/ctype.h>
+-#include <linux/bitops.h>
+-#include <asm/uaccess.h>
+-#include <linux/utsname.h>
+-#include <linux/module.h>
+
+-#include <linux/coda.h>
+-#include <linux/coda_linux.h>
+-#include <linux/coda_fs_i.h>
+-#include <linux/coda_psdev.h>
+-#include <linux/coda_cache.h>
+-#include <linux/coda_proc.h>
++#include "coda_int.h"
+
+ static struct ctl_table_header *fs_table_header;
+
+-#define CODA_TIMEOUT 3 /* timeout on upcalls to become intrble */
+-#define CODA_HARD 5 /* mount type "hard" or "soft" */
+-#define CODA_VFS 6 /* vfs statistics */
+-#define CODA_CACHE_INV 9 /* cache invalidation statistics */
+-#define CODA_FAKE_STATFS 10 /* don't query venus for actual cache usage */
+-
+-struct coda_vfs_stats coda_vfs_stat;
+-static struct coda_cache_inv_stats coda_cache_inv_stat;
+-
+-static void reset_coda_vfs_stats( void )
+-{
+- memset( &coda_vfs_stat, 0, sizeof( coda_vfs_stat ) );
+-}
+-
+-static void reset_coda_cache_inv_stats( void )
+-{
+- memset( &coda_cache_inv_stat, 0, sizeof( coda_cache_inv_stat ) );
+-}
+-
+-static int do_reset_coda_vfs_stats( ctl_table * table, int write,
+- struct file * filp, void __user * buffer,
+- size_t * lenp, loff_t * ppos )
+-{
+- if ( write ) {
+- reset_coda_vfs_stats();
+-
+- *ppos += *lenp;
+- } else {
+- *lenp = 0;
+- }
+-
+- return 0;
+-}
+-
+-static int do_reset_coda_cache_inv_stats( ctl_table * table, int write,
+- struct file * filp,
+- void __user * buffer,
+- size_t * lenp, loff_t * ppos )
+-{
+- if ( write ) {
+- reset_coda_cache_inv_stats();
+-
+- *ppos += *lenp;
+- } else {
+- *lenp = 0;
+- }
+-
+- return 0;
+-}
+-
+-static int proc_vfs_stats_show(struct seq_file *m, void *v)
+-{
+- struct coda_vfs_stats * ps = & coda_vfs_stat;
+-
+- seq_printf(m,
+- "Coda VFS statistics\n"
+- "===================\n\n"
+- "File Operations:\n"
+- "\topen\t\t%9d\n"
+- "\tflush\t\t%9d\n"
+- "\trelease\t\t%9d\n"
+- "\tfsync\t\t%9d\n\n"
+- "Dir Operations:\n"
+- "\treaddir\t\t%9d\n\n"
+- "Inode Operations\n"
+- "\tcreate\t\t%9d\n"
+- "\tlookup\t\t%9d\n"
+- "\tlink\t\t%9d\n"
+- "\tunlink\t\t%9d\n"
+- "\tsymlink\t\t%9d\n"
+- "\tmkdir\t\t%9d\n"
+- "\trmdir\t\t%9d\n"
+- "\trename\t\t%9d\n"
+- "\tpermission\t%9d\n",
+-
+- /* file operations */
+- ps->open,
+- ps->flush,
+- ps->release,
+- ps->fsync,
+-
+- /* dir operations */
+- ps->readdir,
+-
+- /* inode operations */
+- ps->create,
+- ps->lookup,
+- ps->link,
+- ps->unlink,
+- ps->symlink,
+- ps->mkdir,
+- ps->rmdir,
+- ps->rename,
+- ps->permission);
+- return 0;
+-}
+-
+-static int proc_cache_inv_stats_show(struct seq_file *m, void *v)
+-{
+- struct coda_cache_inv_stats * ps = & coda_cache_inv_stat;
+-
+- seq_printf(m,
+- "Coda cache invalidation statistics\n"
+- "==================================\n\n"
+- "flush\t\t%9d\n"
+- "purge user\t%9d\n"
+- "zap_dir\t\t%9d\n"
+- "zap_file\t%9d\n"
+- "zap_vnode\t%9d\n"
+- "purge_fid\t%9d\n"
+- "replace\t\t%9d\n",
+- ps->flush,
+- ps->purge_user,
+- ps->zap_dir,
+- ps->zap_file,
+- ps->zap_vnode,
+- ps->purge_fid,
+- ps->replace );
+- return 0;
+-}
+-
+-static int proc_vfs_stats_open(struct inode *inode, struct file *file)
+-{
+- return single_open(file, proc_vfs_stats_show, NULL);
+-}
+-
+-static int proc_cache_inv_stats_open(struct inode *inode, struct file *file)
+-{
+- return single_open(file, proc_cache_inv_stats_show, NULL);
+-}
+-
+-static const struct file_operations proc_vfs_stats_fops = {
+- .owner = THIS_MODULE,
+- .open = proc_vfs_stats_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
+-};
+-
+-static const struct file_operations proc_cache_inv_stats_fops = {
+- .owner = THIS_MODULE,
+- .open = proc_cache_inv_stats_open,
+- .read = seq_read,
+- .llseek = seq_lseek,
+- .release = single_release,
+-};
+-
+ static ctl_table coda_table[] = {
+ {
+ .ctl_name = CTL_UNNUMBERED,
+@@ -197,22 +30,6 @@ static ctl_table coda_table[] = {
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+- {
+- .ctl_name = CTL_UNNUMBERED,
+- .procname = "vfs_stats",
+- .data = NULL,
+- .maxlen = 0,
+- .mode = 0644,
+- .proc_handler = &do_reset_coda_vfs_stats
+- },
+- {
+- .ctl_name = CTL_UNNUMBERED,
+- .procname = "cache_inv_stats",
+- .data = NULL,
+- .maxlen = 0,
+- .mode = 0644,
+- .proc_handler = &do_reset_coda_cache_inv_stats
+- },
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "fake_statfs",
+@@ -235,59 +52,20 @@ static ctl_table fs_table[] = {
+ };
+
+
+-#ifdef CONFIG_PROC_FS
+-
+-/*
+- target directory structure:
+- /proc/fs (see linux/fs/proc/root.c)
+- /proc/fs/coda
+- /proc/fs/coda/{vfs_stats,
+-
+-*/
+-
+-static struct proc_dir_entry* proc_fs_coda;
+-
+-#endif
+-
+ void coda_sysctl_init(void)
+ {
+- reset_coda_vfs_stats();
+- reset_coda_cache_inv_stats();
+-
+-#ifdef CONFIG_PROC_FS
+- proc_fs_coda = proc_mkdir("coda", proc_root_fs);
+- if (proc_fs_coda) {
+- struct proc_dir_entry *pde;
+-
+- proc_fs_coda->owner = THIS_MODULE;
+- pde = create_proc_entry("vfs_stats", 0, proc_fs_coda);
+- if (pde)
+- pde->proc_fops = &proc_vfs_stats_fops;
+- pde = create_proc_entry("cache_inv_stats", 0, proc_fs_coda);
+- if (pde)
+- pde->proc_fops = &proc_cache_inv_stats_fops;
+- }
+-#endif
+-
+ #ifdef CONFIG_SYSCTL
+ if ( !fs_table_header )
+ fs_table_header = register_sysctl_table(fs_table);
+-#endif
++#endif
+ }
+
+-void coda_sysctl_clean(void)
++void coda_sysctl_clean(void)
+ {
+-
+ #ifdef CONFIG_SYSCTL
+ if ( fs_table_header ) {
+ unregister_sysctl_table(fs_table_header);
+ fs_table_header = NULL;
+ }
+ #endif
+-
+-#ifdef CONFIG_PROC_FS
+- remove_proc_entry("cache_inv_stats", proc_fs_coda);
+- remove_proc_entry("vfs_stats", proc_fs_coda);
+- remove_proc_entry("coda", proc_root_fs);
+-#endif
+ }
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 9a20a3b1998e..e4e766e5557c 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -35,7 +35,8 @@
+ #include <linux/coda_psdev.h>
+ #include <linux/coda_fs_i.h>
+ #include <linux/coda_cache.h>
+-#include <linux/coda_proc.h>
++
++#include "coda_int.h"
+
+ static int coda_upcall(struct venus_comm *vc, int inSize, int *outSize,
+ union inputArgs *buffer);
+diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
+index e4ac016ad272..c4079b403e9e 100644
+--- a/include/linux/coda_linux.h
++++ b/include/linux/coda_linux.h
+@@ -43,9 +43,6 @@ int coda_revalidate_inode(struct dentry *);
+ int coda_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ int coda_setattr(struct dentry *, struct iattr *);
+
+-/* global variables */
+-extern int coda_fake_statfs;
+-
+ /* this file: heloers */
+ static __inline__ struct CodaFid *coda_i2f(struct inode *);
+ static __inline__ char *coda_i2s(struct inode *);
+diff --git a/include/linux/coda_proc.h b/include/linux/coda_proc.h
+deleted file mode 100644
+index 0dc1b0458e75..000000000000
+--- a/include/linux/coda_proc.h
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * coda_statis.h
+- *
+- * CODA operation statistics
+- *
+- * (c) March, 1998
+- * by Michihiro Kuramochi, Zhenyu Xia and Zhanyong Wan
+- * zhanyong.wan@yale.edu
+- *
+- */
+-
+-#ifndef _CODA_PROC_H
+-#define _CODA_PROC_H
+-
+-void coda_sysctl_init(void);
+-void coda_sysctl_clean(void);
+-
+-#include <linux/sysctl.h>
+-#include <linux/coda_fs_i.h>
+-#include <linux/coda.h>
+-
+-/* these four files are presented to show the result of the statistics:
+- *
+- * /proc/fs/coda/vfs_stats
+- * cache_inv_stats
+- *
+- * these four files are presented to reset the statistics to 0:
+- *
+- * /proc/sys/coda/vfs_stats
+- * cache_inv_stats
+- */
+-
+-/* VFS operation statistics */
+-struct coda_vfs_stats
+-{
+- /* file operations */
+- int open;
+- int flush;
+- int release;
+- int fsync;
+-
+- /* dir operations */
+- int readdir;
+-
+- /* inode operations */
+- int create;
+- int lookup;
+- int link;
+- int unlink;
+- int symlink;
+- int mkdir;
+- int rmdir;
+- int rename;
+- int permission;
+-
+- /* symlink operatoins*/
+- int follow_link;
+- int readlink;
+-};
+-
+-/* cache invalidation statistics */
+-struct coda_cache_inv_stats
+-{
+- int flush;
+- int purge_user;
+- int zap_dir;
+- int zap_file;
+- int zap_vnode;
+- int purge_fid;
+- int replace;
+-};
+-
+-/* these global variables hold the actual statistics data */
+-extern struct coda_vfs_stats coda_vfs_stat;
+-
+-#endif /* _CODA_PROC_H */
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index 81b2e4c7d7ce..aa8f454b3b77 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -69,8 +69,6 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs);
+
+
+ /* messages between coda filesystem in kernel and Venus */
+-extern int coda_hard;
+-extern unsigned long coda_timeout;
+ struct upc_req {
+ struct list_head uc_chain;
+ caddr_t uc_data;commit a1b0aa87647493c0201821ab884e86298d5da7d6
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:50 2007 -0700
+
+ coda: remove struct coda_sb_info
+
+ The sb_info structure only contains a single pointer to the character device,
+ there is no need for the added indirection.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/cache.c b/fs/coda/cache.c
+index 11538a2b5423..8a2370341c7a 100644
+--- a/fs/coda/cache.c
++++ b/fs/coda/cache.c
+@@ -49,11 +49,6 @@ void coda_cache_clear_inode(struct inode *inode)
+ /* remove all acl caches */
+ void coda_cache_clear_all(struct super_block *sb)
+ {
+- struct coda_sb_info *sbi;
+-
+- sbi = coda_sbp(sb);
+- BUG_ON(!sbi);
+-
+ atomic_inc(&permission_epoch);
+ }
+
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index 29e441765600..6771a4271e33 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -141,11 +141,10 @@ static int get_device_index(struct coda_mount_data *data)
+
+ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ {
+- struct inode *root = NULL;
+- struct coda_sb_info *sbi = NULL;
++ struct inode *root = NULL;
+ struct venus_comm *vc = NULL;
+ struct CodaFid fid;
+- int error;
++ int error;
+ int idx;
+
+ idx = get_device_index((struct coda_mount_data *) data);
+@@ -167,16 +166,9 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ return -EBUSY;
+ }
+
+- sbi = kmalloc(sizeof(struct coda_sb_info), GFP_KERNEL);
+- if(!sbi) {
+- return -ENOMEM;
+- }
+-
+ vc->vc_sb = sb;
+
+- sbi->sbi_vcomm = vc;
+-
+- sb->s_fs_info = sbi;
++ sb->s_fs_info = vc;
+ sb->s_flags |= MS_NOATIME;
+ sb->s_blocksize = 4096; /* XXXXX what do we put here?? */
+ sb->s_blocksize_bits = 12;
+@@ -207,26 +199,20 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+ return 0;
+
+ error:
+- if (sbi) {
+- kfree(sbi);
+- if(vc)
+- vc->vc_sb = NULL;
+- }
+ if (root)
+- iput(root);
++ iput(root);
++ if (vc)
++ vc->vc_sb = NULL;
+
+- return -EINVAL;
++ return -EINVAL;
+ }
+
+ static void coda_put_super(struct super_block *sb)
+ {
+- struct coda_sb_info *sbi;
+-
+- sbi = coda_sbp(sb);
+- sbi->sbi_vcomm->vc_sb = NULL;
++ coda_vcp(sb)->vc_sb = NULL;
++ sb->s_fs_info = NULL;
+
+ printk("Coda: Bye bye.\n");
+- kfree(sbi);
+ }
+
+ static void coda_clear_inode(struct inode *inode)
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 87601e147644..9a20a3b1998e 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -37,7 +37,7 @@
+ #include <linux/coda_cache.h>
+ #include <linux/coda_proc.h>
+
+-static int coda_upcall(struct coda_sb_info *mntinfo, int inSize, int *outSize,
++static int coda_upcall(struct venus_comm *vc, int inSize, int *outSize,
+ union inputArgs *buffer);
+
+ static void *alloc_upcall(int opcode, int size)
+@@ -83,7 +83,7 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp)
+ insize = SIZE(root);
+ UPARG(CODA_ROOT);
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error)
+ *fidp = outp->coda_root.VFid;
+
+@@ -102,7 +102,7 @@ int venus_getattr(struct super_block *sb, struct CodaFid *fid,
+ UPARG(CODA_GETATTR);
+ inp->coda_getattr.VFid = *fid;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error)
+ *attr = outp->coda_getattr.attr;
+
+@@ -123,7 +123,7 @@ int venus_setattr(struct super_block *sb, struct CodaFid *fid,
+ inp->coda_setattr.VFid = *fid;
+ inp->coda_setattr.attr = *vattr;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -149,7 +149,7 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error) {
+ *resfid = outp->coda_lookup.VFid;
+ *type = outp->coda_lookup.vtype;
+@@ -182,7 +182,7 @@ int venus_store(struct super_block *sb, struct CodaFid *fid, int flags,
+ inp->coda_store.VFid = *fid;
+ inp->coda_store.flags = flags;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -200,7 +200,7 @@ int venus_release(struct super_block *sb, struct CodaFid *fid, int flags)
+ inp->coda_release.VFid = *fid;
+ inp->coda_release.flags = flags;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -229,7 +229,7 @@ int venus_close(struct super_block *sb, struct CodaFid *fid, int flags,
+ inp->coda_close.VFid = *fid;
+ inp->coda_close.flags = flags;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -248,7 +248,7 @@ int venus_open(struct super_block *sb, struct CodaFid *fid,
+ inp->coda_open_by_fd.VFid = *fid;
+ inp->coda_open_by_fd.flags = flags;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error)
+ *fh = outp->coda_open_by_fd.fh;
+
+@@ -276,7 +276,7 @@ int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error) {
+ *attrs = outp->coda_mkdir.attr;
+ *newfid = outp->coda_mkdir.VFid;
+@@ -318,7 +318,7 @@ int venus_rename(struct super_block *sb, struct CodaFid *old_fid,
+ memcpy((char *)(inp) + offset, new_name, new_length);
+ *((char *)inp + offset + new_length) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -347,7 +347,7 @@ int venus_create(struct super_block *sb, struct CodaFid *dirfid,
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error) {
+ *attrs = outp->coda_create.attr;
+ *newfid = outp->coda_create.VFid;
+@@ -373,8 +373,8 @@ int venus_rmdir(struct super_block *sb, struct CodaFid *dirfid,
+ inp->coda_rmdir.name = offset;
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -395,8 +395,8 @@ int venus_remove(struct super_block *sb, struct CodaFid *dirfid,
+ inp->coda_remove.name = offset;
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -417,7 +417,7 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
+
+ inp->coda_readlink.VFid = *fid;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+ if (!error) {
+ retlen = outp->coda_readlink.count;
+ if ( retlen > *length )
+@@ -453,8 +453,8 @@ int venus_link(struct super_block *sb, struct CodaFid *fid,
+ /* make sure strings are null terminated */
+ memcpy((char *)(inp) + offset, name, len);
+ *((char *)inp + offset + len) = '\0';
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -489,7 +489,7 @@ int venus_symlink(struct super_block *sb, struct CodaFid *fid,
+ memcpy((char *)(inp) + offset, name, len);
+ *((char *)inp + offset + len) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -504,9 +504,9 @@ int venus_fsync(struct super_block *sb, struct CodaFid *fid)
+ insize=SIZE(fsync);
+ UPARG(CODA_FSYNC);
+
+- inp->coda_fsync.VFid = *fid;
+- error = coda_upcall(coda_sbp(sb), sizeof(union inputArgs),
+- &outsize, inp);
++ inp->coda_fsync.VFid = *fid;
++ error = coda_upcall(coda_vcp(sb), sizeof(union inputArgs),
++ &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -524,7 +524,7 @@ int venus_access(struct super_block *sb, struct CodaFid *fid, int mask)
+ inp->coda_access.VFid = *fid;
+ inp->coda_access.flags = mask;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -573,9 +573,9 @@ int venus_pioctl(struct super_block *sb, struct CodaFid *fid,
+ goto exit;
+ }
+
+- error = coda_upcall(coda_sbp(sb), SIZE(ioctl) + data->vi.in_size,
+- &outsize, inp);
+-
++ error = coda_upcall(coda_vcp(sb), SIZE(ioctl) + data->vi.in_size,
++ &outsize, inp);
++
+ if (error) {
+ printk("coda_pioctl: Venus returns: %d for %s\n",
+ error, coda_f2s(fid));
+@@ -615,7 +615,7 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
+ insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
+ UPARG(CODA_STATFS);
+
+- error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp);
++ error = coda_upcall(coda_vcp(dentry->d_sb), insize, &outsize, inp);
+ if (!error) {
+ sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
+ sfs->f_bfree = outp->coda_statfs.stat.f_bfree;
+@@ -710,28 +710,25 @@ static inline void coda_waitfor_upcall(struct upc_req *req)
+ }
+
+
+-/*
+- * coda_upcall will return an error in the case of
++/*
++ * coda_upcall will return an error in the case of
+ * failed communication with Venus _or_ will peek at Venus
+ * reply and return Venus' error.
+ *
+ * As venus has 2 types of errors, normal errors (positive) and internal
+ * errors (negative), normal errors are negated, while internal errors
+ * are all mapped to -EINTR, while showing a nice warning message. (jh)
+- *
+ */
+-static int coda_upcall(struct coda_sb_info *sbi,
++static int coda_upcall(struct venus_comm *vcp,
+ int inSize, int *outSize,
+ union inputArgs *buffer)
+ {
+- struct venus_comm *vcommp;
+ union outputArgs *out;
+ union inputArgs *sig_inputArgs;
+ struct upc_req *req, *sig_req;
+ int error = 0;
+
+- vcommp = sbi->sbi_vcomm;
+- if (!vcommp->vc_inuse) {
++ if (!vcp->vc_inuse) {
+ printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
+ return -ENXIO;
+ }
+@@ -746,16 +743,16 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ req->uc_inSize = inSize;
+ req->uc_outSize = *outSize ? *outSize : inSize;
+ req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode;
+- req->uc_unique = ++vcommp->vc_seq;
++ req->uc_unique = ++vcp->vc_seq;
+ init_waitqueue_head(&req->uc_sleep);
+
+ /* Fill in the common input args. */
+ ((union inputArgs *)buffer)->ih.unique = req->uc_unique;
+
+ /* Append msg to pending queue and poke Venus. */
+- list_add_tail(&req->uc_chain, &vcommp->vc_pending);
++ list_add_tail(&req->uc_chain, &vcp->vc_pending);
+
+- wake_up_interruptible(&vcommp->vc_waitq);
++ wake_up_interruptible(&vcp->vc_waitq);
+ /* We can be interrupted while we wait for Venus to process
+ * our request. If the interrupt occurs before Venus has read
+ * the request, we dequeue and return. If it occurs after the
+@@ -788,7 +785,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ goto exit;
+
+ /* Venus saw the upcall, make sure we can send interrupt signal */
+- if (!vcommp->vc_inuse) {
++ if (!vcp->vc_inuse) {
+ printk(KERN_INFO "coda: Venus dead, not sending signal.\n");
+ goto exit;
+ }
+@@ -815,8 +812,8 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ sig_req->uc_outSize = sizeof(struct coda_in_hdr);
+
+ /* insert at head of queue! */
+- list_add(&(sig_req->uc_chain), &vcommp->vc_pending);
+- wake_up_interruptible(&vcommp->vc_waitq);
++ list_add(&(sig_req->uc_chain), &vcp->vc_pending);
++ wake_up_interruptible(&vcp->vc_waitq);
+
+ exit:
+ kfree(req);
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index f28c2f7fd454..81b2e4c7d7ce 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -8,11 +8,6 @@
+
+ struct kstatfs;
+
+-struct coda_sb_info
+-{
+- struct venus_comm *sbi_vcomm;
+-};
+-
+ /* communication pending/processing queues */
+ struct venus_comm {
+ u_long vc_seq;
+@@ -24,9 +19,9 @@ struct venus_comm {
+ };
+
+
+-static inline struct coda_sb_info *coda_sbp(struct super_block *sb)
++static inline struct venus_comm *coda_vcp(struct super_block *sb)
+ {
+- return ((struct coda_sb_info *)((sb)->s_fs_info));
++ return (struct venus_comm *)((sb)->s_fs_info);
+ }
+
+ commit 5fd31e9a67dd6c80e49240514cf854c1f054aca2
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:49 2007 -0700
+
+ coda: cleanup downcall handler
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 097dbb2fd6f5..87601e147644 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -859,77 +859,66 @@ static int coda_upcall(struct coda_sb_info *sbi,
+
+ int coda_downcall(int opcode, union outputArgs * out, struct super_block *sb)
+ {
++ struct inode *inode = NULL;
++ struct CodaFid *fid, *newfid;
++
+ /* Handle invalidation requests. */
+- if ( !sb || !sb->s_root || !sb->s_root->d_inode)
+- return 0;
+-
+- switch (opcode) {
+-
+- case CODA_FLUSH : {
+- coda_cache_clear_all(sb);
+- shrink_dcache_sb(sb);
+- coda_flag_inode(sb->s_root->d_inode, C_FLUSH);
+- return(0);
+- }
+-
+- case CODA_PURGEUSER : {
+- coda_cache_clear_all(sb);
+- return(0);
+- }
+-
+- case CODA_ZAPDIR : {
+- struct inode *inode;
+- struct CodaFid *fid = &out->coda_zapdir.CodaFid;
+-
+- inode = coda_fid_to_inode(fid, sb);
+- if (inode) {
+- coda_flag_inode_children(inode, C_PURGE);
+- coda_flag_inode(inode, C_VATTR);
+- iput(inode);
+- }
+-
+- return(0);
+- }
+-
+- case CODA_ZAPFILE : {
+- struct inode *inode;
+- struct CodaFid *fid = &out->coda_zapfile.CodaFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if ( inode ) {
+- coda_flag_inode(inode, C_VATTR);
+- iput(inode);
+- }
+- return 0;
+- }
+-
+- case CODA_PURGEFID : {
+- struct inode *inode;
+- struct CodaFid *fid = &out->coda_purgefid.CodaFid;
+- inode = coda_fid_to_inode(fid, sb);
+- if ( inode ) {
++ if ( !sb || !sb->s_root)
++ return 0;
++
++ switch (opcode) {
++ case CODA_FLUSH:
++ coda_cache_clear_all(sb);
++ shrink_dcache_sb(sb);
++ if (sb->s_root->d_inode)
++ coda_flag_inode(sb->s_root->d_inode, C_FLUSH);
++ break;
++
++ case CODA_PURGEUSER:
++ coda_cache_clear_all(sb);
++ break;
++
++ case CODA_ZAPDIR:
++ fid = &out->coda_zapdir.CodaFid;
++ inode = coda_fid_to_inode(fid, sb);
++ if (inode) {
++ coda_flag_inode_children(inode, C_PURGE);
++ coda_flag_inode(inode, C_VATTR);
++ }
++ break;
++
++ case CODA_ZAPFILE:
++ fid = &out->coda_zapfile.CodaFid;
++ inode = coda_fid_to_inode(fid, sb);
++ if (inode)
++ coda_flag_inode(inode, C_VATTR);
++ break;
++
++ case CODA_PURGEFID:
++ fid = &out->coda_purgefid.CodaFid;
++ inode = coda_fid_to_inode(fid, sb);
++ if (inode) {
+ coda_flag_inode_children(inode, C_PURGE);
+
+ /* catch the dentries later if some are still busy */
+ coda_flag_inode(inode, C_PURGE);
+ d_prune_aliases(inode);
+
+- iput(inode);
+- }
+- return 0;
+- }
+-
+- case CODA_REPLACE : {
+- struct inode *inode;
+- struct CodaFid *oldfid = &out->coda_replace.OldFid;
+- struct CodaFid *newfid = &out->coda_replace.NewFid;
+- inode = coda_fid_to_inode(oldfid, sb);
+- if ( inode ) {
+- coda_replace_fid(inode, oldfid, newfid);
+- iput(inode);
+- }
+- return 0;
+- }
+- }
+- return 0;
++ }
++ break;
++
++ case CODA_REPLACE:
++ fid = &out->coda_replace.OldFid;
++ newfid = &out->coda_replace.NewFid;
++ inode = coda_fid_to_inode(fid, sb);
++ if (inode)
++ coda_replace_fid(inode, fid, newfid);
++ break;
++ }
++
++ if (inode)
++ iput(inode);
++
++ return 0;
+ }
+ commit ed36f723676b208053d0655cee7e7f1601a2d356
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:49 2007 -0700
+
+ coda: cleanup coda_lookup, use dsplice_alias
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 47ac9e21a590..0c6c48ca7496 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -97,58 +97,45 @@ const struct file_operations coda_dir_operations = {
+ /* access routines: lookup, readlink, permission */
+ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, struct nameidata *nd)
+ {
+- struct inode *res_inode = NULL;
++ struct inode *inode = NULL;
+ struct CodaFid resfid = { { 0, } };
+- int dropme = 0; /* to indicate entry should not be cached */
+ int type = 0;
+ int error = 0;
+ const char *name = entry->d_name.name;
+ size_t length = entry->d_name.len;
+-
+- if ( length > CODA_MAXNAMLEN ) {
+- printk("name too long: lookup, %s (%*s)\n",
++
++ if (length > CODA_MAXNAMLEN) {
++ printk(KERN_ERR "name too long: lookup, %s (%*s)\n",
+ coda_i2s(dir), (int)length, name);
+ return ERR_PTR(-ENAMETOOLONG);
+ }
+
++ /* control object, create inode on the fly */
++ if (coda_isroot(dir) && coda_iscontrol(name, length)) {
++ error = coda_cnode_makectl(&inode, dir->i_sb);
++ type = CODA_NOCACHE;
++ goto exit;
++ }
++
+ lock_kernel();
+- /* control object, create inode on the fly */
+- if (coda_isroot(dir) && coda_iscontrol(name, length)) {
+- error = coda_cnode_makectl(&res_inode, dir->i_sb);
+- dropme = 1;
+- goto exit;
+- }
+
+- error = venus_lookup(dir->i_sb, coda_i2f(dir),
+- (const char *)name, length, &type, &resfid);
++ error = venus_lookup(dir->i_sb, coda_i2f(dir), name, length,
++ &type, &resfid);
++ if (!error)
++ error = coda_cnode_make(&inode, &resfid, dir->i_sb);
+
+- res_inode = NULL;
+- if (!error) {
+- if (type & CODA_NOCACHE) {
+- type &= (~CODA_NOCACHE);
+- dropme = 1;
+- }
++ unlock_kernel();
+
+- error = coda_cnode_make(&res_inode, &resfid, dir->i_sb);
+- if (error) {
+- unlock_kernel();
+- return ERR_PTR(error);
+- }
+- } else if (error != -ENOENT) {
+- unlock_kernel();
++ if (error && error != -ENOENT)
+ return ERR_PTR(error);
+- }
+
+ exit:
+- entry->d_time = 0;
+ entry->d_op = &coda_dentry_operations;
+- d_add(entry, res_inode);
+- if ( dropme ) {
+- d_drop(entry);
+- coda_flag_inode(res_inode, C_VATTR);
+- }
+- unlock_kernel();
+- return NULL;
++
++ if (inode && (type & CODA_NOCACHE))
++ coda_flag_inode(inode, C_VATTR | C_PURGE);
++
++ return d_splice_alias(inode, entry);
+ }
+
+ commit 970648eb03cca7d7405f9a3a5d3fe29929e48aa6
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:48 2007 -0700
+
+ coda: ignore returned values when upcalls return errors
+
+ Venus returns an ENOENT error on open, so we shouldn't try to grab the
+ filehandle for the returned fd.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 330de7dbdcf8..097dbb2fd6f5 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -84,12 +84,8 @@ int venus_rootfid(struct super_block *sb, struct CodaFid *fidp)
+ UPARG(CODA_ROOT);
+
+ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+-
+- if (error) {
+- printk("coda_get_rootfid: error %d\n", error);
+- } else {
++ if (!error)
+ *fidp = outp->coda_root.VFid;
+- }
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -106,9 +102,9 @@ int venus_getattr(struct super_block *sb, struct CodaFid *fid,
+ UPARG(CODA_GETATTR);
+ inp->coda_getattr.VFid = *fid;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+-
+- *attr = outp->coda_getattr.attr;
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error)
++ *attr = outp->coda_getattr.attr;
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -153,10 +149,11 @@ int venus_lookup(struct super_block *sb, struct CodaFid *fid,
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+-
+- *resfid = outp->coda_lookup.VFid;
+- *type = outp->coda_lookup.vtype;
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error) {
++ *resfid = outp->coda_lookup.VFid;
++ *type = outp->coda_lookup.vtype;
++ }
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -278,11 +275,12 @@ int venus_mkdir(struct super_block *sb, struct CodaFid *dirfid,
+ /* Venus must get null terminated string */
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+
+- *attrs = outp->coda_mkdir.attr;
+- *newfid = outp->coda_mkdir.VFid;
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error) {
++ *attrs = outp->coda_mkdir.attr;
++ *newfid = outp->coda_mkdir.VFid;
++ }
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -348,11 +346,12 @@ int venus_create(struct super_block *sb, struct CodaFid *dirfid,
+ /* Venus must get null terminated string */
+ memcpy((char *)(inp) + offset, name, length);
+ *((char *)inp + offset + length) = '\0';
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+
+- *attrs = outp->coda_create.attr;
+- *newfid = outp->coda_create.VFid;
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error) {
++ *attrs = outp->coda_create.attr;
++ *newfid = outp->coda_create.VFid;
++ }
+
+ CODA_FREE(inp, insize);
+ return error;
+@@ -417,19 +416,18 @@ int venus_readlink(struct super_block *sb, struct CodaFid *fid,
+ UPARG(CODA_READLINK);
+
+ inp->coda_readlink.VFid = *fid;
+-
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+-
+- if (! error) {
+- retlen = outp->coda_readlink.count;
++
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error) {
++ retlen = outp->coda_readlink.count;
+ if ( retlen > *length )
+- retlen = *length;
++ retlen = *length;
+ *length = retlen;
+ result = (char *)outp + (long)outp->coda_readlink.data;
+ memcpy(buffer, result, retlen);
+ *(buffer + retlen) = '\0';
+ }
+-
++
+ CODA_FREE(inp, insize);
+ return error;
+ }
+@@ -617,16 +615,13 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
+ insize = max_t(unsigned int, INSIZE(statfs), OUTSIZE(statfs));
+ UPARG(CODA_STATFS);
+
+- error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp);
+-
+- if (!error) {
++ error = coda_upcall(coda_sbp(dentry->d_sb), insize, &outsize, inp);
++ if (!error) {
+ sfs->f_blocks = outp->coda_statfs.stat.f_blocks;
+ sfs->f_bfree = outp->coda_statfs.stat.f_bfree;
+ sfs->f_bavail = outp->coda_statfs.stat.f_bavail;
+ sfs->f_files = outp->coda_statfs.stat.f_files;
+ sfs->f_ffree = outp->coda_statfs.stat.f_ffree;
+- } else {
+- printk("coda_statfs: Venus returns: %d\n", error);
+ }
+
+ CODA_FREE(inp, insize);commit 37461e1957e6262278342a0c1a78e46996b7ff88
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:48 2007 -0700
+
+ coda: replace upc_alloc/upc_free with kmalloc/kfree
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 6818c20372ca..8a09f19596db 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -49,8 +49,6 @@
+
+ #include "coda_int.h"
+
+-#define upc_free(r) kfree(r)
+-
+ /* statistics */
+ int coda_hard; /* allows signals during upcalls */
+ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */
+@@ -264,7 +262,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
+ }
+
+ CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+- upc_free(req);
++ kfree(req);
+ out:
+ unlock_kernel();
+ return (count ? count : retval);
+@@ -320,7 +318,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
+ /* Async requests need to be freed here */
+ if (req->uc_flags & REQ_ASYNC) {
+ CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+- upc_free(req);
++ kfree(req);
+ continue;
+ }
+ req->uc_flags |= REQ_ABORT;
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index ad65ee01790f..330de7dbdcf8 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -37,9 +37,6 @@
+ #include <linux/coda_cache.h>
+ #include <linux/coda_proc.h>
+
+-#define upc_alloc() kmalloc(sizeof(struct upc_req), GFP_KERNEL)
+-#define upc_free(r) kfree(r)
+-
+ static int coda_upcall(struct coda_sb_info *mntinfo, int inSize, int *outSize,
+ union inputArgs *buffer);
+
+@@ -745,7 +742,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ }
+
+ /* Format the request message. */
+- req = upc_alloc();
++ req = kmalloc(sizeof(struct upc_req), GFP_KERNEL);
+ if (!req)
+ return -ENOMEM;
+
+@@ -802,12 +799,12 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ }
+
+ error = -ENOMEM;
+- sig_req = upc_alloc();
++ sig_req = kmalloc(sizeof(struct upc_req), GFP_KERNEL);
+ if (!sig_req) goto exit;
+
+ CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr));
+ if (!sig_req->uc_data) {
+- upc_free(sig_req);
++ kfree(sig_req);
+ goto exit;
+ }
+
+@@ -827,7 +824,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ wake_up_interruptible(&vcommp->vc_waitq);
+
+ exit:
+- upc_free(req);
++ kfree(req);
+ return error;
+ }
+
+ commit 978752534e94b50c8078b229134a37bad9db88b2
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:47 2007 -0700
+
+ coda: avoid lockdep warning in coda_readdir
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Al Viro <viro@zeniv.linux.org.uk>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 01f55f447d82..47ac9e21a590 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -43,15 +43,15 @@ static int coda_rename(struct inode *old_inode, struct dentry *old_dentry,
+ struct inode *new_inode, struct dentry *new_dentry);
+
+ /* dir file-ops */
+-static int coda_readdir(struct file *file, void *dirent, filldir_t filldir);
++static int coda_readdir(struct file *file, void *buf, filldir_t filldir);
+
+ /* dentry ops */
+ static int coda_dentry_revalidate(struct dentry *de, struct nameidata *nd);
+ static int coda_dentry_delete(struct dentry *);
+
+ /* support routines */
+-static int coda_venus_readdir(struct file *filp, filldir_t filldir,
+- void *dirent, struct dentry *dir);
++static int coda_venus_readdir(struct file *coda_file, void *buf,
++ filldir_t filldir);
+
+ /* same as fs/bad_inode.c */
+ static int coda_return_EIO(void)
+@@ -448,12 +448,10 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
+
+
+ /* file operations for directories */
+-int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
++int coda_readdir(struct file *coda_file, void *buf, filldir_t filldir)
+ {
+- struct dentry *coda_dentry = coda_file->f_path.dentry;
+ struct coda_file_info *cfi;
+ struct file *host_file;
+- struct inode *host_inode;
+ int ret;
+
+ cfi = CODA_FTOC(coda_file);
+@@ -462,30 +460,31 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
+
+ coda_vfs_stat.readdir++;
+
+- host_inode = host_file->f_path.dentry->d_inode;
+- mutex_lock(&host_inode->i_mutex);
+- host_file->f_pos = coda_file->f_pos;
+-
+- if (!host_file->f_op->readdir) {
+- /* Venus: we must read Venus dirents from the file */
+- ret = coda_venus_readdir(host_file, filldir, dirent, coda_dentry);
+- } else {
+- /* potemkin case: we were handed a directory inode. */
+- /* Yuk, we can't call vfs_readdir because we are already
+- * holding the inode semaphore. */
+- ret = -ENOTDIR;
+- if (!host_file->f_op || !host_file->f_op->readdir)
+- goto out;
++ if (!host_file->f_op)
++ return -ENOTDIR;
++
++ if (host_file->f_op->readdir)
++ {
++ /* potemkin case: we were handed a directory inode.
++ * We can't use vfs_readdir because we have to keep the file
++ * position in sync between the coda_file and the host_file.
++ * and as such we need grab the inode mutex. */
++ struct inode *host_inode = host_file->f_path.dentry->d_inode;
++
++ mutex_lock(&host_inode->i_mutex);
++ host_file->f_pos = coda_file->f_pos;
+
+ ret = -ENOENT;
+ if (!IS_DEADDIR(host_inode)) {
+- ret = host_file->f_op->readdir(host_file, dirent, filldir);
++ ret = host_file->f_op->readdir(host_file, buf, filldir);
+ file_accessed(host_file);
+ }
++
++ coda_file->f_pos = host_file->f_pos;
++ mutex_unlock(&host_inode->i_mutex);
+ }
+-out:
+- coda_file->f_pos = host_file->f_pos;
+- mutex_unlock(&host_inode->i_mutex);
++ else /* Venus: we must read Venus dirents from a file */
++ ret = coda_venus_readdir(coda_file, buf, filldir);
+
+ return ret;
+ }
+@@ -510,57 +509,68 @@ static inline unsigned int CDT2DT(unsigned char cdt)
+ }
+
+ /* support routines */
+-static int coda_venus_readdir(struct file *filp, filldir_t filldir,
+- void *dirent, struct dentry *dir)
++static int coda_venus_readdir(struct file *coda_file, void *buf,
++ filldir_t filldir)
+ {
+ int result = 0; /* # of entries returned */
++ struct coda_file_info *cfi;
++ struct coda_inode_info *cii;
++ struct file *host_file;
++ struct dentry *de;
+ struct venus_dirent *vdir;
+ unsigned long vdir_size =
+ (unsigned long)(&((struct venus_dirent *)0)->d_name);
+ unsigned int type;
+ struct qstr name;
+ ino_t ino;
+- int ret, i;
++ int ret;
++
++ cfi = CODA_FTOC(coda_file);
++ BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
++ host_file = cfi->cfi_container;
++
++ de = coda_file->f_path.dentry;
++ cii = ITOC(de->d_inode);
+
+ vdir = kmalloc(sizeof(*vdir), GFP_KERNEL);
+ if (!vdir) return -ENOMEM;
+
+- i = filp->f_pos;
+- switch(i) {
++ switch (coda_file->f_pos) {
+ case 0:
+- ret = filldir(dirent, ".", 1, 0, dir->d_inode->i_ino, DT_DIR);
++ ret = filldir(buf, ".", 1, 0, de->d_inode->i_ino, DT_DIR);
+ if (ret < 0) break;
+ result++;
+- filp->f_pos++;
++ coda_file->f_pos++;
+ /* fallthrough */
+ case 1:
+- ret = filldir(dirent, "..", 2, 1, dir->d_parent->d_inode->i_ino, DT_DIR);
++ ret = filldir(buf, "..", 2, 1, de->d_parent->d_inode->i_ino, DT_DIR);
+ if (ret < 0) break;
+ result++;
+- filp->f_pos++;
++ coda_file->f_pos++;
+ /* fallthrough */
+ default:
+ while (1) {
+ /* read entries from the directory file */
+- ret = kernel_read(filp, filp->f_pos - 2, (char *)vdir,
++ ret = kernel_read(host_file, coda_file->f_pos - 2, (char *)vdir,
+ sizeof(*vdir));
+ if (ret < 0) {
+- printk("coda_venus_readdir: read dir failed %d\n", ret);
++ printk(KERN_ERR "coda readdir: read dir %s failed %d\n",
++ coda_f2s(&cii->c_fid), ret);
+ break;
+ }
+ if (ret == 0) break; /* end of directory file reached */
+
+ /* catch truncated reads */
+ if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
+- printk("coda_venus_readdir: short read: %ld\n",
+- filp->f_path.dentry->d_inode->i_ino);
++ printk(KERN_ERR "coda readdir: short read on %s\n",
++ coda_f2s(&cii->c_fid));
+ ret = -EBADF;
+ break;
+ }
+ /* validate whether the directory file actually makes sense */
+ if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
+- printk("coda_venus_readdir: Invalid dir: %ld\n",
+- filp->f_path.dentry->d_inode->i_ino);
++ printk(KERN_ERR "coda readdir: invalid dir %s\n",
++ coda_f2s(&cii->c_fid));
+ ret = -EBADF;
+ break;
+ }
+@@ -579,21 +589,21 @@ static int coda_venus_readdir(struct file *filp, filldir_t filldir,
+ * userspace doesn't have to worry about breaking
+ * getcwd by having mismatched inode numbers for
+ * internal volume mountpoints. */
+- ino = find_inode_number(dir, &name);
++ ino = find_inode_number(de, &name);
+ if (!ino) ino = vdir->d_fileno;
+
+ type = CDT2DT(vdir->d_type);
+- ret = filldir(dirent, name.name, name.len, filp->f_pos,
+- ino, type);
++ ret = filldir(buf, name.name, name.len,
++ coda_file->f_pos, ino, type);
+ /* failure means no space for filling in this round */
+ if (ret < 0) break;
+ result++;
+ }
+ /* we'll always have progress because d_reclen is unsigned and
+ * we've already established it is non-zero. */
+- filp->f_pos += vdir->d_reclen;
++ coda_file->f_pos += vdir->d_reclen;
++ }
+ }
+- }
+ kfree(vdir);
+ return result ? result : ret;
+ }commit d9664c95afe5baa92ea56eff6a1c18e7b7a2cbe7
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:46 2007 -0700
+
+ coda: block signals during upcall processing
+
+ We ignore signals for about 30 seconds to give userspace a chance to see the
+ upcall. As we did not block signals we ended up in a busy loop for the
+ remainder of the period when a signal is received.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 44332efa8411..ad65ee01790f 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -638,42 +638,83 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
+
+ /*
+ * coda_upcall and coda_downcall routines.
+- *
+ */
++static void block_signals(sigset_t *old)
++{
++ spin_lock_irq(¤t->sighand->siglock);
++ *old = current->blocked;
++
++ sigfillset(¤t->blocked);
++ sigdelset(¤t->blocked, SIGKILL);
++ sigdelset(¤t->blocked, SIGSTOP);
++ sigdelset(¤t->blocked, SIGINT);
++
++ recalc_sigpending();
++ spin_unlock_irq(¤t->sighand->siglock);
++}
++
++static void unblock_signals(sigset_t *old)
++{
++ spin_lock_irq(¤t->sighand->siglock);
++ current->blocked = *old;
++ recalc_sigpending();
++ spin_unlock_irq(¤t->sighand->siglock);
++}
++
++/* Don't allow signals to interrupt the following upcalls before venus
++ * has seen them,
++ * - CODA_CLOSE or CODA_RELEASE upcall (to avoid reference count problems)
++ * - CODA_STORE (to avoid data loss)
++ */
++#define CODA_INTERRUPTIBLE(r) (!coda_hard && \
++ (((r)->uc_opcode != CODA_CLOSE && \
++ (r)->uc_opcode != CODA_STORE && \
++ (r)->uc_opcode != CODA_RELEASE) || \
++ (r)->uc_flags & REQ_READ))
+
+-static inline void coda_waitfor_upcall(struct upc_req *vmp)
++static inline void coda_waitfor_upcall(struct upc_req *req)
+ {
+ DECLARE_WAITQUEUE(wait, current);
++ unsigned long timeout = jiffies + coda_timeout * HZ;
++ sigset_t old;
++ int blocked;
+
+- vmp->uc_posttime = jiffies;
++ block_signals(&old);
++ blocked = 1;
+
+- add_wait_queue(&vmp->uc_sleep, &wait);
++ add_wait_queue(&req->uc_sleep, &wait);
+ for (;;) {
+- if ( !coda_hard && vmp->uc_opcode != CODA_CLOSE )
++ if (CODA_INTERRUPTIBLE(req))
+ set_current_state(TASK_INTERRUPTIBLE);
+ else
+ set_current_state(TASK_UNINTERRUPTIBLE);
+
+ /* got a reply */
+- if ( vmp->uc_flags & ( REQ_WRITE | REQ_ABORT ) )
++ if (req->uc_flags & (REQ_WRITE | REQ_ABORT))
+ break;
+
+- if ( !coda_hard && vmp->uc_opcode != CODA_CLOSE && signal_pending(current) ) {
+- /* if this process really wants to die, let it go */
+- if ( sigismember(&(current->pending.signal), SIGKILL) ||
+- sigismember(&(current->pending.signal), SIGINT) )
+- break;
+- /* signal is present: after timeout always return
+- really smart idea, probably useless ... */
+- if ( jiffies - vmp->uc_posttime > coda_timeout * HZ )
+- break;
++ if (blocked && time_after(jiffies, timeout) &&
++ CODA_INTERRUPTIBLE(req))
++ {
++ unblock_signals(&old);
++ blocked = 0;
+ }
+- schedule();
++
++ if (signal_pending(current)) {
++ list_del(&req->uc_chain);
++ break;
++ }
++
++ if (blocked)
++ schedule_timeout(HZ);
++ else
++ schedule();
+ }
+- remove_wait_queue(&vmp->uc_sleep, &wait);
+- set_current_state(TASK_RUNNING);
++ if (blocked)
++ unblock_signals(&old);
+
+- return;
++ remove_wait_queue(&req->uc_sleep, &wait);
++ set_current_state(TASK_RUNNING);
+ }
+
+
+@@ -750,8 +791,6 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ goto exit;
+ }
+
+- list_del(&(req->uc_chain));
+-
+ /* Interrupted before venus read it. */
+ if (!(req->uc_flags & REQ_READ))
+ goto exit;
+diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
+index b541bb3d1f4b..f28c2f7fd454 100644
+--- a/include/linux/coda_psdev.h
++++ b/include/linux/coda_psdev.h
+@@ -85,7 +85,6 @@ struct upc_req {
+ u_short uc_opcode; /* copied from data to save lookup */
+ int uc_unique;
+ wait_queue_head_t uc_sleep; /* process' wait queue */
+- unsigned long uc_posttime;
+ };
+
+ #define REQ_ASYNC 0x1commit fe71b5f3871af2c281a08acd4bedd2da25e46bc3
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:46 2007 -0700
+
+ coda: cleanup for upcall handling path
+
+ Make the code that processes upcall responses more straightforward, uncovered
+ at least one bad assumption. We trusted that vc_inuse would be 0 when upcalls
+ are aborted, however the device may have been reopened.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index a44ca4155fd5..44332efa8411 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -687,27 +687,27 @@ static inline void coda_waitfor_upcall(struct upc_req *vmp)
+ * are all mapped to -EINTR, while showing a nice warning message. (jh)
+ *
+ */
+-static int coda_upcall(struct coda_sb_info *sbi,
+- int inSize, int *outSize,
+- union inputArgs *buffer)
++static int coda_upcall(struct coda_sb_info *sbi,
++ int inSize, int *outSize,
++ union inputArgs *buffer)
+ {
+ struct venus_comm *vcommp;
+ union outputArgs *out;
+- struct upc_req *req;
++ union inputArgs *sig_inputArgs;
++ struct upc_req *req, *sig_req;
+ int error = 0;
+
+ vcommp = sbi->sbi_vcomm;
+- if ( !vcommp->vc_inuse ) {
+- printk("No pseudo device in upcall comms at %p\n", vcommp);
+- return -ENXIO;
++ if (!vcommp->vc_inuse) {
++ printk(KERN_NOTICE "coda: Venus dead, not sending upcall\n");
++ return -ENXIO;
+ }
+
+ /* Format the request message. */
+ req = upc_alloc();
+- if (!req) {
+- printk("Failed to allocate upc_req structure\n");
++ if (!req)
+ return -ENOMEM;
+- }
++
+ req->uc_data = (void *)buffer;
+ req->uc_flags = 0;
+ req->uc_inSize = inSize;
+@@ -715,13 +715,13 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ req->uc_opcode = ((union inputArgs *)buffer)->ih.opcode;
+ req->uc_unique = ++vcommp->vc_seq;
+ init_waitqueue_head(&req->uc_sleep);
+-
++
+ /* Fill in the common input args. */
+ ((union inputArgs *)buffer)->ih.unique = req->uc_unique;
+
+ /* Append msg to pending queue and poke Venus. */
+- list_add_tail(&(req->uc_chain), &vcommp->vc_pending);
+-
++ list_add_tail(&req->uc_chain, &vcommp->vc_pending);
++
+ wake_up_interruptible(&vcommp->vc_waitq);
+ /* We can be interrupted while we wait for Venus to process
+ * our request. If the interrupt occurs before Venus has read
+@@ -735,64 +735,59 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ /* Go to sleep. Wake up on signals only after the timeout. */
+ coda_waitfor_upcall(req);
+
+- if (vcommp->vc_inuse) { /* i.e. Venus is still alive */
+- /* Op went through, interrupt or not... */
+- if (req->uc_flags & REQ_WRITE) {
++ /* Op went through, interrupt or not... */
++ if (req->uc_flags & REQ_WRITE) {
+ out = (union outputArgs *)req->uc_data;
+ /* here we map positive Venus errors to kernel errors */
+ error = -out->oh.result;
+ *outSize = req->uc_outSize;
+ goto exit;
+- }
+- if ( !(req->uc_flags & REQ_READ) && signal_pending(current)) {
+- /* Interrupted before venus read it. */
+- list_del(&(req->uc_chain));
+- /* perhaps the best way to convince the app to
+- give up? */
+- error = -EINTR;
++ }
++
++ error = -EINTR;
++ if ((req->uc_flags & REQ_ABORT) || !signal_pending(current)) {
++ printk(KERN_WARNING "coda: Unexpected interruption.\n");
+ goto exit;
+- }
+- if ( (req->uc_flags & REQ_READ) && signal_pending(current) ) {
+- /* interrupted after Venus did its read, send signal */
+- union inputArgs *sig_inputArgs;
+- struct upc_req *sig_req;
+-
+- list_del(&(req->uc_chain));
+- error = -ENOMEM;
+- sig_req = upc_alloc();
+- if (!sig_req) goto exit;
+-
+- CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr));
+- if (!sig_req->uc_data) {
+- upc_free(sig_req);
+- goto exit;
+- }
+-
+- error = -EINTR;
+- sig_inputArgs = (union inputArgs *)sig_req->uc_data;
+- sig_inputArgs->ih.opcode = CODA_SIGNAL;
+- sig_inputArgs->ih.unique = req->uc_unique;
+-
+- sig_req->uc_flags = REQ_ASYNC;
+- sig_req->uc_opcode = sig_inputArgs->ih.opcode;
+- sig_req->uc_unique = sig_inputArgs->ih.unique;
+- sig_req->uc_inSize = sizeof(struct coda_in_hdr);
+- sig_req->uc_outSize = sizeof(struct coda_in_hdr);
+-
+- /* insert at head of queue! */
+- list_add(&(sig_req->uc_chain), &vcommp->vc_pending);
+- wake_up_interruptible(&vcommp->vc_waitq);
+- } else {
+- printk("Coda: Strange interruption..\n");
+- error = -EINTR;
+- }
+- } else { /* If venus died i.e. !VC_OPEN(vcommp) */
+- printk("coda_upcall: Venus dead on (op,un) (%d.%d) flags %d\n",
+- req->uc_opcode, req->uc_unique, req->uc_flags);
+- error = -ENODEV;
+ }
+
+- exit:
++ list_del(&(req->uc_chain));
++
++ /* Interrupted before venus read it. */
++ if (!(req->uc_flags & REQ_READ))
++ goto exit;
++
++ /* Venus saw the upcall, make sure we can send interrupt signal */
++ if (!vcommp->vc_inuse) {
++ printk(KERN_INFO "coda: Venus dead, not sending signal.\n");
++ goto exit;
++ }
++
++ error = -ENOMEM;
++ sig_req = upc_alloc();
++ if (!sig_req) goto exit;
++
++ CODA_ALLOC((sig_req->uc_data), char *, sizeof(struct coda_in_hdr));
++ if (!sig_req->uc_data) {
++ upc_free(sig_req);
++ goto exit;
++ }
++
++ error = -EINTR;
++ sig_inputArgs = (union inputArgs *)sig_req->uc_data;
++ sig_inputArgs->ih.opcode = CODA_SIGNAL;
++ sig_inputArgs->ih.unique = req->uc_unique;
++
++ sig_req->uc_flags = REQ_ASYNC;
++ sig_req->uc_opcode = sig_inputArgs->ih.opcode;
++ sig_req->uc_unique = sig_inputArgs->ih.unique;
++ sig_req->uc_inSize = sizeof(struct coda_in_hdr);
++ sig_req->uc_outSize = sizeof(struct coda_in_hdr);
++
++ /* insert at head of queue! */
++ list_add(&(sig_req->uc_chain), &vcommp->vc_pending);
++ wake_up_interruptible(&vcommp->vc_waitq);
++
++exit:
+ upc_free(req);
+ return error;
+ }commit 87065519633af79e0577e32a58dcd9cf3c45a8a0
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:45 2007 -0700
+
+ coda: cleanup /dev/cfs open and close handling
+
+ - Make sure device index is not a negative number.
+ - Unlink queued requests when the device is closed to avoid passing them
+ to the next opener.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 09382d47a4e1..6818c20372ca 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -272,56 +272,51 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
+
+ static int coda_psdev_open(struct inode * inode, struct file * file)
+ {
+- struct venus_comm *vcp;
+- int idx;
++ struct venus_comm *vcp;
++ int idx, err;
+
+- lock_kernel();
+ idx = iminor(inode);
+- if(idx >= MAX_CODADEVS) {
+- unlock_kernel();
++ if (idx < 0 || idx >= MAX_CODADEVS)
+ return -ENODEV;
+- }
+
++ lock_kernel();
++
++ err = -EBUSY;
+ vcp = &coda_comms[idx];
+- if(vcp->vc_inuse) {
+- unlock_kernel();
+- return -EBUSY;
+- }
+-
+- if (!vcp->vc_inuse++) {
++ if (!vcp->vc_inuse) {
++ vcp->vc_inuse++;
++
+ INIT_LIST_HEAD(&vcp->vc_pending);
+ INIT_LIST_HEAD(&vcp->vc_processing);
+ init_waitqueue_head(&vcp->vc_waitq);
+ vcp->vc_sb = NULL;
+ vcp->vc_seq = 0;
++
++ file->private_data = vcp;
++ err = 0;
+ }
+-
+- file->private_data = vcp;
+
+ unlock_kernel();
+- return 0;
++ return err;
+ }
+
+
+ static int coda_psdev_release(struct inode * inode, struct file * file)
+ {
+- struct venus_comm *vcp = (struct venus_comm *) file->private_data;
+- struct upc_req *req, *tmp;
++ struct venus_comm *vcp = (struct venus_comm *) file->private_data;
++ struct upc_req *req, *tmp;
+
+- lock_kernel();
+- if ( !vcp->vc_inuse ) {
+- unlock_kernel();
++ if (!vcp || !vcp->vc_inuse ) {
+ printk("psdev_release: Not open.\n");
+ return -1;
+ }
+
+- if (--vcp->vc_inuse) {
+- unlock_kernel();
+- return 0;
+- }
+-
+- /* Wakeup clients so they can return. */
++ lock_kernel();
++
++ /* Wakeup clients so they can return. */
+ list_for_each_entry_safe(req, tmp, &vcp->vc_pending, uc_chain) {
++ list_del(&req->uc_chain);
++
+ /* Async requests need to be freed here */
+ if (req->uc_flags & REQ_ASYNC) {
+ CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
+@@ -330,13 +325,17 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
+ }
+ req->uc_flags |= REQ_ABORT;
+ wake_up(&req->uc_sleep);
+- }
+-
+- list_for_each_entry(req, &vcp->vc_processing, uc_chain) {
++ }
++
++ list_for_each_entry_safe(req, tmp, &vcp->vc_processing, uc_chain) {
++ list_del(&req->uc_chain);
++
+ req->uc_flags |= REQ_ABORT;
+- wake_up(&req->uc_sleep);
+- }
++ wake_up(&req->uc_sleep);
++ }
+
++ file->private_data = NULL;
++ vcp->vc_inuse--;
+ unlock_kernel();
+ return 0;
+ }
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 1651b918219a..a44ca4155fd5 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -641,8 +641,7 @@ int venus_statfs(struct dentry *dentry, struct kstatfs *sfs)
+ *
+ */
+
+-static inline void coda_waitfor_upcall(struct upc_req *vmp,
+- struct venus_comm *vcommp)
++static inline void coda_waitfor_upcall(struct upc_req *vmp)
+ {
+ DECLARE_WAITQUEUE(wait, current);
+
+@@ -655,10 +654,6 @@ static inline void coda_waitfor_upcall(struct upc_req *vmp,
+ else
+ set_current_state(TASK_UNINTERRUPTIBLE);
+
+- /* venus died */
+- if ( !vcommp->vc_inuse )
+- break;
+-
+ /* got a reply */
+ if ( vmp->uc_flags & ( REQ_WRITE | REQ_ABORT ) )
+ break;
+@@ -738,7 +733,7 @@ static int coda_upcall(struct coda_sb_info *sbi,
+ * ENODEV. */
+
+ /* Go to sleep. Wake up on signals only after the timeout. */
+- coda_waitfor_upcall(req, vcommp);
++ coda_waitfor_upcall(req);
+
+ if (vcommp->vc_inuse) { /* i.e. Venus is still alive */
+ /* Op went through, interrupt or not... */commit ed31a7dd636b296746c131b7386023aa1ef84309
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:44 2007 -0700
+
+ coda: use ilookup5
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c
+index 28c872747f81..a7a780929eec 100644
+--- a/fs/coda/cnode.c
++++ b/fs/coda/cnode.c
+@@ -55,11 +55,6 @@ static int coda_set_inode(struct inode *inode, void *data)
+ return 0;
+ }
+
+-static int coda_fail_inode(struct inode *inode, void *data)
+-{
+- return -1;
+-}
+-
+ struct inode * coda_iget(struct super_block * sb, struct CodaFid * fid,
+ struct coda_vattr * attr)
+ {
+@@ -141,7 +136,7 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb)
+ return NULL;
+ }
+
+- inode = iget5_locked(sb, hash, coda_test_inode, coda_fail_inode, fid);
++ inode = ilookup5(sb, hash, coda_test_inode, fid);
+ if ( !inode )
+ return NULL;
+ commit fac1f0e34026a656174102ebad4d1cd71cd4fe2c
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:44 2007 -0700
+
+ coda: coda doesn't track atime
+
+ Set MS_NOATIME flag to avoid unnecessary calls when the coda inode is
+ accessed.
+
+ Also, set statfs.f_bsize to 4k. 1k is obviously too small for the suggested
+ IO size.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/inode.c b/fs/coda/inode.c
+index dbff1bd4fb96..29e441765600 100644
+--- a/fs/coda/inode.c
++++ b/fs/coda/inode.c
+@@ -83,7 +83,7 @@ void coda_destroy_inodecache(void)
+
+ static int coda_remount(struct super_block *sb, int *flags, char *data)
+ {
+- *flags |= MS_NODIRATIME;
++ *flags |= MS_NOATIME;
+ return 0;
+ }
+
+@@ -176,12 +176,12 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent)
+
+ sbi->sbi_vcomm = vc;
+
+- sb->s_fs_info = sbi;
+- sb->s_flags |= MS_NODIRATIME; /* probably even noatime */
+- sb->s_blocksize = 1024; /* XXXXX what do we put here?? */
+- sb->s_blocksize_bits = 10;
+- sb->s_magic = CODA_SUPER_MAGIC;
+- sb->s_op = &coda_super_operations;
++ sb->s_fs_info = sbi;
++ sb->s_flags |= MS_NOATIME;
++ sb->s_blocksize = 4096; /* XXXXX what do we put here?? */
++ sb->s_blocksize_bits = 12;
++ sb->s_magic = CODA_SUPER_MAGIC;
++ sb->s_op = &coda_super_operations;
+
+ /* get root fid from Venus: this needs the root inode */
+ error = venus_rootfid(sb, &fid);
+@@ -296,7 +296,7 @@ static int coda_statfs(struct dentry *dentry, struct kstatfs *buf)
+
+ /* and fill in the rest */
+ buf->f_type = CODA_SUPER_MAGIC;
+- buf->f_bsize = 1024;
++ buf->f_bsize = 4096;
+ buf->f_namelen = CODA_MAXNAMLEN;
+
+ return 0; commit 8c6d21528406ec719aaea9d589876fd105c31646
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:43 2007 -0700
+
+ coda: allow removal of busy directories
+
+ A directory without children may still be busy when it is the cwd for some
+ process. We can safely remove such a directory because the VFS prevents
+ further operations. Also we don't need to call d_delete as it is already
+ called in vfs_rmdir.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 56a3b76b91ca..01f55f447d82 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -391,28 +391,23 @@ int coda_rmdir(struct inode *dir, struct dentry *de)
+ {
+ const char *name = de->d_name.name;
+ int len = de->d_name.len;
+- int error;
++ int error;
+
+ lock_kernel();
+ coda_vfs_stat.rmdir++;
+
+- if (!d_unhashed(de)) {
+- unlock_kernel();
+- return -EBUSY;
+- }
+ error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
++ if (!error) {
++ /* VFS may delete the child */
++ if (de->d_inode)
++ de->d_inode->i_nlink = 0;
+
+- if ( error ) {
+- unlock_kernel();
+- return error;
++ /* fix the link count of the parent */
++ coda_dir_drop_nlink(dir);
++ coda_dir_update_mtime(dir);
+ }
+-
+- coda_dir_drop_nlink(dir);
+- coda_dir_update_mtime(dir);
+- drop_nlink(de->d_inode);
+- d_delete(de);
+ unlock_kernel();
+- return 0;
++ return error;
+ }
+
+ /* rename */commit d728900cd5502927158db747c653007cf72e2e49
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:43 2007 -0700
+
+ coda: fix nlink updates for directories
+
+ The Coda client sets the directory link count to 1 when it isn't sure how many
+ subdirectories we have. In this case we shouldn't change the link count in
+ the kernel when a subdirectory is created or removed.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/dir.c b/fs/coda/dir.c
+index 898a86dde8f5..56a3b76b91ca 100644
+--- a/fs/coda/dir.c
++++ b/fs/coda/dir.c
+@@ -173,12 +173,11 @@ int coda_permission(struct inode *inode, int mask, struct nameidata *nd)
+
+ out:
+ unlock_kernel();
+-
+- return error;
++ return error;
+ }
+
+
+-static inline void coda_dir_changed(struct inode *dir, int link)
++static inline void coda_dir_update_mtime(struct inode *dir)
+ {
+ #ifdef REQUERY_VENUS_FOR_MTIME
+ /* invalidate the directory cnode's attributes so we refetch the
+@@ -186,12 +185,27 @@ static inline void coda_dir_changed(struct inode *dir, int link)
+ coda_flag_inode(dir, C_VATTR);
+ #else
+ /* optimistically we can also act as if our nose bleeds. The
+- * granularity of the mtime is coarse anyways so we might actually be
+- * right most of the time. Note: we only do this for directories. */
++ * granularity of the mtime is coarse anyways so we might actually be
++ * right most of the time. Note: we only do this for directories. */
+ dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+ #endif
+- if (link)
+- dir->i_nlink += link;
++}
++
++/* we have to wrap inc_nlink/drop_nlink because sometimes userspace uses a
++ * trick to fool GNU find's optimizations. If we can't be sure of the link
++ * (because of volume mount points) we set i_nlink to 1 which forces find
++ * to consider every child as a possible directory. We should also never
++ * see an increment or decrement for deleted directories where i_nlink == 0 */
++static inline void coda_dir_inc_nlink(struct inode *dir)
++{
++ if (dir->i_nlink >= 2)
++ inc_nlink(dir);
++}
++
++static inline void coda_dir_drop_nlink(struct inode *dir)
++{
++ if (dir->i_nlink > 2)
++ drop_nlink(dir);
+ }
+
+ /* creation routines: create, mknod, mkdir, link, symlink */
+@@ -229,10 +243,10 @@ static int coda_create(struct inode *dir, struct dentry *de, int mode, struct na
+ }
+
+ /* invalidate the directory cnode's attributes */
+- coda_dir_changed(dir, 0);
++ coda_dir_update_mtime(dir);
+ unlock_kernel();
+ d_instantiate(de, inode);
+- return 0;
++ return 0;
+ }
+
+ static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
+@@ -268,12 +282,13 @@ static int coda_mkdir(struct inode *dir, struct dentry *de, int mode)
+ d_drop(de);
+ return PTR_ERR(inode);
+ }
+-
++
+ /* invalidate the directory cnode's attributes */
+- coda_dir_changed(dir, 1);
++ coda_dir_inc_nlink(dir);
++ coda_dir_update_mtime(dir);
+ unlock_kernel();
+ d_instantiate(de, inode);
+- return 0;
++ return 0;
+ }
+
+ /* try to make de an entry in dir_inodde linked to source_de */
+@@ -296,16 +311,16 @@ static int coda_link(struct dentry *source_de, struct inode *dir_inode,
+ error = venus_link(dir_inode->i_sb, coda_i2f(inode),
+ coda_i2f(dir_inode), (const char *)name, len);
+
+- if (error) {
++ if (error) {
+ d_drop(de);
+ goto out;
+ }
+
+- coda_dir_changed(dir_inode, 0);
++ coda_dir_update_mtime(dir_inode);
+ atomic_inc(&inode->i_count);
+ d_instantiate(de, inode);
+ inc_nlink(inode);
+-
++
+ out:
+ unlock_kernel();
+ return(error);
+@@ -336,18 +351,18 @@ static int coda_symlink(struct inode *dir_inode, struct dentry *de,
+
+ /*
+ * This entry is now negative. Since we do not create
+- * an inode for the entry we have to drop it.
++ * an inode for the entry we have to drop it.
+ */
+ d_drop(de);
+- error = venus_symlink(dir_inode->i_sb, coda_i2f(dir_inode), name, len,
++ error = venus_symlink(dir_inode->i_sb, coda_i2f(dir_inode), name, len,
+ symname, symlen);
+
+ /* mtime is no good anymore */
+ if ( !error )
+- coda_dir_changed(dir_inode, 0);
++ coda_dir_update_mtime(dir_inode);
+
+ unlock_kernel();
+- return error;
++ return error;
+ }
+
+ /* destruction routines: unlink, rmdir */
+@@ -360,17 +375,16 @@ int coda_unlink(struct inode *dir, struct dentry *de)
+ lock_kernel();
+ coda_vfs_stat.unlink++;
+
+- error = venus_remove(dir->i_sb, coda_i2f(dir), name, len);
+- if ( error ) {
++ error = venus_remove(dir->i_sb, coda_i2f(dir), name, len);
++ if ( error ) {
+ unlock_kernel();
+- return error;
+- }
++ return error;
++ }
+
+- coda_dir_changed(dir, 0);
++ coda_dir_update_mtime(dir);
+ drop_nlink(de->d_inode);
+ unlock_kernel();
+-
+- return 0;
++ return 0;
+ }
+
+ int coda_rmdir(struct inode *dir, struct dentry *de)
+@@ -388,49 +402,49 @@ int coda_rmdir(struct inode *dir, struct dentry *de)
+ }
+ error = venus_rmdir(dir->i_sb, coda_i2f(dir), name, len);
+
+- if ( error ) {
++ if ( error ) {
+ unlock_kernel();
+- return error;
+- }
++ return error;
++ }
+
+- coda_dir_changed(dir, -1);
++ coda_dir_drop_nlink(dir);
++ coda_dir_update_mtime(dir);
+ drop_nlink(de->d_inode);
+ d_delete(de);
+ unlock_kernel();
+-
+- return 0;
++ return 0;
+ }
+
+ /* rename */
+-static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
++static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
+ struct inode *new_dir, struct dentry *new_dentry)
+ {
+- const char *old_name = old_dentry->d_name.name;
+- const char *new_name = new_dentry->d_name.name;
++ const char *old_name = old_dentry->d_name.name;
++ const char *new_name = new_dentry->d_name.name;
+ int old_length = old_dentry->d_name.len;
+ int new_length = new_dentry->d_name.len;
+- int link_adjust = 0;
+- int error;
++ int error;
+
+ lock_kernel();
+ coda_vfs_stat.rename++;
+
+- error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
+- coda_i2f(new_dir), old_length, new_length,
++ error = venus_rename(old_dir->i_sb, coda_i2f(old_dir),
++ coda_i2f(new_dir), old_length, new_length,
+ (const char *) old_name, (const char *)new_name);
+
+- if ( !error ) {
++ if ( !error ) {
+ if ( new_dentry->d_inode ) {
+- if ( S_ISDIR(new_dentry->d_inode->i_mode) )
+- link_adjust = 1;
+-
+- coda_dir_changed(old_dir, -link_adjust);
+- coda_dir_changed(new_dir, link_adjust);
++ if ( S_ISDIR(new_dentry->d_inode->i_mode) ) {
++ coda_dir_drop_nlink(old_dir);
++ coda_dir_inc_nlink(new_dir);
++ }
++ coda_dir_update_mtime(old_dir);
++ coda_dir_update_mtime(new_dir);
+ coda_flag_inode(new_dentry->d_inode, C_VATTR);
+ } else {
+ coda_flag_inode(old_dir, C_VATTR);
+ coda_flag_inode(new_dir, C_VATTR);
+- }
++ }
+ }
+ unlock_kernel();
+ commit 56ee3547940f895a2cf20f2ac462fbeaee55fa2a
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:42 2007 -0700
+
+ coda: correctly invalidate cached access rights
+
+ Change the epoch value to forces a refresh instead of clearing the cached
+ rights mask and block all further accesses to the object.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/cache.c b/fs/coda/cache.c
+index fcb88fa8d2f2..11538a2b5423 100644
+--- a/fs/coda/cache.c
++++ b/fs/coda/cache.c
+@@ -43,7 +43,7 @@ void coda_cache_enter(struct inode *inode, int mask)
+ void coda_cache_clear_inode(struct inode *inode)
+ {
+ struct coda_inode_info *cii = ITOC(inode);
+- cii->c_cached_perm = 0;
++ cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
+ }
+
+ /* remove all acl caches */commit 38c2e4370da495813ca93d7cad31ed5090e8c310
+Author: Jan Harkes <jaharkes@cs.cmu.edu>
+Date: Thu Jul 19 01:48:41 2007 -0700
+
+ coda: do not grab an uninitialized fd when the open upcall returns an error
+
+ When open fails the fd in the response is uninitialized and we ended up taking
+ a reference on the file struct and never released it.
+
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index 99dbe866816d..e7d622709c90 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -143,8 +143,11 @@ int coda_open(struct inode *coda_inode, struct file *coda_file)
+ lock_kernel();
+
+ error = venus_open(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags,
+- &host_file);
+- if (error || !host_file) {
++ &host_file);
++ if (!host_file)
++ error = -EIO;
++
++ if (error) {
+ kfree(cfi);
+ unlock_kernel();
+ return error;
+diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
+index 803aacf0d49c..09382d47a4e1 100644
+--- a/fs/coda/psdev.c
++++ b/fs/coda/psdev.c
+@@ -195,7 +195,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
+ if (req->uc_opcode == CODA_OPEN_BY_FD) {
+ struct coda_open_by_fd_out *outp =
+ (struct coda_open_by_fd_out *)req->uc_data;
+- outp->fh = fget(outp->fd);
++ if (!outp->oh.result)
++ outp->fh = fget(outp->fd);
+ }
+
+ wake_up(&req->uc_sleep);
+diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
+index 5faacdb1a479..1651b918219a 100644
+--- a/fs/coda/upcall.c
++++ b/fs/coda/upcall.c
+@@ -251,12 +251,12 @@ int venus_open(struct super_block *sb, struct CodaFid *fid,
+ insize = SIZE(open_by_fd);
+ UPARG(CODA_OPEN_BY_FD);
+
+- inp->coda_open.VFid = *fid;
+- inp->coda_open.flags = flags;
++ inp->coda_open_by_fd.VFid = *fid;
++ inp->coda_open_by_fd.flags = flags;
+
+- error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
+-
+- *fh = outp->coda_open_by_fd.fh;
++ error = coda_upcall(coda_sbp(sb), insize, &outsize, inp);
++ if (!error)
++ *fh = outp->coda_open_by_fd.fh;
+
+ CODA_FREE(inp, insize);
+ return error;
+ commit 7deeed13170e634adc4552ff94588d6301a3da83
+Author: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+Date: Tue Jun 19 09:05:21 2007 +0200
+
+ [TRIVIAL PATCH] Kill blk_congestion_wait() stub for !CONFIG_BLOCK
+
+ blk_congestion_wait() doesn't exist anymore, but there's still a stub
+ in blkdev.h for the !CONFIG_BLOCK case. Kill it.
+
+ Signed-off-by: Benjamin Gilbert <bgilbert@cs.cmu.edu>
+ Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
+
+diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
+index db5b00a792f5..fae138bd2207 100644
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -868,11 +868,6 @@ void kblockd_flush_work(struct work_struct *work);
+ */
+ #define buffer_heads_over_limit 0
+
+-static inline long blk_congestion_wait(int rw, long timeout)
+-{
+- return io_schedule_timeout(timeout);
+-}
+-
+ static inline long nr_blockdev_pages(void)
+ {
+ return 0;commit d4473b9b778f39f0b5da870a9a96b5778861c60b
+Author: Eric Cooper <ecc@cmu.edu>
+Date: Sat Jul 29 20:10:54 2017 -0400
+
+ rtc: m41t80: enable wakealarm when "wakeup-source" is specified
+
+ Don't require an IRQ if the wakeup-source device-tree property is present.
+
+ Signed-off-by: Eric Cooper <ecc@cmu.edu>
+ Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
+index 8940e9e43ea0..412a4e04de79 100644
+--- a/drivers/rtc/rtc-m41t80.c
++++ b/drivers/rtc/rtc-m41t80.c
+@@ -927,6 +927,7 @@ static int m41t80_probe(struct i2c_client *client,
+ struct rtc_device *rtc = NULL;
+ struct rtc_time tm;
+ struct m41t80_data *m41t80_data = NULL;
++ bool wakeup_source = false;
+
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK |
+ I2C_FUNC_SMBUS_BYTE_DATA)) {
+@@ -947,6 +948,10 @@ static int m41t80_probe(struct i2c_client *client,
+ m41t80_data->features = id->driver_data;
+ i2c_set_clientdata(client, m41t80_data);
+
++#ifdef CONFIG_OF
++ wakeup_source = of_property_read_bool(client->dev.of_node,
++ "wakeup-source");
++#endif
+ if (client->irq > 0) {
+ rc = devm_request_threaded_irq(&client->dev, client->irq,
+ NULL, m41t80_handle_irq,
+@@ -955,14 +960,16 @@ static int m41t80_probe(struct i2c_client *client,
+ if (rc) {
+ dev_warn(&client->dev, "unable to request IRQ, alarms disabled\n");
+ client->irq = 0;
+- } else {
+- m41t80_rtc_ops.read_alarm = m41t80_read_alarm;
+- m41t80_rtc_ops.set_alarm = m41t80_set_alarm;
+- m41t80_rtc_ops.alarm_irq_enable = m41t80_alarm_irq_enable;
+- /* Enable the wakealarm */
+- device_init_wakeup(&client->dev, true);
++ wakeup_source = false;
+ }
+ }
++ if (client->irq > 0 || wakeup_source) {
++ m41t80_rtc_ops.read_alarm = m41t80_read_alarm;
++ m41t80_rtc_ops.set_alarm = m41t80_set_alarm;
++ m41t80_rtc_ops.alarm_irq_enable = m41t80_alarm_irq_enable;
++ /* Enable the wakealarm */
++ device_init_wakeup(&client->dev, true);
++ }
+
+ rtc = devm_rtc_device_register(&client->dev, client->name,
+ &m41t80_rtc_ops, THIS_MODULE);
+@@ -970,6 +977,10 @@ static int m41t80_probe(struct i2c_client *client,
+ return PTR_ERR(rtc);
+
+ m41t80_data->rtc = rtc;
++ if (client->irq <= 0) {
++ /* We cannot support UIE mode if we do not have an IRQ line */
++ rtc->uie_unsupported = 1;
++ }
+
+ /* Make sure HT (Halt Update) bit is cleared */
+ rc = i2c_smbus_read_byte_data(client, M41T80_REG_ALARM_HOUR);commit def7ac806a9ac035abf0e7573ccc8bbfd38e163c
+Author: Gabriel Somlo <somlo@cmu.edu>
+Date: Tue Mar 8 13:30:50 2016 -0500
+
+ firmware: qemu_fw_cfg.c: hold ACPI global lock during device access
+
+ Allowing for the future possibility of implementing AML-based
+ (i.e., firmware-triggered) access to the QEMU fw_cfg device,
+ acquire the global ACPI lock when accessing the device on behalf
+ of the guest-side sysfs driver, to prevent any potential race
+ conditions.
+
+ Suggested-by: Michael S. Tsirkin <mst@redhat.com>
+ Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
+ Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+
+diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
+index e4c471413d46..815c4a5cae54 100644
+--- a/drivers/firmware/qemu_fw_cfg.c
++++ b/drivers/firmware/qemu_fw_cfg.c
+@@ -77,12 +77,28 @@ static inline u16 fw_cfg_sel_endianness(u16 key)
+ static inline void fw_cfg_read_blob(u16 key,
+ void *buf, loff_t pos, size_t count)
+ {
++ u32 glk;
++ acpi_status status;
++
++ /* If we have ACPI, ensure mutual exclusion against any potential
++ * device access by the firmware, e.g. via AML methods:
++ */
++ status = acpi_acquire_global_lock(ACPI_WAIT_FOREVER, &glk);
++ if (ACPI_FAILURE(status) && status != AE_NOT_CONFIGURED) {
++ /* Should never get here */
++ WARN(1, "fw_cfg_read_blob: Failed to lock ACPI!\n");
++ memset(buf, 0, count);
++ return;
++ }
++
+ mutex_lock(&fw_cfg_dev_lock);
+ iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl);
+ while (pos-- > 0)
+ ioread8(fw_cfg_reg_data);
+ ioread8_rep(fw_cfg_reg_data, buf, count);
+ mutex_unlock(&fw_cfg_dev_lock);
++
++ acpi_release_global_lock(glk);
+ }
+
+ /* clean up fw_cfg device i/o */commit 00411b7b1e3ec477b75bb83ccd417c7609832db6 +Author: Gabriel Somlo <somlo@cmu.edu> +Date: Mon Feb 22 16:18:18 2016 -0500 + + firmware: fw_cfg register offsets on supported architectures only + + Refrain from defining default fw_cfg register offsets on + unsupported architectures -- throw an error instead. If + QEMU were to add fw_cfg support on additional architectures, + we should add them to the FW_CFG_SYSFS depends statement in + drivers/firmware/Kconfig, and provide default values for + register offsets in drivers/firmware/qemu_fw_cfg.c at that + time. + + Suggested-by: Michael S. Tsirkin <mst@redhat.com> + Signed-off-by: Gabriel Somlo <somlo@cmu.edu> + Acked-by: Michael S. Tsirkin <mst@redhat.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c +index fedbff55a7f3..7bba76c0206c 100644 +--- a/drivers/firmware/qemu_fw_cfg.c ++++ b/drivers/firmware/qemu_fw_cfg.c +@@ -109,9 +109,7 @@ static void fw_cfg_io_cleanup(void) + # define FW_CFG_CTRL_OFF 0x00 + # define FW_CFG_DATA_OFF 0x01 + # else +-# warning "QEMU FW_CFG may not be available on this architecture!" +-# define FW_CFG_CTRL_OFF 0x00 +-# define FW_CFG_DATA_OFF 0x01 ++# error "QEMU FW_CFG not available on this architecture!" + # endif + #endif +
commit 92aed5d6ba90c2031c8d321a02e7af3d4cb05b8d +Author: Gabriel Somlo <somlo@cmu.edu> +Date: Thu Jan 28 09:23:14 2016 -0500 + + devicetree: update documentation for fw_cfg ARM bindings + + Remove fw_cfg hardware interface details from + Documentation/devicetree/bindings/arm/fw-cfg.txt, + and replace them with a pointer to the authoritative + documentation in the QEMU source tree. + + Signed-off-by: Gabriel Somlo <somlo@cmu.edu> + Cc: Laszlo Ersek <lersek@redhat.com> + Acked-by: Rob Herring <robh@kernel.org> + Reviewed-by: Laszlo Ersek <lersek@redhat.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/Documentation/devicetree/bindings/arm/fw-cfg.txt b/Documentation/devicetree/bindings/arm/fw-cfg.txt +index 953fb640d9c4..fd54e1db2156 100644 +--- a/Documentation/devicetree/bindings/arm/fw-cfg.txt ++++ b/Documentation/devicetree/bindings/arm/fw-cfg.txt +@@ -11,43 +11,9 @@ QEMU exposes the control and data register to ARM guests as memory mapped + registers; their location is communicated to the guest's UEFI firmware in the + DTB that QEMU places at the bottom of the guest's DRAM. + +-The guest writes a selector value (a key) to the selector register, and then +-can read the corresponding data (produced by QEMU) via the data register. If +-the selected entry is writable, the guest can rewrite it through the data +-register. ++The authoritative guest-side hardware interface documentation to the fw_cfg ++device can be found in "docs/specs/fw_cfg.txt" in the QEMU source tree. + +-The selector register takes keys in big endian byte order. +- +-The data register allows accesses with 8, 16, 32 and 64-bit width (only at +-offset 0 of the register). Accesses larger than a byte are interpreted as +-arrays, bundled together only for better performance. The bytes constituting +-such a word, in increasing address order, correspond to the bytes that would +-have been transferred by byte-wide accesses in chronological order. +- +-The interface allows guest firmware to download various parameters and blobs +-that affect how the firmware works and what tables it installs for the guest +-OS. For example, boot order of devices, ACPI tables, SMBIOS tables, kernel and +-initrd images for direct kernel booting, virtual machine UUID, SMP information, +-virtual NUMA topology, and so on. +- +-The authoritative registry of the valid selector values and their meanings is +-the QEMU source code; the structure of the data blobs corresponding to the +-individual key values is also defined in the QEMU source code. +- +-The presence of the registers can be verified by selecting the "signature" blob +-with key 0x0000, and reading four bytes from the data register. The returned +-signature is "QEMU". +- +-The outermost protocol (involving the write / read sequences of the control and +-data registers) is expected to be versioned, and/or described by feature bits. +-The interface revision / feature bitmap can be retrieved with key 0x0001. The +-blob to be read from the data register has size 4, and it is to be interpreted +-as a uint32_t value in little endian byte order. The current value +-(corresponding to the above outer protocol) is zero. +- +-The guest kernel is not expected to use these registers (although it is +-certainly allowed to); the device tree bindings are documented here because +-this is where device tree bindings reside in general. + + Required properties: +
commit 246c46ebaeaef17814dc5a8830d16e7f1b01116b
+Author: Gabriel Somlo <somlo@cmu.edu>
+Date: Thu Jan 28 09:23:13 2016 -0500
+
+ firmware: create directory hierarchy for sysfs fw_cfg entries
+
+ Each fw_cfg entry of type "file" has an associated 56-char,
+ nul-terminated ASCII string which represents its name. While
+ the fw_cfg device doesn't itself impose any specific naming
+ convention, QEMU developers have traditionally used path name
+ semantics (i.e. "etc/acpi/rsdp") to descriptively name the
+ various fw_cfg "blobs" passed into the guest.
+
+ This patch attempts, on a best effort basis, to create a
+ directory hierarchy representing the content of fw_cfg file
+ names, under /sys/firmware/qemu_fw_cfg/by_name.
+
+ Upon successful creation of all directories representing the
+ "dirname" portion of a fw_cfg file, a symlink will be created
+ to represent the "basename", pointing at the appropriate
+ /sys/firmware/qemu_fw_cfg/by_key entry. If a file name is not
+ suitable for this procedure (e.g., if its basename or dirname
+ components collide with an already existing dirname component
+ or basename, respectively) the corresponding fw_cfg blob is
+ skipped and will remain available in sysfs only by its selector
+ key value.
+
+ Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
+ Cc: Andy Lutomirski <luto@amacapital.net>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg b/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+index e9e58d4ea60a..011dda4f8e8a 100644
+--- a/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
++++ b/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+@@ -56,3 +56,45 @@ Description:
+ entry via the control register, and reading a number
+ of bytes equal to the blob size from the data
+ register.
++
++ --- Listing fw_cfg blobs by file name ---
++
++ While the fw_cfg device does not impose any specific naming
++ convention on the blobs registered in the file directory,
++ QEMU developers have traditionally used path name semantics
++ to give each blob a descriptive name. For example:
++
++ "bootorder"
++ "genroms/kvmvapic.bin"
++ "etc/e820"
++ "etc/boot-fail-wait"
++ "etc/system-states"
++ "etc/table-loader"
++ "etc/acpi/rsdp"
++ "etc/acpi/tables"
++ "etc/smbios/smbios-tables"
++ "etc/smbios/smbios-anchor"
++ ...
++
++ In addition to the listing by unique selector key described
++ above, the fw_cfg sysfs driver also attempts to build a tree
++ of directories matching the path name components of fw_cfg
++ blob names, ending in symlinks to the by_key entry for each
++ "basename", as illustrated below (assume current directory is
++ /sys/firmware):
++
++ qemu_fw_cfg/by_name/bootorder -> ../by_key/38
++ qemu_fw_cfg/by_name/etc/e820 -> ../../by_key/35
++ qemu_fw_cfg/by_name/etc/acpi/rsdp -> ../../../by_key/41
++ ...
++
++ Construction of the directory tree and symlinks is done on a
++ "best-effort" basis, as there is no guarantee that components
++ of fw_cfg blob names are always "well behaved". I.e., there is
++ the possibility that a symlink (basename) will conflict with
++ a dirname component of another fw_cfg blob, in which case the
++ creation of the offending /sys/firmware/qemu_fw_cfg/by_name
++ entry will be skipped.
++
++ The authoritative list of entries will continue to be found
++ under the /sys/firmware/qemu_fw_cfg/by_key directory.
+diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
+index 83e8a5c8f887..19f6851be87f 100644
+--- a/drivers/firmware/qemu_fw_cfg.c
++++ b/drivers/firmware/qemu_fw_cfg.c
+@@ -334,9 +334,103 @@ static struct bin_attribute fw_cfg_sysfs_attr_raw = {
+ .read = fw_cfg_sysfs_read_raw,
+ };
+
+-/* kobjects representing top-level and by_key folders */
++/*
++ * Create a kset subdirectory matching each '/' delimited dirname token
++ * in 'name', starting with sysfs kset/folder 'dir'; At the end, create
++ * a symlink directed at the given 'target'.
++ * NOTE: We do this on a best-effort basis, since 'name' is not guaranteed
++ * to be a well-behaved path name. Whenever a symlink vs. kset directory
++ * name collision occurs, the kernel will issue big scary warnings while
++ * refusing to add the offending link or directory. We follow up with our
++ * own, slightly less scary error messages explaining the situation :)
++ */
++static int fw_cfg_build_symlink(struct kset *dir,
++ struct kobject *target, const char *name)
++{
++ int ret;
++ struct kset *subdir;
++ struct kobject *ko;
++ char *name_copy, *p, *tok;
++
++ if (!dir || !target || !name || !*name)
++ return -EINVAL;
++
++ /* clone a copy of name for parsing */
++ name_copy = p = kstrdup(name, GFP_KERNEL);
++ if (!name_copy)
++ return -ENOMEM;
++
++ /* create folders for each dirname token, then symlink for basename */
++ while ((tok = strsep(&p, "/")) && *tok) {
++
++ /* last (basename) token? If so, add symlink here */
++ if (!p || !*p) {
++ ret = sysfs_create_link(&dir->kobj, target, tok);
++ break;
++ }
++
++ /* does the current dir contain an item named after tok ? */
++ ko = kset_find_obj(dir, tok);
++ if (ko) {
++ /* drop reference added by kset_find_obj */
++ kobject_put(ko);
++
++ /* ko MUST be a kset - we're about to use it as one ! */
++ if (ko->ktype != dir->kobj.ktype) {
++ ret = -EINVAL;
++ break;
++ }
++
++ /* descend into already existing subdirectory */
++ dir = to_kset(ko);
++ } else {
++ /* create new subdirectory kset */
++ subdir = kzalloc(sizeof(struct kset), GFP_KERNEL);
++ if (!subdir) {
++ ret = -ENOMEM;
++ break;
++ }
++ subdir->kobj.kset = dir;
++ subdir->kobj.ktype = dir->kobj.ktype;
++ ret = kobject_set_name(&subdir->kobj, "%s", tok);
++ if (ret) {
++ kfree(subdir);
++ break;
++ }
++ ret = kset_register(subdir);
++ if (ret) {
++ kfree(subdir);
++ break;
++ }
++
++ /* descend into newly created subdirectory */
++ dir = subdir;
++ }
++ }
++
++ /* we're done with cloned copy of name */
++ kfree(name_copy);
++ return ret;
++}
++
++/* recursively unregister fw_cfg/by_name/ kset directory tree */
++static void fw_cfg_kset_unregister_recursive(struct kset *kset)
++{
++ struct kobject *k, *next;
++
++ list_for_each_entry_safe(k, next, &kset->list, entry)
++ /* all set members are ksets too, but check just in case... */
++ if (k->ktype == kset->kobj.ktype)
++ fw_cfg_kset_unregister_recursive(to_kset(k));
++
++ /* symlinks are cleanly and automatically removed with the directory */
++ kset_unregister(kset);
++}
++
++/* kobjects & kset representing top-level, by_key, and by_name folders */
+ static struct kobject *fw_cfg_top_ko;
+ static struct kobject *fw_cfg_sel_ko;
++static struct kset *fw_cfg_fname_kset;
+
+ /* register an individual fw_cfg file */
+ static int fw_cfg_register_file(const struct fw_cfg_file *f)
+@@ -363,6 +457,9 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f)
+ if (err)
+ goto err_add_raw;
+
++ /* try adding "/sys/firmware/qemu_fw_cfg/by_name/" symlink */
++ fw_cfg_build_symlink(fw_cfg_fname_kset, &entry->kobj, entry->f.name);
++
+ /* success, add entry to global cache */
+ fw_cfg_sysfs_cache_enlist(entry);
+ return 0;
+@@ -417,18 +514,21 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev)
+
+ /* NOTE: If we supported multiple fw_cfg devices, we'd first create
+ * a subdirectory named after e.g. pdev->id, then hang per-device
+- * by_key subdirectories underneath it. However, only
++ * by_key (and by_name) subdirectories underneath it. However, only
+ * one fw_cfg device exist system-wide, so if one was already found
+ * earlier, we might as well stop here.
+ */
+ if (fw_cfg_sel_ko)
+ return -EBUSY;
+
+- /* create by_key subdirectory of /sys/firmware/qemu_fw_cfg/ */
++ /* create by_key and by_name subdirs of /sys/firmware/qemu_fw_cfg/ */
+ err = -ENOMEM;
+ fw_cfg_sel_ko = kobject_create_and_add("by_key", fw_cfg_top_ko);
+ if (!fw_cfg_sel_ko)
+ goto err_sel;
++ fw_cfg_fname_kset = kset_create_and_add("by_name", NULL, fw_cfg_top_ko);
++ if (!fw_cfg_fname_kset)
++ goto err_name;
+
+ /* initialize fw_cfg device i/o from platform data */
+ err = fw_cfg_do_platform_probe(pdev);
+@@ -457,6 +557,8 @@ static int fw_cfg_sysfs_probe(struct platform_device *pdev)
+ err_rev:
+ fw_cfg_io_cleanup();
+ err_probe:
++ fw_cfg_kset_unregister_recursive(fw_cfg_fname_kset);
++err_name:
+ fw_cfg_kobj_cleanup(fw_cfg_sel_ko);
+ err_sel:
+ return err;
+@@ -466,6 +568,7 @@ static int fw_cfg_sysfs_remove(struct platform_device *pdev)
+ {
+ pr_debug("fw_cfg: unloading.\n");
+ fw_cfg_sysfs_cache_cleanup();
++ fw_cfg_kset_unregister_recursive(fw_cfg_fname_kset);
+ fw_cfg_kobj_cleanup(fw_cfg_sel_ko);
+ fw_cfg_io_cleanup();
+ return 0;commit 75f3e8e47f381074801d0034874d20c638d9e3d9
+Author: Gabriel Somlo <somlo@cmu.edu>
+Date: Thu Jan 28 09:23:11 2016 -0500
+
+ firmware: introduce sysfs driver for QEMU's fw_cfg device
+
+ Make fw_cfg entries of type "file" available via sysfs. Entries
+ are listed under /sys/firmware/qemu_fw_cfg/by_key, in folders
+ named after each entry's selector key. Filename, selector value,
+ and size read-only attributes are included for each entry. Also,
+ a "raw" attribute allows retrieval of the full binary content of
+ each entry.
+
+ The fw_cfg device can be instantiated automatically from ACPI or
+ the Device Tree, or manually by using a kernel module (or command
+ line) parameter, with a syntax outlined in the documentation file.
+
+ Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg b/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+new file mode 100644
+index 000000000000..e9e58d4ea60a
+--- /dev/null
++++ b/Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+@@ -0,0 +1,58 @@
++What: /sys/firmware/qemu_fw_cfg/
++Date: August 2015
++Contact: Gabriel Somlo <somlo@cmu.edu>
++Description:
++ Several different architectures supported by QEMU (x86, arm,
++ sun4*, ppc/mac) are provisioned with a firmware configuration
++ (fw_cfg) device, originally intended as a way for the host to
++ provide configuration data to the guest firmware. Starting
++ with QEMU v2.4, arbitrary fw_cfg file entries may be specified
++ by the user on the command line, which makes fw_cfg additionally
++ useful as an out-of-band, asynchronous mechanism for providing
++ configuration data to the guest userspace.
++
++ The authoritative guest-side hardware interface documentation
++ to the fw_cfg device can be found in "docs/specs/fw_cfg.txt"
++ in the QEMU source tree.
++
++ === SysFS fw_cfg Interface ===
++
++ The fw_cfg sysfs interface described in this document is only
++ intended to display discoverable blobs (i.e., those registered
++ with the file directory), as there is no way to determine the
++ presence or size of "legacy" blobs (with selector keys between
++ 0x0002 and 0x0018) programmatically.
++
++ All fw_cfg information is shown under:
++
++ /sys/firmware/qemu_fw_cfg/
++
++ The only legacy blob displayed is the fw_cfg device revision:
++
++ /sys/firmware/qemu_fw_cfg/rev
++
++ --- Discoverable fw_cfg blobs by selector key ---
++
++ All discoverable blobs listed in the fw_cfg file directory are
++ displayed as entries named after their unique selector key
++ value, e.g.:
++
++ /sys/firmware/qemu_fw_cfg/by_key/32
++ /sys/firmware/qemu_fw_cfg/by_key/33
++ /sys/firmware/qemu_fw_cfg/by_key/34
++ ...
++
++ Each such fw_cfg sysfs entry has the following values exported
++ as attributes:
++
++ name : The 56-byte nul-terminated ASCII string used as the
++ blob's 'file name' in the fw_cfg directory.
++ size : The length of the blob, as given in the fw_cfg
++ directory.
++ key : The value of the blob's selector key as given in the
++ fw_cfg directory. This value is the same as used in
++ the parent directory name.
++ raw : The raw bytes of the blob, obtained by selecting the
++ entry via the control register, and reading a number
++ of bytes equal to the blob size from the data
++ register.
+diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
+index 49a3a1185bb6..5130f74ae3bd 100644
+--- a/drivers/firmware/Kconfig
++++ b/drivers/firmware/Kconfig
+@@ -161,6 +161,25 @@ config RASPBERRYPI_FIRMWARE
+ This option enables support for communicating with the firmware on the
+ Raspberry Pi.
+
++config FW_CFG_SYSFS
++ tristate "QEMU fw_cfg device support in sysfs"
++ depends on SYSFS && (ARM || ARM64 || PPC_PMAC || SPARC || X86)
++ default n
++ help
++ Say Y or M here to enable the exporting of the QEMU firmware
++ configuration (fw_cfg) file entries via sysfs. Entries are
++ found under /sys/firmware/fw_cfg when this option is enabled
++ and loaded.
++
++config FW_CFG_SYSFS_CMDLINE
++ bool "QEMU fw_cfg device parameter parsing"
++ depends on FW_CFG_SYSFS
++ help
++ Allow the qemu_fw_cfg device to be initialized via the kernel
++ command line or using a module parameter.
++ WARNING: Using incorrect parameters (base address in particular)
++ may crash your system.
++
+ config QCOM_SCM
+ bool
+ depends on ARM || ARM64
+diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
+index 48dd4175297e..474bada56fcd 100644
+--- a/drivers/firmware/Makefile
++++ b/drivers/firmware/Makefile
+@@ -14,6 +14,7 @@ obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o
+ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
+ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
+ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
++obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o
+ obj-$(CONFIG_QCOM_SCM) += qcom_scm.o
+ obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o
+ obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o
+diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
+new file mode 100644
+index 000000000000..83e8a5c8f887
+--- /dev/null
++++ b/drivers/firmware/qemu_fw_cfg.c
+@@ -0,0 +1,648 @@
++/*
++ * drivers/firmware/qemu_fw_cfg.c
++ *
++ * Copyright 2015 Carnegie Mellon University
++ *
++ * Expose entries from QEMU's firmware configuration (fw_cfg) device in
++ * sysfs (read-only, under "/sys/firmware/qemu_fw_cfg/...").
++ *
++ * The fw_cfg device may be instantiated via either an ACPI node (on x86
++ * and select subsets of aarch64), a Device Tree node (on arm), or using
++ * a kernel module (or command line) parameter with the following syntax:
++ *
++ * [fw_cfg.]ioport=<size>@<base>[:<ctrl_off>:<data_off>]
++ * or
++ * [fw_cfg.]mmio=<size>@<base>[:<ctrl_off>:<data_off>]
++ *
++ * where:
++ * <size> := size of ioport or mmio range
++ * <base> := physical base address of ioport or mmio range
++ * <ctrl_off> := (optional) offset of control register
++ * <data_off> := (optional) offset of data register
++ *
++ * e.g.:
++ * fw_cfg.ioport=2@0x510:0:1 (the default on x86)
++ * or
++ * fw_cfg.mmio=0xA@0x9020000:8:0 (the default on arm)
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/acpi.h>
++#include <linux/slab.h>
++#include <linux/io.h>
++#include <linux/ioport.h>
++
++MODULE_AUTHOR("Gabriel L. Somlo <somlo@cmu.edu>");
++MODULE_DESCRIPTION("QEMU fw_cfg sysfs support");
++MODULE_LICENSE("GPL");
++
++/* selector key values for "well-known" fw_cfg entries */
++#define FW_CFG_SIGNATURE 0x00
++#define FW_CFG_ID 0x01
++#define FW_CFG_FILE_DIR 0x19
++
++/* size in bytes of fw_cfg signature */
++#define FW_CFG_SIG_SIZE 4
++
++/* fw_cfg "file name" is up to 56 characters (including terminating nul) */
++#define FW_CFG_MAX_FILE_PATH 56
++
++/* fw_cfg file directory entry type */
++struct fw_cfg_file {
++ u32 size;
++ u16 select;
++ u16 reserved;
++ char name[FW_CFG_MAX_FILE_PATH];
++};
++
++/* fw_cfg device i/o register addresses */
++static bool fw_cfg_is_mmio;
++static phys_addr_t fw_cfg_p_base;
++static resource_size_t fw_cfg_p_size;
++static void __iomem *fw_cfg_dev_base;
++static void __iomem *fw_cfg_reg_ctrl;
++static void __iomem *fw_cfg_reg_data;
++
++/* atomic access to fw_cfg device (potentially slow i/o, so using mutex) */
++static DEFINE_MUTEX(fw_cfg_dev_lock);
++
++/* pick appropriate endianness for selector key */
++static inline u16 fw_cfg_sel_endianness(u16 key)
++{
++ return fw_cfg_is_mmio ? cpu_to_be16(key) : cpu_to_le16(key);
++}
++
++/* read chunk of given fw_cfg blob (caller responsible for sanity-check) */
++static inline void fw_cfg_read_blob(u16 key,
++ void *buf, loff_t pos, size_t count)
++{
++ mutex_lock(&fw_cfg_dev_lock);
++ iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl);
++ while (pos-- > 0)
++ ioread8(fw_cfg_reg_data);
++ ioread8_rep(fw_cfg_reg_data, buf, count);
++ mutex_unlock(&fw_cfg_dev_lock);
++}
++
++/* clean up fw_cfg device i/o */
++static void fw_cfg_io_cleanup(void)
++{
++ if (fw_cfg_is_mmio) {
++ iounmap(fw_cfg_dev_base);
++ release_mem_region(fw_cfg_p_base, fw_cfg_p_size);
++ } else {
++ ioport_unmap(fw_cfg_dev_base);
++ release_region(fw_cfg_p_base, fw_cfg_p_size);
++ }
++}
++
++/* arch-specific ctrl & data register offsets are not available in ACPI, DT */
++#if !(defined(FW_CFG_CTRL_OFF) && defined(FW_CTRL_DATA_OFF))
++# if (defined(CONFIG_ARM) || defined(CONFIG_ARM64))
++# define FW_CFG_CTRL_OFF 0x08
++# define FW_CFG_DATA_OFF 0x00
++# elif (defined(CONFIG_PPC_PMAC) || defined(CONFIG_SPARC32)) /* ppc/mac,sun4m */
++# define FW_CFG_CTRL_OFF 0x00
++# define FW_CFG_DATA_OFF 0x02
++# elif (defined(CONFIG_X86) || defined(CONFIG_SPARC64)) /* x86, sun4u */
++# define FW_CFG_CTRL_OFF 0x00
++# define FW_CFG_DATA_OFF 0x01
++# else
++# warning "QEMU FW_CFG may not be available on this architecture!"
++# define FW_CFG_CTRL_OFF 0x00
++# define FW_CFG_DATA_OFF 0x01
++# endif
++#endif
++
++/* initialize fw_cfg device i/o from platform data */
++static int fw_cfg_do_platform_probe(struct platform_device *pdev)
++{
++ char sig[FW_CFG_SIG_SIZE];
++ struct resource *range, *ctrl, *data;
++
++ /* acquire i/o range details */
++ fw_cfg_is_mmio = false;
++ range = platform_get_resource(pdev, IORESOURCE_IO, 0);
++ if (!range) {
++ fw_cfg_is_mmio = true;
++ range = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (!range)
++ return -EINVAL;
++ }
++ fw_cfg_p_base = range->start;
++ fw_cfg_p_size = resource_size(range);
++
++ if (fw_cfg_is_mmio) {
++ if (!request_mem_region(fw_cfg_p_base,
++ fw_cfg_p_size, "fw_cfg_mem"))
++ return -EBUSY;
++ fw_cfg_dev_base = ioremap(fw_cfg_p_base, fw_cfg_p_size);
++ if (!fw_cfg_dev_base) {
++ release_mem_region(fw_cfg_p_base, fw_cfg_p_size);
++ return -EFAULT;
++ }
++ } else {
++ if (!request_region(fw_cfg_p_base,
++ fw_cfg_p_size, "fw_cfg_io"))
++ return -EBUSY;
++ fw_cfg_dev_base = ioport_map(fw_cfg_p_base, fw_cfg_p_size);
++ if (!fw_cfg_dev_base) {
++ release_region(fw_cfg_p_base, fw_cfg_p_size);
++ return -EFAULT;
++ }
++ }
++
++ /* were custom register offsets provided (e.g. on the command line)? */
++ ctrl = platform_get_resource_byname(pdev, IORESOURCE_REG, "ctrl");
++ data = platform_get_resource_byname(pdev, IORESOURCE_REG, "data");
++ if (ctrl && data) {
++ fw_cfg_reg_ctrl = fw_cfg_dev_base + ctrl->start;
++ fw_cfg_reg_data = fw_cfg_dev_base + data->start;
++ } else {
++ /* use architecture-specific offsets */
++ fw_cfg_reg_ctrl = fw_cfg_dev_base + FW_CFG_CTRL_OFF;
++ fw_cfg_reg_data = fw_cfg_dev_base + FW_CFG_DATA_OFF;
++ }
++
++ /* verify fw_cfg device signature */
++ fw_cfg_read_blob(FW_CFG_SIGNATURE, sig, 0, FW_CFG_SIG_SIZE);
++ if (memcmp(sig, "QEMU", FW_CFG_SIG_SIZE) != 0) {
++ fw_cfg_io_cleanup();
++ return -ENODEV;
++ }
++
++ return 0;
++}
++
++/* fw_cfg revision attribute, in /sys/firmware/qemu_fw_cfg top-level dir. */
++static u32 fw_cfg_rev;
++
++static ssize_t fw_cfg_showrev(struct kobject *k, struct attribute *a, char *buf)
++{
++ return sprintf(buf, "%u\n", fw_cfg_rev);
++}
++
++static const struct {
++ struct attribute attr;
++ ssize_t (*show)(struct kobject *k, struct attribute *a, char *buf);
++} fw_cfg_rev_attr = {
++ .attr = { .name = "rev", .mode = S_IRUSR },
++ .show = fw_cfg_showrev,
++};
++
++/* fw_cfg_sysfs_entry type */
++struct fw_cfg_sysfs_entry {
++ struct kobject kobj;
++ struct fw_cfg_file f;
++ struct list_head list;
++};
++
++/* get fw_cfg_sysfs_entry from kobject member */
++static inline struct fw_cfg_sysfs_entry *to_entry(struct kobject *kobj)
++{
++ return container_of(kobj, struct fw_cfg_sysfs_entry, kobj);
++}
++
++/* fw_cfg_sysfs_attribute type */
++struct fw_cfg_sysfs_attribute {
++ struct attribute attr;
++ ssize_t (*show)(struct fw_cfg_sysfs_entry *entry, char *buf);
++};
++
++/* get fw_cfg_sysfs_attribute from attribute member */
++static inline struct fw_cfg_sysfs_attribute *to_attr(struct attribute *attr)
++{
++ return container_of(attr, struct fw_cfg_sysfs_attribute, attr);
++}
++
++/* global cache of fw_cfg_sysfs_entry objects */
++static LIST_HEAD(fw_cfg_entry_cache);
++
++/* kobjects removed lazily by kernel, mutual exclusion needed */
++static DEFINE_SPINLOCK(fw_cfg_cache_lock);
++
++static inline void fw_cfg_sysfs_cache_enlist(struct fw_cfg_sysfs_entry *entry)
++{
++ spin_lock(&fw_cfg_cache_lock);
++ list_add_tail(&entry->list, &fw_cfg_entry_cache);
++ spin_unlock(&fw_cfg_cache_lock);
++}
++
++static inline void fw_cfg_sysfs_cache_delist(struct fw_cfg_sysfs_entry *entry)
++{
++ spin_lock(&fw_cfg_cache_lock);
++ list_del(&entry->list);
++ spin_unlock(&fw_cfg_cache_lock);
++}
++
++static void fw_cfg_sysfs_cache_cleanup(void)
++{
++ struct fw_cfg_sysfs_entry *entry, *next;
++
++ list_for_each_entry_safe(entry, next, &fw_cfg_entry_cache, list) {
++ /* will end up invoking fw_cfg_sysfs_cache_delist()
++ * via each object's release() method (i.e. destructor)
++ */
++ kobject_put(&entry->kobj);
++ }
++}
++
++/* default_attrs: per-entry attributes and show methods */
++
++#define FW_CFG_SYSFS_ATTR(_attr) \
++struct fw_cfg_sysfs_attribute fw_cfg_sysfs_attr_##_attr = { \
++ .attr = { .name = __stringify(_attr), .mode = S_IRUSR }, \
++ .show = fw_cfg_sysfs_show_##_attr, \
++}
++
++static ssize_t fw_cfg_sysfs_show_size(struct fw_cfg_sysfs_entry *e, char *buf)
++{
++ return sprintf(buf, "%u\n", e->f.size);
++}
++
++static ssize_t fw_cfg_sysfs_show_key(struct fw_cfg_sysfs_entry *e, char *buf)
++{
++ return sprintf(buf, "%u\n", e->f.select);
++}
++
++static ssize_t fw_cfg_sysfs_show_name(struct fw_cfg_sysfs_entry *e, char *buf)
++{
++ return sprintf(buf, "%s\n", e->f.name);
++}
++
++static FW_CFG_SYSFS_ATTR(size);
++static FW_CFG_SYSFS_ATTR(key);
++static FW_CFG_SYSFS_ATTR(name);
++
++static struct attribute *fw_cfg_sysfs_entry_attrs[] = {
++ &fw_cfg_sysfs_attr_size.attr,
++ &fw_cfg_sysfs_attr_key.attr,
++ &fw_cfg_sysfs_attr_name.attr,
++ NULL,
++};
++
++/* sysfs_ops: find fw_cfg_[entry, attribute] and call appropriate show method */
++static ssize_t fw_cfg_sysfs_attr_show(struct kobject *kobj, struct attribute *a,
++ char *buf)
++{
++ struct fw_cfg_sysfs_entry *entry = to_entry(kobj);
++ struct fw_cfg_sysfs_attribute *attr = to_attr(a);
++
++ return attr->show(entry, buf);
++}
++
++static const struct sysfs_ops fw_cfg_sysfs_attr_ops = {
++ .show = fw_cfg_sysfs_attr_show,
++};
++
++/* release: destructor, to be called via kobject_put() */
++static void fw_cfg_sysfs_release_entry(struct kobject *kobj)
++{
++ struct fw_cfg_sysfs_entry *entry = to_entry(kobj);
++
++ fw_cfg_sysfs_cache_delist(entry);
++ kfree(entry);
++}
++
++/* kobj_type: ties together all properties required to register an entry */
++static struct kobj_type fw_cfg_sysfs_entry_ktype = {
++ .default_attrs = fw_cfg_sysfs_entry_attrs,
++ .sysfs_ops = &fw_cfg_sysfs_attr_ops,
++ .release = fw_cfg_sysfs_release_entry,
++};
++
++/* raw-read method and attribute */
++static ssize_t fw_cfg_sysfs_read_raw(struct file *filp, struct kobject *kobj,
++ struct bin_attribute *bin_attr,
++ char *buf, loff_t pos, size_t count)
++{
++ struct fw_cfg_sysfs_entry *entry = to_entry(kobj);
++
++ if (pos > entry->f.size)
++ return -EINVAL;
++
++ if (count > entry->f.size - pos)
++ count = entry->f.size - pos;
++
++ fw_cfg_read_blob(entry->f.select, buf, pos, count);
++ return count;
++}
++
++static struct bin_attribute fw_cfg_sysfs_attr_raw = {
++ .attr = { .name = "raw", .mode = S_IRUSR },
++ .read = fw_cfg_sysfs_read_raw,
++};
++
++/* kobjects representing top-level and by_key folders */
++static struct kobject *fw_cfg_top_ko;
++static struct kobject *fw_cfg_sel_ko;
++
++/* register an individual fw_cfg file */
++static int fw_cfg_register_file(const struct fw_cfg_file *f)
++{
++ int err;
++ struct fw_cfg_sysfs_entry *entry;
++
++ /* allocate new entry */
++ entry = kzalloc(sizeof(*entry), GFP_KERNEL);
++ if (!entry)
++ return -ENOMEM;
++
++ /* set file entry information */
++ memcpy(&entry->f, f, sizeof(struct fw_cfg_file));
++
++ /* register entry under "/sys/firmware/qemu_fw_cfg/by_key/" */
++ err = kobject_init_and_add(&entry->kobj, &fw_cfg_sysfs_entry_ktype,
++ fw_cfg_sel_ko, "%d", entry->f.select);
++ if (err)
++ goto err_register;
++
++ /* add raw binary content access */
++ err = sysfs_create_bin_file(&entry->kobj, &fw_cfg_sysfs_attr_raw);
++ if (err)
++ goto err_add_raw;
++
++ /* success, add entry to global cache */
++ fw_cfg_sysfs_cache_enlist(entry);
++ return 0;
++
++err_add_raw:
++ kobject_del(&entry->kobj);
++err_register:
++ kfree(entry);
++ return err;
++}
++
++/* iterate over all fw_cfg directory entries, registering each one */
++static int fw_cfg_register_dir_entries(void)
++{
++ int ret = 0;
++ u32 count, i;
++ struct fw_cfg_file *dir;
++ size_t dir_size;
++
++ fw_cfg_read_blob(FW_CFG_FILE_DIR, &count, 0, sizeof(count));
++ count = be32_to_cpu(count);
++ dir_size = count * sizeof(struct fw_cfg_file);
++
++ dir = kmalloc(dir_size, GFP_KERNEL);
++ if (!dir)
++ return -ENOMEM;
++
++ fw_cfg_read_blob(FW_CFG_FILE_DIR, dir, sizeof(count), dir_size);
++
++ for (i = 0; i < count; i++) {
++ dir[i].size = be32_to_cpu(dir[i].size);
++ dir[i].select = be16_to_cpu(dir[i].select);
++ ret = fw_cfg_register_file(&dir[i]);
++ if (ret)
++ break;
++ }
++
++ kfree(dir);
++ return ret;
++}
++
++/* unregister top-level or by_key folder */
++static inline void fw_cfg_kobj_cleanup(struct kobject *kobj)
++{
++ kobject_del(kobj);
++ kobject_put(kobj);
++}
++
++static int fw_cfg_sysfs_probe(struct platform_device *pdev)
++{
++ int err;
++
++ /* NOTE: If we supported multiple fw_cfg devices, we'd first create
++ * a subdirectory named after e.g. pdev->id, then hang per-device
++ * by_key subdirectories underneath it. However, only
++ * one fw_cfg device exist system-wide, so if one was already found
++ * earlier, we might as well stop here.
++ */
++ if (fw_cfg_sel_ko)
++ return -EBUSY;
++
++ /* create by_key subdirectory of /sys/firmware/qemu_fw_cfg/ */
++ err = -ENOMEM;
++ fw_cfg_sel_ko = kobject_create_and_add("by_key", fw_cfg_top_ko);
++ if (!fw_cfg_sel_ko)
++ goto err_sel;
++
++ /* initialize fw_cfg device i/o from platform data */
++ err = fw_cfg_do_platform_probe(pdev);
++ if (err)
++ goto err_probe;
++
++ /* get revision number, add matching top-level attribute */
++ fw_cfg_read_blob(FW_CFG_ID, &fw_cfg_rev, 0, sizeof(fw_cfg_rev));
++ fw_cfg_rev = le32_to_cpu(fw_cfg_rev);
++ err = sysfs_create_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr);
++ if (err)
++ goto err_rev;
++
++ /* process fw_cfg file directory entry, registering each file */
++ err = fw_cfg_register_dir_entries();
++ if (err)
++ goto err_dir;
++
++ /* success */
++ pr_debug("fw_cfg: loaded.\n");
++ return 0;
++
++err_dir:
++ fw_cfg_sysfs_cache_cleanup();
++ sysfs_remove_file(fw_cfg_top_ko, &fw_cfg_rev_attr.attr);
++err_rev:
++ fw_cfg_io_cleanup();
++err_probe:
++ fw_cfg_kobj_cleanup(fw_cfg_sel_ko);
++err_sel:
++ return err;
++}
++
++static int fw_cfg_sysfs_remove(struct platform_device *pdev)
++{
++ pr_debug("fw_cfg: unloading.\n");
++ fw_cfg_sysfs_cache_cleanup();
++ fw_cfg_kobj_cleanup(fw_cfg_sel_ko);
++ fw_cfg_io_cleanup();
++ return 0;
++}
++
++static const struct of_device_id fw_cfg_sysfs_mmio_match[] = {
++ { .compatible = "qemu,fw-cfg-mmio", },
++ {},
++};
++MODULE_DEVICE_TABLE(of, fw_cfg_sysfs_mmio_match);
++
++#ifdef CONFIG_ACPI
++static const struct acpi_device_id fw_cfg_sysfs_acpi_match[] = {
++ { "QEMU0002", },
++ {},
++};
++MODULE_DEVICE_TABLE(acpi, fw_cfg_sysfs_acpi_match);
++#endif
++
++static struct platform_driver fw_cfg_sysfs_driver = {
++ .probe = fw_cfg_sysfs_probe,
++ .remove = fw_cfg_sysfs_remove,
++ .driver = {
++ .name = "fw_cfg",
++ .of_match_table = fw_cfg_sysfs_mmio_match,
++ .acpi_match_table = ACPI_PTR(fw_cfg_sysfs_acpi_match),
++ },
++};
++
++#ifdef CONFIG_FW_CFG_SYSFS_CMDLINE
++
++static struct platform_device *fw_cfg_cmdline_dev;
++
++/* this probably belongs in e.g. include/linux/types.h,
++ * but right now we are the only ones doing it...
++ */
++#ifdef CONFIG_PHYS_ADDR_T_64BIT
++#define __PHYS_ADDR_PREFIX "ll"
++#else
++#define __PHYS_ADDR_PREFIX ""
++#endif
++
++/* use special scanf/printf modifier for phys_addr_t, resource_size_t */
++#define PH_ADDR_SCAN_FMT "@%" __PHYS_ADDR_PREFIX "i%n" \
++ ":%" __PHYS_ADDR_PREFIX "i" \
++ ":%" __PHYS_ADDR_PREFIX "i%n"
++
++#define PH_ADDR_PR_1_FMT "0x%" __PHYS_ADDR_PREFIX "x@" \
++ "0x%" __PHYS_ADDR_PREFIX "x"
++
++#define PH_ADDR_PR_3_FMT PH_ADDR_PR_1_FMT \
++ ":%" __PHYS_ADDR_PREFIX "u" \
++ ":%" __PHYS_ADDR_PREFIX "u"
++
++static int fw_cfg_cmdline_set(const char *arg, const struct kernel_param *kp)
++{
++ struct resource res[3] = {};
++ char *str;
++ phys_addr_t base;
++ resource_size_t size, ctrl_off, data_off;
++ int processed, consumed = 0;
++
++ /* only one fw_cfg device can exist system-wide, so if one
++ * was processed on the command line already, we might as
++ * well stop here.
++ */
++ if (fw_cfg_cmdline_dev) {
++ /* avoid leaking previously registered device */
++ platform_device_unregister(fw_cfg_cmdline_dev);
++ return -EINVAL;
++ }
++
++ /* consume "<size>" portion of command line argument */
++ size = memparse(arg, &str);
++
++ /* get "@<base>[:<ctrl_off>:<data_off>]" chunks */
++ processed = sscanf(str, PH_ADDR_SCAN_FMT,
++ &base, &consumed,
++ &ctrl_off, &data_off, &consumed);
++
++ /* sscanf() must process precisely 1 or 3 chunks:
++ * <base> is mandatory, optionally followed by <ctrl_off>
++ * and <data_off>;
++ * there must be no extra characters after the last chunk,
++ * so str[consumed] must be '\0'.
++ */
++ if (str[consumed] ||
++ (processed != 1 && processed != 3))
++ return -EINVAL;
++
++ res[0].start = base;
++ res[0].end = base + size - 1;
++ res[0].flags = !strcmp(kp->name, "mmio") ? IORESOURCE_MEM :
++ IORESOURCE_IO;
++
++ /* insert register offsets, if provided */
++ if (processed > 1) {
++ res[1].name = "ctrl";
++ res[1].start = ctrl_off;
++ res[1].flags = IORESOURCE_REG;
++ res[2].name = "data";
++ res[2].start = data_off;
++ res[2].flags = IORESOURCE_REG;
++ }
++
++ /* "processed" happens to nicely match the number of resources
++ * we need to pass in to this platform device.
++ */
++ fw_cfg_cmdline_dev = platform_device_register_simple("fw_cfg",
++ PLATFORM_DEVID_NONE, res, processed);
++ if (IS_ERR(fw_cfg_cmdline_dev))
++ return PTR_ERR(fw_cfg_cmdline_dev);
++
++ return 0;
++}
++
++static int fw_cfg_cmdline_get(char *buf, const struct kernel_param *kp)
++{
++ /* stay silent if device was not configured via the command
++ * line, or if the parameter name (ioport/mmio) doesn't match
++ * the device setting
++ */
++ if (!fw_cfg_cmdline_dev ||
++ (!strcmp(kp->name, "mmio") ^
++ (fw_cfg_cmdline_dev->resource[0].flags == IORESOURCE_MEM)))
++ return 0;
++
++ switch (fw_cfg_cmdline_dev->num_resources) {
++ case 1:
++ return snprintf(buf, PAGE_SIZE, PH_ADDR_PR_1_FMT,
++ resource_size(&fw_cfg_cmdline_dev->resource[0]),
++ fw_cfg_cmdline_dev->resource[0].start);
++ case 3:
++ return snprintf(buf, PAGE_SIZE, PH_ADDR_PR_3_FMT,
++ resource_size(&fw_cfg_cmdline_dev->resource[0]),
++ fw_cfg_cmdline_dev->resource[0].start,
++ fw_cfg_cmdline_dev->resource[1].start,
++ fw_cfg_cmdline_dev->resource[2].start);
++ }
++
++ /* Should never get here */
++ WARN(1, "Unexpected number of resources: %d\n",
++ fw_cfg_cmdline_dev->num_resources);
++ return 0;
++}
++
++static const struct kernel_param_ops fw_cfg_cmdline_param_ops = {
++ .set = fw_cfg_cmdline_set,
++ .get = fw_cfg_cmdline_get,
++};
++
++device_param_cb(ioport, &fw_cfg_cmdline_param_ops, NULL, S_IRUSR);
++device_param_cb(mmio, &fw_cfg_cmdline_param_ops, NULL, S_IRUSR);
++
++#endif /* CONFIG_FW_CFG_SYSFS_CMDLINE */
++
++static int __init fw_cfg_sysfs_init(void)
++{
++ /* create /sys/firmware/qemu_fw_cfg/ top level directory */
++ fw_cfg_top_ko = kobject_create_and_add("qemu_fw_cfg", firmware_kobj);
++ if (!fw_cfg_top_ko)
++ return -ENOMEM;
++
++ return platform_driver_register(&fw_cfg_sysfs_driver);
++}
++
++static void __exit fw_cfg_sysfs_exit(void)
++{
++ platform_driver_unregister(&fw_cfg_sysfs_driver);
++
++#ifdef CONFIG_FW_CFG_SYSFS_CMDLINE
++ platform_device_unregister(fw_cfg_cmdline_dev);
++#endif
++
++ /* clean up /sys/firmware/qemu_fw_cfg/ */
++ fw_cfg_kobj_cleanup(fw_cfg_top_ko);
++}
++
++module_init(fw_cfg_sysfs_init);
++module_exit(fw_cfg_sysfs_exit);commit 2fe829aca9d7bed5fd6b49c6a1452e5e486b6cc3
+Author: Gabriel Somlo <somlo@cmu.edu>
+Date: Thu Jan 28 09:23:12 2016 -0500
+
+ kobject: export kset_find_obj() for module use
+
+ Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/lib/kobject.c b/lib/kobject.c
+index 7cbccd2b4c72..445dcaeb0f56 100644
+--- a/lib/kobject.c
++++ b/lib/kobject.c
+@@ -861,6 +861,7 @@ struct kobject *kset_find_obj(struct kset *kset, const char *name)
+ spin_unlock(&kset->list_lock);
+ return ret;
+ }
++EXPORT_SYMBOL_GPL(kset_find_obj);
+
+ static void kset_release(struct kobject *kobj)
+ {commit fa40ae34441286b2cb595468ef781e24573e9e7d
+Author: Gabriel Somlo <somlo@cmu.edu>
+Date: Mon Aug 10 15:51:43 2015 -0400
+
+ kobject: move EXPORT_SYMBOL() macros next to corresponding definitions
+
+ Move EXPORT_SYMBOL() macros in kobject.c from the end of the file
+ next to the function definitions to which they belong.
+
+ Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/lib/kobject.c b/lib/kobject.c
+index 3e3a5c3cb330..055407746266 100644
+--- a/lib/kobject.c
++++ b/lib/kobject.c
+@@ -568,6 +568,7 @@ void kobject_del(struct kobject *kobj)
+ kobject_put(kobj->parent);
+ kobj->parent = NULL;
+ }
++EXPORT_SYMBOL(kobject_del);
+
+ /**
+ * kobject_get - increment refcount for object.
+@@ -584,6 +585,7 @@ struct kobject *kobject_get(struct kobject *kobj)
+ }
+ return kobj;
+ }
++EXPORT_SYMBOL(kobject_get);
+
+ static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj)
+ {
+@@ -675,6 +677,7 @@ void kobject_put(struct kobject *kobj)
+ kref_put(&kobj->kref, kobject_release);
+ }
+ }
++EXPORT_SYMBOL(kobject_put);
+
+ static void dynamic_kobj_release(struct kobject *kobj)
+ {
+@@ -803,6 +806,7 @@ int kset_register(struct kset *k)
+ kobject_uevent(&k->kobj, KOBJ_ADD);
+ return 0;
+ }
++EXPORT_SYMBOL(kset_register);
+
+ /**
+ * kset_unregister - remove a kset.
+@@ -815,6 +819,7 @@ void kset_unregister(struct kset *k)
+ kobject_del(&k->kobj);
+ kobject_put(&k->kobj);
+ }
++EXPORT_SYMBOL(kset_unregister);
+
+ /**
+ * kset_find_obj - search for object in kset.
+@@ -1051,10 +1056,3 @@ void kobj_ns_drop(enum kobj_ns_type type, void *ns)
+ kobj_ns_ops_tbl[type]->drop_ns(ns);
+ spin_unlock(&kobj_ns_type_lock);
+ }
+-
+-EXPORT_SYMBOL(kobject_get);
+-EXPORT_SYMBOL(kobject_put);
+-EXPORT_SYMBOL(kobject_del);
+-
+-EXPORT_SYMBOL(kset_register);
+-EXPORT_SYMBOL(kset_unregister);commit 9c15364f83201802e995cbf72d833e5e1b3b9adb +Author: Eric Cooper <ecc@cmu.edu> +Date: Wed Feb 2 17:16:11 2011 -0500 + + [ARM] Kirkwood: enable PCIe for kexec + + Use the machine-specific kexec_reinit hook to make sure + PCIe is enabled before starting a new kernel. + + Signed-off-by: Eric Cooper <ecc@cmu.edu> + Signed-off-by: Nicolas Pitre <nico@fluxnic.net> + +diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c +index 3688123b5ad8..966df630b76f 100644 +--- a/arch/arm/mach-kirkwood/common.c ++++ b/arch/arm/mach-kirkwood/common.c +@@ -21,6 +21,7 @@ + #include <net/dsa.h> + #include <asm/page.h> + #include <asm/timex.h> ++#include <asm/kexec.h> + #include <asm/mach/map.h> + #include <asm/mach/time.h> + #include <mach/kirkwood.h> +@@ -1003,6 +1004,10 @@ void __init kirkwood_init(void) + kirkwood_xor0_init(); + kirkwood_xor1_init(); + kirkwood_crypto_init(); ++ ++#ifdef CONFIG_KEXEC ++ kexec_reinit = kirkwood_enable_pcie; ++#endif + } + + static int __init kirkwood_clock_gate(void)+
commit 0e0cdd37709ba7ac9f0bff5de1b22f1b7987b04c
+Author: Eric Cooper <ecc@cmu.edu>
+Date: Wed Feb 2 17:16:10 2011 -0500
+
+ [ARM] Kirkwood: enable PCIe before reading device ID register
+
+ PCIe may have been disabled (by kirkwood_clock_gate)
+ if this kernel was started by kexec. Make sure PCIe
+ is enabled before attempting to access the device ID
+ register, otherwise the system will hang.
+
+ Signed-off-by: Eric Cooper <ecc@cmu.edu>
+ Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
+
+diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
+index 95bb0a73adfb..a35b86235772 100644
+--- a/arch/arm/mach-kirkwood/common.h
++++ b/arch/arm/mach-kirkwood/common.h
+@@ -32,6 +32,7 @@ void kirkwood_init_irq(void);
+ extern struct mbus_dram_target_info kirkwood_mbus_dram_info;
+ void kirkwood_setup_cpu_mbus(void);
+
++void kirkwood_enable_pcie(void);
+ void kirkwood_pcie_id(u32 *dev, u32 *rev);
+
+ void kirkwood_ehci_init(void);
+diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
+index 513ad3102d7c..ca294ff6d5be 100644
+--- a/arch/arm/mach-kirkwood/pcie.c
++++ b/arch/arm/mach-kirkwood/pcie.c
+@@ -18,8 +18,16 @@
+ #include <mach/bridge-regs.h>
+ #include "common.h"
+
++void kirkwood_enable_pcie(void)
++{
++ u32 curr = readl(CLOCK_GATING_CTRL);
++ if (!(curr & CGC_PEX0))
++ writel(curr | CGC_PEX0, CLOCK_GATING_CTRL);
++}
++
+ void __init kirkwood_pcie_id(u32 *dev, u32 *rev)
+ {
++ kirkwood_enable_pcie();
+ *dev = orion_pcie_dev_id((void __iomem *)PCIE_VIRT_BASE);
+ *rev = orion_pcie_rev((void __iomem *)PCIE_VIRT_BASE);
+ }commit 868d172b8ac23070418ec6265195e88e8d5dbe92
+Author: Eric Cooper <ecc@cmu.edu>
+Date: Wed Feb 2 17:16:09 2011 -0500
+
+ [ARM] add machine-specific hook to machine_kexec
+
+ Provide the option to call a machine-specific function
+ before kexec'ing a new kernel.
+
+ Signed-off-by: Eric Cooper <ecc@cmu.edu>
+ Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
+
+diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h
+index c0094d8edae4..c2b9b4bdec00 100644
+--- a/arch/arm/include/asm/kexec.h
++++ b/arch/arm/include/asm/kexec.h
+@@ -50,6 +50,9 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
+ }
+ }
+
++/* Function pointer to optional machine-specific reinitialization */
++extern void (*kexec_reinit)(void);
++
+ #endif /* __ASSEMBLY__ */
+
+ #endif /* CONFIG_KEXEC */
+diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
+index 30ead135ff5f..e59bbd496c39 100644
+--- a/arch/arm/kernel/machine_kexec.c
++++ b/arch/arm/kernel/machine_kexec.c
+@@ -75,6 +75,11 @@ void machine_crash_shutdown(struct pt_regs *regs)
+ printk(KERN_INFO "Loading crashdump kernel...\n");
+ }
+
++/*
++ * Function pointer to optional machine-specific reinitialization
++ */
++void (*kexec_reinit)(void);
++
+ void machine_kexec(struct kimage *image)
+ {
+ unsigned long page_list;
+@@ -104,6 +109,8 @@ void machine_kexec(struct kimage *image)
+ (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);
+ printk(KERN_INFO "Bye!\n");
+
++ if (kexec_reinit)
++ kexec_reinit();
+ local_irq_disable();
+ local_fiq_disable();
+ setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/commit 709406494c0ed7da843bad624f6b16f9a2df4a6c
+Author: Eric Cooper <ecc@cmu.edu>
+Date: Wed Sep 15 10:49:41 2010 -0400
+
+ [ARM] Kirkwood: support for Seagate DockStar
+
+ This patch adds support for the Seagate FreeAgent DockStar,
+ a Marvell SheevaPlug variant.
+
+ Signed-off-by: Eric Cooper <ecc@cmu.edu>
+ Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
+
+diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
+index ccc9c9959b82..2f7042813765 100644
+--- a/arch/arm/configs/kirkwood_defconfig
++++ b/arch/arm/configs/kirkwood_defconfig
+@@ -15,6 +15,7 @@ CONFIG_MACH_MV88F6281GTW_GE=y
+ CONFIG_MACH_SHEEVAPLUG=y
+ CONFIG_MACH_ESATA_SHEEVAPLUG=y
+ CONFIG_MACH_GURUPLUG=y
++CONFIG_MACH_DOCKSTAR=y
+ CONFIG_MACH_TS219=y
+ CONFIG_MACH_TS41X=y
+ CONFIG_MACH_OPENRD_BASE=y
+diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
+index cc25501b57fa..3d5d66e7aaa0 100644
+--- a/arch/arm/mach-kirkwood/Kconfig
++++ b/arch/arm/mach-kirkwood/Kconfig
+@@ -58,6 +58,12 @@ config MACH_TS41X
+ QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS
+ devices.
+
++config MACH_DOCKSTAR
++ bool "Seagate FreeAgent DockStar"
++ help
++ Say 'Y' here if you want your kernel to support the
++ Seagate FreeAgent DockStar.
++
+ config MACH_OPENRD
+ bool
+
+diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
+index 295d7baa6ae1..9e43e953226e 100644
+--- a/arch/arm/mach-kirkwood/Makefile
++++ b/arch/arm/mach-kirkwood/Makefile
+@@ -7,6 +7,7 @@ obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
+ obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
+ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
+ obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
++obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
+ obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
+ obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
+ obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
+diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
+new file mode 100644
+index 000000000000..a90475d5059c
+--- /dev/null
++++ b/arch/arm/mach-kirkwood/dockstar-setup.c
+@@ -0,0 +1,112 @@
++/*
++ * arch/arm/mach-kirkwood/dockstar-setup.c
++ *
++ * Seagate FreeAgent DockStar Setup
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License version 2. This program is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/ata_platform.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mv643xx_eth.h>
++#include <linux/gpio.h>
++#include <linux/leds.h>
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <mach/kirkwood.h>
++#include <plat/mvsdio.h>
++#include "common.h"
++#include "mpp.h"
++
++static struct mtd_partition dockstar_nand_parts[] = {
++ {
++ .name = "u-boot",
++ .offset = 0,
++ .size = SZ_1M
++ }, {
++ .name = "uImage",
++ .offset = MTDPART_OFS_NXTBLK,
++ .size = SZ_4M
++ }, {
++ .name = "root",
++ .offset = MTDPART_OFS_NXTBLK,
++ .size = MTDPART_SIZ_FULL
++ },
++};
++
++static struct mv643xx_eth_platform_data dockstar_ge00_data = {
++ .phy_addr = MV643XX_ETH_PHY_ADDR(0),
++};
++
++static struct gpio_led dockstar_led_pins[] = {
++ {
++ .name = "dockstar:green:health",
++ .default_trigger = "default-on",
++ .gpio = 46,
++ .active_low = 1,
++ },
++ {
++ .name = "dockstar:orange:misc",
++ .default_trigger = "none",
++ .gpio = 47,
++ .active_low = 1,
++ },
++};
++
++static struct gpio_led_platform_data dockstar_led_data = {
++ .leds = dockstar_led_pins,
++ .num_leds = ARRAY_SIZE(dockstar_led_pins),
++};
++
++static struct platform_device dockstar_leds = {
++ .name = "leds-gpio",
++ .id = -1,
++ .dev = {
++ .platform_data = &dockstar_led_data,
++ }
++};
++
++static unsigned int dockstar_mpp_config[] __initdata = {
++ MPP29_GPIO, /* USB Power Enable */
++ MPP46_GPIO, /* LED green */
++ MPP47_GPIO, /* LED orange */
++ 0
++};
++
++static void __init dockstar_init(void)
++{
++ /*
++ * Basic setup. Needs to be called early.
++ */
++ kirkwood_init();
++
++ /* setup gpio pin select */
++ kirkwood_mpp_conf(dockstar_mpp_config);
++
++ kirkwood_uart0_init();
++ kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25);
++
++ if (gpio_request(29, "USB Power Enable") != 0 ||
++ gpio_direction_output(29, 1) != 0)
++ printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n");
++ kirkwood_ehci_init();
++
++ kirkwood_ge00_init(&dockstar_ge00_data);
++
++ platform_device_register(&dockstar_leds);
++}
++
++MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")
++ .phys_io = KIRKWOOD_REGS_PHYS_BASE,
++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
++ .boot_params = 0x00000100,
++ .init_machine = dockstar_init,
++ .map_io = kirkwood_map_io,
++ .init_irq = kirkwood_init_irq,
++ .timer = &kirkwood_timer,
++MACHINE_ENDcommit 096486eece7ef38cf1ee46b704482c75c4010fb1
+Author: Nik A. Melchior <melchior+kernel@cmu.edu>
+Date: Mon Jun 21 12:47:05 2010 +0800
+
+ ACPI video: fix string mismatch for Sony SR290 laptop
+
+ Fix string mismatch for Sony SR290 laptop.
+ https://bugzilla.kernel.org/show_bug.cgi?id=12904#c45
+
+ Signed-off-by: Nik A. Melchior <melchior+kernel@cmu.edu>
+ Signed-off-by: Len Brown <len.brown@intel.com>
+
+diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
+index 01381be05e96..2bb28b9d91c4 100644
+--- a/drivers/acpi/blacklist.c
++++ b/drivers/acpi/blacklist.c
+@@ -214,7 +214,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
+ .ident = "Sony VGN-SR290J",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+- DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR290J"),
+ },
+ },
+ {commit e59f87966adef2cb03d419530e3ade5159487d6d
+Author: Eric Cooper <ecc@cmu.edu>
+Date: Thu Mar 13 12:55:46 2008 +0100
+
+ eeepc-laptop: add base driver
+
+ This patch is based on Eric Cooper's work to clean the original asus_acpi
+ given by Asus. It's a platform driver (/sys/devices/platform/eeepc/)
+ wich support:
+ - hotkeys - wlan on/off - camera on/off - cardr on/off
+
+ Signed-off-by: Corentin Chary <corentincj@iksaif.net>
+ Signed-off-by: Len Brown <len.brown@intel.com>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index c1dd1ae7b133..37debda36661 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1531,6 +1531,13 @@ L: bluesmoke-devel@lists.sourceforge.net
+ W: bluesmoke.sourceforge.net
+ S: Maintained
+
++EEEPC LAPTOP EXTRAS DRIVER
++P: Corentin Chary
++M: corentincj@iksaif.net
++L: acpi4asus-user@lists.sourceforge.net
++W: http://sourceforge.net/projects/acpi4asus
++S: Maintained
++
+ EEPRO100 NETWORK DRIVER
+ P: Andrey V. Savochkin
+ M: saw@saw.sw.com.sg
+diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+index 297a48f85446..2264127afac7 100644
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -351,6 +351,17 @@ config INTEL_MENLOW
+
+ If unsure, say N.
+
++config EEEPC_LAPTOP
++ tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
++ depends on X86
++ depends on ACPI
++ depends on EXPERIMENTAL
++ ---help---
++ This driver supports the Fn-Fx keys on Eee PC laptops.
++ It also adds the ability to switch camera/wlan on/off.
++
++ If you have an Eee PC laptop, say Y or M here.
++
+ config ENCLOSURE_SERVICES
+ tristate "Enclosure Services"
+ default n
+diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
+index 5914da434854..1952875a272e 100644
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -7,7 +7,8 @@ obj-$(CONFIG_IBM_ASM) += ibmasm/
+ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
+ obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
+ obj-$(CONFIG_ACER_WMI) += acer-wmi.o
+-obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
++obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
++obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
+ obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o
+ obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
+ obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
+diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
+new file mode 100644
+index 000000000000..e34ff97530cd
+--- /dev/null
++++ b/drivers/misc/eeepc-laptop.c
+@@ -0,0 +1,442 @@
++/*
++ * eepc-laptop.c - Asus Eee PC extras
++ *
++ * Based on asus_acpi.c as patched for the Eee PC by Asus:
++ * ftp://ftp.asus.com/pub/ASUS/EeePC/701/ASUS_ACPI_071126.rar
++ * Based on eee.c from eeepc-linux
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/platform_device.h>
++#include <acpi/acpi_drivers.h>
++#include <acpi/acpi_bus.h>
++#include <linux/uaccess.h>
++
++#define EEEPC_LAPTOP_VERSION "0.1"
++
++#define EEEPC_HOTK_NAME "Eee PC Hotkey Driver"
++#define EEEPC_HOTK_FILE "eeepc"
++#define EEEPC_HOTK_CLASS "hotkey"
++#define EEEPC_HOTK_DEVICE_NAME "Hotkey"
++#define EEEPC_HOTK_HID "ASUS010"
++
++#define EEEPC_LOG EEEPC_HOTK_FILE ": "
++#define EEEPC_ERR KERN_ERR EEEPC_LOG
++#define EEEPC_WARNING KERN_WARNING EEEPC_LOG
++#define EEEPC_NOTICE KERN_NOTICE EEEPC_LOG
++#define EEEPC_INFO KERN_INFO EEEPC_LOG
++
++/*
++ * Definitions for Asus EeePC
++ */
++#define NOTIFY_WLAN_ON 0x10
++
++enum {
++ DISABLE_ASL_WLAN = 0x0001,
++ DISABLE_ASL_BLUETOOTH = 0x0002,
++ DISABLE_ASL_IRDA = 0x0004,
++ DISABLE_ASL_CAMERA = 0x0008,
++ DISABLE_ASL_TV = 0x0010,
++ DISABLE_ASL_GPS = 0x0020,
++ DISABLE_ASL_DISPLAYSWITCH = 0x0040,
++ DISABLE_ASL_MODEM = 0x0080,
++ DISABLE_ASL_CARDREADER = 0x0100
++};
++
++enum {
++ CM_ASL_WLAN = 0,
++ CM_ASL_BLUETOOTH,
++ CM_ASL_IRDA,
++ CM_ASL_1394,
++ CM_ASL_CAMERA,
++ CM_ASL_TV,
++ CM_ASL_GPS,
++ CM_ASL_DVDROM,
++ CM_ASL_DISPLAYSWITCH,
++ CM_ASL_PANELBRIGHT,
++ CM_ASL_BIOSFLASH,
++ CM_ASL_ACPIFLASH,
++ CM_ASL_CPUFV,
++ CM_ASL_CPUTEMPERATURE,
++ CM_ASL_FANCPU,
++ CM_ASL_FANCHASSIS,
++ CM_ASL_USBPORT1,
++ CM_ASL_USBPORT2,
++ CM_ASL_USBPORT3,
++ CM_ASL_MODEM,
++ CM_ASL_CARDREADER,
++ CM_ASL_LID
++};
++
++const char *cm_getv[] = {
++ "WLDG", NULL, NULL, NULL,
++ "CAMG", NULL, NULL, NULL,
++ NULL, "PBLG", NULL, NULL,
++ "CFVG", NULL, NULL, NULL,
++ "USBG", NULL, NULL, "MODG",
++ "CRDG", "LIDG"
++};
++
++const char *cm_setv[] = {
++ "WLDS", NULL, NULL, NULL,
++ "CAMS", NULL, NULL, NULL,
++ "SDSP", "PBLS", "HDPS", NULL,
++ "CFVS", NULL, NULL, NULL,
++ "USBG", NULL, NULL, "MODS",
++ "CRDS", NULL
++};
++
++/*
++ * This is the main structure, we can use it to store useful information
++ * about the hotk device
++ */
++struct eeepc_hotk {
++ struct acpi_device *device; /* the device we are in */
++ acpi_handle handle; /* the handle of the hotk device */
++ u32 cm_supported; /* the control methods supported
++ by this BIOS */
++ uint init_flag; /* Init flags */
++ u16 event_count[128]; /* count for each event */
++};
++
++/* The actual device the driver binds to */
++static struct eeepc_hotk *ehotk;
++
++/* Platform device/driver */
++static struct platform_driver platform_driver = {
++ .driver = {
++ .name = EEEPC_HOTK_FILE,
++ .owner = THIS_MODULE,
++ }
++};
++
++static struct platform_device *platform_device;
++
++/*
++ * The hotkey driver declaration
++ */
++static int eeepc_hotk_add(struct acpi_device *device);
++static int eeepc_hotk_remove(struct acpi_device *device, int type);
++
++static const struct acpi_device_id eeepc_device_ids[] = {
++ {EEEPC_HOTK_HID, 0},
++ {"", 0},
++};
++MODULE_DEVICE_TABLE(acpi, eeepc_device_ids);
++
++static struct acpi_driver eeepc_hotk_driver = {
++ .name = EEEPC_HOTK_NAME,
++ .class = EEEPC_HOTK_CLASS,
++ .ids = eeepc_device_ids,
++ .ops = {
++ .add = eeepc_hotk_add,
++ .remove = eeepc_hotk_remove,
++ },
++};
++
++MODULE_AUTHOR("Corentin Chary, Eric Cooper");
++MODULE_DESCRIPTION(EEEPC_HOTK_NAME);
++MODULE_LICENSE("GPL");
++
++/*
++ * ACPI Helpers
++ */
++static int write_acpi_int(acpi_handle handle, const char *method, int val,
++ struct acpi_buffer *output)
++{
++ struct acpi_object_list params;
++ union acpi_object in_obj;
++ acpi_status status;
++
++ params.count = 1;
++ params.pointer = &in_obj;
++ in_obj.type = ACPI_TYPE_INTEGER;
++ in_obj.integer.value = val;
++
++ status = acpi_evaluate_object(handle, (char *)method, ¶ms, output);
++ return (status == AE_OK ? 0 : -1);
++}
++
++static int read_acpi_int(acpi_handle handle, const char *method, int *val)
++{
++ acpi_status status;
++ ulong result;
++
++ status = acpi_evaluate_integer(handle, (char *)method, NULL, &result);
++ if (ACPI_FAILURE(status)) {
++ *val = -1;
++ return -1;
++ } else {
++ *val = result;
++ return 0;
++ }
++}
++
++static int set_acpi(int cm, int value)
++{
++ if (ehotk->cm_supported & (0x1 << cm)) {
++ const char *method = cm_setv[cm];
++ if (method == NULL)
++ return -ENODEV;
++ if (write_acpi_int(ehotk->handle, method, value, NULL))
++ printk(EEEPC_WARNING "Error writing %s\n", method);
++ }
++ return 0;
++}
++
++static int get_acpi(int cm)
++{
++ int value = -1;
++ if ((ehotk->cm_supported & (0x1 << cm))) {
++ const char *method = cm_getv[cm];
++ if (method == NULL)
++ return -ENODEV;
++ if (read_acpi_int(ehotk->handle, method, &value))
++ printk(EEEPC_WARNING "Error reading %s\n", method);
++ }
++ return value;
++}
++
++/*
++ * Sys helpers
++ */
++static int parse_arg(const char *buf, unsigned long count, int *val)
++{
++ if (!count)
++ return 0;
++ if (sscanf(buf, "%i", val) != 1)
++ return -EINVAL;
++ return count;
++}
++
++static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
++{
++ int rv, value;
++
++ rv = parse_arg(buf, count, &value);
++ if (rv > 0)
++ set_acpi(cm, value);
++ return rv;
++}
++
++static ssize_t show_sys_acpi(int cm, char *buf)
++{
++ return sprintf(buf, "%d\n", get_acpi(cm));
++}
++
++#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \
++ static ssize_t show_##_name(struct device *dev, \
++ struct device_attribute *attr, \
++ char *buf) \
++ { \
++ return show_sys_acpi(_cm, buf); \
++ } \
++ static ssize_t store_##_name(struct device *dev, \
++ struct device_attribute *attr, \
++ const char *buf, size_t count) \
++ { \
++ return store_sys_acpi(_cm, buf, count); \
++ } \
++ static struct device_attribute dev_attr_##_name = { \
++ .attr = { \
++ .name = __stringify(_name), \
++ .mode = 0644 }, \
++ .show = show_##_name, \
++ .store = store_##_name, \
++ }
++
++EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA);
++EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER);
++EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH);
++EEEPC_CREATE_DEVICE_ATTR(wlan, CM_ASL_WLAN);
++
++static struct attribute *platform_attributes[] = {
++ &dev_attr_camera.attr,
++ &dev_attr_cardr.attr,
++ &dev_attr_disp.attr,
++ &dev_attr_wlan.attr,
++ NULL
++};
++
++static struct attribute_group platform_attribute_group = {
++ .attrs = platform_attributes
++};
++
++/*
++ * Hotkey functions
++ */
++static int eeepc_hotk_check(void)
++{
++ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
++ int result;
++
++ result = acpi_bus_get_status(ehotk->device);
++ if (result)
++ return result;
++ if (ehotk->device->status.present) {
++ if (write_acpi_int(ehotk->handle, "INIT", ehotk->init_flag,
++ &buffer)) {
++ printk(EEEPC_ERR "Hotkey initialization failed\n");
++ return -ENODEV;
++ } else {
++ printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
++ ehotk->init_flag);
++ }
++ /* get control methods supported */
++ if (read_acpi_int(ehotk->handle, "CMSG"
++ , &ehotk->cm_supported)) {
++ printk(EEEPC_ERR
++ "Get control methods supported failed\n");
++ return -ENODEV;
++ } else {
++ printk(EEEPC_INFO
++ "Get control methods supported: 0x%x\n",
++ ehotk->cm_supported);
++ }
++ } else {
++ printk(EEEPC_ERR "Hotkey device not present, aborting\n");
++ return -EINVAL;
++ }
++ return 0;
++}
++
++static void notify_wlan(u32 *event)
++{
++ /* if DISABLE_ASL_WLAN is set, the notify code for fn+f2
++ will always be 0x10 */
++ if (ehotk->cm_supported & (0x1 << CM_ASL_WLAN)) {
++ const char *method = cm_getv[CM_ASL_WLAN];
++ int value;
++ if (read_acpi_int(ehotk->handle, method, &value))
++ printk(EEEPC_WARNING "Error reading %s\n",
++ method);
++ else if (value == 1)
++ *event = 0x11;
++ }
++}
++
++static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
++{
++ if (!ehotk)
++ return;
++ if (event == NOTIFY_WLAN_ON && (DISABLE_ASL_WLAN & ehotk->init_flag))
++ notify_wlan(&event);
++ acpi_bus_generate_proc_event(ehotk->device, event,
++ ehotk->event_count[event % 128]++);
++}
++
++static int eeepc_hotk_add(struct acpi_device *device)
++{
++ acpi_status status = AE_OK;
++ int result;
++
++ if (!device)
++ return -EINVAL;
++ printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
++ ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
++ if (!ehotk)
++ return -ENOMEM;
++ ehotk->init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH;
++ ehotk->handle = device->handle;
++ strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
++ strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
++ acpi_driver_data(device) = ehotk;
++ ehotk->device = device;
++ result = eeepc_hotk_check();
++ if (result)
++ goto end;
++ status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
++ eeepc_hotk_notify, ehotk);
++ if (ACPI_FAILURE(status))
++ printk(EEEPC_ERR "Error installing notify handler\n");
++ end:
++ if (result) {
++ kfree(ehotk);
++ ehotk = NULL;
++ }
++ return result;
++}
++
++static int eeepc_hotk_remove(struct acpi_device *device, int type)
++{
++ acpi_status status = 0;
++
++ if (!device || !acpi_driver_data(device))
++ return -EINVAL;
++ status = acpi_remove_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
++ eeepc_hotk_notify);
++ if (ACPI_FAILURE(status))
++ printk(EEEPC_ERR "Error removing notify handler\n");
++ kfree(ehotk);
++ return 0;
++}
++
++/*
++ * exit/init
++ */
++static void __exit eeepc_laptop_exit(void)
++{
++ acpi_bus_unregister_driver(&eeepc_hotk_driver);
++ sysfs_remove_group(&platform_device->dev.kobj,
++ &platform_attribute_group);
++ platform_device_unregister(platform_device);
++ platform_driver_unregister(&platform_driver);
++}
++
++static int __init eeepc_laptop_init(void)
++{
++ struct device *dev;
++ int result;
++
++ if (acpi_disabled)
++ return -ENODEV;
++ result = acpi_bus_register_driver(&eeepc_hotk_driver);
++ if (result < 0)
++ return result;
++ if (!ehotk) {
++ acpi_bus_unregister_driver(&eeepc_hotk_driver);
++ return -ENODEV;
++ }
++ dev = acpi_get_physical_device(ehotk->device->handle);
++ /* Register platform stuff */
++ result = platform_driver_register(&platform_driver);
++ if (result)
++ goto fail_platform_driver;
++ platform_device = platform_device_alloc(EEEPC_HOTK_FILE, -1);
++ if (!platform_device) {
++ result = -ENOMEM;
++ goto fail_platform_device1;
++ }
++ result = platform_device_add(platform_device);
++ if (result)
++ goto fail_platform_device2;
++ result = sysfs_create_group(&platform_device->dev.kobj,
++ &platform_attribute_group);
++ if (result)
++ goto fail_sysfs;
++ return 0;
++fail_sysfs:
++ platform_device_del(platform_device);
++fail_platform_device2:
++ platform_device_put(platform_device);
++fail_platform_device1:
++ platform_driver_unregister(&platform_driver);
++fail_platform_driver:
++ return result;
++}
++
++module_init(eeepc_laptop_init);
++module_exit(eeepc_laptop_exit);commit bbc60c18ed17df75270da504bbd8f7bc4a52d43d
+Author: Michael Abd-El-Malek <mabdelmalek@cmu.edu>
+Date: Fri Apr 4 02:33:48 2008 -0700
+
+ xen: fix grant table bug
+
+ fix memory corruption and crash due to mis-sized grant table.
+
+ A PV OS has two grant table data structures: the grant table itself
+ and a free list. The free list is composed of an array of pages,
+ which grow dynamically as the guest OS requires more grants. While
+ the grant table contains 8-byte entries, the free list contains 4-byte
+ entries. So we have half as many pages in the free list than in the
+ grant table.
+
+ There was a bug in the free list allocation code. The free list was
+ indexed as if it was the same size as the grant table. But it's only
+ half as large. So memory got corrupted, and I was seeing crashes in
+ the slab allocator later on.
+
+ Taken from:
+
+ http://xenbits.xensource.com/linux-2.6.18-xen.hg?rev/4018c0da3360
+
+ Signed-off-by: Michael Abd-El-Malek <mabdelmalek@cmu.edu>
+ Signed-off-by: Mark McLoughlin <markmc@redhat.com>
+ Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
+ Signed-off-by: Ingo Molnar <mingo@elte.hu>
+
+diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
+index ea94dbabf9a9..d85dc6d41c2a 100644
+--- a/drivers/xen/grant-table.c
++++ b/drivers/xen/grant-table.c
+@@ -381,11 +381,15 @@ EXPORT_SYMBOL_GPL(gnttab_cancel_free_callback);
+ static int grow_gnttab_list(unsigned int more_frames)
+ {
+ unsigned int new_nr_grant_frames, extra_entries, i;
++ unsigned int nr_glist_frames, new_nr_glist_frames;
+
+ new_nr_grant_frames = nr_grant_frames + more_frames;
+ extra_entries = more_frames * GREFS_PER_GRANT_FRAME;
+
+- for (i = nr_grant_frames; i < new_nr_grant_frames; i++) {
++ nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++ new_nr_glist_frames =
++ (new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++ for (i = nr_glist_frames; i < new_nr_glist_frames; i++) {
+ gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC);
+ if (!gnttab_list[i])
+ goto grow_nomem;
+@@ -407,7 +411,7 @@ static int grow_gnttab_list(unsigned int more_frames)
+ return 0;
+
+ grow_nomem:
+- for ( ; i >= nr_grant_frames; i--)
++ for ( ; i >= nr_glist_frames; i--)
+ free_page((unsigned long) gnttab_list[i]);
+ return -ENOMEM;
+ }
+@@ -530,7 +534,7 @@ static int gnttab_expand(unsigned int req_entries)
+ static int __devinit gnttab_init(void)
+ {
+ int i;
+- unsigned int max_nr_glist_frames;
++ unsigned int max_nr_glist_frames, nr_glist_frames;
+ unsigned int nr_init_grefs;
+
+ if (!is_running_on_xen())
+@@ -543,15 +547,15 @@ static int __devinit gnttab_init(void)
+ * grant reference free list on the current hypervisor.
+ */
+ max_nr_glist_frames = (boot_max_nr_grant_frames *
+- GREFS_PER_GRANT_FRAME /
+- (PAGE_SIZE / sizeof(grant_ref_t)));
++ GREFS_PER_GRANT_FRAME / RPP);
+
+ gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *),
+ GFP_KERNEL);
+ if (gnttab_list == NULL)
+ return -ENOMEM;
+
+- for (i = 0; i < nr_grant_frames; i++) {
++ nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
++ for (i = 0; i < nr_glist_frames; i++) {
+ gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL);
+ if (gnttab_list[i] == NULL)
+ goto ini_nomem;commit 439d9eadf648a9d62ab74c64b0e7432b3a15ec3b +Author: Spencer Baugh <sbaugh@andrew.cmu.edu> +Date: Sat Dec 20 15:48:13 2014 -0500 + + lustre: ptlrpc: add "ptlrpc_internal.h" to sec_gc.c + + ptlrpc_internal.h contains the prototypes for sptlrpc_gc_init() and + sptlrpc_gc_fini(), which are defined in sec_gc.c. + + This removes the following sparse warnings: + + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c:217:5: warning: symbol 'sptlrpc_gc_init' was not declared. Should it be static? + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c:241:6: warning: symbol 'sptlrpc_gc_fini' was not declared. Should it be static? + + Signed-off-by: Spencer Baugh <sbaugh@andrew.cmu.edu> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +index c500aff66193..81de68edb04e 100644 +--- a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c ++++ b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +@@ -47,6 +47,8 @@ + #include "../include/lustre_net.h" + #include "../include/lustre_sec.h" + ++#include "ptlrpc_internal.h" ++ + #define SEC_GC_INTERVAL (30 * 60) + +
commit 727543d639efe4abb4be8ce56a1065c32dbac918
+Author: Spencer Baugh <sbaugh@andrew.cmu.edu>
+Date: Sun Sep 14 11:21:11 2014 -0400
+
+ staging: lustre: fix pointer whitespace style
+
+ Fix errors reported by checkpatch of this kind:
+ ERROR: "foo * bar" should be "foo *bar"
+
+ Signed-off-by: Spencer Baugh <sbaugh@andrew.cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
+index 7bf82e03ed63..51f3e98f94e2 100644
+--- a/drivers/staging/lustre/lustre/include/lustre_import.h
++++ b/drivers/staging/lustre/lustre/include/lustre_import.h
+@@ -103,9 +103,9 @@ enum lustre_imp_state {
+ };
+
+ /** Returns test string representation of numeric import state \a state */
+-static inline char * ptlrpc_import_state_name(enum lustre_imp_state state)
++static inline char *ptlrpc_import_state_name(enum lustre_imp_state state)
+ {
+- static char* import_state_names[] = {
++ static char *import_state_names[] = {
+ "<UNKNOWN>", "CLOSED", "NEW", "DISCONN",
+ "CONNECTING", "REPLAY", "REPLAY_LOCKS", "REPLAY_WAIT",
+ "RECOVER", "FULL", "EVICTED",commit db7b4b391e2f301d6d18ded41628ce458cbd4129
+Author: Spencer Baugh <sbaugh@andrew.cmu.edu>
+Date: Sun Sep 14 11:21:10 2014 -0400
+
+ staging: lustre: fix function definition style
+
+ Fix errors reported by checkpatch of this kind:
+ ERROR: open brace '{' following function declarations go on the next line
+
+ Signed-off-by: Spencer Baugh <sbaugh@andrew.cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
+index 8304a55b92f9..7bf82e03ed63 100644
+--- a/drivers/staging/lustre/lustre/include/lustre_import.h
++++ b/drivers/staging/lustre/lustre/include/lustre_import.h
+@@ -346,21 +346,24 @@ static inline unsigned int at_timeout2est(unsigned int val)
+ return (max((val << 2) / 5, 5U) - 4);
+ }
+
+-static inline void at_reset(struct adaptive_timeout *at, int val) {
++static inline void at_reset(struct adaptive_timeout *at, int val)
++{
+ spin_lock(&at->at_lock);
+ at->at_current = val;
+ at->at_worst_ever = val;
+ at->at_worst_time = get_seconds();
+ spin_unlock(&at->at_lock);
+ }
+-static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
++static inline void at_init(struct adaptive_timeout *at, int val, int flags)
++{
+ memset(at, 0, sizeof(*at));
+ spin_lock_init(&at->at_lock);
+ at->at_flags = flags;
+ at_reset(at, val);
+ }
+ extern unsigned int at_min;
+-static inline int at_get(struct adaptive_timeout *at) {
++static inline int at_get(struct adaptive_timeout *at)
++{
+ return (at->at_current > at_min) ? at->at_current : at_min;
+ }
+ int at_measured(struct adaptive_timeout *at, unsigned int val);commit 77ceab8ea590d7dc6c8f055ce43dfebd74428107
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Nov 2 13:38:07 2011 -0700
+
+ cgroups: don't attach task to subsystem if migration failed
+
+ If a task has exited to the point it has called cgroup_exit() already,
+ then we can't migrate it to another cgroup anymore.
+
+ This can happen when we are attaching a task to a new cgroup between the
+ call to ->can_attach_task() on subsystems and the migration that is
+ eventually tried in cgroup_task_migrate().
+
+ In this case cgroup_task_migrate() returns -ESRCH and we don't want to
+ attach the task to the subsystems because the attachment to the new cgroup
+ itself failed.
+
+ Fix this by only calling ->attach_task() on the subsystems if the cgroup
+ migration succeeded.
+
+ Reported-by: Oleg Nesterov <oleg@redhat.com>
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Paul Menage <paul@paulmenage.org>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Tejun Heo <tj@kernel.org>
+ Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 64b0e73402df..8386b21224ef 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -2135,14 +2135,17 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ oldcgrp = task_cgroup_from_root(tsk, root);
+ if (cgrp == oldcgrp)
+ continue;
+- /* attach each task to each subsystem */
+- for_each_subsys(root, ss) {
+- if (ss->attach_task)
+- ss->attach_task(cgrp, tsk);
+- }
+ /* if the thread is PF_EXITING, it can just get skipped. */
+ retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, true);
+- BUG_ON(retval != 0 && retval != -ESRCH);
++ if (retval == 0) {
++ /* attach each task to each subsystem */
++ for_each_subsys(root, ss) {
++ if (ss->attach_task)
++ ss->attach_task(cgrp, tsk);
++ }
++ } else {
++ BUG_ON(retval != -ESRCH);
++ }
+ }
+ /* nothing is sensitive to fork() after this point. */
+
+ commit 33ef6b6984403a688189317ef46bb3caab3b70e0
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Nov 2 13:38:05 2011 -0700
+
+ cgroups: more safe tasklist locking in cgroup_attach_proc
+
+ Fix unstable tasklist locking in cgroup_attach_proc.
+
+ According to this thread - https://lkml.org/lkml/2011/7/27/243 - RCU is
+ not sufficient to guarantee the tasklist is stable w.r.t. de_thread and
+ exit. Taking tasklist_lock for reading, instead of rcu_read_lock, ensures
+ proper exclusion.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Paul Menage <paul@paulmenage.org>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Cc: Frederic Weisbecker <fweisbec@gmail.com>
+ Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ Cc: Neil Brown <neilb@suse.de>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 453100a4159d..64b0e73402df 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -2027,7 +2027,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ goto out_free_group_list;
+
+ /* prevent changes to the threadgroup list while we take a snapshot. */
+- rcu_read_lock();
++ read_lock(&tasklist_lock);
+ if (!thread_group_leader(leader)) {
+ /*
+ * a race with de_thread from another thread's exec() may strip
+@@ -2036,7 +2036,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ * throw this task away and try again (from cgroup_procs_write);
+ * this is "double-double-toil-and-trouble-check locking".
+ */
+- rcu_read_unlock();
++ read_unlock(&tasklist_lock);
+ retval = -EAGAIN;
+ goto out_free_group_list;
+ }
+@@ -2057,7 +2057,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ } while_each_thread(leader, tsk);
+ /* remember the number of threads in the array for later. */
+ group_size = i;
+- rcu_read_unlock();
++ read_unlock(&tasklist_lock);
+
+ /*
+ * step 1: check that we can legitimately attach to the cgroup.commit d846687d7f84e45f23ecf3846dbb43312a1206dd
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Thu May 26 16:25:21 2011 -0700
+
+ cgroups: use flex_array in attach_proc
+
+ Convert cgroup_attach_proc to use flex_array.
+
+ The cgroup_attach_proc implementation requires a pre-allocated array to
+ store task pointers to atomically move a thread-group, but asking for a
+ monolithic array with kmalloc() may be unreliable for very large groups.
+ Using flex_array provides the same functionality with less risk of
+ failure.
+
+ This is a post-patch for cgroup-procs-write.patch.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Matt Helsley <matthltc@us.ibm.com>
+ Reviewed-by: Paul Menage <menage@google.com>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Cc: David Rientjes <rientjes@google.com>
+ Cc: Miao Xie <miaox@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 5e6a9745f0e7..00a884342d3d 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -57,6 +57,7 @@
+ #include <linux/vmalloc.h> /* TODO: replace with more sophisticated array */
+ #include <linux/eventfd.h>
+ #include <linux/poll.h>
++#include <linux/flex_array.h> /* used in cgroup_attach_proc */
+
+ #include <asm/atomic.h>
+
+@@ -1995,7 +1996,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ struct cgroupfs_root *root = cgrp->root;
+ /* threadgroup list cursor and array */
+ struct task_struct *tsk;
+- struct task_struct **group;
++ struct flex_array *group;
+ /*
+ * we need to make sure we have css_sets for all the tasks we're
+ * going to move -before- we actually start moving them, so that in
+@@ -2012,9 +2013,15 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ * and if threads exit, this will just be an over-estimate.
+ */
+ group_size = get_nr_threads(leader);
+- group = kmalloc(group_size * sizeof(*group), GFP_KERNEL);
++ /* flex_array supports very large thread-groups better than kmalloc. */
++ group = flex_array_alloc(sizeof(struct task_struct *), group_size,
++ GFP_KERNEL);
+ if (!group)
+ return -ENOMEM;
++ /* pre-allocate to guarantee space while iterating in rcu read-side. */
++ retval = flex_array_prealloc(group, 0, group_size - 1, GFP_KERNEL);
++ if (retval)
++ goto out_free_group_list;
+
+ /* prevent changes to the threadgroup list while we take a snapshot. */
+ rcu_read_lock();
+@@ -2037,7 +2044,12 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ /* as per above, nr_threads may decrease, but not increase. */
+ BUG_ON(i >= group_size);
+ get_task_struct(tsk);
+- group[i] = tsk;
++ /*
++ * saying GFP_ATOMIC has no effect here because we did prealloc
++ * earlier, but it's good form to communicate our expectations.
++ */
++ retval = flex_array_put_ptr(group, i, tsk, GFP_ATOMIC);
++ BUG_ON(retval != 0);
+ i++;
+ } while_each_thread(leader, tsk);
+ /* remember the number of threads in the array for later. */
+@@ -2059,7 +2071,8 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ if (ss->can_attach_task) {
+ /* run on each task in the threadgroup. */
+ for (i = 0; i < group_size; i++) {
+- retval = ss->can_attach_task(cgrp, group[i]);
++ tsk = flex_array_get_ptr(group, i);
++ retval = ss->can_attach_task(cgrp, tsk);
+ if (retval) {
+ failed_ss = ss;
+ cancel_failed_ss = true;
+@@ -2075,7 +2088,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ */
+ INIT_LIST_HEAD(&newcg_list);
+ for (i = 0; i < group_size; i++) {
+- tsk = group[i];
++ tsk = flex_array_get_ptr(group, i);
+ /* nothing to do if this task is already in the cgroup */
+ oldcgrp = task_cgroup_from_root(tsk, root);
+ if (cgrp == oldcgrp)
+@@ -2114,7 +2127,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ ss->pre_attach(cgrp);
+ }
+ for (i = 0; i < group_size; i++) {
+- tsk = group[i];
++ tsk = flex_array_get_ptr(group, i);
+ /* leave current thread as it is if it's already there */
+ oldcgrp = task_cgroup_from_root(tsk, root);
+ if (cgrp == oldcgrp)
+@@ -2167,10 +2180,12 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+ }
+ }
+ /* clean up the array of referenced threads in the group. */
+- for (i = 0; i < group_size; i++)
+- put_task_struct(group[i]);
++ for (i = 0; i < group_size; i++) {
++ tsk = flex_array_get_ptr(group, i);
++ put_task_struct(tsk);
++ }
+ out_free_group_list:
+- kfree(group);
++ flex_array_free(group);
+ return retval;
+ }
+ commit 74a1166dfe1135dcc168d35fa5261aa7e087011b
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Thu May 26 16:25:20 2011 -0700
+
+ cgroups: make procs file writable
+
+ Make procs file writable to move all threads by tgid at once.
+
+ Add functionality that enables users to move all threads in a threadgroup
+ at once to a cgroup by writing the tgid to the 'cgroup.procs' file. This
+ current implementation makes use of a per-threadgroup rwsem that's taken
+ for reading in the fork() path to prevent newly forking threads within the
+ threadgroup from "escaping" while the move is in progress.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Matt Helsley <matthltc@us.ibm.com>
+ Reviewed-by: Paul Menage <menage@google.com>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Cc: David Rientjes <rientjes@google.com>
+ Cc: Miao Xie <miaox@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
+index b3bd3bdbe202..8c4f3466c894 100644
+--- a/Documentation/cgroups/cgroups.txt
++++ b/Documentation/cgroups/cgroups.txt
+@@ -236,7 +236,8 @@ containing the following files describing that cgroup:
+ - cgroup.procs: list of tgids in the cgroup. This list is not
+ guaranteed to be sorted or free of duplicate tgids, and userspace
+ should sort/uniquify the list if this property is required.
+- This is a read-only file, for now.
++ Writing a thread group id into this file moves all threads in that
++ group into this cgroup.
+ - notify_on_release flag: run the release agent on exit?
+ - release_agent: the path to use for release notifications (this file
+ exists in the top cgroup only)
+@@ -430,6 +431,12 @@ You can attach the current shell task by echoing 0:
+
+ # echo 0 > tasks
+
++You can use the cgroup.procs file instead of the tasks file to move all
++threads in a threadgroup at once. Echoing the pid of any task in a
++threadgroup to cgroup.procs causes all tasks in that threadgroup to be
++be attached to the cgroup. Writing 0 to cgroup.procs moves all tasks
++in the writing task's threadgroup.
++
+ Note: Since every task is always a member of exactly one cgroup in each
+ mounted hierarchy, to remove a task from its current cgroup you must
+ move it into a new cgroup (possibly the root cgroup) by writing to the
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 38fb0ad1cb46..5e6a9745f0e7 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -1735,6 +1735,76 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen)
+ }
+ EXPORT_SYMBOL_GPL(cgroup_path);
+
++/*
++ * cgroup_task_migrate - move a task from one cgroup to another.
++ *
++ * 'guarantee' is set if the caller promises that a new css_set for the task
++ * will already exist. If not set, this function might sleep, and can fail with
++ * -ENOMEM. Otherwise, it can only fail with -ESRCH.
++ */
++static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
++ struct task_struct *tsk, bool guarantee)
++{
++ struct css_set *oldcg;
++ struct css_set *newcg;
++
++ /*
++ * get old css_set. we need to take task_lock and refcount it, because
++ * an exiting task can change its css_set to init_css_set and drop its
++ * old one without taking cgroup_mutex.
++ */
++ task_lock(tsk);
++ oldcg = tsk->cgroups;
++ get_css_set(oldcg);
++ task_unlock(tsk);
++
++ /* locate or allocate a new css_set for this task. */
++ if (guarantee) {
++ /* we know the css_set we want already exists. */
++ struct cgroup_subsys_state *template[CGROUP_SUBSYS_COUNT];
++ read_lock(&css_set_lock);
++ newcg = find_existing_css_set(oldcg, cgrp, template);
++ BUG_ON(!newcg);
++ get_css_set(newcg);
++ read_unlock(&css_set_lock);
++ } else {
++ might_sleep();
++ /* find_css_set will give us newcg already referenced. */
++ newcg = find_css_set(oldcg, cgrp);
++ if (!newcg) {
++ put_css_set(oldcg);
++ return -ENOMEM;
++ }
++ }
++ put_css_set(oldcg);
++
++ /* if PF_EXITING is set, the tsk->cgroups pointer is no longer safe. */
++ task_lock(tsk);
++ if (tsk->flags & PF_EXITING) {
++ task_unlock(tsk);
++ put_css_set(newcg);
++ return -ESRCH;
++ }
++ rcu_assign_pointer(tsk->cgroups, newcg);
++ task_unlock(tsk);
++
++ /* Update the css_set linked lists if we're using them */
++ write_lock(&css_set_lock);
++ if (!list_empty(&tsk->cg_list))
++ list_move(&tsk->cg_list, &newcg->tasks);
++ write_unlock(&css_set_lock);
++
++ /*
++ * We just gained a reference on oldcg by taking it from the task. As
++ * trading it for newcg is protected by cgroup_mutex, we're safe to drop
++ * it here; it will be freed under RCU.
++ */
++ put_css_set(oldcg);
++
++ set_bit(CGRP_RELEASABLE, &oldcgrp->flags);
++ return 0;
++}
++
+ /**
+ * cgroup_attach_task - attach task 'tsk' to cgroup 'cgrp'
+ * @cgrp: the cgroup the task is attaching to
+@@ -1745,11 +1815,9 @@ EXPORT_SYMBOL_GPL(cgroup_path);
+ */
+ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ {
+- int retval = 0;
++ int retval;
+ struct cgroup_subsys *ss, *failed_ss = NULL;
+ struct cgroup *oldcgrp;
+- struct css_set *cg;
+- struct css_set *newcg;
+ struct cgroupfs_root *root = cgrp->root;
+
+ /* Nothing to do if the task is already in that cgroup */
+@@ -1780,36 +1848,9 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ }
+ }
+
+- task_lock(tsk);
+- cg = tsk->cgroups;
+- get_css_set(cg);
+- task_unlock(tsk);
+- /*
+- * Locate or allocate a new css_set for this task,
+- * based on its final set of cgroups
+- */
+- newcg = find_css_set(cg, cgrp);
+- put_css_set(cg);
+- if (!newcg) {
+- retval = -ENOMEM;
+- goto out;
+- }
+-
+- task_lock(tsk);
+- if (tsk->flags & PF_EXITING) {
+- task_unlock(tsk);
+- put_css_set(newcg);
+- retval = -ESRCH;
++ retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, false);
++ if (retval)
+ goto out;
+- }
+- rcu_assign_pointer(tsk->cgroups, newcg);
+- task_unlock(tsk);
+-
+- /* Update the css_set linked lists if we're using them */
+- write_lock(&css_set_lock);
+- if (!list_empty(&tsk->cg_list))
+- list_move(&tsk->cg_list, &newcg->tasks);
+- write_unlock(&css_set_lock);
+
+ for_each_subsys(root, ss) {
+ if (ss->pre_attach)
+@@ -1819,9 +1860,8 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ if (ss->attach)
+ ss->attach(ss, cgrp, oldcgrp, tsk);
+ }
+- set_bit(CGRP_RELEASABLE, &oldcgrp->flags);
++
+ synchronize_rcu();
+- put_css_set(cg);
+
+ /*
+ * wake up rmdir() waiter. the rmdir should fail since the cgroup
+@@ -1871,49 +1911,356 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk)
+ EXPORT_SYMBOL_GPL(cgroup_attach_task_all);
+
+ /*
+- * Attach task with pid 'pid' to cgroup 'cgrp'. Call with cgroup_mutex
+- * held. May take task_lock of task
++ * cgroup_attach_proc works in two stages, the first of which prefetches all
++ * new css_sets needed (to make sure we have enough memory before committing
++ * to the move) and stores them in a list of entries of the following type.
++ * TODO: possible optimization: use css_set->rcu_head for chaining instead
++ */
++struct cg_list_entry {
++ struct css_set *cg;
++ struct list_head links;
++};
++
++static bool css_set_check_fetched(struct cgroup *cgrp,
++ struct task_struct *tsk, struct css_set *cg,
++ struct list_head *newcg_list)
++{
++ struct css_set *newcg;
++ struct cg_list_entry *cg_entry;
++ struct cgroup_subsys_state *template[CGROUP_SUBSYS_COUNT];
++
++ read_lock(&css_set_lock);
++ newcg = find_existing_css_set(cg, cgrp, template);
++ if (newcg)
++ get_css_set(newcg);
++ read_unlock(&css_set_lock);
++
++ /* doesn't exist at all? */
++ if (!newcg)
++ return false;
++ /* see if it's already in the list */
++ list_for_each_entry(cg_entry, newcg_list, links) {
++ if (cg_entry->cg == newcg) {
++ put_css_set(newcg);
++ return true;
++ }
++ }
++
++ /* not found */
++ put_css_set(newcg);
++ return false;
++}
++
++/*
++ * Find the new css_set and store it in the list in preparation for moving the
++ * given task to the given cgroup. Returns 0 or -ENOMEM.
++ */
++static int css_set_prefetch(struct cgroup *cgrp, struct css_set *cg,
++ struct list_head *newcg_list)
++{
++ struct css_set *newcg;
++ struct cg_list_entry *cg_entry;
++
++ /* ensure a new css_set will exist for this thread */
++ newcg = find_css_set(cg, cgrp);
++ if (!newcg)
++ return -ENOMEM;
++ /* add it to the list */
++ cg_entry = kmalloc(sizeof(struct cg_list_entry), GFP_KERNEL);
++ if (!cg_entry) {
++ put_css_set(newcg);
++ return -ENOMEM;
++ }
++ cg_entry->cg = newcg;
++ list_add(&cg_entry->links, newcg_list);
++ return 0;
++}
++
++/**
++ * cgroup_attach_proc - attach all threads in a threadgroup to a cgroup
++ * @cgrp: the cgroup to attach to
++ * @leader: the threadgroup leader task_struct of the group to be attached
++ *
++ * Call holding cgroup_mutex and the threadgroup_fork_lock of the leader. Will
++ * take task_lock of each thread in leader's threadgroup individually in turn.
++ */
++int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
++{
++ int retval, i, group_size;
++ struct cgroup_subsys *ss, *failed_ss = NULL;
++ bool cancel_failed_ss = false;
++ /* guaranteed to be initialized later, but the compiler needs this */
++ struct cgroup *oldcgrp = NULL;
++ struct css_set *oldcg;
++ struct cgroupfs_root *root = cgrp->root;
++ /* threadgroup list cursor and array */
++ struct task_struct *tsk;
++ struct task_struct **group;
++ /*
++ * we need to make sure we have css_sets for all the tasks we're
++ * going to move -before- we actually start moving them, so that in
++ * case we get an ENOMEM we can bail out before making any changes.
++ */
++ struct list_head newcg_list;
++ struct cg_list_entry *cg_entry, *temp_nobe;
++
++ /*
++ * step 0: in order to do expensive, possibly blocking operations for
++ * every thread, we cannot iterate the thread group list, since it needs
++ * rcu or tasklist locked. instead, build an array of all threads in the
++ * group - threadgroup_fork_lock prevents new threads from appearing,
++ * and if threads exit, this will just be an over-estimate.
++ */
++ group_size = get_nr_threads(leader);
++ group = kmalloc(group_size * sizeof(*group), GFP_KERNEL);
++ if (!group)
++ return -ENOMEM;
++
++ /* prevent changes to the threadgroup list while we take a snapshot. */
++ rcu_read_lock();
++ if (!thread_group_leader(leader)) {
++ /*
++ * a race with de_thread from another thread's exec() may strip
++ * us of our leadership, making while_each_thread unsafe to use
++ * on this task. if this happens, there is no choice but to
++ * throw this task away and try again (from cgroup_procs_write);
++ * this is "double-double-toil-and-trouble-check locking".
++ */
++ rcu_read_unlock();
++ retval = -EAGAIN;
++ goto out_free_group_list;
++ }
++ /* take a reference on each task in the group to go in the array. */
++ tsk = leader;
++ i = 0;
++ do {
++ /* as per above, nr_threads may decrease, but not increase. */
++ BUG_ON(i >= group_size);
++ get_task_struct(tsk);
++ group[i] = tsk;
++ i++;
++ } while_each_thread(leader, tsk);
++ /* remember the number of threads in the array for later. */
++ group_size = i;
++ rcu_read_unlock();
++
++ /*
++ * step 1: check that we can legitimately attach to the cgroup.
++ */
++ for_each_subsys(root, ss) {
++ if (ss->can_attach) {
++ retval = ss->can_attach(ss, cgrp, leader);
++ if (retval) {
++ failed_ss = ss;
++ goto out_cancel_attach;
++ }
++ }
++ /* a callback to be run on every thread in the threadgroup. */
++ if (ss->can_attach_task) {
++ /* run on each task in the threadgroup. */
++ for (i = 0; i < group_size; i++) {
++ retval = ss->can_attach_task(cgrp, group[i]);
++ if (retval) {
++ failed_ss = ss;
++ cancel_failed_ss = true;
++ goto out_cancel_attach;
++ }
++ }
++ }
++ }
++
++ /*
++ * step 2: make sure css_sets exist for all threads to be migrated.
++ * we use find_css_set, which allocates a new one if necessary.
++ */
++ INIT_LIST_HEAD(&newcg_list);
++ for (i = 0; i < group_size; i++) {
++ tsk = group[i];
++ /* nothing to do if this task is already in the cgroup */
++ oldcgrp = task_cgroup_from_root(tsk, root);
++ if (cgrp == oldcgrp)
++ continue;
++ /* get old css_set pointer */
++ task_lock(tsk);
++ if (tsk->flags & PF_EXITING) {
++ /* ignore this task if it's going away */
++ task_unlock(tsk);
++ continue;
++ }
++ oldcg = tsk->cgroups;
++ get_css_set(oldcg);
++ task_unlock(tsk);
++ /* see if the new one for us is already in the list? */
++ if (css_set_check_fetched(cgrp, tsk, oldcg, &newcg_list)) {
++ /* was already there, nothing to do. */
++ put_css_set(oldcg);
++ } else {
++ /* we don't already have it. get new one. */
++ retval = css_set_prefetch(cgrp, oldcg, &newcg_list);
++ put_css_set(oldcg);
++ if (retval)
++ goto out_list_teardown;
++ }
++ }
++
++ /*
++ * step 3: now that we're guaranteed success wrt the css_sets, proceed
++ * to move all tasks to the new cgroup, calling ss->attach_task for each
++ * one along the way. there are no failure cases after here, so this is
++ * the commit point.
++ */
++ for_each_subsys(root, ss) {
++ if (ss->pre_attach)
++ ss->pre_attach(cgrp);
++ }
++ for (i = 0; i < group_size; i++) {
++ tsk = group[i];
++ /* leave current thread as it is if it's already there */
++ oldcgrp = task_cgroup_from_root(tsk, root);
++ if (cgrp == oldcgrp)
++ continue;
++ /* attach each task to each subsystem */
++ for_each_subsys(root, ss) {
++ if (ss->attach_task)
++ ss->attach_task(cgrp, tsk);
++ }
++ /* if the thread is PF_EXITING, it can just get skipped. */
++ retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, true);
++ BUG_ON(retval != 0 && retval != -ESRCH);
++ }
++ /* nothing is sensitive to fork() after this point. */
++
++ /*
++ * step 4: do expensive, non-thread-specific subsystem callbacks.
++ * TODO: if ever a subsystem needs to know the oldcgrp for each task
++ * being moved, this call will need to be reworked to communicate that.
++ */
++ for_each_subsys(root, ss) {
++ if (ss->attach)
++ ss->attach(ss, cgrp, oldcgrp, leader);
++ }
++
++ /*
++ * step 5: success! and cleanup
++ */
++ synchronize_rcu();
++ cgroup_wakeup_rmdir_waiter(cgrp);
++ retval = 0;
++out_list_teardown:
++ /* clean up the list of prefetched css_sets. */
++ list_for_each_entry_safe(cg_entry, temp_nobe, &newcg_list, links) {
++ list_del(&cg_entry->links);
++ put_css_set(cg_entry->cg);
++ kfree(cg_entry);
++ }
++out_cancel_attach:
++ /* same deal as in cgroup_attach_task */
++ if (retval) {
++ for_each_subsys(root, ss) {
++ if (ss == failed_ss) {
++ if (cancel_failed_ss && ss->cancel_attach)
++ ss->cancel_attach(ss, cgrp, leader);
++ break;
++ }
++ if (ss->cancel_attach)
++ ss->cancel_attach(ss, cgrp, leader);
++ }
++ }
++ /* clean up the array of referenced threads in the group. */
++ for (i = 0; i < group_size; i++)
++ put_task_struct(group[i]);
++out_free_group_list:
++ kfree(group);
++ return retval;
++}
++
++/*
++ * Find the task_struct of the task to attach by vpid and pass it along to the
++ * function to attach either it or all tasks in its threadgroup. Will take
++ * cgroup_mutex; may take task_lock of task.
+ */
+-static int attach_task_by_pid(struct cgroup *cgrp, u64 pid)
++static int attach_task_by_pid(struct cgroup *cgrp, u64 pid, bool threadgroup)
+ {
+ struct task_struct *tsk;
+ const struct cred *cred = current_cred(), *tcred;
+ int ret;
+
++ if (!cgroup_lock_live_group(cgrp))
++ return -ENODEV;
++
+ if (pid) {
+ rcu_read_lock();
+ tsk = find_task_by_vpid(pid);
+- if (!tsk || tsk->flags & PF_EXITING) {
++ if (!tsk) {
+ rcu_read_unlock();
++ cgroup_unlock();
++ return -ESRCH;
++ }
++ if (threadgroup) {
++ /*
++ * RCU protects this access, since tsk was found in the
++ * tid map. a race with de_thread may cause group_leader
++ * to stop being the leader, but cgroup_attach_proc will
++ * detect it later.
++ */
++ tsk = tsk->group_leader;
++ } else if (tsk->flags & PF_EXITING) {
++ /* optimization for the single-task-only case */
++ rcu_read_unlock();
++ cgroup_unlock();
+ return -ESRCH;
+ }
+
++ /*
++ * even if we're attaching all tasks in the thread group, we
++ * only need to check permissions on one of them.
++ */
+ tcred = __task_cred(tsk);
+ if (cred->euid &&
+ cred->euid != tcred->uid &&
+ cred->euid != tcred->suid) {
+ rcu_read_unlock();
++ cgroup_unlock();
+ return -EACCES;
+ }
+ get_task_struct(tsk);
+ rcu_read_unlock();
+ } else {
+- tsk = current;
++ if (threadgroup)
++ tsk = current->group_leader;
++ else
++ tsk = current;
+ get_task_struct(tsk);
+ }
+
+- ret = cgroup_attach_task(cgrp, tsk);
++ if (threadgroup) {
++ threadgroup_fork_write_lock(tsk);
++ ret = cgroup_attach_proc(cgrp, tsk);
++ threadgroup_fork_write_unlock(tsk);
++ } else {
++ ret = cgroup_attach_task(cgrp, tsk);
++ }
+ put_task_struct(tsk);
++ cgroup_unlock();
+ return ret;
+ }
+
+ static int cgroup_tasks_write(struct cgroup *cgrp, struct cftype *cft, u64 pid)
++{
++ return attach_task_by_pid(cgrp, pid, false);
++}
++
++static int cgroup_procs_write(struct cgroup *cgrp, struct cftype *cft, u64 tgid)
+ {
+ int ret;
+- if (!cgroup_lock_live_group(cgrp))
+- return -ENODEV;
+- ret = attach_task_by_pid(cgrp, pid);
+- cgroup_unlock();
++ do {
++ /*
++ * attach_proc fails with -EAGAIN if threadgroup leadership
++ * changes in the middle of the operation, in which case we need
++ * to find the task_struct for the new leader and start over.
++ */
++ ret = attach_task_by_pid(cgrp, tgid, true);
++ } while (ret == -EAGAIN);
+ return ret;
+ }
+
+@@ -3270,9 +3617,9 @@ static struct cftype files[] = {
+ {
+ .name = CGROUP_FILE_GENERIC_PREFIX "procs",
+ .open = cgroup_procs_open,
+- /* .write_u64 = cgroup_procs_write, TODO */
++ .write_u64 = cgroup_procs_write,
+ .release = cgroup_pidlist_release,
+- .mode = S_IRUGO,
++ .mode = S_IRUGO | S_IWUSR,
+ },
+ {
+ .name = "notify_on_release",commit f780bdb7c1c73009cb57adcf99ef50027d80bf3c
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Thu May 26 16:25:19 2011 -0700
+
+ cgroups: add per-thread subsystem callbacks
+
+ Add cgroup subsystem callbacks for per-thread attachment in atomic contexts
+
+ Add can_attach_task(), pre_attach(), and attach_task() as new callbacks
+ for cgroups's subsystem interface. Unlike can_attach and attach, these
+ are for per-thread operations, to be called potentially many times when
+ attaching an entire threadgroup.
+
+ Also, the old "bool threadgroup" interface is removed, as replaced by
+ this. All subsystems are modified for the new interface - of note is
+ cpuset, which requires from/to nodemasks for attach to be globally scoped
+ (though per-cpuset would work too) to persist from its pre_attach to
+ attach_task and attach.
+
+ This is a pre-patch for cgroup-procs-writable.patch.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Matt Helsley <matthltc@us.ibm.com>
+ Reviewed-by: Paul Menage <menage@google.com>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Cc: David Rientjes <rientjes@google.com>
+ Cc: Miao Xie <miaox@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
+index aedf1bd02fdd..b3bd3bdbe202 100644
+--- a/Documentation/cgroups/cgroups.txt
++++ b/Documentation/cgroups/cgroups.txt
+@@ -575,7 +575,7 @@ rmdir() will fail with it. From this behavior, pre_destroy() can be
+ called multiple times against a cgroup.
+
+ int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct task_struct *task, bool threadgroup)
++ struct task_struct *task)
+ (cgroup_mutex held by caller)
+
+ Called prior to moving a task into a cgroup; if the subsystem
+@@ -584,9 +584,14 @@ task is passed, then a successful result indicates that *any*
+ unspecified task can be moved into the cgroup. Note that this isn't
+ called on a fork. If this method returns 0 (success) then this should
+ remain valid while the caller holds cgroup_mutex and it is ensured that either
+-attach() or cancel_attach() will be called in future. If threadgroup is
+-true, then a successful result indicates that all threads in the given
+-thread's threadgroup can be moved together.
++attach() or cancel_attach() will be called in future.
++
++int can_attach_task(struct cgroup *cgrp, struct task_struct *tsk);
++(cgroup_mutex held by caller)
++
++As can_attach, but for operations that must be run once per task to be
++attached (possibly many when using cgroup_attach_proc). Called after
++can_attach.
+
+ void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+ struct task_struct *task, bool threadgroup)
+@@ -598,15 +603,24 @@ function, so that the subsystem can implement a rollback. If not, not necessary.
+ This will be called only about subsystems whose can_attach() operation have
+ succeeded.
+
++void pre_attach(struct cgroup *cgrp);
++(cgroup_mutex held by caller)
++
++For any non-per-thread attachment work that needs to happen before
++attach_task. Needed by cpuset.
++
+ void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct cgroup *old_cgrp, struct task_struct *task,
+- bool threadgroup)
++ struct cgroup *old_cgrp, struct task_struct *task)
+ (cgroup_mutex held by caller)
+
+ Called after the task has been attached to the cgroup, to allow any
+ post-attachment activity that requires memory allocations or blocking.
+-If threadgroup is true, the subsystem should take care of all threads
+-in the specified thread's threadgroup. Currently does not support any
++
++void attach_task(struct cgroup *cgrp, struct task_struct *tsk);
++(cgroup_mutex held by caller)
++
++As attach, but for operations that must be run once per task to be attached,
++like can_attach_task. Called before attach. Currently does not support any
+ subsystem that might need the old_cgrp for every thread in the group.
+
+ void fork(struct cgroup_subsy *ss, struct task_struct *task)
+diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
+index 07371cfdfae6..bcaf16ee6ad1 100644
+--- a/block/blk-cgroup.c
++++ b/block/blk-cgroup.c
+@@ -30,10 +30,8 @@ EXPORT_SYMBOL_GPL(blkio_root_cgroup);
+
+ static struct cgroup_subsys_state *blkiocg_create(struct cgroup_subsys *,
+ struct cgroup *);
+-static int blkiocg_can_attach(struct cgroup_subsys *, struct cgroup *,
+- struct task_struct *, bool);
+-static void blkiocg_attach(struct cgroup_subsys *, struct cgroup *,
+- struct cgroup *, struct task_struct *, bool);
++static int blkiocg_can_attach_task(struct cgroup *, struct task_struct *);
++static void blkiocg_attach_task(struct cgroup *, struct task_struct *);
+ static void blkiocg_destroy(struct cgroup_subsys *, struct cgroup *);
+ static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);
+
+@@ -46,8 +44,8 @@ static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);
+ struct cgroup_subsys blkio_subsys = {
+ .name = "blkio",
+ .create = blkiocg_create,
+- .can_attach = blkiocg_can_attach,
+- .attach = blkiocg_attach,
++ .can_attach_task = blkiocg_can_attach_task,
++ .attach_task = blkiocg_attach_task,
+ .destroy = blkiocg_destroy,
+ .populate = blkiocg_populate,
+ #ifdef CONFIG_BLK_CGROUP
+@@ -1616,9 +1614,7 @@ blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)
+ * of the main cic data structures. For now we allow a task to change
+ * its cgroup only if it's the only owner of its ioc.
+ */
+-static int blkiocg_can_attach(struct cgroup_subsys *subsys,
+- struct cgroup *cgroup, struct task_struct *tsk,
+- bool threadgroup)
++static int blkiocg_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ {
+ struct io_context *ioc;
+ int ret = 0;
+@@ -1633,9 +1629,7 @@ static int blkiocg_can_attach(struct cgroup_subsys *subsys,
+ return ret;
+ }
+
+-static void blkiocg_attach(struct cgroup_subsys *subsys, struct cgroup *cgroup,
+- struct cgroup *prev, struct task_struct *tsk,
+- bool threadgroup)
++static void blkiocg_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ {
+ struct io_context *ioc;
+
+diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
+index 5ac7ebc36dbb..1e6cde21fa3f 100644
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -467,12 +467,14 @@ struct cgroup_subsys {
+ int (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
+ void (*destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
+ int (*can_attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct task_struct *tsk, bool threadgroup);
++ struct task_struct *tsk);
++ int (*can_attach_task)(struct cgroup *cgrp, struct task_struct *tsk);
+ void (*cancel_attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct task_struct *tsk, bool threadgroup);
++ struct task_struct *tsk);
++ void (*pre_attach)(struct cgroup *cgrp);
++ void (*attach_task)(struct cgroup *cgrp, struct task_struct *tsk);
+ void (*attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct cgroup *old_cgrp, struct task_struct *tsk,
+- bool threadgroup);
++ struct cgroup *old_cgrp, struct task_struct *tsk);
+ void (*fork)(struct cgroup_subsys *ss, struct task_struct *task);
+ void (*exit)(struct cgroup_subsys *ss, struct cgroup *cgrp,
+ struct cgroup *old_cgrp, struct task_struct *task);
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 909a35510af5..38fb0ad1cb46 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -1759,7 +1759,7 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+
+ for_each_subsys(root, ss) {
+ if (ss->can_attach) {
+- retval = ss->can_attach(ss, cgrp, tsk, false);
++ retval = ss->can_attach(ss, cgrp, tsk);
+ if (retval) {
+ /*
+ * Remember on which subsystem the can_attach()
+@@ -1771,6 +1771,13 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ goto out;
+ }
+ }
++ if (ss->can_attach_task) {
++ retval = ss->can_attach_task(cgrp, tsk);
++ if (retval) {
++ failed_ss = ss;
++ goto out;
++ }
++ }
+ }
+
+ task_lock(tsk);
+@@ -1805,8 +1812,12 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ write_unlock(&css_set_lock);
+
+ for_each_subsys(root, ss) {
++ if (ss->pre_attach)
++ ss->pre_attach(cgrp);
++ if (ss->attach_task)
++ ss->attach_task(cgrp, tsk);
+ if (ss->attach)
+- ss->attach(ss, cgrp, oldcgrp, tsk, false);
++ ss->attach(ss, cgrp, oldcgrp, tsk);
+ }
+ set_bit(CGRP_RELEASABLE, &oldcgrp->flags);
+ synchronize_rcu();
+@@ -1829,7 +1840,7 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ */
+ break;
+ if (ss->cancel_attach)
+- ss->cancel_attach(ss, cgrp, tsk, false);
++ ss->cancel_attach(ss, cgrp, tsk);
+ }
+ }
+ return retval;
+diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
+index e7bebb7c6c38..e691818d7e45 100644
+--- a/kernel/cgroup_freezer.c
++++ b/kernel/cgroup_freezer.c
+@@ -160,7 +160,7 @@ static void freezer_destroy(struct cgroup_subsys *ss,
+ */
+ static int freezer_can_attach(struct cgroup_subsys *ss,
+ struct cgroup *new_cgroup,
+- struct task_struct *task, bool threadgroup)
++ struct task_struct *task)
+ {
+ struct freezer *freezer;
+
+@@ -172,26 +172,17 @@ static int freezer_can_attach(struct cgroup_subsys *ss,
+ if (freezer->state != CGROUP_THAWED)
+ return -EBUSY;
+
++ return 0;
++}
++
++static int freezer_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
++{
+ rcu_read_lock();
+- if (__cgroup_freezing_or_frozen(task)) {
++ if (__cgroup_freezing_or_frozen(tsk)) {
+ rcu_read_unlock();
+ return -EBUSY;
+ }
+ rcu_read_unlock();
+-
+- if (threadgroup) {
+- struct task_struct *c;
+-
+- rcu_read_lock();
+- list_for_each_entry_rcu(c, &task->thread_group, thread_group) {
+- if (__cgroup_freezing_or_frozen(c)) {
+- rcu_read_unlock();
+- return -EBUSY;
+- }
+- }
+- rcu_read_unlock();
+- }
+-
+ return 0;
+ }
+
+@@ -390,6 +381,9 @@ struct cgroup_subsys freezer_subsys = {
+ .populate = freezer_populate,
+ .subsys_id = freezer_subsys_id,
+ .can_attach = freezer_can_attach,
++ .can_attach_task = freezer_can_attach_task,
++ .pre_attach = NULL,
++ .attach_task = NULL,
+ .attach = NULL,
+ .fork = freezer_fork,
+ .exit = NULL,
+diff --git a/kernel/cpuset.c b/kernel/cpuset.c
+index 2bb8c2e98fff..55b297d78adc 100644
+--- a/kernel/cpuset.c
++++ b/kernel/cpuset.c
+@@ -1367,14 +1367,10 @@ static int fmeter_getrate(struct fmeter *fmp)
+ return val;
+ }
+
+-/* Protected by cgroup_lock */
+-static cpumask_var_t cpus_attach;
+-
+ /* Called by cgroups to determine if a cpuset is usable; cgroup_mutex held */
+ static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cont,
+- struct task_struct *tsk, bool threadgroup)
++ struct task_struct *tsk)
+ {
+- int ret;
+ struct cpuset *cs = cgroup_cs(cont);
+
+ if (cpumask_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed))
+@@ -1391,29 +1387,42 @@ static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cont,
+ if (tsk->flags & PF_THREAD_BOUND)
+ return -EINVAL;
+
+- ret = security_task_setscheduler(tsk);
+- if (ret)
+- return ret;
+- if (threadgroup) {
+- struct task_struct *c;
+-
+- rcu_read_lock();
+- list_for_each_entry_rcu(c, &tsk->thread_group, thread_group) {
+- ret = security_task_setscheduler(c);
+- if (ret) {
+- rcu_read_unlock();
+- return ret;
+- }
+- }
+- rcu_read_unlock();
+- }
+ return 0;
+ }
+
+-static void cpuset_attach_task(struct task_struct *tsk, nodemask_t *to,
+- struct cpuset *cs)
++static int cpuset_can_attach_task(struct cgroup *cgrp, struct task_struct *task)
++{
++ return security_task_setscheduler(task);
++}
++
++/*
++ * Protected by cgroup_lock. The nodemasks must be stored globally because
++ * dynamically allocating them is not allowed in pre_attach, and they must
++ * persist among pre_attach, attach_task, and attach.
++ */
++static cpumask_var_t cpus_attach;
++static nodemask_t cpuset_attach_nodemask_from;
++static nodemask_t cpuset_attach_nodemask_to;
++
++/* Set-up work for before attaching each task. */
++static void cpuset_pre_attach(struct cgroup *cont)
++{
++ struct cpuset *cs = cgroup_cs(cont);
++
++ if (cs == &top_cpuset)
++ cpumask_copy(cpus_attach, cpu_possible_mask);
++ else
++ guarantee_online_cpus(cs, cpus_attach);
++
++ guarantee_online_mems(cs, &cpuset_attach_nodemask_to);
++}
++
++/* Per-thread attachment work. */
++static void cpuset_attach_task(struct cgroup *cont, struct task_struct *tsk)
+ {
+ int err;
++ struct cpuset *cs = cgroup_cs(cont);
++
+ /*
+ * can_attach beforehand should guarantee that this doesn't fail.
+ * TODO: have a better way to handle failure here
+@@ -1421,45 +1430,29 @@ static void cpuset_attach_task(struct task_struct *tsk, nodemask_t *to,
+ err = set_cpus_allowed_ptr(tsk, cpus_attach);
+ WARN_ON_ONCE(err);
+
+- cpuset_change_task_nodemask(tsk, to);
++ cpuset_change_task_nodemask(tsk, &cpuset_attach_nodemask_to);
+ cpuset_update_task_spread_flag(cs, tsk);
+-
+ }
+
+ static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cont,
+- struct cgroup *oldcont, struct task_struct *tsk,
+- bool threadgroup)
++ struct cgroup *oldcont, struct task_struct *tsk)
+ {
+ struct mm_struct *mm;
+ struct cpuset *cs = cgroup_cs(cont);
+ struct cpuset *oldcs = cgroup_cs(oldcont);
+- static nodemask_t to; /* protected by cgroup_mutex */
+
+- if (cs == &top_cpuset) {
+- cpumask_copy(cpus_attach, cpu_possible_mask);
+- } else {
+- guarantee_online_cpus(cs, cpus_attach);
+- }
+- guarantee_online_mems(cs, &to);
+-
+- /* do per-task migration stuff possibly for each in the threadgroup */
+- cpuset_attach_task(tsk, &to, cs);
+- if (threadgroup) {
+- struct task_struct *c;
+- rcu_read_lock();
+- list_for_each_entry_rcu(c, &tsk->thread_group, thread_group) {
+- cpuset_attach_task(c, &to, cs);
+- }
+- rcu_read_unlock();
+- }
+-
+- /* change mm; only needs to be done once even if threadgroup */
+- to = cs->mems_allowed;
++ /*
++ * Change mm, possibly for multiple threads in a threadgroup. This is
++ * expensive and may sleep.
++ */
++ cpuset_attach_nodemask_from = oldcs->mems_allowed;
++ cpuset_attach_nodemask_to = cs->mems_allowed;
+ mm = get_task_mm(tsk);
+ if (mm) {
+- mpol_rebind_mm(mm, &to);
++ mpol_rebind_mm(mm, &cpuset_attach_nodemask_to);
+ if (is_memory_migrate(cs))
+- cpuset_migrate_mm(mm, &oldcs->mems_allowed, &to);
++ cpuset_migrate_mm(mm, &cpuset_attach_nodemask_from,
++ &cpuset_attach_nodemask_to);
+ mmput(mm);
+ }
+ }
+@@ -1911,6 +1904,9 @@ struct cgroup_subsys cpuset_subsys = {
+ .create = cpuset_create,
+ .destroy = cpuset_destroy,
+ .can_attach = cpuset_can_attach,
++ .can_attach_task = cpuset_can_attach_task,
++ .pre_attach = cpuset_pre_attach,
++ .attach_task = cpuset_attach_task,
+ .attach = cpuset_attach,
+ .populate = cpuset_populate,
+ .post_clone = cpuset_post_clone,
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 2d12893b8b0f..5e43e9dc65d1 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -8764,42 +8764,10 @@ cpu_cgroup_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ return 0;
+ }
+
+-static int
+-cpu_cgroup_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct task_struct *tsk, bool threadgroup)
+-{
+- int retval = cpu_cgroup_can_attach_task(cgrp, tsk);
+- if (retval)
+- return retval;
+- if (threadgroup) {
+- struct task_struct *c;
+- rcu_read_lock();
+- list_for_each_entry_rcu(c, &tsk->thread_group, thread_group) {
+- retval = cpu_cgroup_can_attach_task(cgrp, c);
+- if (retval) {
+- rcu_read_unlock();
+- return retval;
+- }
+- }
+- rcu_read_unlock();
+- }
+- return 0;
+-}
+-
+ static void
+-cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+- struct cgroup *old_cont, struct task_struct *tsk,
+- bool threadgroup)
++cpu_cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+ {
+ sched_move_task(tsk);
+- if (threadgroup) {
+- struct task_struct *c;
+- rcu_read_lock();
+- list_for_each_entry_rcu(c, &tsk->thread_group, thread_group) {
+- sched_move_task(c);
+- }
+- rcu_read_unlock();
+- }
+ }
+
+ static void
+@@ -8887,8 +8855,8 @@ struct cgroup_subsys cpu_cgroup_subsys = {
+ .name = "cpu",
+ .create = cpu_cgroup_create,
+ .destroy = cpu_cgroup_destroy,
+- .can_attach = cpu_cgroup_can_attach,
+- .attach = cpu_cgroup_attach,
++ .can_attach_task = cpu_cgroup_can_attach_task,
++ .attach_task = cpu_cgroup_attach_task,
+ .exit = cpu_cgroup_exit,
+ .populate = cpu_cgroup_populate,
+ .subsys_id = cpu_cgroup_subsys_id,
+diff --git a/mm/memcontrol.c b/mm/memcontrol.c
+index d5fd3dcd3f2e..fc259926c170 100644
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -4953,8 +4953,7 @@ static void mem_cgroup_clear_mc(void)
+
+ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
+ struct cgroup *cgroup,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ int ret = 0;
+ struct mem_cgroup *mem = mem_cgroup_from_cont(cgroup);
+@@ -4993,8 +4992,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
+
+ static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
+ struct cgroup *cgroup,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ mem_cgroup_clear_mc();
+ }
+@@ -5112,8 +5110,7 @@ static void mem_cgroup_move_charge(struct mm_struct *mm)
+ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
+ struct cgroup *cont,
+ struct cgroup *old_cont,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ struct mm_struct *mm;
+
+@@ -5131,22 +5128,19 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
+ #else /* !CONFIG_MMU */
+ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
+ struct cgroup *cgroup,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ return 0;
+ }
+ static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
+ struct cgroup *cgroup,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ }
+ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
+ struct cgroup *cont,
+ struct cgroup *old_cont,
+- struct task_struct *p,
+- bool threadgroup)
++ struct task_struct *p)
+ {
+ }
+ #endif
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index 8d9c48f13774..cd1f779fa51d 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -62,8 +62,7 @@ static inline struct dev_cgroup *task_devcgroup(struct task_struct *task)
+ struct cgroup_subsys devices_subsys;
+
+ static int devcgroup_can_attach(struct cgroup_subsys *ss,
+- struct cgroup *new_cgroup, struct task_struct *task,
+- bool threadgroup)
++ struct cgroup *new_cgroup, struct task_struct *task)
+ {
+ if (current != task && !capable(CAP_SYS_ADMIN))
+ return -EPERM;commit 4714d1d32d97239fb5ae3e10521d3f133a899b66
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Thu May 26 16:25:18 2011 -0700
+
+ cgroups: read-write lock CLONE_THREAD forking per threadgroup
+
+ Adds functionality to read/write lock CLONE_THREAD fork()ing per-threadgroup
+
+ Add an rwsem that lives in a threadgroup's signal_struct that's taken for
+ reading in the fork path, under CONFIG_CGROUPS. If another part of the
+ kernel later wants to use such a locking mechanism, the CONFIG_CGROUPS
+ ifdefs should be changed to a higher-up flag that CGROUPS and the other
+ system would both depend on.
+
+ This is a pre-patch for cgroup-procs-write.patch.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Matt Helsley <matthltc@us.ibm.com>
+ Reviewed-by: Paul Menage <menage@google.com>
+ Cc: Oleg Nesterov <oleg@redhat.com>
+ Cc: David Rientjes <rientjes@google.com>
+ Cc: Miao Xie <miaox@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/init_task.h b/include/linux/init_task.h
+index bafc58c00fc3..580f70c02391 100644
+--- a/include/linux/init_task.h
++++ b/include/linux/init_task.h
+@@ -22,6 +22,14 @@
+ extern struct files_struct init_files;
+ extern struct fs_struct init_fs;
+
++#ifdef CONFIG_CGROUPS
++#define INIT_THREADGROUP_FORK_LOCK(sig) \
++ .threadgroup_fork_lock = \
++ __RWSEM_INITIALIZER(sig.threadgroup_fork_lock),
++#else
++#define INIT_THREADGROUP_FORK_LOCK(sig)
++#endif
++
+ #define INIT_SIGNALS(sig) { \
+ .nr_threads = 1, \
+ .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
+@@ -38,6 +46,7 @@ extern struct fs_struct init_fs;
+ }, \
+ .cred_guard_mutex = \
+ __MUTEX_INITIALIZER(sig.cred_guard_mutex), \
++ INIT_THREADGROUP_FORK_LOCK(sig) \
+ }
+
+ extern struct nsproxy init_nsproxy;
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index f18300eddfcb..dc8871295a5a 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -513,6 +513,7 @@ struct thread_group_cputimer {
+ spinlock_t lock;
+ };
+
++#include <linux/rwsem.h>
+ struct autogroup;
+
+ /*
+@@ -632,6 +633,16 @@ struct signal_struct {
+ unsigned audit_tty;
+ struct tty_audit_buf *tty_audit_buf;
+ #endif
++#ifdef CONFIG_CGROUPS
++ /*
++ * The threadgroup_fork_lock prevents threads from forking with
++ * CLONE_THREAD while held for writing. Use this for fork-sensitive
++ * threadgroup-wide operations. It's taken for reading in fork.c in
++ * copy_process().
++ * Currently only needed write-side by cgroups.
++ */
++ struct rw_semaphore threadgroup_fork_lock;
++#endif
+
+ int oom_adj; /* OOM kill score adjustment (bit shift) */
+ int oom_score_adj; /* OOM kill score adjustment */
+@@ -2323,6 +2334,31 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
+ spin_unlock_irqrestore(&tsk->sighand->siglock, *flags);
+ }
+
++/* See the declaration of threadgroup_fork_lock in signal_struct. */
++#ifdef CONFIG_CGROUPS
++static inline void threadgroup_fork_read_lock(struct task_struct *tsk)
++{
++ down_read(&tsk->signal->threadgroup_fork_lock);
++}
++static inline void threadgroup_fork_read_unlock(struct task_struct *tsk)
++{
++ up_read(&tsk->signal->threadgroup_fork_lock);
++}
++static inline void threadgroup_fork_write_lock(struct task_struct *tsk)
++{
++ down_write(&tsk->signal->threadgroup_fork_lock);
++}
++static inline void threadgroup_fork_write_unlock(struct task_struct *tsk)
++{
++ up_write(&tsk->signal->threadgroup_fork_lock);
++}
++#else
++static inline void threadgroup_fork_read_lock(struct task_struct *tsk) {}
++static inline void threadgroup_fork_read_unlock(struct task_struct *tsk) {}
++static inline void threadgroup_fork_write_lock(struct task_struct *tsk) {}
++static inline void threadgroup_fork_write_unlock(struct task_struct *tsk) {}
++#endif
++
+ #ifndef __HAVE_THREAD_FUNCTIONS
+
+ #define task_thread_info(task) ((struct thread_info *)(task)->stack)
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 8e7e135d0817..1fa9d940e301 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -957,6 +957,10 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
+ tty_audit_fork(sig);
+ sched_autogroup_fork(sig);
+
++#ifdef CONFIG_CGROUPS
++ init_rwsem(&sig->threadgroup_fork_lock);
++#endif
++
+ sig->oom_adj = current->signal->oom_adj;
+ sig->oom_score_adj = current->signal->oom_score_adj;
+ sig->oom_score_adj_min = current->signal->oom_score_adj_min;
+@@ -1138,6 +1142,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ monotonic_to_bootbased(&p->real_start_time);
+ p->io_context = NULL;
+ p->audit_context = NULL;
++ if (clone_flags & CLONE_THREAD)
++ threadgroup_fork_read_lock(current);
+ cgroup_fork(p);
+ #ifdef CONFIG_NUMA
+ p->mempolicy = mpol_dup(p->mempolicy);
+@@ -1342,6 +1348,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ write_unlock_irq(&tasklist_lock);
+ proc_fork_connector(p);
+ cgroup_post_fork(p);
++ if (clone_flags & CLONE_THREAD)
++ threadgroup_fork_read_unlock(current);
+ perf_event_fork(p);
+ return p;
+
+@@ -1380,6 +1388,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ mpol_put(p->mempolicy);
+ bad_fork_cleanup_cgroup:
+ #endif
++ if (clone_flags & CLONE_THREAD)
++ threadgroup_fork_read_unlock(current);
+ cgroup_exit(p, cgroup_callbacks_done);
+ delayacct_tsk_free(p);
+ module_put(task_thread_info(p)->exec_domain->module);commit 8e039d84b323c4503c4d56863faa47c783660826
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Tue Mar 23 05:24:03 2010 +0000
+
+ cgroups: net_cls as module
+
+ Allows the net_cls cgroup subsystem to be compiled as a module
+
+ This patch modifies net/sched/cls_cgroup.c to allow the net_cls subsystem
+ to be optionally compiled as a module instead of builtin. The
+ cgroup_subsys struct is moved around a bit to allow the subsys_id to be
+ either declared as a compile-time constant by the cgroup_subsys.h include
+ in cgroup.h, or, if it's a module, initialized within the struct by
+ cgroup_load_subsys.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Paul Menage <menage@google.com>
+ Cc: "David S. Miller" <davem@davemloft.net>
+ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+ Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/sched/Kconfig b/net/sched/Kconfig
+index 21f9c7678aa3..2f691fb180d1 100644
+--- a/net/sched/Kconfig
++++ b/net/sched/Kconfig
+@@ -328,13 +328,16 @@ config NET_CLS_FLOW
+ module will be called cls_flow.
+
+ config NET_CLS_CGROUP
+- bool "Control Group Classifier"
++ tristate "Control Group Classifier"
+ select NET_CLS
+ depends on CGROUPS
+ ---help---
+ Say Y here if you want to classify packets based on the control
+ cgroup of their process.
+
++ To compile this code as a module, choose M here: the
++ module will be called cls_cgroup.
++
+ config NET_EMATCH
+ bool "Extended Matches"
+ select NET_CLS
+diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c
+index e4877ca6727c..7f27d2c15e08 100644
+--- a/net/sched/cls_cgroup.c
++++ b/net/sched/cls_cgroup.c
+@@ -24,6 +24,25 @@ struct cgroup_cls_state
+ u32 classid;
+ };
+
++static struct cgroup_subsys_state *cgrp_create(struct cgroup_subsys *ss,
++ struct cgroup *cgrp);
++static void cgrp_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp);
++static int cgrp_populate(struct cgroup_subsys *ss, struct cgroup *cgrp);
++
++struct cgroup_subsys net_cls_subsys = {
++ .name = "net_cls",
++ .create = cgrp_create,
++ .destroy = cgrp_destroy,
++ .populate = cgrp_populate,
++#ifdef CONFIG_NET_CLS_CGROUP
++ .subsys_id = net_cls_subsys_id,
++#else
++#define net_cls_subsys_id net_cls_subsys.subsys_id
++#endif
++ .module = THIS_MODULE,
++};
++
++
+ static inline struct cgroup_cls_state *cgrp_cls_state(struct cgroup *cgrp)
+ {
+ return container_of(cgroup_subsys_state(cgrp, net_cls_subsys_id),
+@@ -79,14 +98,6 @@ static int cgrp_populate(struct cgroup_subsys *ss, struct cgroup *cgrp)
+ return cgroup_add_files(cgrp, ss, ss_files, ARRAY_SIZE(ss_files));
+ }
+
+-struct cgroup_subsys net_cls_subsys = {
+- .name = "net_cls",
+- .create = cgrp_create,
+- .destroy = cgrp_destroy,
+- .populate = cgrp_populate,
+- .subsys_id = net_cls_subsys_id,
+-};
+-
+ struct cls_cgroup_head
+ {
+ u32 handle;
+@@ -277,12 +288,19 @@ static struct tcf_proto_ops cls_cgroup_ops __read_mostly = {
+
+ static int __init init_cgroup_cls(void)
+ {
+- return register_tcf_proto_ops(&cls_cgroup_ops);
++ int ret = register_tcf_proto_ops(&cls_cgroup_ops);
++ if (ret)
++ return ret;
++ ret = cgroup_load_subsys(&net_cls_subsys);
++ if (ret)
++ unregister_tcf_proto_ops(&cls_cgroup_ops);
++ return ret;
+ }
+
+ static void __exit exit_cgroup_cls(void)
+ {
+ unregister_tcf_proto_ops(&cls_cgroup_ops);
++ cgroup_unload_subsys(&net_cls_subsys);
+ }
+
+ module_init(init_cgroup_cls);commit 67523c48aa74d5637848edeccf285af1c60bf14a
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Mar 10 15:22:11 2010 -0800
+
+ cgroups: blkio subsystem as module
+
+ Modify the Block I/O cgroup subsystem to be able to be built as a module.
+ As the CFQ disk scheduler optionally depends on blk-cgroup, config options
+ in block/Kconfig, block/Kconfig.iosched, and block/blk-cgroup.h are
+ enhanced to support the new module dependency.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Cc: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Paul Menage <menage@google.com>
+ Cc: "David S. Miller" <davem@davemloft.net>
+ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+ Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
+ Cc: Vivek Goyal <vgoyal@redhat.com>
+ Cc: Jens Axboe <jens.axboe@oracle.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/block/Kconfig b/block/Kconfig
+index e20fbde0875c..62a5921321cd 100644
+--- a/block/Kconfig
++++ b/block/Kconfig
+@@ -78,7 +78,7 @@ config BLK_DEV_INTEGRITY
+ Protection. If in doubt, say N.
+
+ config BLK_CGROUP
+- bool
++ tristate
+ depends on CGROUPS
+ default n
+ ---help---
+diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
+index b71abfb0d726..fc71cf071fb2 100644
+--- a/block/Kconfig.iosched
++++ b/block/Kconfig.iosched
+@@ -23,6 +23,7 @@ config IOSCHED_DEADLINE
+
+ config IOSCHED_CFQ
+ tristate "CFQ I/O scheduler"
++ select BLK_CGROUP if CFQ_GROUP_IOSCHED
+ default y
+ ---help---
+ The CFQ I/O scheduler tries to distribute bandwidth equally
+@@ -35,7 +36,6 @@ config IOSCHED_CFQ
+ config CFQ_GROUP_IOSCHED
+ bool "CFQ Group Scheduling support"
+ depends on IOSCHED_CFQ && CGROUPS
+- select BLK_CGROUP
+ default n
+ ---help---
+ Enable group IO scheduling in CFQ.
+diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
+index c85d74cae200..4b686ad08eaa 100644
+--- a/block/blk-cgroup.c
++++ b/block/blk-cgroup.c
+@@ -23,6 +23,31 @@ static LIST_HEAD(blkio_list);
+ struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT };
+ EXPORT_SYMBOL_GPL(blkio_root_cgroup);
+
++static struct cgroup_subsys_state *blkiocg_create(struct cgroup_subsys *,
++ struct cgroup *);
++static int blkiocg_can_attach(struct cgroup_subsys *, struct cgroup *,
++ struct task_struct *, bool);
++static void blkiocg_attach(struct cgroup_subsys *, struct cgroup *,
++ struct cgroup *, struct task_struct *, bool);
++static void blkiocg_destroy(struct cgroup_subsys *, struct cgroup *);
++static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);
++
++struct cgroup_subsys blkio_subsys = {
++ .name = "blkio",
++ .create = blkiocg_create,
++ .can_attach = blkiocg_can_attach,
++ .attach = blkiocg_attach,
++ .destroy = blkiocg_destroy,
++ .populate = blkiocg_populate,
++#ifdef CONFIG_BLK_CGROUP
++ /* note: blkio_subsys_id is otherwise defined in blk-cgroup.h */
++ .subsys_id = blkio_subsys_id,
++#endif
++ .use_id = 1,
++ .module = THIS_MODULE,
++};
++EXPORT_SYMBOL_GPL(blkio_subsys);
++
+ struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup)
+ {
+ return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id),
+@@ -253,7 +278,8 @@ static void blkiocg_destroy(struct cgroup_subsys *subsys, struct cgroup *cgroup)
+ done:
+ free_css_id(&blkio_subsys, &blkcg->css);
+ rcu_read_unlock();
+- kfree(blkcg);
++ if (blkcg != &blkio_root_cgroup)
++ kfree(blkcg);
+ }
+
+ static struct cgroup_subsys_state *
+@@ -319,17 +345,6 @@ static void blkiocg_attach(struct cgroup_subsys *subsys, struct cgroup *cgroup,
+ task_unlock(tsk);
+ }
+
+-struct cgroup_subsys blkio_subsys = {
+- .name = "blkio",
+- .create = blkiocg_create,
+- .can_attach = blkiocg_can_attach,
+- .attach = blkiocg_attach,
+- .destroy = blkiocg_destroy,
+- .populate = blkiocg_populate,
+- .subsys_id = blkio_subsys_id,
+- .use_id = 1,
+-};
+-
+ void blkio_policy_register(struct blkio_policy_type *blkiop)
+ {
+ spin_lock(&blkio_list_lock);
+@@ -345,3 +360,17 @@ void blkio_policy_unregister(struct blkio_policy_type *blkiop)
+ spin_unlock(&blkio_list_lock);
+ }
+ EXPORT_SYMBOL_GPL(blkio_policy_unregister);
++
++static int __init init_cgroup_blkio(void)
++{
++ return cgroup_load_subsys(&blkio_subsys);
++}
++
++static void __exit exit_cgroup_blkio(void)
++{
++ cgroup_unload_subsys(&blkio_subsys);
++}
++
++module_init(init_cgroup_blkio);
++module_exit(exit_cgroup_blkio);
++MODULE_LICENSE("GPL");
+diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
+index 84bf745fa775..8ccc20464dae 100644
+--- a/block/blk-cgroup.h
++++ b/block/blk-cgroup.h
+@@ -15,7 +15,13 @@
+
+ #include <linux/cgroup.h>
+
+-#ifdef CONFIG_BLK_CGROUP
++#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
++
++#ifndef CONFIG_BLK_CGROUP
++/* When blk-cgroup is a module, its subsys_id isn't a compile-time constant */
++extern struct cgroup_subsys blkio_subsys;
++#define blkio_subsys_id blkio_subsys.subsys_id
++#endif
+
+ struct blkio_cgroup {
+ struct cgroup_subsys_state css;
+@@ -91,7 +97,7 @@ static inline void blkiocg_update_blkio_group_dequeue_stats(
+ struct blkio_group *blkg, unsigned long dequeue) {}
+ #endif
+
+-#ifdef CONFIG_BLK_CGROUP
++#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
+ extern struct blkio_cgroup blkio_root_cgroup;
+ extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup);
+ extern void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,
+diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
+index 1195a806fe0c..a0bb301afac0 100644
+--- a/include/linux/iocontext.h
++++ b/include/linux/iocontext.h
+@@ -42,7 +42,7 @@ struct io_context {
+ unsigned short ioprio;
+ unsigned short ioprio_changed;
+
+-#ifdef CONFIG_BLK_CGROUP
++#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
+ unsigned short cgroup_changed;
+ #endif
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index aa889c96cc74..521591dbab2f 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -705,6 +705,7 @@ void cgroup_lock(void)
+ {
+ mutex_lock(&cgroup_mutex);
+ }
++EXPORT_SYMBOL_GPL(cgroup_lock);
+
+ /**
+ * cgroup_unlock - release lock on cgroup changes
+@@ -715,6 +716,7 @@ void cgroup_unlock(void)
+ {
+ mutex_unlock(&cgroup_mutex);
+ }
++EXPORT_SYMBOL_GPL(cgroup_unlock);
+
+ /*
+ * A couple of forward declarations required, due to cyclic reference loop:
+@@ -1639,6 +1641,7 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen)
+ memmove(buf, start, buf + buflen - start);
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(cgroup_path);
+
+ /**
+ * cgroup_attach_task - attach task 'tsk' to cgroup 'cgrp'
+@@ -1805,6 +1808,7 @@ bool cgroup_lock_live_group(struct cgroup *cgrp)
+ }
+ return true;
+ }
++EXPORT_SYMBOL_GPL(cgroup_lock_live_group);
+
+ static int cgroup_release_agent_write(struct cgroup *cgrp, struct cftype *cft,
+ const char *buffer)
+@@ -4082,6 +4086,7 @@ void __css_put(struct cgroup_subsys_state *css, int count)
+ rcu_read_unlock();
+ WARN_ON_ONCE(val < 1);
+ }
++EXPORT_SYMBOL_GPL(__css_put);
+
+ /*
+ * Notify userspace when a cgroup is released, by running the
+@@ -4197,6 +4202,7 @@ unsigned short css_id(struct cgroup_subsys_state *css)
+ return cssid->id;
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(css_id);
+
+ unsigned short css_depth(struct cgroup_subsys_state *css)
+ {
+@@ -4206,6 +4212,7 @@ unsigned short css_depth(struct cgroup_subsys_state *css)
+ return cssid->depth;
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(css_depth);
+
+ bool css_is_ancestor(struct cgroup_subsys_state *child,
+ const struct cgroup_subsys_state *root)
+@@ -4242,6 +4249,7 @@ void free_css_id(struct cgroup_subsys *ss, struct cgroup_subsys_state *css)
+ spin_unlock(&ss->id_lock);
+ call_rcu(&id->rcu_head, __free_css_id_cb);
+ }
++EXPORT_SYMBOL_GPL(free_css_id);
+
+ /*
+ * This is called by init or create(). Then, calls to this function are
+@@ -4358,6 +4366,7 @@ struct cgroup_subsys_state *css_lookup(struct cgroup_subsys *ss, int id)
+
+ return rcu_dereference(cssid->css);
+ }
++EXPORT_SYMBOL_GPL(css_lookup);
+
+ /**
+ * css_get_next - lookup next cgroup under specified hierarchy.commit cf5d5941fda647fe3d2f2d00cf9e0245236a5f08
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Mar 10 15:22:09 2010 -0800
+
+ cgroups: subsystem module unloading
+
+ Provides support for unloading modular subsystems.
+
+ This patch adds a new function cgroup_unload_subsys which is to be used
+ for removing a loaded subsystem during module deletion. Reference
+ counting of the subsystems' modules is moved from once (at load time) to
+ once per attached hierarchy (in parse_cgroupfs_options and
+ rebind_subsystems) (i.e., 0 or 1).
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Paul Menage <menage@google.com>
+ Cc: "David S. Miller" <davem@davemloft.net>
+ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+ Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
+index ae8a037a761e..764007b63921 100644
+--- a/Documentation/cgroups/cgroups.txt
++++ b/Documentation/cgroups/cgroups.txt
+@@ -489,8 +489,9 @@ Each subsystem should:
+ - define a cgroup_subsys object called <name>_subsys
+
+ If a subsystem can be compiled as a module, it should also have in its
+-module initcall a call to cgroup_load_subsys(&its_subsys_struct). It
+-should also set its_subsys.module = THIS_MODULE in its .c file.
++module initcall a call to cgroup_load_subsys(), and in its exitcall a
++call to cgroup_unload_subsys(). It should also set its_subsys.module =
++THIS_MODULE in its .c file.
+
+ Each subsystem may export the following methods. The only mandatory
+ methods are create/destroy. Any others that are null are presumed to
+diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
+index 402ce477c47e..2a59d3101e5d 100644
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -38,6 +38,7 @@ extern void cgroup_exit(struct task_struct *p, int run_callbacks);
+ extern int cgroupstats_build(struct cgroupstats *stats,
+ struct dentry *dentry);
+ extern int cgroup_load_subsys(struct cgroup_subsys *ss);
++extern void cgroup_unload_subsys(struct cgroup_subsys *ss);
+
+ extern const struct file_operations proc_cgroup_operations;
+
+@@ -271,7 +272,8 @@ struct css_set {
+ /*
+ * Set of subsystem states, one for each subsystem. This array
+ * is immutable after creation apart from the init_css_set
+- * during subsystem registration (at boot time).
++ * during subsystem registration (at boot time) and modular subsystem
++ * loading/unloading.
+ */
+ struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT];
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 2cae38e64c59..aa889c96cc74 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -894,7 +894,9 @@ void cgroup_release_and_wakeup_rmdir(struct cgroup_subsys_state *css)
+ }
+
+ /*
+- * Call with cgroup_mutex held.
++ * Call with cgroup_mutex held. Drops reference counts on modules, including
++ * any duplicate ones that parse_cgroupfs_options took. If this function
++ * returns an error, no reference counts are touched.
+ */
+ static int rebind_subsystems(struct cgroupfs_root *root,
+ unsigned long final_bits)
+@@ -950,6 +952,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ if (ss->bind)
+ ss->bind(ss, cgrp);
+ mutex_unlock(&ss->hierarchy_mutex);
++ /* refcount was already taken, and we're keeping it */
+ } else if (bit & removed_bits) {
+ /* We're removing this subsystem */
+ BUG_ON(ss == NULL);
+@@ -963,10 +966,20 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ subsys[i]->root = &rootnode;
+ list_move(&ss->sibling, &rootnode.subsys_list);
+ mutex_unlock(&ss->hierarchy_mutex);
++ /* subsystem is now free - drop reference on module */
++ module_put(ss->module);
+ } else if (bit & final_bits) {
+ /* Subsystem state should already exist */
+ BUG_ON(ss == NULL);
+ BUG_ON(!cgrp->subsys[i]);
++ /*
++ * a refcount was taken, but we already had one, so
++ * drop the extra reference.
++ */
++ module_put(ss->module);
++#ifdef CONFIG_MODULE_UNLOAD
++ BUG_ON(ss->module && !module_refcount(ss->module));
++#endif
+ } else {
+ /* Subsystem state shouldn't exist */
+ BUG_ON(cgrp->subsys[i]);
+@@ -1010,13 +1023,16 @@ struct cgroup_sb_opts {
+
+ /*
+ * Convert a hierarchy specifier into a bitmask of subsystems and flags. Call
+- * with cgroup_mutex held to protect the subsys[] array.
++ * with cgroup_mutex held to protect the subsys[] array. This function takes
++ * refcounts on subsystems to be used, unless it returns error, in which case
++ * no refcounts are taken.
+ */
+-static int parse_cgroupfs_options(char *data,
+- struct cgroup_sb_opts *opts)
++static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
+ {
+ char *token, *o = data ?: "all";
+ unsigned long mask = (unsigned long)-1;
++ int i;
++ bool module_pin_failed = false;
+
+ BUG_ON(!mutex_is_locked(&cgroup_mutex));
+
+@@ -1031,7 +1047,6 @@ static int parse_cgroupfs_options(char *data,
+ return -EINVAL;
+ if (!strcmp(token, "all")) {
+ /* Add all non-disabled subsystems */
+- int i;
+ opts->subsys_bits = 0;
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+@@ -1054,7 +1069,6 @@ static int parse_cgroupfs_options(char *data,
+ if (!opts->release_agent)
+ return -ENOMEM;
+ } else if (!strncmp(token, "name=", 5)) {
+- int i;
+ const char *name = token + 5;
+ /* Can't specify an empty name */
+ if (!strlen(name))
+@@ -1078,7 +1092,6 @@ static int parse_cgroupfs_options(char *data,
+ return -ENOMEM;
+ } else {
+ struct cgroup_subsys *ss;
+- int i;
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ ss = subsys[i];
+ if (ss == NULL)
+@@ -1117,9 +1130,54 @@ static int parse_cgroupfs_options(char *data,
+ if (!opts->subsys_bits && !opts->name)
+ return -EINVAL;
+
++ /*
++ * Grab references on all the modules we'll need, so the subsystems
++ * don't dance around before rebind_subsystems attaches them. This may
++ * take duplicate reference counts on a subsystem that's already used,
++ * but rebind_subsystems handles this case.
++ */
++ for (i = CGROUP_BUILTIN_SUBSYS_COUNT; i < CGROUP_SUBSYS_COUNT; i++) {
++ unsigned long bit = 1UL << i;
++
++ if (!(bit & opts->subsys_bits))
++ continue;
++ if (!try_module_get(subsys[i]->module)) {
++ module_pin_failed = true;
++ break;
++ }
++ }
++ if (module_pin_failed) {
++ /*
++ * oops, one of the modules was going away. this means that we
++ * raced with a module_delete call, and to the user this is
++ * essentially a "subsystem doesn't exist" case.
++ */
++ for (i--; i >= CGROUP_BUILTIN_SUBSYS_COUNT; i--) {
++ /* drop refcounts only on the ones we took */
++ unsigned long bit = 1UL << i;
++
++ if (!(bit & opts->subsys_bits))
++ continue;
++ module_put(subsys[i]->module);
++ }
++ return -ENOENT;
++ }
++
+ return 0;
+ }
+
++static void drop_parsed_module_refcounts(unsigned long subsys_bits)
++{
++ int i;
++ for (i = CGROUP_BUILTIN_SUBSYS_COUNT; i < CGROUP_SUBSYS_COUNT; i++) {
++ unsigned long bit = 1UL << i;
++
++ if (!(bit & subsys_bits))
++ continue;
++ module_put(subsys[i]->module);
++ }
++}
++
+ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
+ {
+ int ret = 0;
+@@ -1136,21 +1194,19 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
+ if (ret)
+ goto out_unlock;
+
+- /* Don't allow flags to change at remount */
+- if (opts.flags != root->flags) {
+- ret = -EINVAL;
+- goto out_unlock;
+- }
+-
+- /* Don't allow name to change at remount */
+- if (opts.name && strcmp(opts.name, root->name)) {
++ /* Don't allow flags or name to change at remount */
++ if (opts.flags != root->flags ||
++ (opts.name && strcmp(opts.name, root->name))) {
+ ret = -EINVAL;
++ drop_parsed_module_refcounts(opts.subsys_bits);
+ goto out_unlock;
+ }
+
+ ret = rebind_subsystems(root, opts.subsys_bits);
+- if (ret)
++ if (ret) {
++ drop_parsed_module_refcounts(opts.subsys_bits);
+ goto out_unlock;
++ }
+
+ /* (re)populate subsystem files */
+ cgroup_populate_dir(cgrp);
+@@ -1349,7 +1405,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+ new_root = cgroup_root_from_opts(&opts);
+ if (IS_ERR(new_root)) {
+ ret = PTR_ERR(new_root);
+- goto out_err;
++ goto drop_modules;
+ }
+ opts.new_root = new_root;
+
+@@ -1358,7 +1414,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+ if (IS_ERR(sb)) {
+ ret = PTR_ERR(sb);
+ cgroup_drop_root(opts.new_root);
+- goto out_err;
++ goto drop_modules;
+ }
+
+ root = sb->s_fs_info;
+@@ -1414,6 +1470,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+ free_cg_links(&tmp_cg_links);
+ goto drop_new_super;
+ }
++ /*
++ * There must be no failure case after here, since rebinding
++ * takes care of subsystems' refcounts, which are explicitly
++ * dropped in the failure exit path.
++ */
+
+ /* EBUSY should be the only error here */
+ BUG_ON(ret);
+@@ -1452,6 +1513,8 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+ * any) is not needed
+ */
+ cgroup_drop_root(opts.new_root);
++ /* no subsys rebinding, so refcounts don't change */
++ drop_parsed_module_refcounts(opts.subsys_bits);
+ }
+
+ simple_set_mnt(mnt, sb);
+@@ -1461,6 +1524,8 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+
+ drop_new_super:
+ deactivate_locked_super(sb);
++ drop_modules:
++ drop_parsed_module_refcounts(opts.subsys_bits);
+ out_err:
+ kfree(opts.release_agent);
+ kfree(opts.name);
+@@ -3422,19 +3487,71 @@ int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss)
+ lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
+ ss->active = 1;
+
+- /*
+- * pin the subsystem's module so it doesn't go away. this shouldn't
+- * fail, since the module's initcall calls us.
+- * TODO: with module unloading, move this elsewhere
+- */
+- BUG_ON(!try_module_get(ss->module));
+-
+ /* success! */
+ mutex_unlock(&cgroup_mutex);
+ return 0;
+ }
+ EXPORT_SYMBOL_GPL(cgroup_load_subsys);
+
++/**
++ * cgroup_unload_subsys: unload a modular subsystem
++ * @ss: the subsystem to unload
++ *
++ * This function should be called in a modular subsystem's exitcall. When this
++ * function is invoked, the refcount on the subsystem's module will be 0, so
++ * the subsystem will not be attached to any hierarchy.
++ */
++void cgroup_unload_subsys(struct cgroup_subsys *ss)
++{
++ struct cg_cgroup_link *link;
++ struct hlist_head *hhead;
++
++ BUG_ON(ss->module == NULL);
++
++ /*
++ * we shouldn't be called if the subsystem is in use, and the use of
++ * try_module_get in parse_cgroupfs_options should ensure that it
++ * doesn't start being used while we're killing it off.
++ */
++ BUG_ON(ss->root != &rootnode);
++
++ mutex_lock(&cgroup_mutex);
++ /* deassign the subsys_id */
++ BUG_ON(ss->subsys_id < CGROUP_BUILTIN_SUBSYS_COUNT);
++ subsys[ss->subsys_id] = NULL;
++
++ /* remove subsystem from rootnode's list of subsystems */
++ list_del(&ss->sibling);
++
++ /*
++ * disentangle the css from all css_sets attached to the dummytop. as
++ * in loading, we need to pay our respects to the hashtable gods.
++ */
++ write_lock(&css_set_lock);
++ list_for_each_entry(link, &dummytop->css_sets, cgrp_link_list) {
++ struct css_set *cg = link->cg;
++
++ hlist_del(&cg->hlist);
++ BUG_ON(!cg->subsys[ss->subsys_id]);
++ cg->subsys[ss->subsys_id] = NULL;
++ hhead = css_set_hash(cg->subsys);
++ hlist_add_head(&cg->hlist, hhead);
++ }
++ write_unlock(&css_set_lock);
++
++ /*
++ * remove subsystem's css from the dummytop and free it - need to free
++ * before marking as null because ss->destroy needs the cgrp->subsys
++ * pointer to find their state. note that this also takes care of
++ * freeing the css_id.
++ */
++ ss->destroy(ss, dummytop);
++ dummytop->subsys[ss->subsys_id] = NULL;
++
++ mutex_unlock(&cgroup_mutex);
++}
++EXPORT_SYMBOL_GPL(cgroup_unload_subsys);
++
+ /**
+ * cgroup_init_early - cgroup initialization at system boot
+ *commit e6a1105ba08b265023dd71a4174fb4a29ebc7083
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Mar 10 15:22:09 2010 -0800
+
+ cgroups: subsystem module loading interface
+
+ Add interface between cgroups subsystem management and module loading
+
+ This patch implements rudimentary module-loading support for cgroups -
+ namely, a cgroup_load_subsys (similar to cgroup_init_subsys) for use as a
+ module initcall, and a struct module pointer in struct cgroup_subsys.
+
+ Several functions that might be wanted by modules have had EXPORT_SYMBOL
+ added to them, but it's unclear exactly which functions want it and which
+ won't.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Paul Menage <menage@google.com>
+ Cc: "David S. Miller" <davem@davemloft.net>
+ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+ Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
+index d45082653e3d..ae8a037a761e 100644
+--- a/Documentation/cgroups/cgroups.txt
++++ b/Documentation/cgroups/cgroups.txt
+@@ -488,6 +488,10 @@ Each subsystem should:
+ - add an entry in linux/cgroup_subsys.h
+ - define a cgroup_subsys object called <name>_subsys
+
++If a subsystem can be compiled as a module, it should also have in its
++module initcall a call to cgroup_load_subsys(&its_subsys_struct). It
++should also set its_subsys.module = THIS_MODULE in its .c file.
++
+ Each subsystem may export the following methods. The only mandatory
+ methods are create/destroy. Any others that are null are presumed to
+ be successful no-ops.
+diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
+index 28319a9fe569..402ce477c47e 100644
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -37,6 +37,7 @@ extern void cgroup_post_fork(struct task_struct *p);
+ extern void cgroup_exit(struct task_struct *p, int run_callbacks);
+ extern int cgroupstats_build(struct cgroupstats *stats,
+ struct dentry *dentry);
++extern int cgroup_load_subsys(struct cgroup_subsys *ss);
+
+ extern const struct file_operations proc_cgroup_operations;
+
+@@ -486,6 +487,9 @@ struct cgroup_subsys {
+ /* used when use_id == true */
+ struct idr idr;
+ spinlock_t id_lock;
++
++ /* should be defined only by modular subsystems */
++ struct module *module;
+ };
+
+ #define SUBSYS(_x) extern struct cgroup_subsys _x ## _subsys;
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index c92fb9549358..2cae38e64c59 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -44,6 +44,7 @@
+ #include <linux/string.h>
+ #include <linux/sort.h>
+ #include <linux/kmod.h>
++#include <linux/module.h>
+ #include <linux/delayacct.h>
+ #include <linux/cgroupstats.h>
+ #include <linux/hash.h>
+@@ -254,7 +255,8 @@ struct cg_cgroup_link {
+ static struct css_set init_css_set;
+ static struct cg_cgroup_link init_css_set_link;
+
+-static int cgroup_subsys_init_idr(struct cgroup_subsys *ss);
++static int cgroup_init_idr(struct cgroup_subsys *ss,
++ struct cgroup_subsys_state *css);
+
+ /* css_set_lock protects the list of css_set objects, and the
+ * chain of tasks off each css_set. Nests outside task->alloc_lock
+@@ -2125,6 +2127,7 @@ int cgroup_add_file(struct cgroup *cgrp,
+ error = PTR_ERR(dentry);
+ return error;
+ }
++EXPORT_SYMBOL_GPL(cgroup_add_file);
+
+ int cgroup_add_files(struct cgroup *cgrp,
+ struct cgroup_subsys *subsys,
+@@ -2139,6 +2142,7 @@ int cgroup_add_files(struct cgroup *cgrp,
+ }
+ return 0;
+ }
++EXPORT_SYMBOL_GPL(cgroup_add_files);
+
+ /**
+ * cgroup_task_count - count the number of tasks in a cgroup.
+@@ -3292,7 +3296,144 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
+ mutex_init(&ss->hierarchy_mutex);
+ lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
+ ss->active = 1;
++
++ /* this function shouldn't be used with modular subsystems, since they
++ * need to register a subsys_id, among other things */
++ BUG_ON(ss->module);
++}
++
++/**
++ * cgroup_load_subsys: load and register a modular subsystem at runtime
++ * @ss: the subsystem to load
++ *
++ * This function should be called in a modular subsystem's initcall. If the
++ * subsytem is built as a module, it will be assigned a new subsys_id and set
++ * up for use. If the subsystem is built-in anyway, work is delegated to the
++ * simpler cgroup_init_subsys.
++ */
++int __init_or_module cgroup_load_subsys(struct cgroup_subsys *ss)
++{
++ int i;
++ struct cgroup_subsys_state *css;
++
++ /* check name and function validity */
++ if (ss->name == NULL || strlen(ss->name) > MAX_CGROUP_TYPE_NAMELEN ||
++ ss->create == NULL || ss->destroy == NULL)
++ return -EINVAL;
++
++ /*
++ * we don't support callbacks in modular subsystems. this check is
++ * before the ss->module check for consistency; a subsystem that could
++ * be a module should still have no callbacks even if the user isn't
++ * compiling it as one.
++ */
++ if (ss->fork || ss->exit)
++ return -EINVAL;
++
++ /*
++ * an optionally modular subsystem is built-in: we want to do nothing,
++ * since cgroup_init_subsys will have already taken care of it.
++ */
++ if (ss->module == NULL) {
++ /* a few sanity checks */
++ BUG_ON(ss->subsys_id >= CGROUP_BUILTIN_SUBSYS_COUNT);
++ BUG_ON(subsys[ss->subsys_id] != ss);
++ return 0;
++ }
++
++ /*
++ * need to register a subsys id before anything else - for example,
++ * init_cgroup_css needs it.
++ */
++ mutex_lock(&cgroup_mutex);
++ /* find the first empty slot in the array */
++ for (i = CGROUP_BUILTIN_SUBSYS_COUNT; i < CGROUP_SUBSYS_COUNT; i++) {
++ if (subsys[i] == NULL)
++ break;
++ }
++ if (i == CGROUP_SUBSYS_COUNT) {
++ /* maximum number of subsystems already registered! */
++ mutex_unlock(&cgroup_mutex);
++ return -EBUSY;
++ }
++ /* assign ourselves the subsys_id */
++ ss->subsys_id = i;
++ subsys[i] = ss;
++
++ /*
++ * no ss->create seems to need anything important in the ss struct, so
++ * this can happen first (i.e. before the rootnode attachment).
++ */
++ css = ss->create(ss, dummytop);
++ if (IS_ERR(css)) {
++ /* failure case - need to deassign the subsys[] slot. */
++ subsys[i] = NULL;
++ mutex_unlock(&cgroup_mutex);
++ return PTR_ERR(css);
++ }
++
++ list_add(&ss->sibling, &rootnode.subsys_list);
++ ss->root = &rootnode;
++
++ /* our new subsystem will be attached to the dummy hierarchy. */
++ init_cgroup_css(css, ss, dummytop);
++ /* init_idr must be after init_cgroup_css because it sets css->id. */
++ if (ss->use_id) {
++ int ret = cgroup_init_idr(ss, css);
++ if (ret) {
++ dummytop->subsys[ss->subsys_id] = NULL;
++ ss->destroy(ss, dummytop);
++ subsys[i] = NULL;
++ mutex_unlock(&cgroup_mutex);
++ return ret;
++ }
++ }
++
++ /*
++ * Now we need to entangle the css into the existing css_sets. unlike
++ * in cgroup_init_subsys, there are now multiple css_sets, so each one
++ * will need a new pointer to it; done by iterating the css_set_table.
++ * furthermore, modifying the existing css_sets will corrupt the hash
++ * table state, so each changed css_set will need its hash recomputed.
++ * this is all done under the css_set_lock.
++ */
++ write_lock(&css_set_lock);
++ for (i = 0; i < CSS_SET_TABLE_SIZE; i++) {
++ struct css_set *cg;
++ struct hlist_node *node, *tmp;
++ struct hlist_head *bucket = &css_set_table[i], *new_bucket;
++
++ hlist_for_each_entry_safe(cg, node, tmp, bucket, hlist) {
++ /* skip entries that we already rehashed */
++ if (cg->subsys[ss->subsys_id])
++ continue;
++ /* remove existing entry */
++ hlist_del(&cg->hlist);
++ /* set new value */
++ cg->subsys[ss->subsys_id] = css;
++ /* recompute hash and restore entry */
++ new_bucket = css_set_hash(cg->subsys);
++ hlist_add_head(&cg->hlist, new_bucket);
++ }
++ }
++ write_unlock(&css_set_lock);
++
++ mutex_init(&ss->hierarchy_mutex);
++ lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
++ ss->active = 1;
++
++ /*
++ * pin the subsystem's module so it doesn't go away. this shouldn't
++ * fail, since the module's initcall calls us.
++ * TODO: with module unloading, move this elsewhere
++ */
++ BUG_ON(!try_module_get(ss->module));
++
++ /* success! */
++ mutex_unlock(&cgroup_mutex);
++ return 0;
+ }
++EXPORT_SYMBOL_GPL(cgroup_load_subsys);
+
+ /**
+ * cgroup_init_early - cgroup initialization at system boot
+@@ -3364,7 +3505,7 @@ int __init cgroup_init(void)
+ if (!ss->early_init)
+ cgroup_init_subsys(ss);
+ if (ss->use_id)
+- cgroup_subsys_init_idr(ss);
++ cgroup_init_idr(ss, init_css_set.subsys[ss->subsys_id]);
+ }
+
+ /* Add init_css_set to the hash table */
+@@ -4033,15 +4174,14 @@ static struct css_id *get_new_cssid(struct cgroup_subsys *ss, int depth)
+
+ }
+
+-static int __init cgroup_subsys_init_idr(struct cgroup_subsys *ss)
++static int __init_or_module cgroup_init_idr(struct cgroup_subsys *ss,
++ struct cgroup_subsys_state *rootcss)
+ {
+ struct css_id *newid;
+- struct cgroup_subsys_state *rootcss;
+
+ spin_lock_init(&ss->id_lock);
+ idr_init(&ss->idr);
+
+- rootcss = init_css_set.subsys[ss->subsys_id];
+ newid = get_new_cssid(ss, 0);
+ if (IS_ERR(newid))
+ return PTR_ERR(newid);commit aae8aab40367036931608fdaf9e2dc568b516f19
+Author: Ben Blum <bblum@andrew.cmu.edu>
+Date: Wed Mar 10 15:22:07 2010 -0800
+
+ cgroups: revamp subsys array
+
+ This patch series provides the ability for cgroup subsystems to be
+ compiled as modules both within and outside the kernel tree. This is
+ mainly useful for classifiers and subsystems that hook into components
+ that are already modules. cls_cgroup and blkio-cgroup serve as the
+ example use cases for this feature.
+
+ It provides an interface cgroup_load_subsys() and cgroup_unload_subsys()
+ which modular subsystems can use to register and depart during runtime.
+ The net_cls classifier subsystem serves as the example for a subsystem
+ which can be converted into a module using these changes.
+
+ Patch #1 sets up the subsys[] array so its contents can be dynamic as
+ modules appear and (eventually) disappear. Iterations over the array are
+ modified to handle when subsystems are absent, and the dynamic section of
+ the array is protected by cgroup_mutex.
+
+ Patch #2 implements an interface for modules to load subsystems, called
+ cgroup_load_subsys, similar to cgroup_init_subsys, and adds a module
+ pointer in struct cgroup_subsys.
+
+ Patch #3 adds a mechanism for unloading modular subsystems, which includes
+ a more advanced rework of the rudimentary reference counting introduced in
+ patch 2.
+
+ Patch #4 modifies the net_cls subsystem, which already had some module
+ declarations, to be configurable as a module, which also serves as a
+ simple proof-of-concept.
+
+ Part of implementing patches 2 and 4 involved updating css pointers in
+ each css_set when the module appears or leaves. In doing this, it was
+ discovered that css_sets always remain linked to the dummy cgroup,
+ regardless of whether or not any subsystems are actually bound to it
+ (i.e., not mounted on an actual hierarchy). The subsystem loading and
+ unloading code therefore should keep in mind the special cases where the
+ added subsystem is the only one in the dummy cgroup (and therefore all
+ css_sets need to be linked back into it) and where the removed subsys was
+ the only one in the dummy cgroup (and therefore all css_sets should be
+ unlinked from it) - however, as all css_sets always stay attached to the
+ dummy cgroup anyway, these cases are ignored. Any fix that addresses this
+ issue should also make sure these cases are addressed in the subsystem
+ loading and unloading code.
+
+ This patch:
+
+ Make subsys[] able to be dynamically populated to support modular
+ subsystems
+
+ This patch reworks the way the subsys[] array is used so that subsystems
+ can register themselves after boot time, and enables the internals of
+ cgroups to be able to handle when subsystems are not present or may
+ appear/disappear.
+
+ Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
+ Acked-by: Li Zefan <lizf@cn.fujitsu.com>
+ Cc: Paul Menage <menage@google.com>
+ Cc: "David S. Miller" <davem@davemloft.net>
+ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
+ Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
+index 14160b5b693f..28319a9fe569 100644
+--- a/include/linux/cgroup.h
++++ b/include/linux/cgroup.h
+@@ -40,13 +40,19 @@ extern int cgroupstats_build(struct cgroupstats *stats,
+
+ extern const struct file_operations proc_cgroup_operations;
+
+-/* Define the enumeration of all cgroup subsystems */
++/* Define the enumeration of all builtin cgroup subsystems */
+ #define SUBSYS(_x) _x ## _subsys_id,
+ enum cgroup_subsys_id {
+ #include <linux/cgroup_subsys.h>
+- CGROUP_SUBSYS_COUNT
++ CGROUP_BUILTIN_SUBSYS_COUNT
+ };
+ #undef SUBSYS
++/*
++ * This define indicates the maximum number of subsystems that can be loaded
++ * at once. We limit to this many since cgroupfs_root has subsys_bits to keep
++ * track of all of them.
++ */
++#define CGROUP_SUBSYS_COUNT (BITS_PER_BYTE*sizeof(unsigned long))
+
+ /* Per-subsystem/per-cgroup state maintained by the system. */
+ struct cgroup_subsys_state {
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index cace83ddbcdc..c92fb9549358 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -57,10 +57,14 @@
+
+ static DEFINE_MUTEX(cgroup_mutex);
+
+-/* Generate an array of cgroup subsystem pointers */
++/*
++ * Generate an array of cgroup subsystem pointers. At boot time, this is
++ * populated up to CGROUP_BUILTIN_SUBSYS_COUNT, and modular subsystems are
++ * registered after that. The mutable section of this array is protected by
++ * cgroup_mutex.
++ */
+ #define SUBSYS(_x) &_x ## _subsys,
+-
+-static struct cgroup_subsys *subsys[] = {
++static struct cgroup_subsys *subsys[CGROUP_SUBSYS_COUNT] = {
+ #include <linux/cgroup_subsys.h>
+ };
+
+@@ -448,8 +452,11 @@ static struct css_set *find_existing_css_set(
+ struct hlist_node *node;
+ struct css_set *cg;
+
+- /* Built the set of subsystem state objects that we want to
+- * see in the new css_set */
++ /*
++ * Build the set of subsystem state objects that we want to see in the
++ * new css_set. while subsystems can change globally, the entries here
++ * won't change, so no need for locking.
++ */
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ if (root->subsys_bits & (1UL << i)) {
+ /* Subsystem is in this hierarchy. So we want
+@@ -884,7 +891,9 @@ void cgroup_release_and_wakeup_rmdir(struct cgroup_subsys_state *css)
+ css_put(css);
+ }
+
+-
++/*
++ * Call with cgroup_mutex held.
++ */
+ static int rebind_subsystems(struct cgroupfs_root *root,
+ unsigned long final_bits)
+ {
+@@ -892,6 +901,8 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ struct cgroup *cgrp = &root->top_cgroup;
+ int i;
+
++ BUG_ON(!mutex_is_locked(&cgroup_mutex));
++
+ removed_bits = root->actual_subsys_bits & ~final_bits;
+ added_bits = final_bits & ~root->actual_subsys_bits;
+ /* Check that any added subsystems are currently free */
+@@ -900,6 +911,12 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ struct cgroup_subsys *ss = subsys[i];
+ if (!(bit & added_bits))
+ continue;
++ /*
++ * Nobody should tell us to do a subsys that doesn't exist:
++ * parse_cgroupfs_options should catch that case and refcounts
++ * ensure that subsystems won't disappear once selected.
++ */
++ BUG_ON(ss == NULL);
+ if (ss->root != &rootnode) {
+ /* Subsystem isn't free */
+ return -EBUSY;
+@@ -919,6 +936,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ unsigned long bit = 1UL << i;
+ if (bit & added_bits) {
+ /* We're binding this subsystem to this hierarchy */
++ BUG_ON(ss == NULL);
+ BUG_ON(cgrp->subsys[i]);
+ BUG_ON(!dummytop->subsys[i]);
+ BUG_ON(dummytop->subsys[i]->cgroup != dummytop);
+@@ -932,6 +950,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ mutex_unlock(&ss->hierarchy_mutex);
+ } else if (bit & removed_bits) {
+ /* We're removing this subsystem */
++ BUG_ON(ss == NULL);
+ BUG_ON(cgrp->subsys[i] != dummytop->subsys[i]);
+ BUG_ON(cgrp->subsys[i]->cgroup != cgrp);
+ mutex_lock(&ss->hierarchy_mutex);
+@@ -944,6 +963,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
+ mutex_unlock(&ss->hierarchy_mutex);
+ } else if (bit & final_bits) {
+ /* Subsystem state should already exist */
++ BUG_ON(ss == NULL);
+ BUG_ON(!cgrp->subsys[i]);
+ } else {
+ /* Subsystem state shouldn't exist */
+@@ -986,14 +1006,18 @@ struct cgroup_sb_opts {
+
+ };
+
+-/* Convert a hierarchy specifier into a bitmask of subsystems and
+- * flags. */
++/*
++ * Convert a hierarchy specifier into a bitmask of subsystems and flags. Call
++ * with cgroup_mutex held to protect the subsys[] array.
++ */
+ static int parse_cgroupfs_options(char *data,
+ struct cgroup_sb_opts *opts)
+ {
+ char *token, *o = data ?: "all";
+ unsigned long mask = (unsigned long)-1;
+
++ BUG_ON(!mutex_is_locked(&cgroup_mutex));
++
+ #ifdef CONFIG_CPUSETS
+ mask = ~(1UL << cpuset_subsys_id);
+ #endif
+@@ -1009,6 +1033,8 @@ static int parse_cgroupfs_options(char *data,
+ opts->subsys_bits = 0;
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
++ if (ss == NULL)
++ continue;
+ if (!ss->disabled)
+ opts->subsys_bits |= 1ul << i;
+ }
+@@ -1053,6 +1079,8 @@ static int parse_cgroupfs_options(char *data,
+ int i;
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ ss = subsys[i];
++ if (ss == NULL)
++ continue;
+ if (!strcmp(token, ss->name)) {
+ if (!ss->disabled)
+ set_bit(i, &opts->subsys_bits);
+@@ -1306,7 +1334,9 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
+ struct cgroupfs_root *new_root;
+
+ /* First find the desired set of subsystems */
++ mutex_lock(&cgroup_mutex);
+ ret = parse_cgroupfs_options(data, &opts);
++ mutex_unlock(&cgroup_mutex);
+ if (ret)
+ goto out_err;
+
+@@ -2918,8 +2948,14 @@ static void cgroup_lock_hierarchy(struct cgroupfs_root *root)
+ /* We need to take each hierarchy_mutex in a consistent order */
+ int i;
+
++ /*
++ * No worry about a race with rebind_subsystems that might mess up the
++ * locking order, since both parties are under cgroup_mutex.
++ */
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
++ if (ss == NULL)
++ continue;
+ if (ss->root == root)
+ mutex_lock(&ss->hierarchy_mutex);
+ }
+@@ -2931,6 +2967,8 @@ static void cgroup_unlock_hierarchy(struct cgroupfs_root *root)
+
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
++ if (ss == NULL)
++ continue;
+ if (ss->root == root)
+ mutex_unlock(&ss->hierarchy_mutex);
+ }
+@@ -3054,11 +3092,16 @@ static int cgroup_has_css_refs(struct cgroup *cgrp)
+ * synchronization other than RCU, and the subsystem linked
+ * list isn't RCU-safe */
+ int i;
++ /*
++ * We won't need to lock the subsys array, because the subsystems
++ * we're concerned about aren't going anywhere since our cgroup root
++ * has a reference on them.
++ */
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+ struct cgroup_subsys_state *css;
+- /* Skip subsystems not in this hierarchy */
+- if (ss->root != cgrp->root)
++ /* Skip subsystems not present or not in this hierarchy */
++ if (ss == NULL || ss->root != cgrp->root)
+ continue;
+ css = cgrp->subsys[ss->subsys_id];
+ /* When called from check_for_release() it's possible
+@@ -3279,7 +3322,8 @@ int __init cgroup_init_early(void)
+ for (i = 0; i < CSS_SET_TABLE_SIZE; i++)
+ INIT_HLIST_HEAD(&css_set_table[i]);
+
+- for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
++ /* at bootup time, we don't worry about modular subsystems */
++ for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+
+ BUG_ON(!ss->name);
+@@ -3314,7 +3358,8 @@ int __init cgroup_init(void)
+ if (err)
+ return err;
+
+- for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
++ /* at bootup time, we don't worry about modular subsystems */
++ for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+ if (!ss->early_init)
+ cgroup_init_subsys(ss);
+@@ -3423,9 +3468,16 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v)
+ int i;
+
+ seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\tenabled\n");
++ /*
++ * ideally we don't want subsystems moving around while we do this.
++ * cgroup_mutex is also necessary to guarantee an atomic snapshot of
++ * subsys/hierarchy state.
++ */
+ mutex_lock(&cgroup_mutex);
+ for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
++ if (ss == NULL)
++ continue;
+ seq_printf(m, "%s\t%d\t%d\t%d\n",
+ ss->name, ss->root->hierarchy_id,
+ ss->root->number_of_cgroups, !ss->disabled);
+@@ -3483,7 +3535,12 @@ void cgroup_fork_callbacks(struct task_struct *child)
+ {
+ if (need_forkexit_callback) {
+ int i;
+- for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
++ /*
++ * forkexit callbacks are only supported for builtin
++ * subsystems, and the builtin section of the subsys array is
++ * immutable, so we don't need to lock the subsys array here.
++ */
++ for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+ if (ss->fork)
+ ss->fork(ss, child);
+@@ -3552,7 +3609,11 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks)
+ struct css_set *cg;
+
+ if (run_callbacks && need_forkexit_callback) {
+- for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
++ /*
++ * modular subsystems can't use callbacks, so no need to lock
++ * the subsys array
++ */
++ for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+ if (ss->exit)
+ ss->exit(ss, tsk);
+@@ -3844,8 +3905,11 @@ static int __init cgroup_disable(char *str)
+ while ((token = strsep(&str, ",")) != NULL) {
+ if (!*token)
+ continue;
+-
+- for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
++ /*
++ * cgroup_disable, being at boot time, can't know about module
++ * subsystems, so we don't worry about them.
++ */
++ for (i = 0; i < CGROUP_BUILTIN_SUBSYS_COUNT; i++) {
+ struct cgroup_subsys *ss = subsys[i];
+
+ if (!strcmp(token, ss->name)) {
+ commit 69ac59647e66c1b53fb98fe8b6d0f2099cffad60
+Author: Chaskiel Grundman <cg2v@andrew.cmu.edu>
+Date: Fri Sep 9 13:01:54 2005 -0700
+
+ [PATCH] alpha: process_reloc_for_got confuses r_offset and r_addend
+
+ arch/alpha/kernel/module.c:process_reloc_for_got(), which figures out how big
+ the .got section for a module should be, appears to be confusing r_offset (the
+ file offset that the relocation needs to be applied to) with r_addend (the
+ offset of the relocation's actual target address from the address of the
+ relocation's symbol). Because of this, one .got entry is allocated for each
+ relocation instead of one each unique symbol/addend.
+
+ In the module I am working with, this causes the .got section to be almost 10
+ times larger than it needs to be (75544 bytes instead of 7608 bytes). As the
+ .got is accessed with global-pointer-relative instructions, it needs to be
+ within the 64k gp "zone", and a 75544 byte .got clearly does not fit. The
+ result of this is that relocation overflows are detected during module load
+ and the load is aborted.
+
+ Change struct got_entry/process_reloc_for_got to fix this.
+
+ Acked-by: Richard Henderson <rth@twiddle.net>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
+diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
+index fc271e316a38..aac6d4b22f7a 100644
+--- a/arch/alpha/kernel/module.c
++++ b/arch/alpha/kernel/module.c
+@@ -47,7 +47,7 @@ module_free(struct module *mod, void *module_region)
+
+ struct got_entry {
+ struct got_entry *next;
+- Elf64_Addr r_offset;
++ Elf64_Sxword r_addend;
+ int got_offset;
+ };
+
+@@ -57,14 +57,14 @@ process_reloc_for_got(Elf64_Rela *rela,
+ {
+ unsigned long r_sym = ELF64_R_SYM (rela->r_info);
+ unsigned long r_type = ELF64_R_TYPE (rela->r_info);
+- Elf64_Addr r_offset = rela->r_offset;
++ Elf64_Sxword r_addend = rela->r_addend;
+ struct got_entry *g;
+
+ if (r_type != R_ALPHA_LITERAL)
+ return;
+
+ for (g = chains + r_sym; g ; g = g->next)
+- if (g->r_offset == r_offset) {
++ if (g->r_addend == r_addend) {
+ if (g->got_offset == 0) {
+ g->got_offset = *poffset;
+ *poffset += 8;
+@@ -74,7 +74,7 @@ process_reloc_for_got(Elf64_Rela *rela,
+
+ g = kmalloc (sizeof (*g), GFP_KERNEL);
+ g->next = chains[r_sym].next;
+- g->r_offset = r_offset;
++ g->r_addend = r_addend;
+ g->got_offset = *poffset;
+ *poffset += 8;
+ chains[r_sym].next = g;commit 3e66d0138c05d9792f458b96581afdb314bc66d6
+Author: Christopher R. Baker <cbaker@rec.ri.cmu.edu>
+Date: Sat Mar 8 11:00:20 2014 -0500
+
+ can: populate netdev::dev_id for udev discrimination
+
+ My objective is to be able to totally discriminate CAN ports on multi-port
+ cards via udev so as to rename them to semantically interesting/unique names
+ for my system (e.g., "ecuCAN" and "auxCAN" instead of "can0" and "can1").
+
+ The following patch assigns the dev_id field to match the channel number on all
+ multi-channel devices. I can only test my two-port Peak PCI card, but it works
+ as expected: ATTRS{dev_id} now expresses the port number and my udev rules now
+ unambiguously pick out and rename my individual CAN ports.
+
+ Signed-off-by: Christopher R. Baker <cbaker@rec.ri.cmu.edu>
+ Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> [PEAK PCAN-USB pro and EMS PCMCIA]
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
+index d790b874ca79..fd13dbf07d9c 100644
+--- a/drivers/net/can/sja1000/ems_pci.c
++++ b/drivers/net/can/sja1000/ems_pci.c
+@@ -323,6 +323,7 @@ static int ems_pci_add_card(struct pci_dev *pdev,
+ priv->cdr = EMS_PCI_CDR;
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
++ dev->dev_id = i;
+
+ if (card->version == 1)
+ /* reset int flag of pita */
+diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
+index 9e535f2ef52b..381de998d2f1 100644
+--- a/drivers/net/can/sja1000/ems_pcmcia.c
++++ b/drivers/net/can/sja1000/ems_pcmcia.c
+@@ -211,6 +211,7 @@ static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
+ priv = netdev_priv(dev);
+ priv->priv = card;
+ SET_NETDEV_DEV(dev, &pdev->dev);
++ dev->dev_id = i;
+
+ priv->irq_flags = IRQF_SHARED;
+ dev->irq = pdev->irq;
+diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
+index c96eb14699d5..23b8e1324e25 100644
+--- a/drivers/net/can/sja1000/kvaser_pci.c
++++ b/drivers/net/can/sja1000/kvaser_pci.c
+@@ -270,6 +270,7 @@ static int kvaser_pci_add_chan(struct pci_dev *pdev, int channel,
+ priv->reg_base, board->conf_addr, dev->irq);
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
++ dev->dev_id = channel;
+
+ /* Register SJA1000 device */
+ err = register_sja1000dev(dev);
+diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
+index 065ca49eb45e..c540e3d12e3d 100644
+--- a/drivers/net/can/sja1000/peak_pci.c
++++ b/drivers/net/can/sja1000/peak_pci.c
+@@ -642,6 +642,7 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ icr |= chan->icr_mask;
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
++ dev->dev_id = i;
+
+ /* Create chain of SJA1000 devices */
+ chan->prev_dev = pci_get_drvdata(pdev);
+diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
+index f7ad754dd2aa..dd56133cc461 100644
+--- a/drivers/net/can/sja1000/peak_pcmcia.c
++++ b/drivers/net/can/sja1000/peak_pcmcia.c
+@@ -550,6 +550,7 @@ static int pcan_add_channels(struct pcan_pccard *card)
+ priv = netdev_priv(netdev);
+ priv->priv = card;
+ SET_NETDEV_DEV(netdev, &pdev->dev);
++ netdev->dev_id = i;
+
+ priv->irq_flags = IRQF_SHARED;
+ netdev->irq = pdev->irq;
+diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
+index fbb61a0d901f..ec39b7cb2287 100644
+--- a/drivers/net/can/sja1000/plx_pci.c
++++ b/drivers/net/can/sja1000/plx_pci.c
+@@ -587,6 +587,7 @@ static int plx_pci_add_card(struct pci_dev *pdev,
+ priv->cdr = ci->cdr;
+
+ SET_NETDEV_DEV(dev, &pdev->dev);
++ dev->dev_id = i;
+
+ /* Register SJA1000 device */
+ err = register_sja1000dev(dev);
+diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
+index 3766bd90f3ed..7d8c8f3672dd 100644
+--- a/drivers/net/can/softing/softing_main.c
++++ b/drivers/net/can/softing/softing_main.c
+@@ -833,6 +833,7 @@ static int softing_pdev_probe(struct platform_device *pdev)
+ ret = -ENOMEM;
+ goto netdev_failed;
+ }
++ netdev->dev_id = j;
+ priv = netdev_priv(card->net[j]);
+ priv->index = j;
+ ret = softing_netdev_register(netdev);
+diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
+index 1f8ce91adbd3..b7c9e8b11460 100644
+--- a/drivers/net/can/usb/esd_usb2.c
++++ b/drivers/net/can/usb/esd_usb2.c
+@@ -1025,6 +1025,7 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index)
+ netdev->netdev_ops = &esd_usb2_netdev_ops;
+
+ SET_NETDEV_DEV(netdev, &intf->dev);
++ netdev->dev_id = index;
+
+ err = register_candev(netdev);
+ if (err) {
+diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
+index ea596b53a5ae..4ca46edc061d 100644
+--- a/drivers/net/can/usb/kvaser_usb.c
++++ b/drivers/net/can/usb/kvaser_usb.c
+@@ -1530,6 +1530,7 @@ static int kvaser_usb_init_one(struct usb_interface *intf,
+ netdev->netdev_ops = &kvaser_usb_netdev_ops;
+
+ SET_NETDEV_DEV(netdev, &intf->dev);
++ netdev->dev_id = channel;
+
+ dev->nets[channel] = priv;
+
+diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+index 93e4a55a6c23..644e6ab8a489 100644
+--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
++++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+@@ -770,6 +770,7 @@ static int peak_usb_create_dev(struct peak_usb_adapter *peak_usb_adapter,
+ usb_set_intfdata(intf, dev);
+
+ SET_NETDEV_DEV(netdev, &intf->dev);
++ netdev->dev_id = ctrl_idx;
+
+ err = register_candev(netdev);
+ if (err) {commit a14848275b04f3193b9d9e9c745a4fae37f11f2f
+Author: Justin Carlson <justinca@qatar.cmu.edu>
+Date: Sun Sep 24 11:52:12 2006 +0300
+
+ USB: add SeaLevel 2106 SeaLINK support to ftdi_sio
+
+ We have a couple of these USB-Serial converters around; they're slightly
+ different from the 2104 models in that they can handle 500Kb/sec over RS422.
+ The existing ftdi driver seems to work just fine if we add in the
+ appropriate IDs.
+
+ Patch is against 2.6.17.6, but should apply cleanly to pretty much
+ anything recent.
+
+ From: Justin Carlson <justinca@qatar.cmu.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index b94d1bdb174e..e774a27c6c98 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -344,6 +344,7 @@ static struct usb_device_id id_table_combined [] = {
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2102_PID) },
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2103_PID) },
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2104_PID) },
++ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2106_PID) },
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2201_1_PID) },
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2201_2_PID) },
+ { USB_DEVICE(SEALEVEL_VID, SEALEVEL_2202_1_PID) },
+diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
+index 5bada7fa28e9..f0edb87d2dd5 100644
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -111,6 +111,7 @@
+ #define SEALEVEL_2102_PID 0x2102 /* SeaLINK+485 (2102) */
+ #define SEALEVEL_2103_PID 0x2103 /* SeaLINK+232I (2103) */
+ #define SEALEVEL_2104_PID 0x2104 /* SeaLINK+485I (2104) */
++#define SEALEVEL_2106_PID 0x9020 /* SeaLINK+422 (2106) */
+ #define SEALEVEL_2201_1_PID 0x2211 /* SeaPORT+2/232 (2201) Port 1 */
+ #define SEALEVEL_2201_2_PID 0x2221 /* SeaPORT+2/232 (2201) Port 2 */
+ #define SEALEVEL_2202_1_PID 0x2212 /* SeaPORT+2/485 (2202) Port 1 */
+ commit 53fc25b7f557089aff101235152ae4bff15c428a
+Author: Chenyuan Mi <cymi20@fudan.edu.cn>
+Date: Wed Jun 14 08:01:18 2023 -0700
+
+ perf subcmd: Fix missing check for return value of malloc() in add_cmdname()
+
+ The malloc() function may return NULL when it fails,
+ which may cause null pointer deference in add_cmdname(),
+ add Null check for return value of malloc().
+
+ Found by our static analysis tool.
+
+ Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
+ Acked-by: Ian Rogers <irogers@google.com>
+ Cc: Leo Yan <leo.yan@linaro.org>
+ Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+ Cc: linux-kernel@vger.kernel.org
+ Link: https://lore.kernel.org/r/20230614150118.115208-1-cymi20@fudan.edu.cn
+ Signed-off-by: Namhyung Kim <namhyung@kernel.org>
+
+diff --git a/tools/lib/subcmd/help.c b/tools/lib/subcmd/help.c
+index a66fb1a1a312..67a8d6b740ea 100644
+--- a/tools/lib/subcmd/help.c
++++ b/tools/lib/subcmd/help.c
+@@ -16,6 +16,8 @@
+ void add_cmdname(struct cmdnames *cmds, const char *name, size_t len)
+ {
+ struct cmdname *ent = malloc(sizeof(*ent) + len + 1);
++ if (!ent)
++ return;
+
+ ent->len = len;
+ memcpy(ent->name, name, len);commit 7396ba87f1edf549284869451665c7c4e74ecd4f
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Sat Aug 13 20:49:08 2022 +0800
+
+ net: fix potential refcount leak in ndisc_router_discovery()
+
+ The issue happens on specific paths in the function. After both the
+ object `rt` and `neigh` are grabbed successfully, when `lifetime` is
+ nonzero but the metric needs change, the function just deletes the
+ route and set `rt` to NULL. Then, it may try grabbing `rt` and `neigh`
+ again if above conditions hold. The function simply overwrite `neigh`
+ if succeeds or returns if fails, without decreasing the reference
+ count of previous `neigh`. This may result in memory leaks.
+
+ Fix it by decrementing the reference count of `neigh` in place.
+
+ Fixes: 6b2e04bc240f ("net: allow user to set metric on default route learned via Router Advertisement")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
+index 98453693e400..3a553494ff16 100644
+--- a/net/ipv6/ndisc.c
++++ b/net/ipv6/ndisc.c
+@@ -1378,6 +1378,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
+ if (!rt && lifetime) {
+ ND_PRINTK(3, info, "RA: adding default router\n");
+
++ if (neigh)
++ neigh_release(neigh);
++
+ rt = rt6_add_dflt_router(net, &ipv6_hdr(skb)->saddr,
+ skb->dev, pref, defrtr_usr_metric);
+ if (!rt) {commit bfc48f1b0505ffcb03a6d749139b7577d6b81ae0
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Wed Aug 10 23:29:13 2022 +0800
+
+ net/sunrpc: fix potential memory leaks in rpc_sysfs_xprt_state_change()
+
+ The issue happens on some error handling paths. When the function
+ fails to grab the object `xprt`, it simply returns 0, forgetting to
+ decrease the reference count of another object `xps`, which is
+ increased by rpc_sysfs_xprt_kobj_get_xprt_switch(), causing refcount
+ leaks. Also, the function forgets to check whether `xps` is valid
+ before using it, which may result in NULL-dereferencing issues.
+
+ Fix it by adding proper error handling code when either `xprt` or
+ `xps` is NULL.
+
+ Fixes: 5b7eb78486cd ("SUNRPC: take a xprt offline using sysfs")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
+index 7330eb9a70cf..c65c90ad626a 100644
+--- a/net/sunrpc/sysfs.c
++++ b/net/sunrpc/sysfs.c
+@@ -291,8 +291,10 @@ static ssize_t rpc_sysfs_xprt_state_change(struct kobject *kobj,
+ int offline = 0, online = 0, remove = 0;
+ struct rpc_xprt_switch *xps = rpc_sysfs_xprt_kobj_get_xprt_switch(kobj);
+
+- if (!xprt)
+- return 0;
++ if (!xprt || !xps) {
++ count = 0;
++ goto out_put;
++ }
+
+ if (!strncmp(buf, "offline", 7))
+ offline = 1;commit 9c9cb23e00ddf45679b21b4dacc11d1ae7961ebe
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Sun Jul 24 17:55:58 2022 +0800
+
+ xfrm: fix refcount leak in __xfrm_policy_check()
+
+ The issue happens on an error path in __xfrm_policy_check(). When the
+ fetching process of the object `pols[1]` fails, the function simply
+ returns 0, forgetting to decrement the reference count of `pols[0]`,
+ which is incremented earlier by either xfrm_sk_policy_lookup() or
+ xfrm_policy_lookup(). This may result in memory leaks.
+
+ Fix it by decreasing the reference count of `pols[0]` in that path.
+
+ Fixes: 134b0fc544ba ("IPsec: propagate security module errors up from flow_cache_lookup")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+
+diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
+index f1a0bab920a5..4f8bbb825abc 100644
+--- a/net/xfrm/xfrm_policy.c
++++ b/net/xfrm/xfrm_policy.c
+@@ -3599,6 +3599,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
+ if (pols[1]) {
+ if (IS_ERR(pols[1])) {
+ XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR);
++ xfrm_pol_put(pols[0]);
+ return 0;
+ }
+ pols[1]->curlft.use_time = ktime_get_real_seconds();commit 11c3627ec6b56c1525013f336f41b79a983b4d46
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Thu Apr 28 11:39:08 2022 +0800
+
+ apparmor: fix reference count leak in aa_pivotroot()
+
+ The aa_pivotroot() function has a reference counting bug in a specific
+ path. When aa_replace_current_label() returns on success, the function
+ forgets to decrement the reference count of “target”, which is
+ increased earlier by build_pivotroot(), causing a reference leak.
+
+ Fix it by decreasing the refcount of “target” in that path.
+
+ Fixes: 2ea3ffb7782a ("apparmor: add mount mediation")
+ Co-developed-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Co-developed-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: John Johansen <john.johansen@canonical.com>
+
+diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
+index 5cc5de062fc8..fa64a2db3aec 100644
+--- a/security/apparmor/mount.c
++++ b/security/apparmor/mount.c
+@@ -719,6 +719,7 @@ int aa_pivotroot(struct aa_label *label, const struct path *old_path,
+ aa_put_label(target);
+ goto out;
+ }
++ aa_put_label(target);
+ } else
+ /* already audited error */
+ error = PTR_ERR(target);commit d21a580dafc69aa04f46e6099616146a536b0724
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Fri Apr 29 16:11:22 2022 +0800
+
+ ksmbd: fix reference count leak in smb_check_perm_dacl()
+
+ The issue happens in a specific path in smb_check_perm_dacl(). When
+ "id" and "uid" have the same value, the function simply jumps out of
+ the loop without decrementing the reference count of the object
+ "posix_acls", which is increased by get_acl() earlier. This may
+ result in memory leaks.
+
+ Fix it by decreasing the reference count of "posix_acls" before
+ jumping to label "check_access_bits".
+
+ Fixes: 777cad1604d6 ("ksmbd: remove select FS_POSIX_ACL in Kconfig")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Acked-by: Namjae Jeon <linkinjeon@kernel.org>
+ Signed-off-by: Steve French <stfrench@microsoft.com>
+
+diff --git a/fs/ksmbd/smbacl.c b/fs/ksmbd/smbacl.c
+index 6ecf55ea1fed..38f23bf981ac 100644
+--- a/fs/ksmbd/smbacl.c
++++ b/fs/ksmbd/smbacl.c
+@@ -1261,6 +1261,7 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, struct path *path,
+ if (!access_bits)
+ access_bits =
+ SET_MINIMUM_RIGHTS;
++ posix_acl_release(posix_acls);
+ goto check_access_bits;
+ }
+ }commit fecbd4a317c95d73c849648c406bcf1b6a0ec1cf
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Fri Mar 4 16:53:32 2022 +0800
+
+ mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init
+
+ The reference counting issue happens in several error handling paths
+ on a refcounted object "nc->dmac". In these paths, the function simply
+ returns the error code, forgetting to balance the reference count of
+ "nc->dmac", increased earlier by dma_request_channel(), which may
+ cause refcount leaks.
+
+ Fix it by decrementing the refcount of specific object in those error
+ paths.
+
+ Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver")
+ Co-developed-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Co-developed-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
+ Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+ Link: https://lore.kernel.org/linux-mtd/20220304085330.3610-1-xiongx18@fudan.edu.cn
+
+diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
+index f3276ee9e4fe..ddd93bc38ea6 100644
+--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
++++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
+@@ -2060,13 +2060,15 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,
+ nc->mck = of_clk_get(dev->parent->of_node, 0);
+ if (IS_ERR(nc->mck)) {
+ dev_err(dev, "Failed to retrieve MCK clk\n");
+- return PTR_ERR(nc->mck);
++ ret = PTR_ERR(nc->mck);
++ goto out_release_dma;
+ }
+
+ np = of_parse_phandle(dev->parent->of_node, "atmel,smc", 0);
+ if (!np) {
+ dev_err(dev, "Missing or invalid atmel,smc property\n");
+- return -EINVAL;
++ ret = -EINVAL;
++ goto out_release_dma;
+ }
+
+ nc->smc = syscon_node_to_regmap(np);
+@@ -2074,10 +2076,16 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,
+ if (IS_ERR(nc->smc)) {
+ ret = PTR_ERR(nc->smc);
+ dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret);
+- return ret;
++ goto out_release_dma;
+ }
+
+ return 0;
++
++out_release_dma:
++ if (nc->dmac)
++ dma_release_channel(nc->dmac);
++
++ return ret;
+ }
+
+ static intcommit b7f114edd54326f730a754547e7cfb197b5bc132
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Tue Jan 25 21:10:45 2022 +0800
+
+ NFSv4.2: fix reference count leaks in _nfs42_proc_copy_notify()
+
+ [You don't often get email from xiongx18@fudan.edu.cn. Learn why this is important at http://aka.ms/LearnAboutSenderIdentification.]
+
+ The reference counting issue happens in two error paths in the
+ function _nfs42_proc_copy_notify(). In both error paths, the function
+ simply returns the error code and forgets to balance the refcount of
+ object `ctx`, bumped by get_nfs_open_context() earlier, which may
+ cause refcount leaks.
+
+ Fix it by balancing refcount of the `ctx` object before the function
+ returns in both error paths.
+
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+
+diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
+index 32129446beca..ca878d021fab 100644
+--- a/fs/nfs/nfs42proc.c
++++ b/fs/nfs/nfs42proc.c
+@@ -591,8 +591,10 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,
+
+ ctx = get_nfs_open_context(nfs_file_open_context(src));
+ l_ctx = nfs_get_lock_context(ctx);
+- if (IS_ERR(l_ctx))
+- return PTR_ERR(l_ctx);
++ if (IS_ERR(l_ctx)) {
++ status = PTR_ERR(l_ctx);
++ goto out;
++ }
+
+ status = nfs4_set_rw_stateid(&args->cna_src_stateid, ctx, l_ctx,
+ FMODE_READ);
+@@ -600,7 +602,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,
+ if (status) {
+ if (status == -EAGAIN)
+ status = -NFS4ERR_BAD_STATEID;
+- return status;
++ goto out;
+ }
+
+ status = nfs4_call_sync(src_server->client, src_server, &msg,
+@@ -609,6 +611,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,
+ if (status == -ENOTSUPP)
+ src_server->caps &= ~NFS_CAP_COPY_NOTIFY;
+
++out:
+ put_nfs_open_context(nfs_file_open_context(src));
+ return status;
+ }commit 37c2c83ca4f1ef4b6908181ac98e18360af89b42
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Tue Jan 25 18:12:15 2022 +0800
+
+ spi: uniphier: fix reference count leak in uniphier_spi_probe()
+
+ The issue happens in several error paths in uniphier_spi_probe().
+ When either dma_get_slave_caps() or devm_spi_register_master() returns
+ an error code, the function forgets to decrease the refcount of both
+ `dma_rx` and `dma_tx` objects, which may lead to refcount leaks.
+
+ Fix it by decrementing the reference count of specific objects in
+ those error paths.
+
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ Fixes: 28d1dddc59f6 ("spi: uniphier: Add DMA transfer mode support")
+ Link: https://lore.kernel.org/r/20220125101214.35677-1-xiongx18@fudan.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c
+index 342ee8d2c476..cc0da4822231 100644
+--- a/drivers/spi/spi-uniphier.c
++++ b/drivers/spi/spi-uniphier.c
+@@ -726,7 +726,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
+ if (ret) {
+ dev_err(&pdev->dev, "failed to get TX DMA capacities: %d\n",
+ ret);
+- goto out_disable_clk;
++ goto out_release_dma;
+ }
+ dma_tx_burst = caps.max_burst;
+ }
+@@ -735,7 +735,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
+ if (IS_ERR_OR_NULL(master->dma_rx)) {
+ if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+- goto out_disable_clk;
++ goto out_release_dma;
+ }
+ master->dma_rx = NULL;
+ dma_rx_burst = INT_MAX;
+@@ -744,7 +744,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
+ if (ret) {
+ dev_err(&pdev->dev, "failed to get RX DMA capacities: %d\n",
+ ret);
+- goto out_disable_clk;
++ goto out_release_dma;
+ }
+ dma_rx_burst = caps.max_burst;
+ }
+@@ -753,10 +753,20 @@ static int uniphier_spi_probe(struct platform_device *pdev)
+
+ ret = devm_spi_register_master(&pdev->dev, master);
+ if (ret)
+- goto out_disable_clk;
++ goto out_release_dma;
+
+ return 0;
+
++out_release_dma:
++ if (!IS_ERR_OR_NULL(master->dma_rx)) {
++ dma_release_channel(master->dma_rx);
++ master->dma_rx = NULL;
++ }
++ if (!IS_ERR_OR_NULL(master->dma_tx)) {
++ dma_release_channel(master->dma_tx);
++ master->dma_tx = NULL;
++ }
++
+ out_disable_clk:
+ clk_disable_unprepare(priv->clk);
+ commit dfced44f122c500004a48ecc8db516bb6a295a1b +Author: Xin Xiong <xiongx18@fudan.edu.cn> +Date: Fri Jan 21 15:46:23 2022 -0500 + + drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj + + This issue takes place in an error path in + amdgpu_cs_fence_to_handle_ioctl(). When `info->in.what` falls into + default case, the function simply returns -EINVAL, forgetting to + decrement the reference count of a dma_fence obj, which is bumped + earlier by amdgpu_cs_get_fence(). This may result in reference count + leaks. + + Fix it by decreasing the refcount of specific object before returning + the error code. + + Reviewed-by: Christian König <christian.koenig@amd.com> + Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: Alex Deucher <alexander.deucher@amd.com> + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 06d07502a1f6..a34be65c9eaa 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1509,6 +1509,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data, + return 0; + + default: ++ dma_fence_put(fence); + return -EINVAL; + } + }+
commit 76f1017757aa0c308a0b83ca611c9a89ee9a79a4
+Author: Bin Zhou <zhou0022@ntu.edu.sg>
+Date: Mon Jun 5 17:28:30 2006 -0700
+
+ [TCP]: TCP Veno congestion control
+
+ TCP Veno module is a new congestion control module to improve TCP
+ performance over wireless networks. The key innovation in TCP Veno is
+ the enhancement of TCP Reno/Sack congestion control algorithm by using
+ the estimated state of a connection based on TCP Vegas. This scheme
+ significantly reduces "blind" reduction of TCP window regardless of
+ the cause of packet loss.
+
+ This work is based on the research paper "TCP Veno: TCP Enhancement
+ for Transmission over Wireless Access Networks." C. P. Fu, S. C. Liew,
+ IEEE Journal on Selected Areas in Communication, Feb. 2003.
+
+ Original paper and many latest research works on veno:
+ http://www.ntu.edu.sg/home/ascpfu/veno/veno.html
+
+ Signed-off-by: Bin Zhou <zhou0022@ntu.edu.sg>
+ Cheng Peng Fu <ascpfu@ntu.edu.sg>
+ Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
+index ae85149a0434..8514106761b0 100644
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -560,6 +560,18 @@ config TCP_CONG_LP
+ ``fair share`` of bandwidth as targeted by TCP.
+ See http://www-ece.rice.edu/networks/TCP-LP/
+
++config TCP_CONG_VENO
++ tristate "TCP Veno"
++ depends on EXPERIMENTAL
++ default n
++ ---help---
++ TCP Veno is a sender-side only enhancement of TCP to obtain better
++ throughput over wireless networks. TCP Veno makes use of state
++ distinguishing to circumvent the difficult judgment of the packet loss
++ type. TCP Veno cuts down less congestion window in response to random
++ loss packets.
++ See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
++
+ endmenu
+
+ config TCP_CONG_BIC
+diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
+index 58a7a4634f70..00fcd2c1ba78 100644
+--- a/net/ipv4/Makefile
++++ b/net/ipv4/Makefile
+@@ -43,6 +43,7 @@ obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o
+ obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybla.o
+ obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
+ obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
++obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o
+ obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
+ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
+
+diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c
+new file mode 100644
+index 000000000000..1091671751c4
+--- /dev/null
++++ b/net/ipv4/tcp_veno.c
+@@ -0,0 +1,238 @@
++/*
++ * TCP Veno congestion control
++ *
++ * This is based on the congestion detection/avoidance scheme described in
++ * C. P. Fu, S. C. Liew.
++ * "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks."
++ * IEEE Journal on Selected Areas in Communication,
++ * Feb. 2003.
++ * See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
++ */
++
++#include <linux/config.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/inet_diag.h>
++
++#include <net/tcp.h>
++
++/* Default values of the Veno variables, in fixed-point representation
++ * with V_PARAM_SHIFT bits to the right of the binary point.
++ */
++#define V_PARAM_SHIFT 1
++static const int beta = 3 << V_PARAM_SHIFT;
++
++/* Veno variables */
++struct veno {
++ u8 doing_veno_now; /* if true, do veno for this rtt */
++ u16 cntrtt; /* # of rtts measured within last rtt */
++ u32 minrtt; /* min of rtts measured within last rtt (in usec) */
++ u32 basertt; /* the min of all Veno rtt measurements seen (in usec) */
++ u32 inc; /* decide whether to increase cwnd */
++ u32 diff; /* calculate the diff rate */
++};
++
++/* There are several situations when we must "re-start" Veno:
++ *
++ * o when a connection is established
++ * o after an RTO
++ * o after fast recovery
++ * o when we send a packet and there is no outstanding
++ * unacknowledged data (restarting an idle connection)
++ *
++ */
++static inline void veno_enable(struct sock *sk)
++{
++ struct veno *veno = inet_csk_ca(sk);
++
++ /* turn on Veno */
++ veno->doing_veno_now = 1;
++
++ veno->minrtt = 0x7fffffff;
++}
++
++static inline void veno_disable(struct sock *sk)
++{
++ struct veno *veno = inet_csk_ca(sk);
++
++ /* turn off Veno */
++ veno->doing_veno_now = 0;
++}
++
++static void tcp_veno_init(struct sock *sk)
++{
++ struct veno *veno = inet_csk_ca(sk);
++
++ veno->basertt = 0x7fffffff;
++ veno->inc = 1;
++ veno_enable(sk);
++}
++
++/* Do rtt sampling needed for Veno. */
++static void tcp_veno_rtt_calc(struct sock *sk, u32 usrtt)
++{
++ struct veno *veno = inet_csk_ca(sk);
++ u32 vrtt = usrtt + 1; /* Never allow zero rtt or basertt */
++
++ /* Filter to find propagation delay: */
++ if (vrtt < veno->basertt)
++ veno->basertt = vrtt;
++
++ /* Find the min rtt during the last rtt to find
++ * the current prop. delay + queuing delay:
++ */
++ veno->minrtt = min(veno->minrtt, vrtt);
++ veno->cntrtt++;
++}
++
++static void tcp_veno_state(struct sock *sk, u8 ca_state)
++{
++ if (ca_state == TCP_CA_Open)
++ veno_enable(sk);
++ else
++ veno_disable(sk);
++}
++
++/*
++ * If the connection is idle and we are restarting,
++ * then we don't want to do any Veno calculations
++ * until we get fresh rtt samples. So when we
++ * restart, we reset our Veno state to a clean
++ * state. After we get acks for this flight of
++ * packets, _then_ we can make Veno calculations
++ * again.
++ */
++static void tcp_veno_cwnd_event(struct sock *sk, enum tcp_ca_event event)
++{
++ if (event == CA_EVENT_CWND_RESTART || event == CA_EVENT_TX_START)
++ tcp_veno_init(sk);
++}
++
++static void tcp_veno_cong_avoid(struct sock *sk, u32 ack,
++ u32 seq_rtt, u32 in_flight, int flag)
++{
++ struct tcp_sock *tp = tcp_sk(sk);
++ struct veno *veno = inet_csk_ca(sk);
++
++ if (!veno->doing_veno_now)
++ return tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
++
++ /* limited by applications */
++ if (!tcp_is_cwnd_limited(sk, in_flight))
++ return;
++
++ /* We do the Veno calculations only if we got enough rtt samples */
++ if (veno->cntrtt <= 2) {
++ /* We don't have enough rtt samples to do the Veno
++ * calculation, so we'll behave like Reno.
++ */
++ tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
++ } else {
++ u32 rtt, target_cwnd;
++
++ /* We have enough rtt samples, so, using the Veno
++ * algorithm, we determine the state of the network.
++ */
++
++ rtt = veno->minrtt;
++
++ target_cwnd = ((tp->snd_cwnd * veno->basertt)
++ << V_PARAM_SHIFT) / rtt;
++
++ veno->diff = (tp->snd_cwnd << V_PARAM_SHIFT) - target_cwnd;
++
++ if (tp->snd_cwnd <= tp->snd_ssthresh) {
++ /* Slow start. */
++ tcp_slow_start(tp);
++ } else {
++ /* Congestion avoidance. */
++ if (veno->diff < beta) {
++ /* In the "non-congestive state", increase cwnd
++ * every rtt.
++ */
++ if (tp->snd_cwnd_cnt >= tp->snd_cwnd) {
++ if (tp->snd_cwnd < tp->snd_cwnd_clamp)
++ tp->snd_cwnd++;
++ tp->snd_cwnd_cnt = 0;
++ } else
++ tp->snd_cwnd_cnt++;
++ } else {
++ /* In the "congestive state", increase cwnd
++ * every other rtt.
++ */
++ if (tp->snd_cwnd_cnt >= tp->snd_cwnd) {
++ if (veno->inc
++ && tp->snd_cwnd <
++ tp->snd_cwnd_clamp) {
++ tp->snd_cwnd++;
++ veno->inc = 0;
++ } else
++ veno->inc = 1;
++ tp->snd_cwnd_cnt = 0;
++ } else
++ tp->snd_cwnd_cnt++;
++ }
++
++ }
++ if (tp->snd_cwnd < 2)
++ tp->snd_cwnd = 2;
++ else if (tp->snd_cwnd > tp->snd_cwnd_clamp)
++ tp->snd_cwnd = tp->snd_cwnd_clamp;
++ }
++ /* Wipe the slate clean for the next rtt. */
++ /* veno->cntrtt = 0; */
++ veno->minrtt = 0x7fffffff;
++}
++
++/* Veno MD phase */
++static u32 tcp_veno_ssthresh(struct sock *sk)
++{
++ const struct tcp_sock *tp = tcp_sk(sk);
++ struct veno *veno = inet_csk_ca(sk);
++
++ if (veno->diff < beta)
++ /* in "non-congestive state", cut cwnd by 1/5 */
++ return max(tp->snd_cwnd * 4 / 5, 2U);
++ else
++ /* in "congestive state", cut cwnd by 1/2 */
++ return max(tp->snd_cwnd >> 1U, 2U);
++}
++
++static u32 tcp_veno_min_cwnd(struct sock * sk)
++{
++ const struct tcp_sock *tp = tcp_sk(sk);
++ return tp->snd_ssthresh;
++}
++
++static struct tcp_congestion_ops tcp_veno = {
++ .init = tcp_veno_init,
++ .ssthresh = tcp_veno_ssthresh,
++ .cong_avoid = tcp_veno_cong_avoid,
++ .min_cwnd = tcp_veno_min_cwnd,
++ .rtt_sample = tcp_veno_rtt_calc,
++ .set_state = tcp_veno_state,
++ .cwnd_event = tcp_veno_cwnd_event,
++
++ .owner = THIS_MODULE,
++ .name = "veno",
++};
++
++static int __init tcp_veno_register(void)
++{
++ BUG_ON(sizeof(struct veno) > ICSK_CA_PRIV_SIZE);
++ tcp_register_congestion_control(&tcp_veno);
++ return 0;
++}
++
++static void __exit tcp_veno_unregister(void)
++{
++ tcp_unregister_congestion_control(&tcp_veno);
++}
++
++module_init(tcp_veno_register);
++module_exit(tcp_veno_unregister);
++
++MODULE_AUTHOR("Bin Zhou, Cheng Peng Fu");
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("TCP Veno");
+ commit 581141cb4b10ebd865dcb7b80f5e712e2def5408 +Author: Albert D. Cahalan <acahalan@cs.uml.edu> +Date: Tue Feb 14 13:53:20 2006 -0800 + + [PATCH] x86: document sysenter path + + This path isn't obvious. It looks as if the kernel will be taking three + args from the user stack, but it only takes one from there. + + Signed-off-by: Albert Cahalan <acahalan@gmail.com> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Linus Torvalds <torvalds@osdl.org> + +diff --git a/arch/i386/kernel/vsyscall-sysenter.S b/arch/i386/kernel/vsyscall-sysenter.S +index 4daefb2ec1b2..76b728159403 100644 +--- a/arch/i386/kernel/vsyscall-sysenter.S ++++ b/arch/i386/kernel/vsyscall-sysenter.S +@@ -7,6 +7,21 @@ + * for details. + */ + ++/* ++ * The caller puts arg2 in %ecx, which gets pushed. The kernel will use ++ * %ecx itself for arg2. The pushing is because the sysexit instruction ++ * (found in entry.S) requires that we clobber %ecx with the desired %esp. ++ * User code might expect that %ecx is unclobbered though, as it would be ++ * for returning via the iret instruction, so we must push and pop. ++ * ++ * The caller puts arg3 in %edx, which the sysexit instruction requires ++ * for %eip. Thus, exactly as for arg2, we must push and pop. ++ * ++ * Arg6 is different. The caller puts arg6 in %ebp. Since the sysenter ++ * instruction clobbers %esp, the user's %esp won't even survive entry ++ * into the kernel. We store %esp in %ebp. Code in entry.S must fetch ++ * arg6 from the stack. ++ */ + .text + .globl __kernel_vsyscall + .type __kernel_vsyscall,@function+
commit 776d794f28c95051bc70405a7b1fa40115658a18
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Sep 9 12:32:38 2021 +0800
+
+ net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change
+
+ The refcount leak issues take place in an error handling path. When the
+ 3rd argument buf doesn't match with "offline", "online" or "remove", the
+ function simply returns -EINVAL and forgets to decrease the reference
+ count of a rpc_xprt object and a rpc_xprt_switch object increased by
+ rpc_sysfs_xprt_kobj_get_xprt() and
+ rpc_sysfs_xprt_kobj_get_xprt_switch(), causing reference count leaks of
+ both unused objects.
+
+ Fix this issue by jumping to the error handling path labelled with
+ out_put when buf matches none of "offline", "online" or "remove".
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+
+diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c
+index b1aea3419218..49fd0339dc59 100644
+--- a/net/sunrpc/sysfs.c
++++ b/net/sunrpc/sysfs.c
+@@ -295,8 +295,10 @@ static ssize_t rpc_sysfs_xprt_state_change(struct kobject *kobj,
+ online = 1;
+ else if (!strncmp(buf, "remove", 6))
+ remove = 1;
+- else
+- return -EINVAL;
++ else {
++ count = -EINVAL;
++ goto out_put;
++ }
+
+ if (wait_on_bit_lock(&xprt->state, XPRT_LOCKED, TASK_KILLABLE)) {
+ count = -EINTR;commit d94a69cb2cfa77294921aae9afcfb866e723a2da
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Thu Dec 23 10:48:12 2021 +0800
+
+ netfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check()
+
+ The issue takes place in one error path of clusterip_tg_check(). When
+ memcmp() returns nonzero, the function simply returns the error code,
+ forgetting to decrease the reference count of a clusterip_config
+ object, which is bumped earlier by clusterip_config_find_get(). This
+ may incur reference count leak.
+
+ Fix this issue by decrementing the refcount of the object in specific
+ error path.
+
+ Fixes: 06aa151ad1fc74 ("netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+
+diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
+index 8fd1aba8af31..b518f20c9a24 100644
+--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
++++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
+@@ -520,8 +520,11 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
+ if (IS_ERR(config))
+ return PTR_ERR(config);
+ }
+- } else if (memcmp(&config->clustermac, &cipinfo->clustermac, ETH_ALEN))
++ } else if (memcmp(&config->clustermac, &cipinfo->clustermac, ETH_ALEN)) {
++ clusterip_config_entry_put(config);
++ clusterip_config_put(config);
+ return -EINVAL;
++ }
+
+ ret = nf_ct_netns_get(par->net, par->family);
+ if (ret < 0) {commit 1077c2857791076a7e81b0ba91571f136cee08e4
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Nov 8 18:34:48 2021 -0800
+
+ coda: convert from atomic_t to refcount_t on coda_vm_ops->refcnt
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Link: https://lkml.kernel.org/r/20210908140308.18491-8-jaharkes@cs.cmu.edu
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
+ Cc: Alex Shi <alex.shi@linux.alibaba.com>
+ Cc: Jing Yangyang <jing.yangyang@zte.com.cn>
+ Cc: Zeal Robot <zealci@zte.com.cn>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/coda/file.c b/fs/coda/file.c
+index 52deab784667..29dd87be2fb8 100644
+--- a/fs/coda/file.c
++++ b/fs/coda/file.c
+@@ -8,6 +8,7 @@
+ * to the Coda project. Contact Peter Braam <coda@cs.cmu.edu>.
+ */
+
++#include <linux/refcount.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/time.h>
+@@ -28,7 +29,7 @@
+ #include "coda_int.h"
+
+ struct coda_vm_ops {
+- atomic_t refcnt;
++ refcount_t refcnt;
+ struct file *coda_file;
+ const struct vm_operations_struct *host_vm_ops;
+ struct vm_operations_struct vm_ops;
+@@ -98,7 +99,7 @@ coda_vm_open(struct vm_area_struct *vma)
+ struct coda_vm_ops *cvm_ops =
+ container_of(vma->vm_ops, struct coda_vm_ops, vm_ops);
+
+- atomic_inc(&cvm_ops->refcnt);
++ refcount_inc(&cvm_ops->refcnt);
+
+ if (cvm_ops->host_vm_ops && cvm_ops->host_vm_ops->open)
+ cvm_ops->host_vm_ops->open(vma);
+@@ -113,7 +114,7 @@ coda_vm_close(struct vm_area_struct *vma)
+ if (cvm_ops->host_vm_ops && cvm_ops->host_vm_ops->close)
+ cvm_ops->host_vm_ops->close(vma);
+
+- if (atomic_dec_and_test(&cvm_ops->refcnt)) {
++ if (refcount_dec_and_test(&cvm_ops->refcnt)) {
+ vma->vm_ops = cvm_ops->host_vm_ops;
+ fput(cvm_ops->coda_file);
+ kfree(cvm_ops);
+@@ -189,7 +190,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
+ cvm_ops->vm_ops.open = coda_vm_open;
+ cvm_ops->vm_ops.close = coda_vm_close;
+ cvm_ops->coda_file = coda_file;
+- atomic_set(&cvm_ops->refcnt, 1);
++ refcount_set(&cvm_ops->refcnt, 1);
+
+ vma->vm_ops = &cvm_ops->vm_ops;
+ }commit ae3fab5bcc725271a50843e5e284ee20d8b3532b
+Author: Chenyuan Mi <cymi20@fudan.edu.cn>
+Date: Fri Nov 5 13:34:45 2021 -0700
+
+ ocfs2: fix handle refcount leak in two exception handling paths
+
+ The reference counting issue happens in two exception handling paths of
+ ocfs2_replay_truncate_records(). When executing these two exception
+ handling paths, the function forgets to decrease the refcount of handle
+ increased by ocfs2_start_trans(), causing a refcount leak.
+
+ Fix this issue by using ocfs2_commit_trans() to decrease the refcount of
+ handle in two handling paths.
+
+ Link: https://lkml.kernel.org/r/20210908102055.10168-1-cymi20@fudan.edu.cn
+ Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
+ Cc: Wengang Wang <wen.gang.wang@oracle.com>
+ Cc: Mark Fasheh <mark@fasheh.com>
+ Cc: Joel Becker <jlbec@evilplan.org>
+ Cc: Junxiao Bi <junxiao.bi@oracle.com>
+ Cc: Changwei Ge <gechangwei@live.cn>
+ Cc: Gang He <ghe@suse.com>
+ Cc: Jun Piao <piaojun@huawei.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
+index 5d9ae17bd443..1550f18be451 100644
+--- a/fs/ocfs2/alloc.c
++++ b/fs/ocfs2/alloc.c
+@@ -5940,6 +5940,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
+ status = ocfs2_journal_access_di(handle, INODE_CACHE(tl_inode), tl_bh,
+ OCFS2_JOURNAL_ACCESS_WRITE);
+ if (status < 0) {
++ ocfs2_commit_trans(osb, handle);
+ mlog_errno(status);
+ goto bail;
+ }
+@@ -5964,6 +5965,7 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb,
+ data_alloc_bh, start_blk,
+ num_clusters);
+ if (status < 0) {
++ ocfs2_commit_trans(osb, handle);
+ mlog_errno(status);
+ goto bail;
+ }commit 31d21d219b51dcfb16e18427eddae5394d402820
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Jul 19 13:59:14 2021 +0800
+
+ ext4: convert from atomic_t to refcount_t on ext4_io_end->count
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Jan Kara <jack@suse.cz>
+ Link: https://lore.kernel.org/r/1626674355-55795-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
+index 3825195539d7..404dd50856e5 100644
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -17,6 +17,7 @@
+ #ifndef _EXT4_H
+ #define _EXT4_H
+
++#include <linux/refcount.h>
+ #include <linux/types.h>
+ #include <linux/blkdev.h>
+ #include <linux/magic.h>
+@@ -241,7 +242,7 @@ typedef struct ext4_io_end {
+ struct bio *bio; /* Linked list of completed
+ * bios covering the extent */
+ unsigned int flag; /* unwritten or not */
+- atomic_t count; /* reference counter */
++ refcount_t count; /* reference counter */
+ struct list_head list_vec; /* list of ext4_io_end_vec */
+ } ext4_io_end_t;
+
+diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
+index f038d578d8d8..9cb261714991 100644
+--- a/fs/ext4/page-io.c
++++ b/fs/ext4/page-io.c
+@@ -279,14 +279,14 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags)
+ io_end->inode = inode;
+ INIT_LIST_HEAD(&io_end->list);
+ INIT_LIST_HEAD(&io_end->list_vec);
+- atomic_set(&io_end->count, 1);
++ refcount_set(&io_end->count, 1);
+ }
+ return io_end;
+ }
+
+ void ext4_put_io_end_defer(ext4_io_end_t *io_end)
+ {
+- if (atomic_dec_and_test(&io_end->count)) {
++ if (refcount_dec_and_test(&io_end->count)) {
+ if (!(io_end->flag & EXT4_IO_END_UNWRITTEN) ||
+ list_empty(&io_end->list_vec)) {
+ ext4_release_io_end(io_end);
+@@ -300,7 +300,7 @@ int ext4_put_io_end(ext4_io_end_t *io_end)
+ {
+ int err = 0;
+
+- if (atomic_dec_and_test(&io_end->count)) {
++ if (refcount_dec_and_test(&io_end->count)) {
+ if (io_end->flag & EXT4_IO_END_UNWRITTEN) {
+ err = ext4_convert_unwritten_io_end_vec(io_end->handle,
+ io_end);
+@@ -314,7 +314,7 @@ int ext4_put_io_end(ext4_io_end_t *io_end)
+
+ ext4_io_end_t *ext4_get_io_end(ext4_io_end_t *io_end)
+ {
+- atomic_inc(&io_end->count);
++ refcount_inc(&io_end->count);
+ return io_end;
+ }
+ commit 6bb8c2d51811eb5e6504f49efe3b089d026009d2
+Author: Chenyuan Mi <cymi20@fudan.edu.cn>
+Date: Tue Sep 7 20:26:33 2021 +0800
+
+ drm/nouveau/svm: Fix refcount leak bug and missing check against null bug
+
+ The reference counting issue happens in one exception handling path of
+ nouveau_svmm_bind(). When cli->svm.svmm is null, the function forgets
+ to decrease the refcount of mm increased by get_task_mm(), causing a
+ refcount leak.
+
+ Fix this issue by using mmput() to decrease the refcount in the
+ exception handling path.
+
+ Also, the function forgets to do check against null when get mm
+ by get_task_mm().
+
+ Fix this issue by adding null check after get mm by get_task_mm().
+
+ Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Fixes: 822cab6150d3 ("drm/nouveau/svm: check for SVM initialized before migrating")
+ Reviewed-by: Lyude Paul <lyude@redhat.com>
+ Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
+ Reviewed-by: Karol Herbst <kherbst@redhat.com>
+ Signed-off-by: Karol Herbst <kherbst@redhat.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20210907122633.16665-1-cymi20@fudan.edu.cn
+ Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/14
+
+diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
+index b0c3422cb01f..9985bfde015a 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
++++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
+@@ -162,10 +162,14 @@ nouveau_svmm_bind(struct drm_device *dev, void *data,
+ */
+
+ mm = get_task_mm(current);
++ if (!mm) {
++ return -EINVAL;
++ }
+ mmap_read_lock(mm);
+
+ if (!cli->svm.svmm) {
+ mmap_read_unlock(mm);
++ mmput(mm);
+ return -EINVAL;
+ }
+ commit 9bf9e0b44104d05b21761441227ae566c732ecb9
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Sat Sep 11 15:05:33 2021 +0800
+
+ dmaengine: mmp_pdma: fix reference count leaks in mmp_pdma_probe
+
+ The issue happens in an error handling path. If
+ of_dma_controller_register() fails, the function simply prints error
+ messages and returns error code, without decrementing the reference
+ count of pdev->device incremented earlier by
+ dma_async_device_register(), which may result in refcount leaks.
+
+ Fix it by invoking dma_async_device_unregister() before returning the
+ error code.
+
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/20210911070533.3114-1-xiongx18@fudan.edu.cn
+ Signed-off-by: Vinod Koul <vkoul@kernel.org>
+
+diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
+index 89f1814ff27a..a23563cd118b 100644
+--- a/drivers/dma/mmp_pdma.c
++++ b/drivers/dma/mmp_pdma.c
+@@ -1123,6 +1123,7 @@ static int mmp_pdma_probe(struct platform_device *op)
+ mmp_pdma_dma_xlate, pdev);
+ if (ret < 0) {
+ dev_err(&op->dev, "of_dma_controller_register failed\n");
++ dma_async_device_unregister(&pdev->device);
+ return ret;
+ }
+ }commit 8105c2abbf36296bf38ca44f55ee45d160db476a
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Sat Oct 9 12:19:18 2021 +0800
+
+ mmc: moxart: Fix reference count leaks in moxart_probe
+
+ The issue happens in several error handling paths on two refcounted
+ object related to the object "host" (dma_chan_rx, dma_chan_tx). In
+ these paths, the function forgets to decrement one or both objects'
+ reference count increased earlier by dma_request_chan(), causing
+ reference count leaks.
+
+ Fix it by balancing the refcounts of both objects in some error
+ handling paths. In correspondence with the changes in moxart_probe(),
+ IS_ERR() is replaced with IS_ERR_OR_NULL() in moxart_remove() as well.
+
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/20211009041918.28419-1-xiongx18@fudan.edu.cn
+ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+
+diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
+index 6c9d38132f74..7b9fcef490de 100644
+--- a/drivers/mmc/host/moxart-mmc.c
++++ b/drivers/mmc/host/moxart-mmc.c
+@@ -621,6 +621,14 @@ static int moxart_probe(struct platform_device *pdev)
+ ret = -EPROBE_DEFER;
+ goto out;
+ }
++ if (!IS_ERR(host->dma_chan_tx)) {
++ dma_release_channel(host->dma_chan_tx);
++ host->dma_chan_tx = NULL;
++ }
++ if (!IS_ERR(host->dma_chan_rx)) {
++ dma_release_channel(host->dma_chan_rx);
++ host->dma_chan_rx = NULL;
++ }
+ dev_dbg(dev, "PIO mode transfer enabled\n");
+ host->have_dma = false;
+ } else {
+@@ -675,6 +683,10 @@ static int moxart_probe(struct platform_device *pdev)
+ return 0;
+
+ out:
++ if (!IS_ERR_OR_NULL(host->dma_chan_tx))
++ dma_release_channel(host->dma_chan_tx);
++ if (!IS_ERR_OR_NULL(host->dma_chan_rx))
++ dma_release_channel(host->dma_chan_rx);
+ if (mmc)
+ mmc_free_host(mmc);
+ return ret;
+@@ -687,9 +699,9 @@ static int moxart_remove(struct platform_device *pdev)
+
+ dev_set_drvdata(&pdev->dev, NULL);
+
+- if (!IS_ERR(host->dma_chan_tx))
++ if (!IS_ERR_OR_NULL(host->dma_chan_tx))
+ dma_release_channel(host->dma_chan_tx);
+- if (!IS_ERR(host->dma_chan_rx))
++ if (!IS_ERR_OR_NULL(host->dma_chan_rx))
+ dma_release_channel(host->dma_chan_rx);
+ mmc_remove_host(mmc);
+ mmc_free_host(mmc);commit ac2c63757f4f413980d6c676dbe1ae2941b94afa
+Author: Chenyuan Mi <cymi20@fudan.edu.cn>
+Date: Tue Sep 7 19:41:05 2021 +0800
+
+ orangefs: Fix sb refcount leak when allocate sb info failed.
+
+ The reference counting issue happens in one exception handling
+ path of orangefs_mount(). When failing to allocate sb info, the
+ function forgets to decrease the refcount of sb increased by
+ sget(), causing a refcount leak.
+
+ Fix this issue by jumping to the label "free_sb_and_op" instead
+ of "free_op"
+
+ Signed-off-by: Chenyuan Mi <cymi20@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Mike Marshall <hubcap@omnibond.com>
+
+diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
+index 897fb6c3f161..18341cde3f34 100644
+--- a/fs/orangefs/super.c
++++ b/fs/orangefs/super.c
+@@ -526,7 +526,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,
+ sb->s_fs_info = kzalloc(sizeof(struct orangefs_sb_info_s), GFP_KERNEL);
+ if (!ORANGEFS_SB(sb)) {
+ d = ERR_PTR(-ENOMEM);
+- goto free_op;
++ goto free_sb_and_op;
+ }
+
+ ret = orangefs_fill_sb(sb,commit f62314b1ced25c58b86e044fc951cd6a1ea234cf +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Thu Sep 9 15:24:36 2021 +0800 + + kunit: fix reference count leak in kfree_at_end + + The reference counting issue happens in the normal path of + kfree_at_end(). When kunit_alloc_and_get_resource() is invoked, the + function forgets to handle the returned resource object, whose refcount + increased inside, causing a refcount leak. + + Fix this issue by calling kunit_alloc_resource() instead of + kunit_alloc_and_get_resource(). + + Fixed the following when applying: + Shuah Khan <skhan@linuxfoundation.org> + + CHECK: Alignment should match open parenthesis + + kunit_alloc_resource(test, NULL, kfree_res_free, GFP_KERNEL, + (void *)to_free); + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Reviewed-by: Daniel Latypov <dlatypov@google.com> + Reviewed-by: Brendan Higgins <brendanhiggins@google.com> + Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> + +diff --git a/lib/kunit/executor_test.c b/lib/kunit/executor_test.c +index cdbe54b16501..e14a18af573d 100644 +--- a/lib/kunit/executor_test.c ++++ b/lib/kunit/executor_test.c +@@ -116,8 +116,8 @@ static void kfree_at_end(struct kunit *test, const void *to_free) + /* kfree() handles NULL already, but avoid allocating a no-op cleanup. */ + if (IS_ERR_OR_NULL(to_free)) + return; +- kunit_alloc_and_get_resource(test, NULL, kfree_res_free, GFP_KERNEL, +- (void *)to_free); ++ kunit_alloc_resource(test, NULL, kfree_res_free, GFP_KERNEL, ++ (void *)to_free); + } + + static struct kunit_suite *alloc_fake_suite(struct kunit *test,+
commit 9b6ff7eb666415e1558f1ba8a742f5db6a9954de
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Sep 9 12:32:00 2021 +0800
+
+ net/l2tp: Fix reference count leak in l2tp_udp_recv_core
+
+ The reference count leak issue may take place in an error handling
+ path. If both conditions of tunnel->version == L2TP_HDR_VER_3 and the
+ return value of l2tp_v3_ensure_opt_in_linear is nonzero, the function
+ would directly jump to label invalid, without decrementing the reference
+ count of the l2tp_session object session increased earlier by
+ l2tp_tunnel_get_session(). This may result in refcount leaks.
+
+ Fix this issue by decrease the reference count before jumping to the
+ label invalid.
+
+ Fixes: 4522a70db7aa ("l2tp: fix reading optional fields of L2TPv3")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
+index 53486b162f01..93271a2632b8 100644
+--- a/net/l2tp/l2tp_core.c
++++ b/net/l2tp/l2tp_core.c
+@@ -869,8 +869,10 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb)
+ }
+
+ if (tunnel->version == L2TP_HDR_VER_3 &&
+- l2tp_v3_ensure_opt_in_linear(session, skb, &ptr, &optr))
++ l2tp_v3_ensure_opt_in_linear(session, skb, &ptr, &optr)) {
++ l2tp_session_dec_refcount(session);
+ goto invalid;
++ }
+
+ l2tp_recv_common(session, skb, ptr, optr, hdrflags, length);
+ l2tp_session_dec_refcount(session);commit c66070125837900163b81a03063ddd657a7e9bfb
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sun Aug 29 23:58:01 2021 +0800
+
+ net: sched: Fix qdisc_rate_table refcount leak when get tcf_block failed
+
+ The reference counting issue happens in one exception handling path of
+ cbq_change_class(). When failing to get tcf_block, the function forgets
+ to decrease the refcount of "rtab" increased by qdisc_put_rtab(),
+ causing a refcount leak.
+
+ Fix this issue by jumping to "failure" label when get tcf_block failed.
+
+ Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Reviewed-by: Cong Wang <cong.wang@bytedance.com>
+ Link: https://lore.kernel.org/r/1630252681-71588-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+
+diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
+index 2dabaffd39d0..e0da15530f0e 100644
+--- a/net/sched/sch_cbq.c
++++ b/net/sched/sch_cbq.c
+@@ -1614,7 +1614,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t
+ err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack);
+ if (err) {
+ kfree(cl);
+- return err;
++ goto failure;
+ }
+
+ if (tca[TCA_RATE]) {commit 8c27cc5b90ed00ed0dc5956b99e455a494ac8970
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Jul 19 13:58:51 2021 +0800
+
+ drm/exynos: Convert from atomic_t to refcount_t on g2d_cmdlist_userptr->refcount
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Inki Dae <inki.dae@samsung.com>
+
+diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+index 0ed665501ac4..b00230626c6a 100644
+--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
++++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+@@ -4,6 +4,7 @@
+ * Authors: Joonyoung Shim <jy0922.shim@samsung.com>
+ */
+
++#include <linux/refcount.h>
+ #include <linux/clk.h>
+ #include <linux/component.h>
+ #include <linux/delay.h>
+@@ -208,7 +209,7 @@ struct g2d_cmdlist_userptr {
+ struct page **pages;
+ unsigned int npages;
+ struct sg_table *sgt;
+- atomic_t refcount;
++ refcount_t refcount;
+ bool in_pool;
+ bool out_of_list;
+ };
+@@ -386,9 +387,9 @@ static void g2d_userptr_put_dma_addr(struct g2d_data *g2d,
+ if (force)
+ goto out;
+
+- atomic_dec(&g2d_userptr->refcount);
++ refcount_dec(&g2d_userptr->refcount);
+
+- if (atomic_read(&g2d_userptr->refcount) > 0)
++ if (refcount_read(&g2d_userptr->refcount) > 0)
+ return;
+
+ if (g2d_userptr->in_pool)
+@@ -436,7 +437,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
+ * and different size.
+ */
+ if (g2d_userptr->size == size) {
+- atomic_inc(&g2d_userptr->refcount);
++ refcount_inc(&g2d_userptr->refcount);
+ *obj = g2d_userptr;
+
+ return &g2d_userptr->dma_addr;
+@@ -461,7 +462,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d,
+ if (!g2d_userptr)
+ return ERR_PTR(-ENOMEM);
+
+- atomic_set(&g2d_userptr->refcount, 1);
++ refcount_set(&g2d_userptr->refcount, 1);
+ g2d_userptr->size = size;
+
+ start = userptr & PAGE_MASK;commit a0293eb24936ff30e5a23f9438fd4ad1c4009dbf
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Jul 19 14:00:53 2021 +0800
+
+ RDMA/hfi1: Convert from atomic_t to refcount_t on hfi1_devdata->user_refcount
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Link: https://lore.kernel.org/r/1626674454-56075-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Tested-by: Josh Fisher <josh.fisher@cornelisnetworks.com>
+ Acked-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
+ Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
+
+diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
+index c97544638367..50ffb8244625 100644
+--- a/drivers/infiniband/hw/hfi1/chip.c
++++ b/drivers/infiniband/hw/hfi1/chip.c
+@@ -15336,7 +15336,7 @@ int hfi1_init_dd(struct hfi1_devdata *dd)
+ init_completion(&dd->user_comp);
+
+ /* The user refcount starts with one to inidicate an active device */
+- atomic_set(&dd->user_refcount, 1);
++ refcount_set(&dd->user_refcount, 1);
+
+ goto bail;
+
+diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
+index 955c3637980e..6dbfb794c255 100644
+--- a/drivers/infiniband/hw/hfi1/file_ops.c
++++ b/drivers/infiniband/hw/hfi1/file_ops.c
+@@ -194,7 +194,7 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
+ if (!((dd->flags & HFI1_PRESENT) && dd->kregbase1))
+ return -EINVAL;
+
+- if (!atomic_inc_not_zero(&dd->user_refcount))
++ if (!refcount_inc_not_zero(&dd->user_refcount))
+ return -ENXIO;
+
+ /* The real work is performed later in assign_ctxt() */
+@@ -213,7 +213,7 @@ static int hfi1_file_open(struct inode *inode, struct file *fp)
+ nomem:
+ kfree(fd);
+ fp->private_data = NULL;
+- if (atomic_dec_and_test(&dd->user_refcount))
++ if (refcount_dec_and_test(&dd->user_refcount))
+ complete(&dd->user_comp);
+ return -ENOMEM;
+ }
+@@ -711,7 +711,7 @@ static int hfi1_file_close(struct inode *inode, struct file *fp)
+ deallocate_ctxt(uctxt);
+ done:
+
+- if (atomic_dec_and_test(&dd->user_refcount))
++ if (refcount_dec_and_test(&dd->user_refcount))
+ complete(&dd->user_comp);
+
+ cleanup_srcu_struct(&fdata->pq_srcu);
+diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
+index 31664f43c27f..6cf03d16a495 100644
+--- a/drivers/infiniband/hw/hfi1/hfi.h
++++ b/drivers/infiniband/hw/hfi1/hfi.h
+@@ -48,6 +48,7 @@
+ *
+ */
+
++#include <linux/refcount.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+ #include <linux/dma-mapping.h>
+@@ -1384,7 +1385,7 @@ struct hfi1_devdata {
+ /* Number of verbs contexts which have disabled ASPM */
+ atomic_t aspm_disabled_cnt;
+ /* Keeps track of user space clients */
+- atomic_t user_refcount;
++ refcount_t user_refcount;
+ /* Used to wait for outstanding user space clients before dev removal */
+ struct completion user_comp;
+
+diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
+index 34106e5be679..f37b157dbdb2 100644
+--- a/drivers/infiniband/hw/hfi1/init.c
++++ b/drivers/infiniband/hw/hfi1/init.c
+@@ -1747,7 +1747,7 @@ static void wait_for_clients(struct hfi1_devdata *dd)
+ * Remove the device init value and complete the device if there is
+ * no clients or wait for active clients to finish.
+ */
+- if (atomic_dec_and_test(&dd->user_refcount))
++ if (refcount_dec_and_test(&dd->user_refcount))
+ complete(&dd->user_comp);
+
+ wait_for_completion(&dd->user_comp);commit d5ee8e750c9449e9849a09ce6fb6b8adeaa66adc
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Tue Jul 20 11:05:11 2021 -0400
+
+ padata: Convert from atomic_t to refcount_t on parallel_data->refcnt
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Acked-by: Daniel Jordan <daniel.m.jordan@oracle.com>
+ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+
+diff --git a/include/linux/padata.h b/include/linux/padata.h
+index a433f13fc4bf..495b16b6b4d7 100644
+--- a/include/linux/padata.h
++++ b/include/linux/padata.h
+@@ -12,6 +12,7 @@
+ #ifndef PADATA_H
+ #define PADATA_H
+
++#include <linux/refcount.h>
+ #include <linux/compiler_types.h>
+ #include <linux/workqueue.h>
+ #include <linux/spinlock.h>
+@@ -96,7 +97,7 @@ struct parallel_data {
+ struct padata_shell *ps;
+ struct padata_list __percpu *reorder_list;
+ struct padata_serial_queue __percpu *squeue;
+- atomic_t refcnt;
++ refcount_t refcnt;
+ unsigned int seq_nr;
+ unsigned int processed;
+ int cpu;
+diff --git a/kernel/padata.c b/kernel/padata.c
+index d4d3ba6e1728..378c36080781 100644
+--- a/kernel/padata.c
++++ b/kernel/padata.c
+@@ -211,7 +211,7 @@ int padata_do_parallel(struct padata_shell *ps,
+ if ((pinst->flags & PADATA_RESET))
+ goto out;
+
+- atomic_inc(&pd->refcnt);
++ refcount_inc(&pd->refcnt);
+ padata->pd = pd;
+ padata->cb_cpu = *cb_cpu;
+
+@@ -383,7 +383,7 @@ static void padata_serial_worker(struct work_struct *serial_work)
+ }
+ local_bh_enable();
+
+- if (atomic_sub_and_test(cnt, &pd->refcnt))
++ if (refcount_sub_and_test(cnt, &pd->refcnt))
+ padata_free_pd(pd);
+ }
+
+@@ -593,7 +593,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_shell *ps)
+ padata_init_reorder_list(pd);
+ padata_init_squeues(pd);
+ pd->seq_nr = -1;
+- atomic_set(&pd->refcnt, 1);
++ refcount_set(&pd->refcnt, 1);
+ spin_lock_init(&pd->lock);
+ pd->cpu = cpumask_first(pd->cpumask.pcpu);
+ INIT_WORK(&pd->reorder_work, invoke_padata_reorder);
+@@ -667,7 +667,7 @@ static int padata_replace(struct padata_instance *pinst)
+ synchronize_rcu();
+
+ list_for_each_entry_continue_reverse(ps, &pinst->pslist, list)
+- if (atomic_dec_and_test(&ps->opd->refcnt))
++ if (refcount_dec_and_test(&ps->opd->refcnt))
+ padata_free_pd(ps->opd);
+
+ pinst->flags &= ~PADATA_RESET;commit 03acb0c5ac46b1aa5f3015f1e01243aff9e08600
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sat Jul 17 18:17:22 2021 +0800
+
+ misc: sgi-gru: Convert from atomic_t to refcount_t on gru_thread_state->ts_refcnt
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Acked-by: Dimitri Sivanich <sivanich@hpe.com>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/1626517043-42696-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
+index 40ac59dd018c..9afda47efbf2 100644
+--- a/drivers/misc/sgi-gru/grumain.c
++++ b/drivers/misc/sgi-gru/grumain.c
+@@ -282,7 +282,7 @@ static void gru_unload_mm_tracker(struct gru_state *gru,
+ */
+ void gts_drop(struct gru_thread_state *gts)
+ {
+- if (gts && atomic_dec_return(>s->ts_refcnt) == 0) {
++ if (gts && refcount_dec_and_test(>s->ts_refcnt)) {
+ if (gts->ts_gms)
+ gru_drop_mmu_notifier(gts->ts_gms);
+ kfree(gts);
+@@ -323,7 +323,7 @@ struct gru_thread_state *gru_alloc_gts(struct vm_area_struct *vma,
+
+ STAT(gts_alloc);
+ memset(gts, 0, sizeof(struct gru_thread_state)); /* zero out header */
+- atomic_set(>s->ts_refcnt, 1);
++ refcount_set(>s->ts_refcnt, 1);
+ mutex_init(>s->ts_ctxlock);
+ gts->ts_cbr_au_count = cbr_au_count;
+ gts->ts_dsr_au_count = dsr_au_count;
+@@ -888,7 +888,7 @@ struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts)
+ gts->ts_gru = gru;
+ gts->ts_blade = gru->gs_blade_id;
+ gts->ts_ctxnum = gru_assign_context_number(gru);
+- atomic_inc(>s->ts_refcnt);
++ refcount_inc(>s->ts_refcnt);
+ gru->gs_gts[gts->ts_ctxnum] = gts;
+ spin_unlock(&gru->gs_lock);
+
+diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
+index 5ce8f3081e96..e4c067c61251 100644
+--- a/drivers/misc/sgi-gru/grutables.h
++++ b/drivers/misc/sgi-gru/grutables.h
+@@ -129,6 +129,7 @@
+ *
+ */
+
++#include <linux/refcount.h>
+ #include <linux/rmap.h>
+ #include <linux/interrupt.h>
+ #include <linux/mutex.h>
+@@ -358,7 +359,7 @@ struct gru_thread_state {
+ enabled */
+ int ts_ctxnum; /* context number where the
+ context is loaded */
+- atomic_t ts_refcnt; /* reference count GTS */
++ refcount_t ts_refcnt; /* reference count GTS */
+ unsigned char ts_dsr_au_count;/* Number of DSR resources
+ required for contest */
+ unsigned char ts_cbr_au_count;/* Number of CBR resourcescommit 0189cb57b96ff92f75e3680b3710a46dacd6509f
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Jul 19 13:59:45 2021 +0800
+
+ fbmem: Convert from atomic_t to refcount_t on fb_info->count
+
+ refcount_t type and corresponding API can protect refcounters from
+ accidental underflow and overflow and further use-after-free situations.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
+ Link: https://patchwork.freedesktop.org/patch/msgid/1626674392-55857-1-git-send-email-xiyuyang19@fudan.edu.cn
+
+diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
+index 072780b0e570..1598736e3bcf 100644
+--- a/drivers/video/fbdev/core/fbmem.c
++++ b/drivers/video/fbdev/core/fbmem.c
+@@ -67,7 +67,7 @@ static struct fb_info *get_fb_info(unsigned int idx)
+ mutex_lock(®istration_lock);
+ fb_info = registered_fb[idx];
+ if (fb_info)
+- atomic_inc(&fb_info->count);
++ refcount_inc(&fb_info->count);
+ mutex_unlock(®istration_lock);
+
+ return fb_info;
+@@ -75,7 +75,7 @@ static struct fb_info *get_fb_info(unsigned int idx)
+
+ static void put_fb_info(struct fb_info *fb_info)
+ {
+- if (!atomic_dec_and_test(&fb_info->count))
++ if (!refcount_dec_and_test(&fb_info->count))
+ return;
+ if (fb_info->fbops->fb_destroy)
+ fb_info->fbops->fb_destroy(fb_info);
+@@ -1590,7 +1590,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)
+ if (!registered_fb[i])
+ break;
+ fb_info->node = i;
+- atomic_set(&fb_info->count, 1);
++ refcount_set(&fb_info->count, 1);
+ mutex_init(&fb_info->lock);
+ mutex_init(&fb_info->mm_lock);
+
+diff --git a/include/linux/fb.h b/include/linux/fb.h
+index a8dccd23c249..9023739e9a42 100644
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -2,6 +2,7 @@
+ #ifndef _LINUX_FB_H
+ #define _LINUX_FB_H
+
++#include <linux/refcount.h>
+ #include <linux/kgdb.h>
+ #include <uapi/linux/fb.h>
+
+@@ -435,7 +436,7 @@ struct fb_tile_ops {
+
+
+ struct fb_info {
+- atomic_t count;
++ refcount_t count;
+ int node;
+ int flags;
+ /*commit 8c13212443230d03ff25014514ec0d53498c0912 +Author: Jiajun Cao <jjcao20@fudan.edu.cn> +Date: Tue Jun 22 21:19:42 2021 +0800 + + ALSA: hda: Add IRQ check for platform_get_irq() + + The function hda_tegra_first_init() neglects to check the return + value after executing platform_get_irq(). + + hda_tegra_first_init() should check the return value (if negative + error number) for errors so as to not pass a negative value to + the devm_request_irq(). + + Fix it by adding a check for the return value irq_id. + + Signed-off-by: Jiajun Cao <jjcao20@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Reviewed-by: Thierry Reding <treding@nvidia.com> + Link: https://lore.kernel.org/r/20210622131947.94346-1-jjcao20@fudan.edu.cn + Signed-off-by: Takashi Iwai <tiwai@suse.de> + +diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c +index 5aeef6123781..ea700395bef4 100644 +--- a/sound/pci/hda/hda_tegra.c ++++ b/sound/pci/hda/hda_tegra.c +@@ -260,6 +260,9 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) + const char *sname, *drv_name = "tegra-hda"; + struct device_node *np = pdev->dev.of_node; + ++ if (irq_id < 0) ++ return irq_id; ++ + err = hda_tegra_init_chip(chip, pdev); + if (err) + return err;
commit 7c8f176d6a3fa18aa0f8875da6f7c672ed2a8554
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Jun 10 10:49:20 2021 +0800
+
+ iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation
+
+ The reference counting issue happens in several exception handling paths
+ of arm_smmu_iova_to_phys_hard(). When those error scenarios occur, the
+ function forgets to decrease the refcount of "smmu" increased by
+ arm_smmu_rpm_get(), causing a refcount leak.
+
+ Fix this issue by jumping to "out" label when those error scenarios
+ occur.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Rob Clark <robdclark@chromium.org>
+ Link: https://lore.kernel.org/r/1623293391-17261-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
+index 5de5cf5fcc50..22be819d6b7f 100644
+--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
++++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
+@@ -1271,6 +1271,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
+ u64 phys;
+ unsigned long va, flags;
+ int ret, idx = cfg->cbndx;
++ phys_addr_t addr = 0;
+
+ ret = arm_smmu_rpm_get(smmu);
+ if (ret < 0)
+@@ -1290,6 +1291,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
+ dev_err(dev,
+ "iova to phys timed out on %pad. Falling back to software table walk.\n",
+ &iova);
++ arm_smmu_rpm_put(smmu);
+ return ops->iova_to_phys(ops, iova);
+ }
+
+@@ -1298,12 +1300,14 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
+ if (phys & ARM_SMMU_CB_PAR_F) {
+ dev_err(dev, "translation fault!\n");
+ dev_err(dev, "PAR = 0x%llx\n", phys);
+- return 0;
++ goto out;
+ }
+
++ addr = (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
++out:
+ arm_smmu_rpm_put(smmu);
+
+- return (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
++ return addr;
+ }
+
+ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,commit 1adf30f198c26539a62d761e45af72cde570413d
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Jun 10 10:54:29 2021 +0800
+
+ iommu/arm-smmu: Fix arm_smmu_device refcount leak when arm_smmu_rpm_get fails
+
+ arm_smmu_rpm_get() invokes pm_runtime_get_sync(), which increases the
+ refcount of the "smmu" even though the return value is less than 0.
+
+ The reference counting issue happens in some error handling paths of
+ arm_smmu_rpm_get() in its caller functions. When arm_smmu_rpm_get()
+ fails, the caller functions forget to decrease the refcount of "smmu"
+ increased by arm_smmu_rpm_get(), causing a refcount leak.
+
+ Fix this issue by calling pm_runtime_resume_and_get() instead of
+ pm_runtime_get_sync() in arm_smmu_rpm_get(), which can keep the refcount
+ balanced in case of failure.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/1623293672-17954-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Will Deacon <will@kernel.org>
+
+diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
+index 88a3023676ce..5de5cf5fcc50 100644
+--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
++++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
+@@ -74,7 +74,7 @@ static bool using_legacy_binding, using_generic_binding;
+ static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu)
+ {
+ if (pm_runtime_enabled(smmu->dev))
+- return pm_runtime_get_sync(smmu->dev);
++ return pm_runtime_resume_and_get(smmu->dev);
+
+ return 0;
+ }
+ commit a34a0a632dd991a371fec56431d73279f9c54029
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Sun Jul 19 23:45:45 2020 +0800
+
+ drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
+
+ drm_dp_mst_allocate_vcpi() invokes
+ drm_dp_mst_topology_get_port_validated(), which increases the refcount
+ of the "port".
+
+ These reference counting issues take place in two exception handling
+ paths separately. Either when “slots” is less than 0 or when
+ drm_dp_init_vcpi() returns a negative value, the function forgets to
+ reduce the refcnt increased drm_dp_mst_topology_get_port_validated(),
+ which results in a refcount leak.
+
+ Fix these issues by pulling up the error handling when "slots" is less
+ than 0, and calling drm_dp_mst_topology_put_port() before termination
+ when drm_dp_init_vcpi() returns a negative value.
+
+ Fixes: 1e797f556c61 ("drm/dp: Split drm_dp_mst_allocate_vcpi")
+ Cc: <stable@vger.kernel.org> # v4.12+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Reviewed-by: Lyude Paul <lyude@redhat.com>
+ Signed-off-by: Lyude Paul <lyude@redhat.com>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20200719154545.GA41231@xin-virtual-machine
+
+diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
+index 09b32289497e..b23cb2fec3f3 100644
+--- a/drivers/gpu/drm/drm_dp_mst_topology.c
++++ b/drivers/gpu/drm/drm_dp_mst_topology.c
+@@ -4308,11 +4308,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
+ {
+ int ret;
+
+- port = drm_dp_mst_topology_get_port_validated(mgr, port);
+- if (!port)
++ if (slots < 0)
+ return false;
+
+- if (slots < 0)
++ port = drm_dp_mst_topology_get_port_validated(mgr, port);
++ if (!port)
+ return false;
+
+ if (port->vcpi.vcpi > 0) {
+@@ -4328,6 +4328,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
+ if (ret) {
+ DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n",
+ DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
++ drm_dp_mst_topology_put_port(port);
+ goto out;
+ }
+ DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",commit e692139e6af339a1495ef401b2d95f7f9d1c7a44
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Thu Jul 30 18:29:41 2020 +0800
+
+ net/mlx5e: fix bpf_prog reference count leaks in mlx5e_alloc_rq
+
+ The function invokes bpf_prog_inc(), which increases the reference
+ count of a bpf_prog object "rq->xdp_prog" if the object isn't NULL.
+
+ The refcount leak issues take place in two error handling paths. When
+ either mlx5_wq_ll_create() or mlx5_wq_cyc_create() fails, the function
+ simply returns the error code and forgets to drop the reference count
+ increased earlier, causing a reference count leak of "rq->xdp_prog".
+
+ Fix this issue by jumping to the error handling path err_rq_wq_destroy
+ while either function fails.
+
+ Fixes: 422d4c401edd ("net/mlx5e: RX, Split WQ objects for different RQ types")
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+
+diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+index 07fdbea7ea13..3b892ec301b4 100644
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+@@ -419,7 +419,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
+ err = mlx5_wq_ll_create(mdev, &rqp->wq, rqc_wq, &rq->mpwqe.wq,
+ &rq->wq_ctrl);
+ if (err)
+- return err;
++ goto err_rq_wq_destroy;
+
+ rq->mpwqe.wq.db = &rq->mpwqe.wq.db[MLX5_RCV_DBR];
+
+@@ -470,7 +470,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c,
+ err = mlx5_wq_cyc_create(mdev, &rqp->wq, rqc_wq, &rq->wqe.wq,
+ &rq->wq_ctrl);
+ if (err)
+- return err;
++ goto err_rq_wq_destroy;
+
+ rq->wqe.wq.db = &rq->wqe.wq.db[MLX5_RCV_DBR];
+ commit 51875dad43b44241b46a569493f1e4bfa0386d86
+Author: Xin Xiong <xiongx18@fudan.edu.cn>
+Date: Wed Jul 29 21:06:59 2020 +0800
+
+ atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent
+
+ atmtcp_remove_persistent() invokes atm_dev_lookup(), which returns a
+ reference of atm_dev with increased refcount or NULL if fails.
+
+ The refcount leaks issues occur in two error handling paths. If
+ dev_data->persist is zero or PRIV(dev)->vcc isn't NULL, the function
+ returns 0 without decreasing the refcount kept by a local variable,
+ resulting in refcount leaks.
+
+ Fix the issue by adding atm_dev_put() before returning 0 both when
+ dev_data->persist is zero or PRIV(dev)->vcc isn't NULL.
+
+ Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
+index d9fd70280482..7f814da3c2d0 100644
+--- a/drivers/atm/atmtcp.c
++++ b/drivers/atm/atmtcp.c
+@@ -433,9 +433,15 @@ static int atmtcp_remove_persistent(int itf)
+ return -EMEDIUMTYPE;
+ }
+ dev_data = PRIV(dev);
+- if (!dev_data->persist) return 0;
++ if (!dev_data->persist) {
++ atm_dev_put(dev);
++ return 0;
++ }
+ dev_data->persist = 0;
+- if (PRIV(dev)->vcc) return 0;
++ if (PRIV(dev)->vcc) {
++ atm_dev_put(dev);
++ return 0;
++ }
+ kfree(dev_data);
+ atm_dev_put(dev);
+ atm_dev_deregister(dev);commit 706ec919164622ff5ce822065472d0f30a9e9dd2
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sat Jul 25 16:02:18 2020 +0800
+
+ ipv6: Fix nexthop refcnt leak when creating ipv6 route info
+
+ ip6_route_info_create() invokes nexthop_get(), which increases the
+ refcount of the "nh".
+
+ When ip6_route_info_create() returns, local variable "nh" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ ip6_route_info_create(). When nexthops can not be used with source
+ routing, the function forgets to decrease the refcnt increased by
+ nexthop_get(), causing a refcnt leak.
+
+ Fix this issue by pulling up the error source routing handling when
+ nexthops can not be used with source routing.
+
+ Fixes: f88d8ea67fbd ("ipv6: Plumb support for nexthop object in a fib6_info")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: David Ahern <dsahern@kernel.org>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index f3279810d765..4c36bd0c7930 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -3685,14 +3685,14 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
+ rt->fib6_src.plen = cfg->fc_src_len;
+ #endif
+ if (nh) {
+- if (!nexthop_get(nh)) {
+- NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
+- goto out;
+- }
+ if (rt->fib6_src.plen) {
+ NL_SET_ERR_MSG(extack, "Nexthops can not be used with source routing");
+ goto out;
+ }
++ if (!nexthop_get(nh)) {
++ NL_SET_ERR_MSG(extack, "Nexthop has been deleted");
++ goto out;
++ }
+ rt->nh = nh;
+ fib6_nh = nexthop_fib6_nh(rt->nh);
+ } else {commit 77577de64167aa0643d47ffbaacf3642632b321b +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Jun 13 20:27:09 2020 +0800 + + cifs: Fix cached_fid refcnt leak in open_shroot + + open_shroot() invokes kref_get(), which increases the refcount of the + "tcon->crfid" object. When open_shroot() returns not zero, it means the + open operation failed and close_shroot() will not be called to decrement + the refcount of the "tcon->crfid". + + The reference counting issue happens in one normal path of + open_shroot(). When the cached root have been opened successfully in a + concurrent process, the function increases the refcount and jump to + "oshr_free" to return. However the current return value "rc" may not + equal to 0, thus the increased refcount will not be balanced outside the + function, causing a refcnt leak. + + Fix this issue by setting the value of "rc" to 0 before jumping to + "oshr_free" label. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: Steve French <stfrench@microsoft.com> + CC: Stable <stable@vger.kernel.org> + +diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c +index 736d86b8a910..28553d45604e 100644 +--- a/fs/cifs/smb2ops.c ++++ b/fs/cifs/smb2ops.c +@@ -763,6 +763,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, + /* close extra handle outside of crit sec */ + SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); + } ++ rc = 0; + goto oshr_free; + } +
commit 11425c4519e2c974a100fc984867046d905b9380
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sat Jun 13 20:30:25 2020 +0800
+
+ drm/ttm: Fix dma_fence refcnt leak when adding move fence
+
+ ttm_bo_add_move_fence() invokes dma_fence_get(), which returns a
+ reference of the specified dma_fence object to "fence" with increased
+ refcnt.
+
+ When ttm_bo_add_move_fence() returns, local variable "fence" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ ttm_bo_add_move_fence(). When no_wait_gpu flag is equals to true, the
+ function forgets to decrease the refcnt increased by dma_fence_get(),
+ causing a refcnt leak.
+
+ Fix this issue by calling dma_fence_put() when no_wait_gpu flag is
+ equals to true.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Christian König <christian.koenig@amd.com>
+ Link: https://patchwork.freedesktop.org/patch/370221/
+ Signed-off-by: Christian König <christian.koenig@amd.com>
+
+diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
+index 9e07c3f75156..ef5bc00c73e2 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo.c
++++ b/drivers/gpu/drm/ttm/ttm_bo.c
+@@ -881,8 +881,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
+ if (!fence)
+ return 0;
+
+- if (no_wait_gpu)
++ if (no_wait_gpu) {
++ dma_fence_put(fence);
+ return -EBUSY;
++ }
+
+ dma_resv_add_shared_fence(bo->base.resv, fence);
+ commit 37cc4b95d13f311c04aa8e9daacca3905ad45ca7 +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Jun 13 20:28:38 2020 +0800 + + drm/ttm: Fix dma_fence refcnt leak in ttm_bo_vm_fault_reserved + + ttm_bo_vm_fault_reserved() invokes dma_fence_get(), which returns a + reference of the specified dma_fence object to "moving" with increased + refcnt. + + When ttm_bo_vm_fault_reserved() returns, local variable "moving" becomes + invalid, so the refcount should be decreased to keep refcount balanced. + + The reference counting issue happens in several exception handling paths + of ttm_bo_vm_fault_reserved(). When those error scenarios occur such as + "err" equals to -EBUSY, the function forgets to decrease the refcnt + increased by dma_fence_get(), causing a refcnt leak. + + Fix this issue by calling dma_fence_put() when no_wait_gpu flag is + equals to true. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Reviewed-by: Christian König <christian.koenig@amd.com> + Link: https://patchwork.freedesktop.org/patch/370219/ + Signed-off-by: Christian König <christian.koenig@amd.com> + +diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c +index 0ad30b112982..72100b84c7a9 100644 +--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c +@@ -300,8 +300,10 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, + break; + case -EBUSY: + case -ERESTARTSYS: ++ dma_fence_put(moving); + return VM_FAULT_NOPAGE; + default: ++ dma_fence_put(moving); + return VM_FAULT_SIGBUS; + } +
commit 3bbd0ef26098d241dc59ee77ba14b7dab0df0786 +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Thu Apr 23 13:09:27 2020 +0800 + + ext4: fix buffer_head refcnt leak when ext4_iget() fails + + ext4_orphan_get() invokes ext4_read_inode_bitmap(), which returns a + reference of the specified buffer_head object to "bitmap_bh" with + increased refcnt. + + When ext4_orphan_get() returns, local variable "bitmap_bh" becomes + invalid, so the refcount should be decreased to keep refcount balanced. + + The reference counting issue happens in one exception handling path of + ext4_orphan_get(). When ext4_iget() fails, the function forgets to + decrease the refcnt increased by ext4_read_inode_bitmap(), causing a + refcnt leak. + + Fix this issue by calling brelse() when ext4_iget() fails. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Cc: stable@kernel.org + Link: https://lore.kernel.org/r/1587618568-13418-1-git-send-email-xiyuyang19@fudan.edu.cn + Signed-off-by: Theodore Ts'o <tytso@mit.edu> + +diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c +index 4b8c9a9bdf0c..011bcb8c4770 100644 +--- a/fs/ext4/ialloc.c ++++ b/fs/ext4/ialloc.c +@@ -1246,6 +1246,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) + ext4_error_err(sb, -err, + "couldn't read orphan inode %lu (err %d)", + ino, err); ++ brelse(bitmap_bh); + return inode; + } +
commit 36124fb19f1ae68a500cd76a76d40c6e81bee346
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon May 25 22:12:46 2020 +0800
+
+ ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed
+
+ fsl_asrc_dma_hw_params() invokes dma_request_channel() or
+ fsl_asrc_get_dma_channel(), which returns a reference of the specified
+ dma_chan object to "pair->dma_chan[dir]" with increased refcnt.
+
+ The reference counting issue happens in one exception handling path of
+ fsl_asrc_dma_hw_params(). When config DMA channel failed for Back-End,
+ the function forgets to decrease the refcnt increased by
+ dma_request_channel() or fsl_asrc_get_dma_channel(), causing a refcnt
+ leak.
+
+ Fix this issue by calling dma_release_channel() when config DMA channel
+ failed.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/1590415966-52416-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
+index e5d1b218acf8..d6a3fc5f87e5 100644
+--- a/sound/soc/fsl/fsl_asrc_dma.c
++++ b/sound/soc/fsl/fsl_asrc_dma.c
+@@ -261,6 +261,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
+ ret = dmaengine_slave_config(pair->dma_chan[dir], &config_be);
+ if (ret) {
+ dev_err(dev, "failed to config DMA channel for Back-End\n");
++ dma_release_channel(pair->dma_chan[dir]);
+ return ret;
+ }
+ commit 037e910b52b04fbd41990f643dff97c7e43b0e47
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon May 25 22:17:02 2020 +0800
+
+ SUNRPC: Remove unreachable error condition in rpcb_getport_async()
+
+ rpcb_getport_async() invokes rpcb_call_async(), which return the value
+ of rpc_run_task() to "child". Since rpc_run_task() is impossible to
+ return an ERR pointer, there is no need to add the IS_ERR() condition on
+ "child" here. So we need to remove it.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+
+diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
+index 4a020b688860..c27123e6ba80 100644
+--- a/net/sunrpc/rpcb_clnt.c
++++ b/net/sunrpc/rpcb_clnt.c
+@@ -795,12 +795,6 @@ void rpcb_getport_async(struct rpc_task *task)
+
+ child = rpcb_call_async(rpcb_clnt, map, proc);
+ rpc_release_client(rpcb_clnt);
+- if (IS_ERR(child)) {
+- /* rpcb_map_release() has freed the arguments */
+- dprintk("RPC: %5u %s: rpc_run_task failed\n",
+- task->tk_pid, __func__);
+- return;
+- }
+
+ xprt->stat.bind_count++;
+ rpc_put_task(child);
+ commit a4abc6b12eb1f7a533c2e7484cfa555454ff0977
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon May 25 22:15:41 2020 +0800
+
+ nfsd: Fix svc_xprt refcnt leak when setup callback client failed
+
+ nfsd4_process_cb_update() invokes svc_xprt_get(), which increases the
+ refcount of the "c->cn_xprt".
+
+ The reference counting issue happens in one exception handling path of
+ nfsd4_process_cb_update(). When setup callback client failed, the
+ function forgets to decrease the refcnt increased by svc_xprt_get(),
+ causing a refcnt leak.
+
+ Fix this issue by calling svc_xprt_put() when setup callback client
+ failed.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+
+diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
+index 966ca75418c8..7fbe9840a03e 100644
+--- a/fs/nfsd/nfs4callback.c
++++ b/fs/nfsd/nfs4callback.c
+@@ -1306,6 +1306,8 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)
+ err = setup_callback_client(clp, &conn, ses);
+ if (err) {
+ nfsd4_mark_cb_down(clp, err);
++ if (c)
++ svc_xprt_put(c->cn_xprt);
+ return;
+ }
+ }commit 7217e6e694da3aae6d17db8a7f7460c8d4817ebf
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon May 25 22:16:24 2020 +0800
+
+ scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event
+
+ In order to create or activate a new node, lpfc_els_unsol_buffer() invokes
+ lpfc_nlp_init() or lpfc_enable_node() or lpfc_nlp_get(), all of them will
+ return a reference of the specified lpfc_nodelist object to "ndlp" with
+ increased refcnt.
+
+ When lpfc_els_unsol_buffer() returns, local variable "ndlp" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ lpfc_els_unsol_buffer(). When "ndlp" in DEV_LOSS, the function forgets to
+ decrease the refcnt increased by lpfc_nlp_init() or lpfc_enable_node() or
+ lpfc_nlp_get(), causing a refcnt leak.
+
+ Fix this issue by calling lpfc_nlp_put() when "ndlp" in DEV_LOSS.
+
+ Link: https://lore.kernel.org/r/1590416184-52592-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Reviewed-by: Daniel Wagner <dwagner@suse.de>
+ Reviewed-by: James Smart <james.smart@broadcom.com>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
+index 565a21401660..3d670568a276 100644
+--- a/drivers/scsi/lpfc/lpfc_els.c
++++ b/drivers/scsi/lpfc/lpfc_els.c
+@@ -8508,6 +8508,8 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+ spin_lock_irq(shost->host_lock);
+ if (ndlp->nlp_flag & NLP_IN_DEV_LOSS) {
+ spin_unlock_irq(shost->host_lock);
++ if (newnode)
++ lpfc_nlp_put(ndlp);
+ goto dropit;
+ }
+ spin_unlock_irq(shost->host_lock);commit c6b39f070722ea9963ffe756bfe94e89218c5e63
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:35:28 2020 +0800
+
+ apparmor: Fix aa_label refcnt leak in policy_update
+
+ policy_update() invokes begin_current_label_crit_section(), which
+ returns a reference of the updated aa_label object to "label" with
+ increased refcount.
+
+ When policy_update() returns, "label" becomes invalid, so the refcount
+ should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ policy_update(). When aa_may_manage_policy() returns not NULL, the
+ refcnt increased by begin_current_label_crit_section() is not decreased,
+ causing a refcnt leak.
+
+ Fix this issue by jumping to "end_section" label when
+ aa_may_manage_policy() returns not NULL.
+
+ Fixes: 5ac8c355ae00 ("apparmor: allow introspecting the loaded policy pre internal transform")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: John Johansen <john.johansen@canonical.com>
+
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index 280741fc0f5f..f6a3ecfadf80 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -454,7 +454,7 @@ static ssize_t policy_update(u32 mask, const char __user *buf, size_t size,
+ */
+ error = aa_may_manage_policy(label, ns, mask);
+ if (error)
+- return error;
++ goto end_section;
+
+ data = aa_simple_write_to_buffer(buf, size, size, pos);
+ error = PTR_ERR(data);
+@@ -462,6 +462,7 @@ static ssize_t policy_update(u32 mask, const char __user *buf, size_t size,
+ error = aa_replace_profiles(ns, label, mask, data);
+ aa_put_loaddata(data);
+ }
++end_section:
+ end_current_label_crit_section(label);
+
+ return error;commit a0b845ffa0d91855532b50fc040aeb2d8338dca4
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sun Apr 5 13:11:55 2020 +0800
+
+ apparmor: fix potential label refcnt leak in aa_change_profile
+
+ aa_change_profile() invokes aa_get_current_label(), which returns
+ a reference of the current task's label.
+
+ According to the comment of aa_get_current_label(), the returned
+ reference must be put with aa_put_label().
+ However, when the original object pointed by "label" becomes
+ unreachable because aa_change_profile() returns or a new object
+ is assigned to "label", reference count increased by
+ aa_get_current_label() is not decreased, causing a refcnt leak.
+
+ Fix this by calling aa_put_label() before aa_change_profile() return
+ and dropping unnecessary aa_get_current_label().
+
+ Fixes: 9fcf78cca198 ("apparmor: update domain transitions that are subsets of confinement at nnp")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: John Johansen <john.johansen@canonical.com>
+
+diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
+index 6ceb74e0f789..a84ef030fbd7 100644
+--- a/security/apparmor/domain.c
++++ b/security/apparmor/domain.c
+@@ -1328,6 +1328,7 @@ int aa_change_profile(const char *fqname, int flags)
+ ctx->nnp = aa_get_label(label);
+
+ if (!fqname || !*fqname) {
++ aa_put_label(label);
+ AA_DEBUG("no profile name");
+ return -EINVAL;
+ }
+@@ -1346,8 +1347,6 @@ int aa_change_profile(const char *fqname, int flags)
+ op = OP_CHANGE_PROFILE;
+ }
+
+- label = aa_get_current_label();
+-
+ if (*fqname == '&') {
+ stack = true;
+ /* don't have label_parse() do stacking */commit a697ae6ea56e23397341b027098c1b11d9ab13da
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sat Apr 25 20:48:35 2020 +0800
+
+ ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type
+
+ davinci_mcasp_get_dma_type() invokes dma_request_chan(), which returns a
+ reference of the specified dma_chan object to "chan" with increased
+ refcnt.
+
+ When davinci_mcasp_get_dma_type() returns, local variable "chan" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ davinci_mcasp_get_dma_type(). When chan device is NULL, the function
+ forgets to decrease the refcnt increased by dma_request_chan(), causing
+ a refcnt leak.
+
+ Fix this issue by calling dma_release_channel() when chan device is
+ NULL.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
+ Link: https://lore.kernel.org/r/1587818916-38730-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
+index 734ffe925c4d..7a7db743dc5b 100644
+--- a/sound/soc/ti/davinci-mcasp.c
++++ b/sound/soc/ti/davinci-mcasp.c
+@@ -1896,8 +1896,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
+ PTR_ERR(chan));
+ return PTR_ERR(chan);
+ }
+- if (WARN_ON(!chan->device || !chan->device->dev))
++ if (WARN_ON(!chan->device || !chan->device->dev)) {
++ dma_release_channel(chan);
+ return -EINVAL;
++ }
+
+ if (chan->device->dev->of_node)
+ ret = of_property_read_string(chan->device->dev->of_node,commit 18f02ad19e2c2a1d9e1d55a4e1c0cbf51419151c
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sun Apr 26 11:35:15 2020 +0800
+
+ bpf: Fix sk_psock refcnt leak when receiving message
+
+ tcp_bpf_recvmsg() invokes sk_psock_get(), which returns a reference of
+ the specified sk_psock object to "psock" with increased refcnt.
+
+ When tcp_bpf_recvmsg() returns, local variable "psock" becomes invalid,
+ so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in several exception handling paths
+ of tcp_bpf_recvmsg(). When those error scenarios occur such as "flags"
+ includes MSG_ERRQUEUE, the function forgets to decrease the refcnt
+ increased by sk_psock_get(), causing a refcnt leak.
+
+ Fix this issue by calling sk_psock_put() or pulling up the error queue
+ read handling when those error scenarios occur.
+
+ Fixes: e7a5f1f1cd000 ("bpf/sockmap: Read psock ingress_msg before sk_receive_queue")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+ Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
+ Link: https://lore.kernel.org/bpf/1587872115-42805-1-git-send-email-xiyuyang19@fudan.edu.cn
+
+diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
+index 5a05327f97c1..ff96466ea6da 100644
+--- a/net/ipv4/tcp_bpf.c
++++ b/net/ipv4/tcp_bpf.c
+@@ -262,14 +262,17 @@ static int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+ struct sk_psock *psock;
+ int copied, ret;
+
++ if (unlikely(flags & MSG_ERRQUEUE))
++ return inet_recv_error(sk, msg, len, addr_len);
++
+ psock = sk_psock_get(sk);
+ if (unlikely(!psock))
+ return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
+- if (unlikely(flags & MSG_ERRQUEUE))
+- return inet_recv_error(sk, msg, len, addr_len);
+ if (!skb_queue_empty(&sk->sk_receive_queue) &&
+- sk_psock_queue_empty(psock))
++ sk_psock_queue_empty(psock)) {
++ sk_psock_put(sk, psock);
+ return tcp_recvmsg(sk, msg, len, nonblock, flags, addr_len);
++ }
+ lock_sock(sk);
+ msg_bytes_ready:
+ copied = __tcp_bpf_recvmsg(sk, psock, msg, len, flags);commit 62b4011fa7bef9fa00a6aeec26e69685dc1cc21e
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Sat Apr 25 21:10:23 2020 +0800
+
+ net/tls: Fix sk_psock refcnt leak when in tls_data_ready()
+
+ tls_data_ready() invokes sk_psock_get(), which returns a reference of
+ the specified sk_psock object to "psock" with increased refcnt.
+
+ When tls_data_ready() returns, local variable "psock" becomes invalid,
+ so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ tls_data_ready(). When "psock->ingress_msg" is empty but "psock" is not
+ NULL, the function forgets to decrease the refcnt increased by
+ sk_psock_get(), causing a refcnt leak.
+
+ Fix this issue by calling sk_psock_put() on all paths when "psock" is
+ not NULL.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
+index 704313dd082f..e23f94a5549b 100644
+--- a/net/tls/tls_sw.c
++++ b/net/tls/tls_sw.c
+@@ -2083,8 +2083,9 @@ static void tls_data_ready(struct sock *sk)
+ strp_data_ready(&ctx->strp);
+
+ psock = sk_psock_get(sk);
+- if (psock && !list_empty(&psock->ingress_msg)) {
+- ctx->saved_data_ready(sk);
++ if (psock) {
++ if (!list_empty(&psock->ingress_msg))
++ ctx->saved_data_ready(sk);
+ sk_psock_put(sk, psock);
+ }
+ }commit 4becb7ee5b3d2829ed7b9261a245a77d5b7de902 +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Apr 25 21:06:25 2020 +0800 + + net/x25: Fix x25_neigh refcnt leak when x25 disconnect + + x25_connect() invokes x25_get_neigh(), which returns a reference of the + specified x25_neigh object to "x25->neighbour" with increased refcnt. + + When x25 connect success and returns, the reference still be hold by + "x25->neighbour", so the refcount should be decreased in + x25_disconnect() to keep refcount balanced. + + The reference counting issue happens in x25_disconnect(), which forgets + to decrease the refcnt increased by x25_get_neigh() in x25_connect(), + causing a refcnt leak. + + Fix this issue by calling x25_neigh_put() before x25_disconnect() + returns. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c +index 8aa415a38814..8b1b06cabcbf 100644 +--- a/net/x25/x25_subr.c ++++ b/net/x25/x25_subr.c +@@ -357,6 +357,10 @@ void x25_disconnect(struct sock *sk, int reason, unsigned char cause, + sk->sk_state_change(sk); + sock_set_flag(sk, SOCK_DEAD); + } ++ read_lock_bh(&x25_list_lock); ++ x25_neigh_put(x25->neighbour); ++ x25->neighbour = NULL; ++ read_unlock_bh(&x25_list_lock); + } + + /*
commit 095f5614bfe16e5b3e191b34ea41b10d6fdd4ced +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Apr 25 20:54:37 2020 +0800 + + net/tls: Fix sk_psock refcnt leak in bpf_exec_tx_verdict() + + bpf_exec_tx_verdict() invokes sk_psock_get(), which returns a reference + of the specified sk_psock object to "psock" with increased refcnt. + + When bpf_exec_tx_verdict() returns, local variable "psock" becomes + invalid, so the refcount should be decreased to keep refcount balanced. + + The reference counting issue happens in one exception handling path of + bpf_exec_tx_verdict(). When "policy" equals to NULL but "psock" is not + NULL, the function forgets to decrease the refcnt increased by + sk_psock_get(), causing a refcnt leak. + + Fix this issue by calling sk_psock_put() on this error path before + bpf_exec_tx_verdict() returns. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c +index c98e602a1a2d..704313dd082f 100644 +--- a/net/tls/tls_sw.c ++++ b/net/tls/tls_sw.c +@@ -800,6 +800,8 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, + *copied -= sk_msg_free(sk, msg); + tls_free_open_rec(sk); + } ++ if (psock) ++ sk_psock_put(sk, psock); + return err; + } + more_data:
commit 5d5e100a20348c336e56df604b353b978f8adbb9
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:41:54 2020 +0800
+
+ drm/i915/selftests: Fix i915_address_space refcnt leak
+
+ igt_ppgtt_pin_update() invokes i915_gem_context_get_vm_rcu(), which
+ returns a reference of the i915_address_space object to "vm" with
+ increased refcount.
+
+ When igt_ppgtt_pin_update() returns, "vm" becomes invalid, so the
+ refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in two exception handling paths of
+ igt_ppgtt_pin_update(). When i915_gem_object_create_internal() returns
+ IS_ERR, the refcnt increased by i915_gem_context_get_vm_rcu() is not
+ decreased, causing a refcnt leak.
+
+ Fix this issue by jumping to "out_vm" label when
+ i915_gem_object_create_internal() returns IS_ERR.
+
+ Fixes: a4e7ccdac38e ("drm/i915: Move context management under GEM")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Link: https://patchwork.freedesktop.org/patch/msgid/1587361342-83494-1-git-send-email-xiyuyang19@fudan.edu.cn
+ (cherry picked from commit e07c7606a00c4361bad72ff4e72ed0dfbefa23b0)
+ Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+index 2d0fd50c5312..d4f94ca9ae0d 100644
+--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
++++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+@@ -1477,8 +1477,10 @@ static int igt_ppgtt_pin_update(void *arg)
+ unsigned int page_size = BIT(first);
+
+ obj = i915_gem_object_create_internal(dev_priv, page_size);
+- if (IS_ERR(obj))
+- return PTR_ERR(obj);
++ if (IS_ERR(obj)) {
++ err = PTR_ERR(obj);
++ goto out_vm;
++ }
+
+ vma = i915_vma_instance(obj, vm, NULL);
+ if (IS_ERR(vma)) {
+@@ -1531,8 +1533,10 @@ static int igt_ppgtt_pin_update(void *arg)
+ }
+
+ obj = i915_gem_object_create_internal(dev_priv, PAGE_SIZE);
+- if (IS_ERR(obj))
+- return PTR_ERR(obj);
++ if (IS_ERR(obj)) {
++ err = PTR_ERR(obj);
++ goto out_vm;
++ }
+
+ vma = i915_vma_instance(obj, vm, NULL);
+ if (IS_ERR(vma)) {
+ commit 8aebfffacfa379ba400da573a5bf9e49634e38cb +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Apr 25 20:52:26 2020 +0800 + + configfs: fix config_item refcnt leak in configfs_rmdir() + + configfs_rmdir() invokes configfs_get_config_item(), which returns a + reference of the specified config_item object to "parent_item" with + increased refcnt. + + When configfs_rmdir() returns, local variable "parent_item" becomes + invalid, so the refcount should be decreased to keep refcount balanced. + + The reference counting issue happens in one exception handling path of + configfs_rmdir(). When down_write_killable() fails, the function forgets + to decrease the refcnt increased by configfs_get_config_item(), causing + a refcnt leak. + + Fix this issue by calling config_item_put() when down_write_killable() + fails. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c +index cf7b7e1d5bd7..cb733652ecca 100644 +--- a/fs/configfs/dir.c ++++ b/fs/configfs/dir.c +@@ -1519,6 +1519,7 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) + spin_lock(&configfs_dirent_lock); + configfs_detach_rollback(dentry); + spin_unlock(&configfs_dirent_lock); ++ config_item_put(parent_item); + return -EINTR; + } + frag->frag_dead = true;
commit 6e47666ef93dc9c4011407df8d2de1dd1ed39f25 +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Sat Apr 25 21:04:40 2020 +0800 + + NFSv4: Remove unreachable error condition due to rpc_run_task() + + nfs4_proc_layoutget() invokes rpc_run_task(), which return the value to + "task". Since rpc_run_task() is impossible to return an ERR pointer, + there is no need to add the IS_ERR() condition on "task" here. So we + need to remove it. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> + +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 512afb1c7867..1c710a7834c2 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -9191,8 +9191,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout) + nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0, 0); + + task = rpc_run_task(&task_setup_data); +- if (IS_ERR(task)) +- return ERR_CAST(task); ++ + status = rpc_wait_for_completion_task(task); + if (status != 0) + goto out;
commit f35d12971b4d814cdb2f659d76b42f0c545270b6
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Apr 23 13:13:03 2020 +0800
+
+ net/x25: Fix x25_neigh refcnt leak when receiving frame
+
+ x25_lapb_receive_frame() invokes x25_get_neigh(), which returns a
+ reference of the specified x25_neigh object to "nb" with increased
+ refcnt.
+
+ When x25_lapb_receive_frame() returns, local variable "nb" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one path of
+ x25_lapb_receive_frame(). When pskb_may_pull() returns false, the
+ function forgets to decrease the refcnt increased by x25_get_neigh(),
+ causing a refcnt leak.
+
+ Fix this issue by calling x25_neigh_put() when pskb_may_pull() returns
+ false.
+
+ Fixes: cb101ed2c3c7 ("x25: Handle undersized/fragmented skbs")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
+index 00e782335cb0..25bf72ee6cad 100644
+--- a/net/x25/x25_dev.c
++++ b/net/x25/x25_dev.c
+@@ -115,8 +115,10 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev,
+ goto drop;
+ }
+
+- if (!pskb_may_pull(skb, 1))
++ if (!pskb_may_pull(skb, 1)) {
++ x25_neigh_put(nb);
+ return 0;
++ }
+
+ switch (skb->data[0]) {
+ commit 1402d17dfd9657be0da8458b2079d03c2d61c86a
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:39:39 2020 +0800
+
+ btrfs: fix transaction leak in btrfs_recover_relocation
+
+ btrfs_recover_relocation() invokes btrfs_join_transaction(), which joins
+ a btrfs_trans_handle object into transactions and returns a reference of
+ it with increased refcount to "trans".
+
+ When btrfs_recover_relocation() returns, "trans" becomes invalid, so the
+ refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ btrfs_recover_relocation(). When read_fs_root() failed, the refcnt
+ increased by btrfs_join_transaction() is not decreased, causing a refcnt
+ leak.
+
+ Fix this issue by calling btrfs_end_transaction() on this error path
+ when read_fs_root() failed.
+
+ Fixes: 79787eaab461 ("btrfs: replace many BUG_ONs with proper error handling")
+ CC: stable@vger.kernel.org # 4.4+
+ Reviewed-by: Filipe Manana <fdmanana@suse.com>
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David Sterba <dsterba@suse.com>
+
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index d35936c934ab..03bc7134e8cb 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -4559,6 +4559,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
+ if (IS_ERR(fs_root)) {
+ err = PTR_ERR(fs_root);
+ list_add_tail(&reloc_root->root_list, &reloc_roots);
++ btrfs_end_transaction(trans);
+ goto out_unset;
+ }
+ commit f6033c5e333238f299c3ae03fac8cc1365b23b77
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Tue Apr 21 10:54:11 2020 +0800
+
+ btrfs: fix block group leak when removing fails
+
+ btrfs_remove_block_group() invokes btrfs_lookup_block_group(), which
+ returns a local reference of the block group that contains the given
+ bytenr to "block_group" with increased refcount.
+
+ When btrfs_remove_block_group() returns, "block_group" becomes invalid,
+ so the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in several exception handling paths
+ of btrfs_remove_block_group(). When those error scenarios occur such as
+ btrfs_alloc_path() returns NULL, the function forgets to decrease its
+ refcnt increased by btrfs_lookup_block_group() and will cause a refcnt
+ leak.
+
+ Fix this issue by jumping to "out_put_group" label and calling
+ btrfs_put_block_group() when those error scenarios occur.
+
+ CC: stable@vger.kernel.org # 4.4+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: David Sterba <dsterba@suse.com>
+ Signed-off-by: David Sterba <dsterba@suse.com>
+
+diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
+index af9e9a008724..696f47103cfc 100644
+--- a/fs/btrfs/block-group.c
++++ b/fs/btrfs/block-group.c
+@@ -916,7 +916,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
+ path = btrfs_alloc_path();
+ if (!path) {
+ ret = -ENOMEM;
+- goto out;
++ goto out_put_group;
+ }
+
+ /*
+@@ -954,7 +954,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
+ ret = btrfs_orphan_add(trans, BTRFS_I(inode));
+ if (ret) {
+ btrfs_add_delayed_iput(inode);
+- goto out;
++ goto out_put_group;
+ }
+ clear_nlink(inode);
+ /* One for the block groups ref */
+@@ -977,13 +977,13 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
+
+ ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);
+ if (ret < 0)
+- goto out;
++ goto out_put_group;
+ if (ret > 0)
+ btrfs_release_path(path);
+ if (ret == 0) {
+ ret = btrfs_del_item(trans, tree_root, path);
+ if (ret)
+- goto out;
++ goto out_put_group;
+ btrfs_release_path(path);
+ }
+
+@@ -1102,9 +1102,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
+
+ ret = remove_block_group_free_space(trans, block_group);
+ if (ret)
+- goto out;
++ goto out_put_group;
+
+- btrfs_put_block_group(block_group);
++ /* Once for the block groups rbtree */
+ btrfs_put_block_group(block_group);
+
+ ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
+@@ -1127,6 +1127,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
+ /* once for the tree */
+ free_extent_map(em);
+ }
++
++out_put_group:
++ /* Once for the lookup reference */
++ btrfs_put_block_group(block_group);
+ out:
+ if (remove_rsv)
+ btrfs_delayed_refs_rsv_release(fs_info, 1);commit 332e0e17ad49e084b7db670ef43b5eb59abd9e34
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:44:16 2020 +0800
+
+ staging: comedi: Fix comedi_device refcnt leak in comedi_open
+
+ comedi_open() invokes comedi_dev_get_from_minor(), which returns a
+ reference of the COMEDI device to "dev" with increased refcount.
+
+ When comedi_open() returns, "dev" becomes invalid, so the refcount
+ should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling path of
+ comedi_open(). When "cfp" allocation is failed, the refcnt increased by
+ comedi_dev_get_from_minor() is not decreased, causing a refcnt leak.
+
+ Fix this issue by calling comedi_dev_put() on this error path when "cfp"
+ allocation is failed.
+
+ Fixes: 20f083c07565 ("staging: comedi: prepare support for per-file read and write subdevices")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Cc: stable <stable@vger.kernel.org>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
+ Link: https://lore.kernel.org/r/1587361459-83622-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
+index 08d1bbbebf2d..e84b4fb493d6 100644
+--- a/drivers/staging/comedi/comedi_fops.c
++++ b/drivers/staging/comedi/comedi_fops.c
+@@ -2725,8 +2725,10 @@ static int comedi_open(struct inode *inode, struct file *file)
+ }
+
+ cfp = kzalloc(sizeof(*cfp), GFP_KERNEL);
+- if (!cfp)
++ if (!cfp) {
++ comedi_dev_put(dev);
+ return -ENOMEM;
++ }
+
+ cfp->dev = dev;
+ commit e3436ce60cf5f5eaedda2b8c622f69feb97595e2
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Apr 23 13:15:40 2020 +0800
+
+ staging: gasket: Fix mapping refcnt leak when register/store fails
+
+ gasket_sysfs_register_store() invokes get_mapping(), which returns a
+ reference of the specified gasket_sysfs_mapping object to "mapping" with
+ increased refcnt.
+
+ When gasket_sysfs_register_store() returns, local variable "mapping"
+ becomes invalid, so the refcount should be decreased to keep refcount
+ balanced.
+
+ The reference counting issue happens in one exception handling path of
+ gasket_sysfs_register_store(). When gasket_dev is NULL, the function
+ forgets to decrease the refcnt increased by get_mapping(), causing a
+ refcnt leak.
+
+ Fix this issue by calling put_mapping() when gasket_dev is NULL.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Link: https://lore.kernel.org/r/1587618941-13718-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/staging/gasket/gasket_sysfs.c b/drivers/staging/gasket/gasket_sysfs.c
+index f24edc38c27b..b4aa8c2ba2c0 100644
+--- a/drivers/staging/gasket/gasket_sysfs.c
++++ b/drivers/staging/gasket/gasket_sysfs.c
+@@ -374,6 +374,7 @@ ssize_t gasket_sysfs_register_store(struct device *device,
+ gasket_dev = mapping->gasket_dev;
+ if (!gasket_dev) {
+ dev_err(device, "Device driver may have been removed\n");
++ put_mapping(mapping);
+ return 0;
+ }
+ commit 57a66838e1494cd881b7f4e110ec685736e8e3ca +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Thu Apr 23 13:14:55 2020 +0800 + + staging: gasket: Fix mapping refcnt leak when put attribute fails + + gasket_sysfs_put_attr() invokes get_mapping(), which returns a reference + of the specified gasket_sysfs_mapping object to "mapping" with increased + refcnt. + + When gasket_sysfs_put_attr() returns, local variable "mapping" becomes + invalid, so the refcount should be decreased to keep refcount balanced. + + The reference counting issue happens in one path of + gasket_sysfs_put_attr(). When mapping attribute is unknown, the function + forgets to decrease the refcnt increased by get_mapping(), causing a + refcnt leak. + + Fix this issue by calling put_mapping() when put attribute fails due to + unknown attribute. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Link: https://lore.kernel.org/r/1587618895-13660-1-git-send-email-xiyuyang19@fudan.edu.cn + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/gasket/gasket_sysfs.c b/drivers/staging/gasket/gasket_sysfs.c +index a2d67c28f530..f24edc38c27b 100644 +--- a/drivers/staging/gasket/gasket_sysfs.c ++++ b/drivers/staging/gasket/gasket_sysfs.c +@@ -340,6 +340,7 @@ void gasket_sysfs_put_attr(struct device *device, + + dev_err(device, "Unable to put unknown attribute: %s\n", + attr->attr.attr.name); ++ put_mapping(mapping); + } + EXPORT_SYMBOL(gasket_sysfs_put_attr); +
commit 59e1947ca09ebd1cae147c08c7c41f3141233c84
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Thu Apr 23 12:54:19 2020 +0800
+
+ ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
+
+ snd_microii_spdif_default_get() invokes snd_usb_lock_shutdown(), which
+ increases the refcount of the snd_usb_audio object "chip".
+
+ When snd_microii_spdif_default_get() returns, local variable "chip"
+ becomes invalid, so the refcount should be decreased to keep refcount
+ balanced.
+
+ The reference counting issue happens in several exception handling paths
+ of snd_microii_spdif_default_get(). When those error scenarios occur
+ such as usb_ifnum_to_if() returns NULL, the function forgets to decrease
+ the refcnt increased by snd_usb_lock_shutdown(), causing a refcnt leak.
+
+ Fix this issue by jumping to "end" label when those error scenarios
+ occur.
+
+ Fixes: 447d6275f0c2 ("ALSA: usb-audio: Add sanity checks for endpoint accesses")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/1587617711-13200-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
+index 02b036b2aefb..a5f65a9a0254 100644
+--- a/sound/usb/mixer_quirks.c
++++ b/sound/usb/mixer_quirks.c
+@@ -1509,11 +1509,15 @@ static int snd_microii_spdif_default_get(struct snd_kcontrol *kcontrol,
+
+ /* use known values for that card: interface#1 altsetting#1 */
+ iface = usb_ifnum_to_if(chip->dev, 1);
+- if (!iface || iface->num_altsetting < 2)
+- return -EINVAL;
++ if (!iface || iface->num_altsetting < 2) {
++ err = -EINVAL;
++ goto end;
++ }
+ alts = &iface->altsetting[1];
+- if (get_iface_desc(alts)->bNumEndpoints < 1)
+- return -EINVAL;
++ if (get_iface_desc(alts)->bNumEndpoints < 1) {
++ err = -EINVAL;
++ goto end;
++ }
+ ep = get_endpoint(alts, 0)->bEndpointAddress;
+
+ err = snd_usb_ctl_msg(chip->dev,commit efe57fd58e1cb77f9186152ee12a8aa4ae3348e0
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 23:14:19 2020 +0800
+
+ SUNRPC: Remove unreachable error condition
+
+ rpc_clnt_test_and_add_xprt() invokes rpc_call_null_helper(), which
+ return the value of rpc_run_task() to "task". Since rpc_run_task() is
+ impossible to return an ERR pointer, there is no need to add the
+ IS_ERR() condition on "task" here. So we need to remove it.
+
+ Fixes: 7f554890587c ("SUNRPC: Allow addition of new transports to a struct rpc_clnt")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+
+diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
+index 325a0858700f..05404bb05607 100644
+--- a/net/sunrpc/clnt.c
++++ b/net/sunrpc/clnt.c
+@@ -2808,8 +2808,7 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt,
+ task = rpc_call_null_helper(clnt, xprt, NULL,
+ RPC_TASK_SOFT|RPC_TASK_SOFTCONN|RPC_TASK_ASYNC|RPC_TASK_NULLCREDS,
+ &rpc_cb_add_xprt_call_ops, data);
+- if (IS_ERR(task))
+- return PTR_ERR(task);
++
+ rpc_put_task(task);
+ success:
+ return 1;
+ commit 6f91a3f7af4186099dd10fa530dd7e0d9c29747d
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:37:20 2020 +0800
+
+ batman-adv: Fix refcnt leak in batadv_v_ogm_process
+
+ batadv_v_ogm_process() invokes batadv_hardif_neigh_get(), which returns
+ a reference of the neighbor object to "hardif_neigh" with increased
+ refcount.
+
+ When batadv_v_ogm_process() returns, "hardif_neigh" becomes invalid, so
+ the refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in one exception handling paths of
+ batadv_v_ogm_process(). When batadv_v_ogm_orig_get() fails to get the
+ orig node and returns NULL, the refcnt increased by
+ batadv_hardif_neigh_get() is not decreased, causing a refcnt leak.
+
+ Fix this issue by jumping to "out" label when batadv_v_ogm_orig_get()
+ fails to get the orig node.
+
+ Fixes: 9323158ef9f4 ("batman-adv: OGMv2 - implement originators logic")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Sven Eckelmann <sven@narfation.org>
+ Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+
+diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
+index 969466218999..80b87b1f4e3a 100644
+--- a/net/batman-adv/bat_v_ogm.c
++++ b/net/batman-adv/bat_v_ogm.c
+@@ -893,7 +893,7 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,
+
+ orig_node = batadv_v_ogm_orig_get(bat_priv, ogm_packet->orig);
+ if (!orig_node)
+- return;
++ goto out;
+
+ neigh_node = batadv_neigh_node_get_or_create(orig_node, if_incoming,
+ ethhdr->h_source);commit 6107c5da0fca8b50b4d3215e94d619d38cc4a18c
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Wed Apr 15 16:35:21 2020 +0800
+
+ batman-adv: Fix refcnt leak in batadv_store_throughput_override
+
+ batadv_show_throughput_override() invokes batadv_hardif_get_by_netdev(),
+ which gets a batadv_hard_iface object from net_dev with increased refcnt
+ and its reference is assigned to a local pointer 'hard_iface'.
+
+ When batadv_store_throughput_override() returns, "hard_iface" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The issue happens in one error path of
+ batadv_store_throughput_override(). When batadv_parse_throughput()
+ returns NULL, the refcnt increased by batadv_hardif_get_by_netdev() is
+ not decreased, causing a refcnt leak.
+
+ Fix this issue by jumping to "out" label when batadv_parse_throughput()
+ returns NULL.
+
+ Fixes: 0b5ecc6811bd ("batman-adv: add throughput override attribute to hard_ifaces")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Sven Eckelmann <sven@narfation.org>
+ Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+
+diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
+index c0b00268aac4..0f962dcd239e 100644
+--- a/net/batman-adv/sysfs.c
++++ b/net/batman-adv/sysfs.c
+@@ -1150,7 +1150,7 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj,
+ ret = batadv_parse_throughput(net_dev, buff, "throughput_override",
+ &tp_override);
+ if (!ret)
+- return count;
++ goto out;
+
+ old_tp_override = atomic_read(&hard_iface->bat_v.throughput_override);
+ if (old_tp_override == tp_override)commit f872de8185acf1b48b954ba5bd8f9bc0a0d14016
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Wed Apr 15 16:31:50 2020 +0800
+
+ batman-adv: Fix refcnt leak in batadv_show_throughput_override
+
+ batadv_show_throughput_override() invokes batadv_hardif_get_by_netdev(),
+ which gets a batadv_hard_iface object from net_dev with increased refcnt
+ and its reference is assigned to a local pointer 'hard_iface'.
+
+ When batadv_show_throughput_override() returns, "hard_iface" becomes
+ invalid, so the refcount should be decreased to keep refcount balanced.
+
+ The issue happens in the normal path of
+ batadv_show_throughput_override(), which forgets to decrease the refcnt
+ increased by batadv_hardif_get_by_netdev() before the function returns,
+ causing a refcnt leak.
+
+ Fix this issue by calling batadv_hardif_put() before the
+ batadv_show_throughput_override() returns in the normal path.
+
+ Fixes: 0b5ecc6811bd ("batman-adv: add throughput override attribute to hard_ifaces")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: Sven Eckelmann <sven@narfation.org>
+ Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+
+diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
+index c45962d8527b..c0b00268aac4 100644
+--- a/net/batman-adv/sysfs.c
++++ b/net/batman-adv/sysfs.c
+@@ -1190,6 +1190,7 @@ static ssize_t batadv_show_throughput_override(struct kobject *kobj,
+
+ tp_override = atomic_read(&hard_iface->bat_v.throughput_override);
+
++ batadv_hardif_put(hard_iface);
+ return sprintf(buff, "%u.%u MBit\n", tp_override / 10,
+ tp_override % 10);
+ }commit e07c7606a00c4361bad72ff4e72ed0dfbefa23b0
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Apr 20 13:41:54 2020 +0800
+
+ drm/i915/selftests: Fix i915_address_space refcnt leak
+
+ igt_ppgtt_pin_update() invokes i915_gem_context_get_vm_rcu(), which
+ returns a reference of the i915_address_space object to "vm" with
+ increased refcount.
+
+ When igt_ppgtt_pin_update() returns, "vm" becomes invalid, so the
+ refcount should be decreased to keep refcount balanced.
+
+ The reference counting issue happens in two exception handling paths of
+ igt_ppgtt_pin_update(). When i915_gem_object_create_internal() returns
+ IS_ERR, the refcnt increased by i915_gem_context_get_vm_rcu() is not
+ decreased, causing a refcnt leak.
+
+ Fix this issue by jumping to "out_vm" label when
+ i915_gem_object_create_internal() returns IS_ERR.
+
+ Fixes: a4e7ccdac38e ("drm/i915: Move context management under GEM")
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Link: https://patchwork.freedesktop.org/patch/msgid/1587361342-83494-1-git-send-email-xiyuyang19@fudan.edu.cn
+
+diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+index 2d0fd50c5312..d4f94ca9ae0d 100644
+--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
++++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+@@ -1477,8 +1477,10 @@ static int igt_ppgtt_pin_update(void *arg)
+ unsigned int page_size = BIT(first);
+
+ obj = i915_gem_object_create_internal(dev_priv, page_size);
+- if (IS_ERR(obj))
+- return PTR_ERR(obj);
++ if (IS_ERR(obj)) {
++ err = PTR_ERR(obj);
++ goto out_vm;
++ }
+
+ vma = i915_vma_instance(obj, vm, NULL);
+ if (IS_ERR(vma)) {
+@@ -1531,8 +1533,10 @@ static int igt_ppgtt_pin_update(void *arg)
+ }
+
+ obj = i915_gem_object_create_internal(dev_priv, PAGE_SIZE);
+- if (IS_ERR(obj))
+- return PTR_ERR(obj);
++ if (IS_ERR(obj)) {
++ err = PTR_ERR(obj);
++ goto out_vm;
++ }
+
+ vma = i915_vma_instance(obj, vm, NULL);
+ if (IS_ERR(vma)) {commit 7717cbec172c3554d470023b4020d5781961187e +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Wed Apr 15 16:41:20 2020 +0800 + + wimax/i2400m: Fix potential urb refcnt leak + + i2400mu_bus_bm_wait_for_ack() invokes usb_get_urb(), which increases the + refcount of the "notif_urb". + + When i2400mu_bus_bm_wait_for_ack() returns, local variable "notif_urb" + becomes invalid, so the refcount should be decreased to keep refcount + balanced. + + The issue happens in all paths of i2400mu_bus_bm_wait_for_ack(), which + forget to decrease the refcnt increased by usb_get_urb(), causing a + refcnt leak. + + Fix this issue by calling usb_put_urb() before the + i2400mu_bus_bm_wait_for_ack() returns. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c +index 529ebca1e9e1..1f7709d24f35 100644 +--- a/drivers/net/wimax/i2400m/usb-fw.c ++++ b/drivers/net/wimax/i2400m/usb-fw.c +@@ -354,6 +354,7 @@ ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *i2400m, + usb_autopm_put_interface(i2400mu->usb_iface); + d_fnend(8, dev, "(i2400m %p ack %p size %zu) = %ld\n", + i2400m, ack, ack_size, (long) result); ++ usb_put_urb(¬if_urb); + return result; + + error_exceeded:
commit de058420767df21e2b6b0f3bb36d1616fb962032
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Wed Apr 15 16:40:28 2020 +0800
+
+ tipc: Fix potential tipc_node refcnt leak in tipc_rcv
+
+ tipc_rcv() invokes tipc_node_find() twice, which returns a reference of
+ the specified tipc_node object to "n" with increased refcnt.
+
+ When tipc_rcv() returns or a new object is assigned to "n", the original
+ local reference of "n" becomes invalid, so the refcount should be
+ decreased to keep refcount balanced.
+
+ The issue happens in some paths of tipc_rcv(), which forget to decrease
+ the refcnt increased by tipc_node_find() and will cause a refcnt leak.
+
+ Fix this issue by calling tipc_node_put() before the original object
+ pointed by "n" becomes invalid.
+
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/tipc/node.c b/net/tipc/node.c
+index 10292c942384..803a3a6d0f50 100644
+--- a/net/tipc/node.c
++++ b/net/tipc/node.c
+@@ -2038,6 +2038,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b)
+ n = tipc_node_find_by_id(net, ehdr->id);
+ }
+ tipc_crypto_rcv(net, (n) ? n->crypto_rx : NULL, &skb, b);
++ tipc_node_put(n);
+ if (!skb)
+ return;
+
+@@ -2090,7 +2091,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b)
+ /* Check/update node state before receiving */
+ if (unlikely(skb)) {
+ if (unlikely(skb_linearize(skb)))
+- goto discard;
++ goto out_node_put;
+ tipc_node_write_lock(n);
+ if (tipc_node_check_state(n, skb, bearer_id, &xmitq)) {
+ if (le->link) {
+@@ -2119,6 +2120,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b)
+ if (!skb_queue_empty(&xmitq))
+ tipc_bearer_xmit(net, bearer_id, &xmitq, &le->maddr, n);
+
++out_node_put:
+ tipc_node_put(n);
+ discard:
+ kfree_skb(skb);commit 441870ee4240cf67b5d3ab8e16216a9ff42eb5d6 +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Wed Apr 15 16:39:56 2020 +0800 + + tipc: Fix potential tipc_aead refcnt leak in tipc_crypto_rcv + + tipc_crypto_rcv() invokes tipc_aead_get(), which returns a reference of + the tipc_aead object to "aead" with increased refcnt. + + When tipc_crypto_rcv() returns, the original local reference of "aead" + becomes invalid, so the refcount should be decreased to keep refcount + balanced. + + The issue happens in one error path of tipc_crypto_rcv(). When TIPC + message decryption status is EINPROGRESS or EBUSY, the function forgets + to decrease the refcnt increased by tipc_aead_get() and causes a refcnt + leak. + + Fix this issue by calling tipc_aead_put() on the error path when TIPC + message decryption status is EINPROGRESS or EBUSY. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c +index c8c47fc72653..8c47ded2edb6 100644 +--- a/net/tipc/crypto.c ++++ b/net/tipc/crypto.c +@@ -1712,6 +1712,7 @@ int tipc_crypto_rcv(struct net *net, struct tipc_crypto *rx, + case -EBUSY: + this_cpu_inc(stats->stat[STAT_ASYNC]); + *skb = NULL; ++ tipc_aead_put(aead); + return rc; + default: + this_cpu_inc(stats->stat[STAT_NOK]);
commit d03f228470a8c0a22b774d1f8d47071e0de4f6dd +Author: Xiyu Yang <xiyuyang19@fudan.edu.cn> +Date: Wed Apr 15 16:36:19 2020 +0800 + + net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node + + nr_add_node() invokes nr_neigh_get_dev(), which returns a local + reference of the nr_neigh object to "nr_neigh" with increased refcnt. + + When nr_add_node() returns, "nr_neigh" becomes invalid, so the refcount + should be decreased to keep refcount balanced. + + The issue happens in one normal path of nr_add_node(), which forgets to + decrease the refcnt increased by nr_neigh_get_dev() and causes a refcnt + leak. It should decrease the refcnt before the function returns like + other normal paths do. + + Fix this issue by calling nr_neigh_put() before the nr_add_node() + returns. + + Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn> + Signed-off-by: Xin Tan <tanxin.ctf@gmail.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c +index 79f12d8c7b86..0891ee02ca4f 100644 +--- a/net/netrom/nr_route.c ++++ b/net/netrom/nr_route.c +@@ -208,6 +208,7 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic, + /* refcount initialized at 1 */ + spin_unlock_bh(&nr_node_list_lock); + ++ nr_neigh_put(nr_neigh); + return 0; + } + nr_node_lock(nr_node);
commit 04db1580b5e48a79e24aa51ecae0cd4b2296ec23
+Author: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+Date: Mon Dec 30 10:24:28 2019 +0800
+
+ RDMA/i40iw: fix a potential NULL pointer dereference
+
+ A NULL pointer can be returned by in_dev_get(). Thus add a corresponding
+ check so that a NULL pointer dereference will be avoided at this place.
+
+ Fixes: 8e06af711bf2 ("i40iw: add main, hdr, status")
+ Link: https://lore.kernel.org/r/1577672668-46499-1-git-send-email-xiyuyang19@fudan.edu.cn
+ Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
+ Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
+ Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
+ Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
+ Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+
+diff --git a/drivers/infiniband/hw/i40iw/i40iw_main.c b/drivers/infiniband/hw/i40iw/i40iw_main.c
+index d44cf33df81a..238614370927 100644
+--- a/drivers/infiniband/hw/i40iw/i40iw_main.c
++++ b/drivers/infiniband/hw/i40iw/i40iw_main.c
+@@ -1225,6 +1225,8 @@ static void i40iw_add_ipv4_addr(struct i40iw_device *iwdev)
+ const struct in_ifaddr *ifa;
+
+ idev = in_dev_get(dev);
++ if (!idev)
++ continue;
+ in_dev_for_each_ifa_rtnl(ifa, idev) {
+ i40iw_debug(&iwdev->sc_dev, I40IW_DEBUG_CM,
+ "IP=%pI4, vlan_id=%d, MAC=%pM\n", &ifa->ifa_address,
+ commit aef5976fc52a497ac8161f54164c786c771d3ae8 +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Fri Jan 31 13:35:32 2014 -0800 + + tools/liblockdep: Add include directory to allow tests to compile + + All of the programs in the tests directory require the + liblockdep/mutex.h header in order to compile. Add the include directory + to the compiler options so that the tests can be built with the provided + Makefile. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Sasha Levin <sasha.levin@oracle.com> + +diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile +index da8b7aa3d351..e8dd7497f57a 100644 +--- a/tools/lib/lockdep/Makefile ++++ b/tools/lib/lockdep/Makefile +@@ -112,7 +112,7 @@ export Q VERBOSE + + LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION) + +-INCLUDES = -I. -I/usr/local/include -I./uinclude $(CONFIG_INCLUDES) ++INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES) + + # Set compile option CFLAGS if not set elsewhere + CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
commit 75759827bbe78e53330de2c5e061ecec7fa6f86e
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Fri Jan 31 13:35:31 2014 -0800
+
+ tools/liblockdep: Fix include of asm/hash.h
+
+ Commit 71ae8aac ("lib: introduce arch optimized hash library")
+ added an include to <linux/hash.h> for setting up an architecture
+ specific fast hash.
+
+ This patch mirrors the fix used for perf, titled "tools: perf: util: fix
+ include for non x86 architectures".
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+
+diff --git a/tools/lib/lockdep/uinclude/asm/hash.h b/tools/lib/lockdep/uinclude/asm/hash.h
+new file mode 100644
+index 000000000000..d82b170bb216
+--- /dev/null
++++ b/tools/lib/lockdep/uinclude/asm/hash.h
+@@ -0,0 +1,6 @@
++#ifndef __ASM_GENERIC_HASH_H
++#define __ASM_GENERIC_HASH_H
++
++/* Stub */
++
++#endif /* __ASM_GENERIC_HASH_H */commit 367d896dafe1b5f49bee75d3a419b9eb9936ae26
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Fri Jan 31 15:30:54 2014 -0800
+
+ tools/liblockdep: Fix initialization code path
+
+ This makes initialization actually happen. Without it, initialization is
+ always skipped due to an incorrect conditional statement.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
+
+diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c
+index f8465a811aa5..23bd69cb5ade 100644
+--- a/tools/lib/lockdep/preload.c
++++ b/tools/lib/lockdep/preload.c
+@@ -418,7 +418,7 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
+
+ __attribute__((constructor)) static void init_preload(void)
+ {
+- if (__init_state != done)
++ if (__init_state == done)
+ return;
+
+ #ifndef __GLIBC__commit 73615c8669ef1c497c942cae0d5079b95824332a
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 29 09:58:25 2014 -0800
+
+ can: janz-ican3: fix uninitialized variable warnings
+
+ Analysis of the code shows that the struct ican3_msg variable cannot be
+ used uninitialized. Error conditions are checked and the loop terminates
+ before calling the ican3_handle_message() function with an uninitialized
+ value.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index e24e6690d672..07f0ba03cd59 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -1322,7 +1322,7 @@ static int ican3_napi(struct napi_struct *napi, int budget)
+
+ /* process all communication messages */
+ while (true) {
+- struct ican3_msg msg;
++ struct ican3_msg uninitialized_var(msg);
+ ret = ican3_recv_msg(mod, &msg);
+ if (ret)
+ break;commit e21093ef6fb4cbecdf926102286dbe280ae965db
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Tue Sep 11 15:58:15 2012 -0700
+
+ can: janz-ican3: fix support for older hardware revisions
+
+ The Revision 1.0 Janz CMOD-IO Carrier Board does not have support for
+ the reset registers. To support older hardware, the code is changed to
+ use the hardware reset register on the Janz VMOD-ICAN3 hardware itself.
+
+ Cc: stable <stable@vger.kernel.org>
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index 98ee43819911..7edadee487ba 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -1391,7 +1391,6 @@ static irqreturn_t ican3_irq(int irq, void *dev_id)
+ */
+ static int ican3_reset_module(struct ican3_dev *mod)
+ {
+- u8 val = 1 << mod->num;
+ unsigned long start;
+ u8 runold, runnew;
+
+@@ -1405,8 +1404,7 @@ static int ican3_reset_module(struct ican3_dev *mod)
+ runold = ioread8(mod->dpm + TARGET_RUNNING);
+
+ /* reset the module */
+- iowrite8(val, &mod->ctrl->reset_assert);
+- iowrite8(val, &mod->ctrl->reset_deassert);
++ iowrite8(0x00, &mod->dpmctrl->hwreset);
+
+ /* wait until the module has finished resetting and is running */
+ start = jiffies;commit 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Wed Jul 18 15:33:18 2012 -0700 + + can: janz-ican3: add support for one shot mode + + The Janz VMOD-ICAN3 hardware has support for one shot packet + transmission. This means that a packet will be attempted to be sent + once, with no automatic retries. + + The SocketCAN core has a controller-wide setting for this mode: + CAN_CTRLMODE_ONE_SHOT. The Janz VMOD-ICAN3 hardware supports this flag + on a per-packet level, but the SocketCAN core does not. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c +index e06ec403521a..98ee43819911 100644 +--- a/drivers/net/can/janz-ican3.c ++++ b/drivers/net/can/janz-ican3.c +@@ -116,6 +116,7 @@ + #define ICAN3_BUSERR_QUOTA_MAX 255 + + /* Janz ICAN3 CAN Frame Conversion */ ++#define ICAN3_SNGL 0x02 + #define ICAN3_ECHO 0x10 + #define ICAN3_EFF_RTR 0x40 + #define ICAN3_SFF_RTR 0x10 +@@ -848,6 +849,10 @@ static void can_frame_to_ican3(struct ican3_dev *mod, + desc->data[0] |= cf->can_dlc; + desc->data[1] |= ICAN3_ECHO; + ++ /* support single transmission (no retries) mode */ ++ if (mod->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT) ++ desc->data[1] |= ICAN3_SNGL; ++ + if (cf->can_id & CAN_RTR_FLAG) + desc->data[0] |= ICAN3_EFF_RTR; + +@@ -1810,7 +1815,8 @@ static int __devinit ican3_probe(struct platform_device *pdev) + mod->can.do_set_mode = ican3_set_mode; + mod->can.do_get_berr_counter = ican3_get_berr_counter; + mod->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES +- | CAN_CTRLMODE_BERR_REPORTING; ++ | CAN_CTRLMODE_BERR_REPORTING ++ | CAN_CTRLMODE_ONE_SHOT; + + /* find our IRQ number */ + mod->irq = platform_get_irq(pdev, 0);
commit 30df5888e4a244093c1b403b55ef889c97824f7b
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Jul 18 15:33:17 2012 -0700
+
+ can: janz-ican3: avoid firmware lockup caused by infinite bus error quota
+
+ If the bus error quota is set to infinite and the host CPU cannot keep
+ up, the Janz VMOD-ICAN3 firmware will stop responding to control
+ messages until the controller is reset.
+
+ The firmware will automatically stop sending bus error messages when the
+ quota is reached, and will only resume sending bus error messages when
+ the quota is re-set to a positive value.
+
+ This limitation is worked around by setting the bus error quota to one
+ message, and then re-setting the quota to one message every time a bus
+ error message is received. By doing this, the firmware never stops
+ responding to control messages. The CAN bus can be reset without a
+ hard-reset of the controller card.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index 47f8f6b4fef9..e06ec403521a 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -972,6 +972,16 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ stats->rx_errors++;
+ }
+
++ /*
++ * The controller automatically disables bus-error interrupts
++ * and therefore we must re-enable them.
++ */
++ ret = ican3_set_buserror(mod, 1);
++ if (ret) {
++ dev_err(mod->dev, "unable to re-enable bus-error\n");
++ return ret;
++ }
++
+ /* bus error reporting is off, return immediately */
+ if (!(mod->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING))
+ return 0;
+@@ -1451,7 +1461,7 @@ static int __devinit ican3_startup_module(struct ican3_dev *mod)
+ }
+
+ /* default to "bus errors enabled" */
+- ret = ican3_set_buserror(mod, ICAN3_BUSERR_QUOTA_MAX);
++ ret = ican3_set_buserror(mod, 1);
+ if (ret) {
+ dev_err(mod->dev, "unable to set bus-error\n");
+ return ret;commit 83702f69272e4591a91a27eb58eade1bcd361dae
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu Jul 19 08:54:42 2012 -0700
+
+ can: janz-ican3: fix support for CAN_RAW_RECV_OWN_MSGS
+
+ The Janz VMOD-ICAN3 firmware does not support any sort of TX-done
+ notification or interrupt. The driver previously used the hardware
+ loopback to attempt to work around this deficiency, but this caused all
+ sockets to receive all messages, even if CAN_RAW_RECV_OWN_MSGS is off.
+
+ Using the new function ican3_cmp_echo_skb(), we can drop the loopback
+ messages and return the original skbs. This fixes the issues with
+ CAN_RAW_RECV_OWN_MSGS.
+
+ A private skb queue is used to store the echo skbs. This avoids the need
+ for any index management.
+
+ Due to a lack of TX-error interrupts, bus errors are permanently
+ enabled, and are used as a TX-error notification. This is used to drop
+ an echo skb when transmission fails. Bus error packets are not generated
+ if the user has not enabled bus error reporting.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index 4a5a8fb53a2f..47f8f6b4fef9 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -220,6 +220,9 @@ struct ican3_dev {
+ /* old and new style host interface */
+ unsigned int iftype;
+
++ /* queue for echo packets */
++ struct sk_buff_head echoq;
++
+ /*
+ * Any function which changes the current DPM page must hold this
+ * lock while it is performing data accesses. This ensures that the
+@@ -925,7 +928,7 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ struct net_device *dev = mod->ndev;
+ struct net_device_stats *stats = &dev->stats;
+ enum can_state state = mod->can.state;
+- u8 status, isrc, rxerr, txerr;
++ u8 isrc, ecc, status, rxerr, txerr;
+ struct can_frame *cf;
+ struct sk_buff *skb;
+
+@@ -941,15 +944,43 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ return -EINVAL;
+ }
+
+- skb = alloc_can_err_skb(dev, &cf);
+- if (skb == NULL)
+- return -ENOMEM;
+-
+ isrc = msg->data[0];
++ ecc = msg->data[2];
+ status = msg->data[3];
+ rxerr = msg->data[4];
+ txerr = msg->data[5];
+
++ /*
++ * This hardware lacks any support other than bus error messages to
++ * determine if packet transmission has failed.
++ *
++ * When TX errors happen, one echo skb needs to be dropped from the
++ * front of the queue.
++ *
++ * A small bit of code is duplicated here and below, to avoid error
++ * skb allocation when it will just be freed immediately.
++ */
++ if (isrc == CEVTIND_BEI) {
++ int ret;
++ dev_dbg(mod->dev, "bus error interrupt\n");
++
++ /* TX error */
++ if (!(ecc & ECC_DIR)) {
++ kfree_skb(skb_dequeue(&mod->echoq));
++ stats->tx_errors++;
++ } else {
++ stats->rx_errors++;
++ }
++
++ /* bus error reporting is off, return immediately */
++ if (!(mod->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING))
++ return 0;
++ }
++
++ skb = alloc_can_err_skb(dev, &cf);
++ if (skb == NULL)
++ return -ENOMEM;
++
+ /* data overrun interrupt */
+ if (isrc == CEVTIND_DOI || isrc == CEVTIND_LOST) {
+ dev_dbg(mod->dev, "data overrun interrupt\n");
+@@ -978,9 +1009,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+
+ /* bus error interrupt */
+ if (isrc == CEVTIND_BEI) {
+- u8 ecc = msg->data[2];
+-
+- dev_dbg(mod->dev, "bus error interrupt\n");
+ mod->can.can_stats.bus_error++;
+ cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+@@ -1000,12 +1028,8 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ break;
+ }
+
+- if (!(ecc & ECC_DIR)) {
++ if (!(ecc & ECC_DIR))
+ cf->data[2] |= CAN_ERR_PROT_TX;
+- stats->tx_errors++;
+- } else {
+- stats->rx_errors++;
+- }
+
+ cf->data[6] = txerr;
+ cf->data[7] = rxerr;
+@@ -1089,6 +1113,88 @@ static void ican3_handle_message(struct ican3_dev *mod, struct ican3_msg *msg)
+ }
+ }
+
++/*
++ * The ican3 needs to store all echo skbs, and therefore cannot
++ * use the generic infrastructure for this.
++ */
++static void ican3_put_echo_skb(struct ican3_dev *mod, struct sk_buff *skb)
++{
++ struct sock *srcsk = skb->sk;
++
++ if (atomic_read(&skb->users) != 1) {
++ struct sk_buff *old_skb = skb;
++
++ skb = skb_clone(old_skb, GFP_ATOMIC);
++ kfree_skb(old_skb);
++ if (!skb)
++ return;
++ } else {
++ skb_orphan(skb);
++ }
++
++ skb->sk = srcsk;
++
++ /* save this skb for tx interrupt echo handling */
++ skb_queue_tail(&mod->echoq, skb);
++}
++
++static unsigned int ican3_get_echo_skb(struct ican3_dev *mod)
++{
++ struct sk_buff *skb = skb_dequeue(&mod->echoq);
++ struct can_frame *cf;
++ u8 dlc;
++
++ /* this should never trigger unless there is a driver bug */
++ if (!skb) {
++ netdev_err(mod->ndev, "BUG: echo skb not occupied\n");
++ return 0;
++ }
++
++ cf = (struct can_frame *)skb->data;
++ dlc = cf->can_dlc;
++
++ /* check flag whether this packet has to be looped back */
++ if (skb->pkt_type != PACKET_LOOPBACK) {
++ kfree_skb(skb);
++ return dlc;
++ }
++
++ skb->protocol = htons(ETH_P_CAN);
++ skb->pkt_type = PACKET_BROADCAST;
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++ skb->dev = mod->ndev;
++ netif_receive_skb(skb);
++ return dlc;
++}
++
++/*
++ * Compare an skb with an existing echo skb
++ *
++ * This function will be used on devices which have a hardware loopback.
++ * On these devices, this function can be used to compare a received skb
++ * with the saved echo skbs so that the hardware echo skb can be dropped.
++ *
++ * Returns true if the skb's are identical, false otherwise.
++ */
++static bool ican3_echo_skb_matches(struct ican3_dev *mod, struct sk_buff *skb)
++{
++ struct can_frame *cf = (struct can_frame *)skb->data;
++ struct sk_buff *echo_skb = skb_peek(&mod->echoq);
++ struct can_frame *echo_cf;
++
++ if (!echo_skb)
++ return false;
++
++ echo_cf = (struct can_frame *)echo_skb->data;
++ if (cf->can_id != echo_cf->can_id)
++ return false;
++
++ if (cf->can_dlc != echo_cf->can_dlc)
++ return false;
++
++ return memcmp(cf->data, echo_cf->data, cf->can_dlc) == 0;
++}
++
+ /*
+ * Check that there is room in the TX ring to transmit another skb
+ *
+@@ -1099,6 +1205,10 @@ static bool ican3_txok(struct ican3_dev *mod)
+ struct ican3_fast_desc __iomem *desc;
+ u8 control;
+
++ /* check that we have echo queue space */
++ if (skb_queue_len(&mod->echoq) >= ICAN3_TX_BUFFERS)
++ return false;
++
+ /* copy the control bits of the descriptor */
+ ican3_set_page(mod, mod->fasttx_start + (mod->fasttx_num / 16));
+ desc = mod->dpm + ((mod->fasttx_num % 16) * sizeof(*desc));
+@@ -1149,10 +1259,27 @@ static int ican3_recv_skb(struct ican3_dev *mod)
+ /* convert the ICAN3 frame into Linux CAN format */
+ ican3_to_can_frame(mod, &desc, cf);
+
+- /* receive the skb, update statistics */
+- netif_receive_skb(skb);
++ /*
++ * If this is an ECHO frame received from the hardware loopback
++ * feature, use the skb saved in the ECHO stack instead. This allows
++ * the Linux CAN core to support CAN_RAW_RECV_OWN_MSGS correctly.
++ *
++ * Since this is a confirmation of a successfully transmitted packet
++ * sent from this host, update the transmit statistics.
++ *
++ * Also, the netdevice queue needs to be allowed to send packets again.
++ */
++ if (ican3_echo_skb_matches(mod, skb)) {
++ stats->tx_packets++;
++ stats->tx_bytes += ican3_get_echo_skb(mod);
++ kfree_skb(skb);
++ goto err_noalloc;
++ }
++
++ /* update statistics, receive the skb */
+ stats->rx_packets++;
+ stats->rx_bytes += cf->can_dlc;
++ netif_receive_skb(skb);
+
+ err_noalloc:
+ /* toggle the valid bit and return the descriptor to the ring */
+@@ -1175,13 +1302,13 @@ static int ican3_recv_skb(struct ican3_dev *mod)
+ static int ican3_napi(struct napi_struct *napi, int budget)
+ {
+ struct ican3_dev *mod = container_of(napi, struct ican3_dev, napi);
+- struct ican3_msg msg;
+ unsigned long flags;
+ int received = 0;
+ int ret;
+
+ /* process all communication messages */
+ while (true) {
++ struct ican3_msg msg;
+ ret = ican3_recv_msg(mod, &msg);
+ if (ret)
+ break;
+@@ -1353,7 +1480,6 @@ static int __devinit ican3_startup_module(struct ican3_dev *mod)
+ static int ican3_open(struct net_device *ndev)
+ {
+ struct ican3_dev *mod = netdev_priv(ndev);
+- u8 quota;
+ int ret;
+
+ /* open the CAN layer */
+@@ -1363,19 +1489,6 @@ static int ican3_open(struct net_device *ndev)
+ return ret;
+ }
+
+- /* set the bus error generation state appropriately */
+- if (mod->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+- quota = ICAN3_BUSERR_QUOTA_MAX;
+- else
+- quota = 0;
+-
+- ret = ican3_set_buserror(mod, quota);
+- if (ret) {
+- dev_err(mod->dev, "unable to set bus-error\n");
+- close_candev(ndev);
+- return ret;
+- }
+-
+ /* bring the bus online */
+ ret = ican3_set_bus_state(mod, true);
+ if (ret) {
+@@ -1407,6 +1520,9 @@ static int ican3_stop(struct net_device *ndev)
+ return ret;
+ }
+
++ /* drop all outstanding echo skbs */
++ skb_queue_purge(&mod->echoq);
++
+ /* close the CAN layer */
+ close_candev(ndev);
+ return 0;
+@@ -1415,7 +1531,6 @@ static int ican3_stop(struct net_device *ndev)
+ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+ {
+ struct ican3_dev *mod = netdev_priv(ndev);
+- struct net_device_stats *stats = &ndev->stats;
+ struct can_frame *cf = (struct can_frame *)skb->data;
+ struct ican3_fast_desc desc;
+ void __iomem *desc_addr;
+@@ -1428,8 +1543,7 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+
+ /* check that we can actually transmit */
+ if (!ican3_txok(mod)) {
+- dev_err(mod->dev, "no free descriptors, stopping queue\n");
+- netif_stop_queue(ndev);
++ dev_err(mod->dev, "BUG: no free descriptors\n");
+ spin_unlock_irqrestore(&mod->lock, flags);
+ return NETDEV_TX_BUSY;
+ }
+@@ -1443,6 +1557,14 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+ /* convert the Linux CAN frame into ICAN3 format */
+ can_frame_to_ican3(mod, cf, &desc);
+
++ /*
++ * This hardware doesn't have TX-done notifications, so we'll try and
++ * emulate it the best we can using ECHO skbs. Add the skb to the ECHO
++ * stack. Upon packet reception, check if the ECHO skb and received
++ * skb match, and use that to wake the queue.
++ */
++ ican3_put_echo_skb(mod, skb);
++
+ /*
+ * the programming manual says that you must set the IVALID bit, then
+ * interrupt, then set the valid bit. Quite weird, but it seems to be
+@@ -1461,19 +1583,7 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
+ mod->fasttx_num = (desc.control & DESC_WRAP) ? 0
+ : (mod->fasttx_num + 1);
+
+- /* update statistics */
+- stats->tx_packets++;
+- stats->tx_bytes += cf->can_dlc;
+- kfree_skb(skb);
+-
+- /*
+- * This hardware doesn't have TX-done notifications, so we'll try and
+- * emulate it the best we can using ECHO skbs. Get the next TX
+- * descriptor, and see if we have room to send. If not, stop the queue.
+- * It will be woken when the ECHO skb for the current packet is recv'd.
+- */
+-
+- /* copy the control bits of the descriptor */
++ /* if there is no free descriptor space, stop the transmit queue */
+ if (!ican3_txok(mod))
+ netif_stop_queue(ndev);
+
+@@ -1669,6 +1779,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
+ mod->dev = &pdev->dev;
+ mod->num = pdata->modno;
+ netif_napi_add(ndev, &mod->napi, ican3_napi, ICAN3_RX_BUFFERS);
++ skb_queue_head_init(&mod->echoq);
+ spin_lock_init(&mod->lock);
+ init_completion(&mod->termination_comp);
+ init_completion(&mod->buserror_comp);commit 88b587039c1ad4e7a981bea3269eeb02a1a2a14b
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu Jul 19 08:54:18 2012 -0700
+
+ can: janz-ican3: fix error and byte counters
+
+ The error and byte counter statistics were being incremented
+ incorrectly. For example, a TX error would be counted both in tx_errors
+ and rx_errors.
+
+ This corrects the problem so that tx_errors and rx_errors are only
+ incremented for errors caused by packets sent to the bus. Error packets
+ generated by the driver are not counted.
+
+ The byte counters are only increased for packets which are actually
+ transmitted or received from the bus. Error packets generated by the
+ driver are not counted.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index b19aca591c7a..4a5a8fb53a2f 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -907,8 +907,8 @@ static void ican3_handle_msglost(struct ican3_dev *mod, struct ican3_msg *msg)
+ if (skb) {
+ cf->can_id |= CAN_ERR_CRTL;
+ cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
++ stats->rx_over_errors++;
+ stats->rx_errors++;
+- stats->rx_bytes += cf->can_dlc;
+ netif_rx(skb);
+ }
+ }
+@@ -982,7 +982,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+
+ dev_dbg(mod->dev, "bus error interrupt\n");
+ mod->can.can_stats.bus_error++;
+- stats->rx_errors++;
+ cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+
+ switch (ecc & ECC_MASK) {
+@@ -1001,8 +1000,12 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ break;
+ }
+
+- if ((ecc & ECC_DIR) == 0)
++ if (!(ecc & ECC_DIR)) {
+ cf->data[2] |= CAN_ERR_PROT_TX;
++ stats->tx_errors++;
++ } else {
++ stats->rx_errors++;
++ }
+
+ cf->data[6] = txerr;
+ cf->data[7] = rxerr;
+@@ -1028,8 +1031,6 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
+ }
+
+ mod->can.state = state;
+- stats->rx_errors++;
+- stats->rx_bytes += cf->can_dlc;
+ netif_rx(skb);
+ return 0;
+ }commit 007890d726602c925077381500f0b633cfacd711 +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Wed Jul 18 15:33:14 2012 -0700 + + can: janz-ican3: drop invalid skbs + + The commit which added the janz-ican3 driver and commit + 3ccd4c61 "can: Unify droping of invalid tx skbs and netdev stats" were + committed into mainline Linux during the same merge window. + + Therefore, the addition of this code to the janz-ican3 driver was + forgotten. This patch adds the expected code. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c +index f41623d003e1..754b803fa926 100644 +--- a/drivers/net/can/janz-ican3.c ++++ b/drivers/net/can/janz-ican3.c +@@ -1420,6 +1420,9 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev) + void __iomem *desc_addr; + unsigned long flags; + ++ if (can_dropped_invalid_skb(ndev, skb)) ++ return NETDEV_TX_OK; ++ + spin_lock_irqsave(&mod->lock, flags); + + /* check that we can actually transmit */+
commit 8456a9196f7696421eecffdbab5d785f852d95e8
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Jul 18 15:33:13 2012 -0700
+
+ can: janz-ican3: remove dead code
+
+ The code which used this variable was removed during review, before the
+ driver was added to mainline Linux. It is now dead code, and can be
+ removed.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+index e7d1532d5f1b..f41623d003e1 100644
+--- a/drivers/net/can/janz-ican3.c
++++ b/drivers/net/can/janz-ican3.c
+@@ -235,7 +235,6 @@ struct ican3_dev {
+
+ /* fast host interface */
+ unsigned int fastrx_start;
+- unsigned int fastrx_int;
+ unsigned int fastrx_num;
+ unsigned int fasttx_start;
+ unsigned int fasttx_num;
+@@ -454,7 +453,6 @@ static void __devinit ican3_init_fast_host_interface(struct ican3_dev *mod)
+ /* save the start recv page */
+ mod->fastrx_start = mod->free_page;
+ mod->fastrx_num = 0;
+- mod->fastrx_int = 0;
+
+ /* build a single fast tohost queue descriptor */
+ memset(&desc, 0, sizeof(desc));commit 30ec5a2cb17d78482de0cf9e38721410d48c086d
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Fri Jan 6 11:29:19 2012 -0800
+
+ mtd: cfi: AMD/Fujitsu compatibles: add panic write support
+
+ This allows the mtdoops driver to work on flash chips using the
+ AMD/Fujitsu compatible command set.
+
+ As the code comments note, the locks used throughout the normal code
+ paths in the driver are ignored, so that the chance of writing out the
+ kernel's last messages are maximized.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
+ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+
+diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
+index 8d70895a58d6..e2d94bb1d7c8 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -59,6 +59,9 @@ static void cfi_amdstd_resume (struct mtd_info *);
+ static int cfi_amdstd_reboot(struct notifier_block *, unsigned long, void *);
+ static int cfi_amdstd_secsi_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
+
++static int cfi_amdstd_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
++ size_t *retlen, const u_char *buf);
++
+ static void cfi_amdstd_destroy(struct mtd_info *);
+
+ struct mtd_info *cfi_cmdset_0002(struct map_info *, int);
+@@ -443,6 +446,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
+ pr_debug("MTD %s(): write buffer size %d\n", __func__,
+ mtd->writebufsize);
+
++ mtd->panic_write = cfi_amdstd_panic_write;
+ mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
+
+ if (cfi->cfi_mode==CFI_MODE_CFI){
+@@ -1562,6 +1566,242 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
+ return 0;
+ }
+
++/*
++ * Wait for the flash chip to become ready to write data
++ *
++ * This is only called during the panic_write() path. When panic_write()
++ * is called, the kernel is in the process of a panic, and will soon be
++ * dead. Therefore we don't take any locks, and attempt to get access
++ * to the chip as soon as possible.
++ */
++static int cfi_amdstd_panic_wait(struct map_info *map, struct flchip *chip,
++ unsigned long adr)
++{
++ struct cfi_private *cfi = map->fldrv_priv;
++ int retries = 10;
++ int i;
++
++ /*
++ * If the driver thinks the chip is idle, and no toggle bits
++ * are changing, then the chip is actually idle for sure.
++ */
++ if (chip->state == FL_READY && chip_ready(map, adr))
++ return 0;
++
++ /*
++ * Try several times to reset the chip and then wait for it
++ * to become idle. The upper limit of a few milliseconds of
++ * delay isn't a big problem: the kernel is dying anyway. It
++ * is more important to save the messages.
++ */
++ while (retries > 0) {
++ const unsigned long timeo = (HZ / 1000) + 1;
++
++ /* send the reset command */
++ map_write(map, CMD(0xF0), chip->start);
++
++ /* wait for the chip to become ready */
++ for (i = 0; i < jiffies_to_usecs(timeo); i++) {
++ if (chip_ready(map, adr))
++ return 0;
++
++ udelay(1);
++ }
++ }
++
++ /* the chip never became ready */
++ return -EBUSY;
++}
++
++/*
++ * Write out one word of data to a single flash chip during a kernel panic
++ *
++ * This is only called during the panic_write() path. When panic_write()
++ * is called, the kernel is in the process of a panic, and will soon be
++ * dead. Therefore we don't take any locks, and attempt to get access
++ * to the chip as soon as possible.
++ *
++ * The implementation of this routine is intentionally similar to
++ * do_write_oneword(), in order to ease code maintenance.
++ */
++static int do_panic_write_oneword(struct map_info *map, struct flchip *chip,
++ unsigned long adr, map_word datum)
++{
++ const unsigned long uWriteTimeout = (HZ / 1000) + 1;
++ struct cfi_private *cfi = map->fldrv_priv;
++ int retry_cnt = 0;
++ map_word oldd;
++ int ret = 0;
++ int i;
++
++ adr += chip->start;
++
++ ret = cfi_amdstd_panic_wait(map, chip, adr);
++ if (ret)
++ return ret;
++
++ pr_debug("MTD %s(): PANIC WRITE 0x%.8lx(0x%.8lx)\n",
++ __func__, adr, datum.x[0]);
++
++ /*
++ * Check for a NOP for the case when the datum to write is already
++ * present - it saves time and works around buggy chips that corrupt
++ * data at other locations when 0xff is written to a location that
++ * already contains 0xff.
++ */
++ oldd = map_read(map, adr);
++ if (map_word_equal(map, oldd, datum)) {
++ pr_debug("MTD %s(): NOP\n", __func__);
++ goto op_done;
++ }
++
++ ENABLE_VPP(map);
++
++retry:
++ cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
++ cfi_send_gen_cmd(0x55, cfi->addr_unlock2, chip->start, map, cfi, cfi->device_type, NULL);
++ cfi_send_gen_cmd(0xA0, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
++ map_write(map, datum, adr);
++
++ for (i = 0; i < jiffies_to_usecs(uWriteTimeout); i++) {
++ if (chip_ready(map, adr))
++ break;
++
++ udelay(1);
++ }
++
++ if (!chip_good(map, adr, datum)) {
++ /* reset on all failures. */
++ map_write(map, CMD(0xF0), chip->start);
++ /* FIXME - should have reset delay before continuing */
++
++ if (++retry_cnt <= MAX_WORD_RETRIES)
++ goto retry;
++
++ ret = -EIO;
++ }
++
++op_done:
++ DISABLE_VPP(map);
++ return ret;
++}
++
++/*
++ * Write out some data during a kernel panic
++ *
++ * This is used by the mtdoops driver to save the dying messages from a
++ * kernel which has panic'd.
++ *
++ * This routine ignores all of the locking used throughout the rest of the
++ * driver, in order to ensure that the data gets written out no matter what
++ * state this driver (and the flash chip itself) was in when the kernel crashed.
++ *
++ * The implementation of this routine is intentionally similar to
++ * cfi_amdstd_write_words(), in order to ease code maintenance.
++ */
++static int cfi_amdstd_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
++ size_t *retlen, const u_char *buf)
++{
++ struct map_info *map = mtd->priv;
++ struct cfi_private *cfi = map->fldrv_priv;
++ unsigned long ofs, chipstart;
++ int ret = 0;
++ int chipnum;
++
++ *retlen = 0;
++ if (!len)
++ return 0;
++
++ chipnum = to >> cfi->chipshift;
++ ofs = to - (chipnum << cfi->chipshift);
++ chipstart = cfi->chips[chipnum].start;
++
++ /* If it's not bus aligned, do the first byte write */
++ if (ofs & (map_bankwidth(map) - 1)) {
++ unsigned long bus_ofs = ofs & ~(map_bankwidth(map) - 1);
++ int i = ofs - bus_ofs;
++ int n = 0;
++ map_word tmp_buf;
++
++ ret = cfi_amdstd_panic_wait(map, &cfi->chips[chipnum], bus_ofs);
++ if (ret)
++ return ret;
++
++ /* Load 'tmp_buf' with old contents of flash */
++ tmp_buf = map_read(map, bus_ofs + chipstart);
++
++ /* Number of bytes to copy from buffer */
++ n = min_t(int, len, map_bankwidth(map) - i);
++
++ tmp_buf = map_word_load_partial(map, tmp_buf, buf, i, n);
++
++ ret = do_panic_write_oneword(map, &cfi->chips[chipnum],
++ bus_ofs, tmp_buf);
++ if (ret)
++ return ret;
++
++ ofs += n;
++ buf += n;
++ (*retlen) += n;
++ len -= n;
++
++ if (ofs >> cfi->chipshift) {
++ chipnum++;
++ ofs = 0;
++ if (chipnum == cfi->numchips)
++ return 0;
++ }
++ }
++
++ /* We are now aligned, write as much as possible */
++ while (len >= map_bankwidth(map)) {
++ map_word datum;
++
++ datum = map_word_load(map, buf);
++
++ ret = do_panic_write_oneword(map, &cfi->chips[chipnum],
++ ofs, datum);
++ if (ret)
++ return ret;
++
++ ofs += map_bankwidth(map);
++ buf += map_bankwidth(map);
++ (*retlen) += map_bankwidth(map);
++ len -= map_bankwidth(map);
++
++ if (ofs >> cfi->chipshift) {
++ chipnum++;
++ ofs = 0;
++ if (chipnum == cfi->numchips)
++ return 0;
++
++ chipstart = cfi->chips[chipnum].start;
++ }
++ }
++
++ /* Write the trailing bytes if any */
++ if (len & (map_bankwidth(map) - 1)) {
++ map_word tmp_buf;
++
++ ret = cfi_amdstd_panic_wait(map, &cfi->chips[chipnum], ofs);
++ if (ret)
++ return ret;
++
++ tmp_buf = map_read(map, ofs + chipstart);
++
++ tmp_buf = map_word_load_partial(map, tmp_buf, buf, 0, len);
++
++ ret = do_panic_write_oneword(map, &cfi->chips[chipnum],
++ ofs, tmp_buf);
++ if (ret)
++ return ret;
++
++ (*retlen) += len;
++ }
++
++ return 0;
++}
++
+
+ /*
+ * Handle devices with one erase region, that only implementcommit 6c15d7afbb2f9e2d3114b513306dae736b56f535
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Jan 26 11:00:14 2012 +0000
+
+ carma-fpga: fix race between data dumping and DMA callback
+
+ When the system is under heavy load, we occasionally saw a problem where
+ the system would get a legitimate interrupt when they should be
+ disabled.
+
+ This was caused by the data_dma_cb() DMA callback unconditionally
+ re-enabling FPGA interrupts even when data dumping is disabled. When
+ data dumping was re-enabled, the irq handler would fire while a DMA was
+ in progress. The "BUG_ON(priv->inflight != NULL);" during the second
+ invocation of the DMA callback caused the system to crash.
+
+ To fix the issue, the priv->enabled boolean is moved under the
+ protection of the priv->lock spinlock. The DMA callback checks the
+ boolean to know whether to re-enable FPGA interrupts before it returns.
+
+ Now that it is fixed, the driver keeps FPGA interrupts disabled when it
+ expects that they are disabled, fixing the bug.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
+index 4fd896deda0d..0cfc5bf13fa5 100644
+--- a/drivers/misc/carma/carma-fpga.c
++++ b/drivers/misc/carma/carma-fpga.c
+@@ -560,6 +560,9 @@ static void data_enable_interrupts(struct fpga_device *priv)
+
+ /* flush the writes */
+ fpga_read_reg(priv, 0, MMAP_REG_STATUS);
++ fpga_read_reg(priv, 1, MMAP_REG_STATUS);
++ fpga_read_reg(priv, 2, MMAP_REG_STATUS);
++ fpga_read_reg(priv, 3, MMAP_REG_STATUS);
+
+ /* switch back to the external interrupt source */
+ iowrite32be(0x3F, priv->regs + SYS_IRQ_SOURCE_CTL);
+@@ -591,8 +594,12 @@ static void data_dma_cb(void *data)
+ list_move_tail(&priv->inflight->entry, &priv->used);
+ priv->inflight = NULL;
+
+- /* clear the FPGA status and re-enable interrupts */
+- data_enable_interrupts(priv);
++ /*
++ * If data dumping is still enabled, then clear the FPGA
++ * status registers and re-enable FPGA interrupts
++ */
++ if (priv->enabled)
++ data_enable_interrupts(priv);
+
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+@@ -708,6 +715,15 @@ static irqreturn_t data_irq(int irq, void *dev_id)
+
+ spin_lock(&priv->lock);
+
++ /*
++ * This is an error case that should never happen.
++ *
++ * If this driver has a bug and manages to re-enable interrupts while
++ * a DMA is in progress, then we will hit this statement and should
++ * start paying attention immediately.
++ */
++ BUG_ON(priv->inflight != NULL);
++
+ /* hide the interrupt by switching the IRQ driver to GPIO */
+ data_disable_interrupts(priv);
+
+@@ -762,11 +778,15 @@ static irqreturn_t data_irq(int irq, void *dev_id)
+ */
+ static int data_device_enable(struct fpga_device *priv)
+ {
++ bool enabled;
+ u32 val;
+ int ret;
+
+ /* multiple enables are safe: they do nothing */
+- if (priv->enabled)
++ spin_lock_irq(&priv->lock);
++ enabled = priv->enabled;
++ spin_unlock_irq(&priv->lock);
++ if (enabled)
+ return 0;
+
+ /* check that the FPGAs are programmed */
+@@ -797,6 +817,9 @@ static int data_device_enable(struct fpga_device *priv)
+ goto out_error;
+ }
+
++ /* prevent the FPGAs from generating interrupts */
++ data_disable_interrupts(priv);
++
+ /* hookup the irq handler */
+ ret = request_irq(priv->irq, data_irq, IRQF_SHARED, drv_name, priv);
+ if (ret) {
+@@ -804,11 +827,13 @@ static int data_device_enable(struct fpga_device *priv)
+ goto out_error;
+ }
+
+- /* switch to the external FPGA IRQ line */
+- data_enable_interrupts(priv);
+-
+- /* success, we're enabled */
++ /* allow the DMA callback to re-enable FPGA interrupts */
++ spin_lock_irq(&priv->lock);
+ priv->enabled = true;
++ spin_unlock_irq(&priv->lock);
++
++ /* allow the FPGAs to generate interrupts */
++ data_enable_interrupts(priv);
+ return 0;
+
+ out_error:
+@@ -834,41 +859,40 @@ static int data_device_enable(struct fpga_device *priv)
+ */
+ static int data_device_disable(struct fpga_device *priv)
+ {
+- int ret;
++ spin_lock_irq(&priv->lock);
+
+ /* allow multiple disable */
+- if (!priv->enabled)
++ if (!priv->enabled) {
++ spin_unlock_irq(&priv->lock);
+ return 0;
++ }
++
++ /*
++ * Mark the device disabled
++ *
++ * This stops DMA callbacks from re-enabling interrupts
++ */
++ priv->enabled = false;
+
+- /* switch to the internal GPIO IRQ line */
++ /* prevent the FPGAs from generating interrupts */
+ data_disable_interrupts(priv);
+
++ /* wait until all ongoing DMA has finished */
++ while (priv->inflight != NULL) {
++ spin_unlock_irq(&priv->lock);
++ wait_event(priv->wait, priv->inflight == NULL);
++ spin_lock_irq(&priv->lock);
++ }
++
++ spin_unlock_irq(&priv->lock);
++
+ /* unhook the irq handler */
+ free_irq(priv->irq, priv);
+
+- /*
+- * wait for all outstanding DMA to complete
+- *
+- * Device interrupts are disabled, therefore another buffer cannot
+- * be marked inflight.
+- */
+- ret = wait_event_interruptible(priv->wait, priv->inflight == NULL);
+- if (ret)
+- return ret;
+-
+ /* free the correlation table */
+ sg_free_table(&priv->corl_table);
+ priv->corl_nents = 0;
+
+- /*
+- * We are taking the spinlock not to protect priv->enabled, but instead
+- * to make sure that there are no readers in the process of altering
+- * the free or used lists while we are setting this flag.
+- */
+- spin_lock_irq(&priv->lock);
+- priv->enabled = false;
+- spin_unlock_irq(&priv->lock);
+-
+ /* free all buffers: the free and used lists are not being changed */
+ data_free_buffers(priv);
+ return 0;
+@@ -896,15 +920,6 @@ static unsigned int list_num_entries(struct list_head *list)
+ static int data_debug_show(struct seq_file *f, void *offset)
+ {
+ struct fpga_device *priv = f->private;
+- int ret;
+-
+- /*
+- * Lock the mutex first, so that we get an accurate value for enable
+- * Lock the spinlock next, to get accurate list counts
+- */
+- ret = mutex_lock_interruptible(&priv->mutex);
+- if (ret)
+- return ret;
+
+ spin_lock_irq(&priv->lock);
+
+@@ -917,7 +932,6 @@ static int data_debug_show(struct seq_file *f, void *offset)
+ seq_printf(f, "num_dropped: %d\n", priv->num_dropped);
+
+ spin_unlock_irq(&priv->lock);
+- mutex_unlock(&priv->mutex);
+ return 0;
+ }
+
+@@ -970,7 +984,13 @@ static ssize_t data_en_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+ {
+ struct fpga_device *priv = dev_get_drvdata(dev);
+- return snprintf(buf, PAGE_SIZE, "%u\n", priv->enabled);
++ int ret;
++
++ spin_lock_irq(&priv->lock);
++ ret = snprintf(buf, PAGE_SIZE, "%u\n", priv->enabled);
++ spin_unlock_irq(&priv->lock);
++
++ return ret;
+ }
+
+ static ssize_t data_en_set(struct device *dev, struct device_attribute *attr,
+@@ -986,6 +1006,7 @@ static ssize_t data_en_set(struct device *dev, struct device_attribute *attr,
+ return -EINVAL;
+ }
+
++ /* protect against concurrent enable/disable */
+ ret = mutex_lock_interruptible(&priv->mutex);
+ if (ret)
+ return ret;commit 75ff85a81680e5779383aa6210a4f89ed76e40ec
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Jan 26 10:59:54 2012 +0000
+
+ carma-fpga: fix lockdep warning
+
+ Lockdep occasionally complains with the message:
+ INFO: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected
+
+ This is caused by calling videobuf_dma_unmap() under spin_lock_irq(). To
+ fix the warning, we drop the lock before unmapping and freeing the
+ buffer.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
+index 14e974b2a781..4fd896deda0d 100644
+--- a/drivers/misc/carma/carma-fpga.c
++++ b/drivers/misc/carma/carma-fpga.c
+@@ -1079,6 +1079,7 @@ static ssize_t data_read(struct file *filp, char __user *ubuf, size_t count,
+ struct fpga_reader *reader = filp->private_data;
+ struct fpga_device *priv = reader->priv;
+ struct list_head *used = &priv->used;
++ bool drop_buffer = false;
+ struct data_buf *dbuf;
+ size_t avail;
+ void *data;
+@@ -1166,10 +1167,12 @@ static ssize_t data_read(struct file *filp, char __user *ubuf, size_t count,
+ * One of two things has happened, the device is disabled, or the
+ * device has been reconfigured underneath us. In either case, we
+ * should just throw away the buffer.
++ *
++ * Lockdep complains if this is done under the spinlock, so we
++ * handle it during the unlock path.
+ */
+ if (!priv->enabled || dbuf->size != priv->bufsize) {
+- videobuf_dma_unmap(priv->dev, &dbuf->vb);
+- data_free_buffer(dbuf);
++ drop_buffer = true;
+ goto out_unlock;
+ }
+
+@@ -1178,6 +1181,12 @@ static ssize_t data_read(struct file *filp, char __user *ubuf, size_t count,
+
+ out_unlock:
+ spin_unlock_irq(&priv->lock);
++
++ if (drop_buffer) {
++ videobuf_dma_unmap(priv->dev, &dbuf->vb);
++ data_free_buffer(dbuf);
++ }
++
+ return count;
+ }
+ commit 40c8cefaaf12734327db7199a56e60058d98e7b6
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri Jan 6 12:34:07 2012 +0000
+
+ powerpc: Fix kernel log of oops/panic instruction dump
+
+ A kernel oops/panic prints an instruction dump showing several
+ instructions before and after the instruction which caused the
+ oops/panic.
+
+ The code intended that the faulting instruction be enclosed in angle
+ brackets, however a bug caused the faulting instruction to be
+ interpreted by printk() as the message log level.
+
+ To fix this, the KERN_CONT log level is added before the actual text of
+ the printed message.
+
+ === Before the patch ===
+
+ [ 1081.587266] Instruction dump:
+ [ 1081.590236] 7c000110 7c0000f8 5400077c 552907f6 7d290378 992b0003 4e800020 38000001
+ [ 1081.598034] 3d20c03a 9009a114 7c0004ac 39200000
+ [ 1081.602500] 4e800020 3803ffd0 2b800009
+
+ <4>[ 1081.587266] Instruction dump:
+ <4>[ 1081.590236] 7c000110 7c0000f8 5400077c 552907f6 7d290378 992b0003 4e800020 38000001
+ <4>[ 1081.598034] 3d20c03a 9009a114 7c0004ac 39200000
+ <98090000>[ 1081.602500] 4e800020 3803ffd0 2b800009
+
+ === After the patch ===
+
+ [ 51.385216] Instruction dump:
+ [ 51.388186] 7c000110 7c0000f8 5400077c 552907f6 7d290378 992b0003 4e800020 38000001
+ [ 51.395986] 3d20c03a 9009a114 7c0004ac 39200000 <98090000> 4e800020 3803ffd0 2b800009
+
+ <4>[ 51.385216] Instruction dump:
+ <4>[ 51.388186] 7c000110 7c0000f8 5400077c 552907f6 7d290378 992b0003 4e800020 38000001
+ <4>[ 51.395986] 3d20c03a 9009a114 7c0004ac 39200000 <98090000> 4e800020 3803ffd0 2b800009
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Paul Mackerras <paulus@samba.org>
+ Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ Cc: linuxppc-dev@lists.ozlabs.org
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
+index ebe5766781aa..d817ab018486 100644
+--- a/arch/powerpc/kernel/process.c
++++ b/arch/powerpc/kernel/process.c
+@@ -566,12 +566,12 @@ static void show_instructions(struct pt_regs *regs)
+ */
+ if (!__kernel_text_address(pc) ||
+ __get_user(instr, (unsigned int __user *)pc)) {
+- printk("XXXXXXXX ");
++ printk(KERN_CONT "XXXXXXXX ");
+ } else {
+ if (regs->nip == pc)
+- printk("<%08x> ", instr);
++ printk(KERN_CONT "<%08x> ", instr);
+ else
+- printk("%08x ", instr);
++ printk(KERN_CONT "%08x ", instr);
+ }
+
+ pc += sizeof(int);commit 0e1d715b5b982ee0099f3fbf6ad47dc8bda518a6
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri Feb 11 13:34:30 2011 +0000
+
+ misc: Add CARMA DATA-FPGA Programmer support
+
+ This adds support for programming the data processing FPGAs on the OVRO
+ CARMA board. These FPGAs have a special programming sequence that
+ requires that we program the Freescale DMA engine, which is only
+ available inside the kernel.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+diff --git a/drivers/misc/carma/Kconfig b/drivers/misc/carma/Kconfig
+index 4be183f7e6f1..c90370ed712b 100644
+--- a/drivers/misc/carma/Kconfig
++++ b/drivers/misc/carma/Kconfig
+@@ -7,3 +7,11 @@ config CARMA_FPGA
+ Say Y here to include support for communicating with the data
+ processing FPGAs on the OVRO CARMA board.
+
++config CARMA_FPGA_PROGRAM
++ tristate "CARMA DATA-FPGA Programmer"
++ depends on FSL_SOC && PPC_83xx && MEDIA_SUPPORT && HAS_DMA && FSL_DMA
++ select VIDEOBUF_DMA_SG
++ default n
++ help
++ Say Y here to include support for programming the data processing
++ FPGAs on the OVRO CARMA board.
+diff --git a/drivers/misc/carma/Makefile b/drivers/misc/carma/Makefile
+index 0b69fa787953..ff36ac2ce534 100644
+--- a/drivers/misc/carma/Makefile
++++ b/drivers/misc/carma/Makefile
+@@ -1 +1,2 @@
+ obj-$(CONFIG_CARMA_FPGA) += carma-fpga.o
++obj-$(CONFIG_CARMA_FPGA_PROGRAM) += carma-fpga-program.o
+diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
+new file mode 100644
+index 000000000000..7ce6065dc20e
+--- /dev/null
++++ b/drivers/misc/carma/carma-fpga-program.c
+@@ -0,0 +1,1141 @@
++/*
++ * CARMA Board DATA-FPGA Programmer
++ *
++ * Copyright (c) 2009-2011 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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/dma-mapping.h>
++#include <linux/of_platform.h>
++#include <linux/completion.h>
++#include <linux/miscdevice.h>
++#include <linux/dmaengine.h>
++#include <linux/interrupt.h>
++#include <linux/highmem.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++#include <linux/delay.h>
++#include <linux/init.h>
++#include <linux/leds.h>
++#include <linux/slab.h>
++#include <linux/kref.h>
++#include <linux/fs.h>
++#include <linux/io.h>
++
++#include <media/videobuf-dma-sg.h>
++
++/* MPC8349EMDS specific get_immrbase() */
++#include <sysdev/fsl_soc.h>
++
++static const char drv_name[] = "carma-fpga-program";
++
++/*
++ * Firmware images are always this exact size
++ *
++ * 12849552 bytes for a CARMA Digitizer Board (EP2S90 FPGAs)
++ * 18662880 bytes for a CARMA Correlator Board (EP2S130 FPGAs)
++ */
++#define FW_SIZE_EP2S90 12849552
++#define FW_SIZE_EP2S130 18662880
++
++struct fpga_dev {
++ struct miscdevice miscdev;
++
++ /* Reference count */
++ struct kref ref;
++
++ /* Device Registers */
++ struct device *dev;
++ void __iomem *regs;
++ void __iomem *immr;
++
++ /* Freescale DMA Device */
++ struct dma_chan *chan;
++
++ /* Interrupts */
++ int irq, status;
++ struct completion completion;
++
++ /* FPGA Bitfile */
++ struct mutex lock;
++
++ struct videobuf_dmabuf vb;
++ bool vb_allocated;
++
++ /* max size and written bytes */
++ size_t fw_size;
++ size_t bytes;
++};
++
++/*
++ * FPGA Bitfile Helpers
++ */
++
++/**
++ * fpga_drop_firmware_data() - drop the bitfile image from memory
++ * @priv: the driver's private data structure
++ *
++ * LOCKING: must hold priv->lock
++ */
++static void fpga_drop_firmware_data(struct fpga_dev *priv)
++{
++ videobuf_dma_free(&priv->vb);
++ priv->vb_allocated = false;
++ priv->bytes = 0;
++}
++
++/*
++ * Private Data Reference Count
++ */
++
++static void fpga_dev_remove(struct kref *ref)
++{
++ struct fpga_dev *priv = container_of(ref, struct fpga_dev, ref);
++
++ /* free any firmware image that was not programmed */
++ fpga_drop_firmware_data(priv);
++
++ mutex_destroy(&priv->lock);
++ kfree(priv);
++}
++
++/*
++ * LED Trigger (could be a seperate module)
++ */
++
++/*
++ * NOTE: this whole thing does have the problem that whenever the led's are
++ * NOTE: first set to use the fpga trigger, they could be in the wrong state
++ */
++
++DEFINE_LED_TRIGGER(ledtrig_fpga);
++
++static void ledtrig_fpga_programmed(bool enabled)
++{
++ if (enabled)
++ led_trigger_event(ledtrig_fpga, LED_FULL);
++ else
++ led_trigger_event(ledtrig_fpga, LED_OFF);
++}
++
++/*
++ * FPGA Register Helpers
++ */
++
++/* Register Definitions */
++#define FPGA_CONFIG_CONTROL 0x40
++#define FPGA_CONFIG_STATUS 0x44
++#define FPGA_CONFIG_FIFO_SIZE 0x48
++#define FPGA_CONFIG_FIFO_USED 0x4C
++#define FPGA_CONFIG_TOTAL_BYTE_COUNT 0x50
++#define FPGA_CONFIG_CUR_BYTE_COUNT 0x54
++
++#define FPGA_FIFO_ADDRESS 0x3000
++
++static int fpga_fifo_size(void __iomem *regs)
++{
++ return ioread32be(regs + FPGA_CONFIG_FIFO_SIZE);
++}
++
++#define CFG_STATUS_ERR_MASK 0xfffe
++
++static int fpga_config_error(void __iomem *regs)
++{
++ return ioread32be(regs + FPGA_CONFIG_STATUS) & CFG_STATUS_ERR_MASK;
++}
++
++static int fpga_fifo_empty(void __iomem *regs)
++{
++ return ioread32be(regs + FPGA_CONFIG_FIFO_USED) == 0;
++}
++
++static void fpga_fifo_write(void __iomem *regs, u32 val)
++{
++ iowrite32be(val, regs + FPGA_FIFO_ADDRESS);
++}
++
++static void fpga_set_byte_count(void __iomem *regs, u32 count)
++{
++ iowrite32be(count, regs + FPGA_CONFIG_TOTAL_BYTE_COUNT);
++}
++
++#define CFG_CTL_ENABLE (1 << 0)
++#define CFG_CTL_RESET (1 << 1)
++#define CFG_CTL_DMA (1 << 2)
++
++static void fpga_programmer_enable(struct fpga_dev *priv, bool dma)
++{
++ u32 val;
++
++ val = (dma) ? (CFG_CTL_ENABLE | CFG_CTL_DMA) : CFG_CTL_ENABLE;
++ iowrite32be(val, priv->regs + FPGA_CONFIG_CONTROL);
++}
++
++static void fpga_programmer_disable(struct fpga_dev *priv)
++{
++ iowrite32be(0x0, priv->regs + FPGA_CONFIG_CONTROL);
++}
++
++static void fpga_dump_registers(struct fpga_dev *priv)
++{
++ u32 control, status, size, used, total, curr;
++
++ /* good status: do nothing */
++ if (priv->status == 0)
++ return;
++
++ /* Dump all status registers */
++ control = ioread32be(priv->regs + FPGA_CONFIG_CONTROL);
++ status = ioread32be(priv->regs + FPGA_CONFIG_STATUS);
++ size = ioread32be(priv->regs + FPGA_CONFIG_FIFO_SIZE);
++ used = ioread32be(priv->regs + FPGA_CONFIG_FIFO_USED);
++ total = ioread32be(priv->regs + FPGA_CONFIG_TOTAL_BYTE_COUNT);
++ curr = ioread32be(priv->regs + FPGA_CONFIG_CUR_BYTE_COUNT);
++
++ dev_err(priv->dev, "Configuration failed, dumping status registers\n");
++ dev_err(priv->dev, "Control: 0x%.8x\n", control);
++ dev_err(priv->dev, "Status: 0x%.8x\n", status);
++ dev_err(priv->dev, "FIFO Size: 0x%.8x\n", size);
++ dev_err(priv->dev, "FIFO Used: 0x%.8x\n", used);
++ dev_err(priv->dev, "FIFO Total: 0x%.8x\n", total);
++ dev_err(priv->dev, "FIFO Curr: 0x%.8x\n", curr);
++}
++
++/*
++ * FPGA Power Supply Code
++ */
++
++#define CTL_PWR_CONTROL 0x2006
++#define CTL_PWR_STATUS 0x200A
++#define CTL_PWR_FAIL 0x200B
++
++#define PWR_CONTROL_ENABLE 0x01
++
++#define PWR_STATUS_ERROR_MASK 0x10
++#define PWR_STATUS_GOOD 0x0f
++
++/*
++ * Determine if the FPGA power is good for all supplies
++ */
++static bool fpga_power_good(struct fpga_dev *priv)
++{
++ u8 val;
++
++ val = ioread8(priv->regs + CTL_PWR_STATUS);
++ if (val & PWR_STATUS_ERROR_MASK)
++ return false;
++
++ return val == PWR_STATUS_GOOD;
++}
++
++/*
++ * Disable the FPGA power supplies
++ */
++static void fpga_disable_power_supplies(struct fpga_dev *priv)
++{
++ unsigned long start;
++ u8 val;
++
++ iowrite8(0x0, priv->regs + CTL_PWR_CONTROL);
++
++ /*
++ * Wait 500ms for the power rails to discharge
++ *
++ * Without this delay, the CTL-CPLD state machine can get into a
++ * state where it is waiting for the power-goods to assert, but they
++ * never do. This only happens when enabling and disabling the
++ * power sequencer very rapidly.
++ *
++ * The loop below will also wait for the power goods to de-assert,
++ * but testing has shown that they are always disabled by the time
++ * the sleep completes. However, omitting the sleep and only waiting
++ * for the power-goods to de-assert was not sufficient to ensure
++ * that the power sequencer would not wedge itself.
++ */
++ msleep(500);
++
++ start = jiffies;
++ while (time_before(jiffies, start + HZ)) {
++ val = ioread8(priv->regs + CTL_PWR_STATUS);
++ if (!(val & PWR_STATUS_GOOD))
++ break;
++
++ usleep_range(5000, 10000);
++ }
++
++ val = ioread8(priv->regs + CTL_PWR_STATUS);
++ if (val & PWR_STATUS_GOOD) {
++ dev_err(priv->dev, "power disable failed: "
++ "power goods: status 0x%.2x\n", val);
++ }
++
++ if (val & PWR_STATUS_ERROR_MASK) {
++ dev_err(priv->dev, "power disable failed: "
++ "alarm bit set: status 0x%.2x\n", val);
++ }
++}
++
++/**
++ * fpga_enable_power_supplies() - enable the DATA-FPGA power supplies
++ * @priv: the driver's private data structure
++ *
++ * Enable the DATA-FPGA power supplies, waiting up to 1 second for
++ * them to enable successfully.
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int fpga_enable_power_supplies(struct fpga_dev *priv)
++{
++ unsigned long start = jiffies;
++
++ if (fpga_power_good(priv)) {
++ dev_dbg(priv->dev, "power was already good\n");
++ return 0;
++ }
++
++ iowrite8(PWR_CONTROL_ENABLE, priv->regs + CTL_PWR_CONTROL);
++ while (time_before(jiffies, start + HZ)) {
++ if (fpga_power_good(priv))
++ return 0;
++
++ usleep_range(5000, 10000);
++ }
++
++ return fpga_power_good(priv) ? 0 : -ETIMEDOUT;
++}
++
++/*
++ * Determine if the FPGA power supplies are all enabled
++ */
++static bool fpga_power_enabled(struct fpga_dev *priv)
++{
++ u8 val;
++
++ val = ioread8(priv->regs + CTL_PWR_CONTROL);
++ if (val & PWR_CONTROL_ENABLE)
++ return true;
++
++ return false;
++}
++
++/*
++ * Determine if the FPGA's are programmed and running correctly
++ */
++static bool fpga_running(struct fpga_dev *priv)
++{
++ if (!fpga_power_good(priv))
++ return false;
++
++ /* Check the config done bit */
++ return ioread32be(priv->regs + FPGA_CONFIG_STATUS) & (1 << 18);
++}
++
++/*
++ * FPGA Programming Code
++ */
++
++/**
++ * fpga_program_block() - put a block of data into the programmer's FIFO
++ * @priv: the driver's private data structure
++ * @buf: the data to program
++ * @count: the length of data to program (must be a multiple of 4 bytes)
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int fpga_program_block(struct fpga_dev *priv, void *buf, size_t count)
++{
++ u32 *data = buf;
++ int size = fpga_fifo_size(priv->regs);
++ int i, len;
++ unsigned long timeout;
++
++ /* enforce correct data length for the FIFO */
++ BUG_ON(count % 4 != 0);
++
++ while (count > 0) {
++
++ /* Get the size of the block to write (maximum is FIFO_SIZE) */
++ len = min_t(size_t, count, size);
++ timeout = jiffies + HZ / 4;
++
++ /* Write the block */
++ for (i = 0; i < len / 4; i++)
++ fpga_fifo_write(priv->regs, data[i]);
++
++ /* Update the amounts left */
++ count -= len;
++ data += len / 4;
++
++ /* Wait for the fifo to empty */
++ while (true) {
++
++ if (fpga_fifo_empty(priv->regs)) {
++ break;
++ } else {
++ dev_dbg(priv->dev, "Fifo not empty\n");
++ cpu_relax();
++ }
++
++ if (fpga_config_error(priv->regs)) {
++ dev_err(priv->dev, "Error detected\n");
++ return -EIO;
++ }
++
++ if (time_after(jiffies, timeout)) {
++ dev_err(priv->dev, "Fifo drain timeout\n");
++ return -ETIMEDOUT;
++ }
++
++ usleep_range(5000, 10000);
++ }
++ }
++
++ return 0;
++}
++
++/**
++ * fpga_program_cpu() - program the DATA-FPGA's using the CPU
++ * @priv: the driver's private data structure
++ *
++ * This is useful when the DMA programming method fails. It is possible to
++ * wedge the Freescale DMA controller such that the DMA programming method
++ * always fails. This method has always succeeded.
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static noinline int fpga_program_cpu(struct fpga_dev *priv)
++{
++ int ret;
++
++ /* Disable the programmer */
++ fpga_programmer_disable(priv);
++
++ /* Set the total byte count */
++ fpga_set_byte_count(priv->regs, priv->bytes);
++ dev_dbg(priv->dev, "total byte count %u bytes\n", priv->bytes);
++
++ /* Enable the controller for programming */
++ fpga_programmer_enable(priv, false);
++ dev_dbg(priv->dev, "enabled the controller\n");
++
++ /* Write each chunk of the FPGA bitfile to FPGA programmer */
++ ret = fpga_program_block(priv, priv->vb.vaddr, priv->bytes);
++ if (ret)
++ goto out_disable_controller;
++
++ /* Wait for the interrupt handler to signal that programming finished */
++ ret = wait_for_completion_timeout(&priv->completion, 2 * HZ);
++ if (!ret) {
++ dev_err(priv->dev, "Timed out waiting for completion\n");
++ ret = -ETIMEDOUT;
++ goto out_disable_controller;
++ }
++
++ /* Retrieve the status from the interrupt handler */
++ ret = priv->status;
++
++out_disable_controller:
++ fpga_programmer_disable(priv);
++ return ret;
++}
++
++#define FIFO_DMA_ADDRESS 0xf0003000
++#define FIFO_MAX_LEN 4096
++
++/**
++ * fpga_program_dma() - program the DATA-FPGA's using the DMA engine
++ * @priv: the driver's private data structure
++ *
++ * Program the DATA-FPGA's using the Freescale DMA engine. This requires that
++ * the engine is programmed such that the hardware DMA request lines can
++ * control the entire DMA transaction. The system controller FPGA then
++ * completely offloads the programming from the CPU.
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static noinline int fpga_program_dma(struct fpga_dev *priv)
++{
++ struct videobuf_dmabuf *vb = &priv->vb;
++ struct dma_chan *chan = priv->chan;
++ struct dma_async_tx_descriptor *tx;
++ size_t num_pages, len, avail = 0;
++ struct dma_slave_config config;
++ struct scatterlist *sg;
++ struct sg_table table;
++ dma_cookie_t cookie;
++ int ret, i;
++
++ /* Disable the programmer */
++ fpga_programmer_disable(priv);
++
++ /* Allocate a scatterlist for the DMA destination */
++ num_pages = DIV_ROUND_UP(priv->bytes, FIFO_MAX_LEN);
++ ret = sg_alloc_table(&table, num_pages, GFP_KERNEL);
++ if (ret) {
++ dev_err(priv->dev, "Unable to allocate dst scatterlist\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ /*
++ * This is an ugly hack
++ *
++ * We fill in a scatterlist as if it were mapped for DMA. This is
++ * necessary because there exists no better structure for this
++ * inside the kernel code.
++ *
++ * As an added bonus, we can use the DMAEngine API for all of this,
++ * rather than inventing another extremely similar API.
++ */
++ avail = priv->bytes;
++ for_each_sg(table.sgl, sg, num_pages, i) {
++ len = min_t(size_t, avail, FIFO_MAX_LEN);
++ sg_dma_address(sg) = FIFO_DMA_ADDRESS;
++ sg_dma_len(sg) = len;
++
++ avail -= len;
++ }
++
++ /* Map the buffer for DMA */
++ ret = videobuf_dma_map(priv->dev, &priv->vb);
++ if (ret) {
++ dev_err(priv->dev, "Unable to map buffer for DMA\n");
++ goto out_free_table;
++ }
++
++ /*
++ * Configure the DMA channel to transfer FIFO_SIZE / 2 bytes per
++ * transaction, and then put it under external control
++ */
++ memset(&config, 0, sizeof(config));
++ config.direction = DMA_TO_DEVICE;
++ config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
++ config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4;
++ ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG,
++ (unsigned long)&config);
++ if (ret) {
++ dev_err(priv->dev, "DMA slave configuration failed\n");
++ goto out_dma_unmap;
++ }
++
++ ret = chan->device->device_control(chan, FSLDMA_EXTERNAL_START, 1);
++ if (ret) {
++ dev_err(priv->dev, "DMA external control setup failed\n");
++ goto out_dma_unmap;
++ }
++
++ /* setup and submit the DMA transaction */
++ tx = chan->device->device_prep_dma_sg(chan,
++ table.sgl, num_pages,
++ vb->sglist, vb->sglen, 0);
++ if (!tx) {
++ dev_err(priv->dev, "Unable to prep DMA transaction\n");
++ ret = -ENOMEM;
++ goto out_dma_unmap;
++ }
++
++ cookie = tx->tx_submit(tx);
++ if (dma_submit_error(cookie)) {
++ dev_err(priv->dev, "Unable to submit DMA transaction\n");
++ ret = -ENOMEM;
++ goto out_dma_unmap;
++ }
++
++ dma_async_memcpy_issue_pending(chan);
++
++ /* Set the total byte count */
++ fpga_set_byte_count(priv->regs, priv->bytes);
++ dev_dbg(priv->dev, "total byte count %u bytes\n", priv->bytes);
++
++ /* Enable the controller for DMA programming */
++ fpga_programmer_enable(priv, true);
++ dev_dbg(priv->dev, "enabled the controller\n");
++
++ /* Wait for the interrupt handler to signal that programming finished */
++ ret = wait_for_completion_timeout(&priv->completion, 2 * HZ);
++ if (!ret) {
++ dev_err(priv->dev, "Timed out waiting for completion\n");
++ ret = -ETIMEDOUT;
++ goto out_disable_controller;
++ }
++
++ /* Retrieve the status from the interrupt handler */
++ ret = priv->status;
++
++out_disable_controller:
++ fpga_programmer_disable(priv);
++out_dma_unmap:
++ videobuf_dma_unmap(priv->dev, vb);
++out_free_table:
++ sg_free_table(&table);
++out_return:
++ return ret;
++}
++
++/*
++ * Interrupt Handling
++ */
++
++static irqreturn_t fpga_irq(int irq, void *dev_id)
++{
++ struct fpga_dev *priv = dev_id;
++
++ /* Save the status */
++ priv->status = fpga_config_error(priv->regs) ? -EIO : 0;
++ dev_dbg(priv->dev, "INTERRUPT status %d\n", priv->status);
++ fpga_dump_registers(priv);
++
++ /* Disabling the programmer clears the interrupt */
++ fpga_programmer_disable(priv);
++
++ /* Notify any waiters */
++ complete(&priv->completion);
++
++ return IRQ_HANDLED;
++}
++
++/*
++ * SYSFS Helpers
++ */
++
++/**
++ * fpga_do_stop() - deconfigure (reset) the DATA-FPGA's
++ * @priv: the driver's private data structure
++ *
++ * LOCKING: must hold priv->lock
++ */
++static int fpga_do_stop(struct fpga_dev *priv)
++{
++ u32 val;
++
++ /* Set the led to unprogrammed */
++ ledtrig_fpga_programmed(false);
++
++ /* Pulse the config line to reset the FPGA's */
++ val = CFG_CTL_ENABLE | CFG_CTL_RESET;
++ iowrite32be(val, priv->regs + FPGA_CONFIG_CONTROL);
++ iowrite32be(0x0, priv->regs + FPGA_CONFIG_CONTROL);
++
++ return 0;
++}
++
++static noinline int fpga_do_program(struct fpga_dev *priv)
++{
++ int ret;
++
++ if (priv->bytes != priv->fw_size) {
++ dev_err(priv->dev, "Incorrect bitfile size: got %zu bytes, "
++ "should be %zu bytes\n",
++ priv->bytes, priv->fw_size);
++ return -EINVAL;
++ }
++
++ if (!fpga_power_enabled(priv)) {
++ dev_err(priv->dev, "Power not enabled\n");
++ return -EINVAL;
++ }
++
++ if (!fpga_power_good(priv)) {
++ dev_err(priv->dev, "Power not good\n");
++ return -EINVAL;
++ }
++
++ /* Set the LED to unprogrammed */
++ ledtrig_fpga_programmed(false);
++
++ /* Try to program the FPGA's using DMA */
++ ret = fpga_program_dma(priv);
++
++ /* If DMA failed or doesn't exist, try with CPU */
++ if (ret) {
++ dev_warn(priv->dev, "Falling back to CPU programming\n");
++ ret = fpga_program_cpu(priv);
++ }
++
++ if (ret) {
++ dev_err(priv->dev, "Unable to program FPGA's\n");
++ return ret;
++ }
++
++ /* Drop the firmware bitfile from memory */
++ fpga_drop_firmware_data(priv);
++
++ dev_dbg(priv->dev, "FPGA programming successful\n");
++ ledtrig_fpga_programmed(true);
++
++ return 0;
++}
++
++/*
++ * File Operations
++ */
++
++static int fpga_open(struct inode *inode, struct file *filp)
++{
++ /*
++ * The miscdevice layer puts our struct miscdevice into the
++ * filp->private_data field. We use this to find our private
++ * data and then overwrite it with our own private structure.
++ */
++ struct fpga_dev *priv = container_of(filp->private_data,
++ struct fpga_dev, miscdev);
++ unsigned int nr_pages;
++ int ret;
++
++ /* We only allow one process at a time */
++ ret = mutex_lock_interruptible(&priv->lock);
++ if (ret)
++ return ret;
++
++ filp->private_data = priv;
++ kref_get(&priv->ref);
++
++ /* Truncation: drop any existing data */
++ if (filp->f_flags & O_TRUNC)
++ priv->bytes = 0;
++
++ /* Check if we have already allocated a buffer */
++ if (priv->vb_allocated)
++ return 0;
++
++ /* Allocate a buffer to hold enough data for the bitfile */
++ nr_pages = DIV_ROUND_UP(priv->fw_size, PAGE_SIZE);
++ ret = videobuf_dma_init_kernel(&priv->vb, DMA_TO_DEVICE, nr_pages);
++ if (ret) {
++ dev_err(priv->dev, "unable to allocate data buffer\n");
++ mutex_unlock(&priv->lock);
++ kref_put(&priv->ref, fpga_dev_remove);
++ return ret;
++ }
++
++ priv->vb_allocated = true;
++ return 0;
++}
++
++static int fpga_release(struct inode *inode, struct file *filp)
++{
++ struct fpga_dev *priv = filp->private_data;
++
++ mutex_unlock(&priv->lock);
++ kref_put(&priv->ref, fpga_dev_remove);
++ return 0;
++}
++
++static ssize_t fpga_write(struct file *filp, const char __user *buf,
++ size_t count, loff_t *f_pos)
++{
++ struct fpga_dev *priv = filp->private_data;
++
++ /* FPGA bitfiles have an exact size: disallow anything else */
++ if (priv->bytes >= priv->fw_size)
++ return -ENOSPC;
++
++ count = min_t(size_t, priv->fw_size - priv->bytes, count);
++ if (copy_from_user(priv->vb.vaddr + priv->bytes, buf, count))
++ return -EFAULT;
++
++ priv->bytes += count;
++ return count;
++}
++
++static ssize_t fpga_read(struct file *filp, char __user *buf, size_t count,
++ loff_t *f_pos)
++{
++ struct fpga_dev *priv = filp->private_data;
++
++ count = min_t(size_t, priv->bytes - *f_pos, count);
++ if (copy_to_user(buf, priv->vb.vaddr + *f_pos, count))
++ return -EFAULT;
++
++ *f_pos += count;
++ return count;
++}
++
++static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)
++{
++ struct fpga_dev *priv = filp->private_data;
++ loff_t newpos;
++
++ /* only read-only opens are allowed to seek */
++ if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
++ return -EINVAL;
++
++ switch (origin) {
++ case SEEK_SET: /* seek relative to the beginning of the file */
++ newpos = offset;
++ break;
++ case SEEK_CUR: /* seek relative to current position in the file */
++ newpos = filp->f_pos + offset;
++ break;
++ case SEEK_END: /* seek relative to the end of the file */
++ newpos = priv->fw_size - offset;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ /* check for sanity */
++ if (newpos > priv->fw_size)
++ return -EINVAL;
++
++ filp->f_pos = newpos;
++ return newpos;
++}
++
++static const struct file_operations fpga_fops = {
++ .open = fpga_open,
++ .release = fpga_release,
++ .write = fpga_write,
++ .read = fpga_read,
++ .llseek = fpga_llseek,
++};
++
++/*
++ * Device Attributes
++ */
++
++static ssize_t pfail_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ u8 val;
++
++ val = ioread8(priv->regs + CTL_PWR_FAIL);
++ return snprintf(buf, PAGE_SIZE, "0x%.2x\n", val);
++}
++
++static ssize_t pgood_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ return snprintf(buf, PAGE_SIZE, "%d\n", fpga_power_good(priv));
++}
++
++static ssize_t penable_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ return snprintf(buf, PAGE_SIZE, "%d\n", fpga_power_enabled(priv));
++}
++
++static ssize_t penable_store(struct device *dev, struct device_attribute *attr,
++ const char *buf, size_t count)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ unsigned long val;
++ int ret;
++
++ if (strict_strtoul(buf, 0, &val))
++ return -EINVAL;
++
++ if (val) {
++ ret = fpga_enable_power_supplies(priv);
++ if (ret)
++ return ret;
++ } else {
++ fpga_do_stop(priv);
++ fpga_disable_power_supplies(priv);
++ }
++
++ return count;
++}
++
++static ssize_t program_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ return snprintf(buf, PAGE_SIZE, "%d\n", fpga_running(priv));
++}
++
++static ssize_t program_store(struct device *dev, struct device_attribute *attr,
++ const char *buf, size_t count)
++{
++ struct fpga_dev *priv = dev_get_drvdata(dev);
++ unsigned long val;
++ int ret;
++
++ if (strict_strtoul(buf, 0, &val))
++ return -EINVAL;
++
++ /* We can't have an image writer and be programming simultaneously */
++ if (mutex_lock_interruptible(&priv->lock))
++ return -ERESTARTSYS;
++
++ /* Program or Reset the FPGA's */
++ ret = val ? fpga_do_program(priv) : fpga_do_stop(priv);
++ if (ret)
++ goto out_unlock;
++
++ /* Success */
++ ret = count;
++
++out_unlock:
++ mutex_unlock(&priv->lock);
++ return ret;
++}
++
++static DEVICE_ATTR(power_fail, S_IRUGO, pfail_show, NULL);
++static DEVICE_ATTR(power_good, S_IRUGO, pgood_show, NULL);
++static DEVICE_ATTR(power_enable, S_IRUGO | S_IWUSR,
++ penable_show, penable_store);
++
++static DEVICE_ATTR(program, S_IRUGO | S_IWUSR,
++ program_show, program_store);
++
++static struct attribute *fpga_attributes[] = {
++ &dev_attr_power_fail.attr,
++ &dev_attr_power_good.attr,
++ &dev_attr_power_enable.attr,
++ &dev_attr_program.attr,
++ NULL,
++};
++
++static const struct attribute_group fpga_attr_group = {
++ .attrs = fpga_attributes,
++};
++
++/*
++ * OpenFirmware Device Subsystem
++ */
++
++#define SYS_REG_VERSION 0x00
++#define SYS_REG_GEOGRAPHIC 0x10
++
++static bool dma_filter(struct dma_chan *chan, void *data)
++{
++ /*
++ * DMA Channel #0 is the only acceptable device
++ *
++ * This probably won't survive an unload/load cycle of the Freescale
++ * DMAEngine driver, but that won't be a problem
++ */
++ return chan->chan_id == 0 && chan->device->dev_id == 0;
++}
++
++static int fpga_of_remove(struct platform_device *op)
++{
++ struct fpga_dev *priv = dev_get_drvdata(&op->dev);
++ struct device *this_device = priv->miscdev.this_device;
++
++ sysfs_remove_group(&this_device->kobj, &fpga_attr_group);
++ misc_deregister(&priv->miscdev);
++
++ free_irq(priv->irq, priv);
++ irq_dispose_mapping(priv->irq);
++
++ /* make sure the power supplies are off */
++ fpga_disable_power_supplies(priv);
++
++ /* unmap registers */
++ iounmap(priv->immr);
++ iounmap(priv->regs);
++
++ dma_release_channel(priv->chan);
++
++ /* drop our reference to the private data structure */
++ kref_put(&priv->ref, fpga_dev_remove);
++ return 0;
++}
++
++/* CTL-CPLD Version Register */
++#define CTL_CPLD_VERSION 0x2000
++
++static int fpga_of_probe(struct platform_device *op,
++ const struct of_device_id *match)
++{
++ struct device_node *of_node = op->dev.of_node;
++ struct device *this_device;
++ struct fpga_dev *priv;
++ dma_cap_mask_t mask;
++ u32 ver;
++ int ret;
++
++ /* Allocate private data */
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ if (!priv) {
++ dev_err(&op->dev, "Unable to allocate private data\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ /* Setup the miscdevice */
++ priv->miscdev.minor = MISC_DYNAMIC_MINOR;
++ priv->miscdev.name = drv_name;
++ priv->miscdev.fops = &fpga_fops;
++
++ kref_init(&priv->ref);
++
++ dev_set_drvdata(&op->dev, priv);
++ priv->dev = &op->dev;
++ mutex_init(&priv->lock);
++ init_completion(&priv->completion);
++ videobuf_dma_init(&priv->vb);
++
++ dev_set_drvdata(priv->dev, priv);
++ dma_cap_zero(mask);
++ dma_cap_set(DMA_MEMCPY, mask);
++ dma_cap_set(DMA_INTERRUPT, mask);
++ dma_cap_set(DMA_SLAVE, mask);
++ dma_cap_set(DMA_SG, mask);
++
++ /* Get control of DMA channel #0 */
++ priv->chan = dma_request_channel(mask, dma_filter, NULL);
++ if (!priv->chan) {
++ dev_err(&op->dev, "Unable to acquire DMA channel #0\n");
++ ret = -ENODEV;
++ goto out_free_priv;
++ }
++
++ /* Remap the registers for use */
++ priv->regs = of_iomap(of_node, 0);
++ if (!priv->regs) {
++ dev_err(&op->dev, "Unable to ioremap registers\n");
++ ret = -ENOMEM;
++ goto out_dma_release_channel;
++ }
++
++ /* Remap the IMMR for use */
++ priv->immr = ioremap(get_immrbase(), 0x100000);
++ if (!priv->immr) {
++ dev_err(&op->dev, "Unable to ioremap IMMR\n");
++ ret = -ENOMEM;
++ goto out_unmap_regs;
++ }
++
++ /*
++ * Check that external DMA is configured
++ *
++ * U-Boot does this for us, but we should check it and bail out if
++ * there is a problem. Failing to have this register setup correctly
++ * will cause the DMA controller to transfer a single cacheline
++ * worth of data, then wedge itself.
++ */
++ if ((ioread32be(priv->immr + 0x114) & 0xE00) != 0xE00) {
++ dev_err(&op->dev, "External DMA control not configured\n");
++ ret = -ENODEV;
++ goto out_unmap_immr;
++ }
++
++ /*
++ * Check the CTL-CPLD version
++ *
++ * This driver uses the CTL-CPLD DATA-FPGA power sequencer, and we
++ * don't want to run on any version of the CTL-CPLD that does not use
++ * a compatible register layout.
++ *
++ * v2: changed register layout, added power sequencer
++ * v3: added glitch filter on the i2c overcurrent/overtemp outputs
++ */
++ ver = ioread8(priv->regs + CTL_CPLD_VERSION);
++ if (ver != 0x02 && ver != 0x03) {
++ dev_err(&op->dev, "CTL-CPLD is not version 0x02 or 0x03!\n");
++ ret = -ENODEV;
++ goto out_unmap_immr;
++ }
++
++ /* Set the exact size that the firmware image should be */
++ ver = ioread32be(priv->regs + SYS_REG_VERSION);
++ priv->fw_size = (ver & (1 << 18)) ? FW_SIZE_EP2S130 : FW_SIZE_EP2S90;
++
++ /* Find the correct IRQ number */
++ priv->irq = irq_of_parse_and_map(of_node, 0);
++ if (priv->irq == NO_IRQ) {
++ dev_err(&op->dev, "Unable to find IRQ line\n");
++ ret = -ENODEV;
++ goto out_unmap_immr;
++ }
++
++ /* Request the IRQ */
++ ret = request_irq(priv->irq, fpga_irq, IRQF_SHARED, drv_name, priv);
++ if (ret) {
++ dev_err(&op->dev, "Unable to request IRQ %d\n", priv->irq);
++ ret = -ENODEV;
++ goto out_irq_dispose_mapping;
++ }
++
++ /* Reset and stop the FPGA's, just in case */
++ fpga_do_stop(priv);
++
++ /* Register the miscdevice */
++ ret = misc_register(&priv->miscdev);
++ if (ret) {
++ dev_err(&op->dev, "Unable to register miscdevice\n");
++ goto out_free_irq;
++ }
++
++ /* Create the sysfs files */
++ this_device = priv->miscdev.this_device;
++ dev_set_drvdata(this_device, priv);
++ ret = sysfs_create_group(&this_device->kobj, &fpga_attr_group);
++ if (ret) {
++ dev_err(&op->dev, "Unable to create sysfs files\n");
++ goto out_misc_deregister;
++ }
++
++ dev_info(priv->dev, "CARMA FPGA Programmer: %s rev%s with %s FPGAs\n",
++ (ver & (1 << 17)) ? "Correlator" : "Digitizer",
++ (ver & (1 << 16)) ? "B" : "A",
++ (ver & (1 << 18)) ? "EP2S130" : "EP2S90");
++
++ return 0;
++
++out_misc_deregister:
++ misc_deregister(&priv->miscdev);
++out_free_irq:
++ free_irq(priv->irq, priv);
++out_irq_dispose_mapping:
++ irq_dispose_mapping(priv->irq);
++out_unmap_immr:
++ iounmap(priv->immr);
++out_unmap_regs:
++ iounmap(priv->regs);
++out_dma_release_channel:
++ dma_release_channel(priv->chan);
++out_free_priv:
++ kref_put(&priv->ref, fpga_dev_remove);
++out_return:
++ return ret;
++}
++
++static struct of_device_id fpga_of_match[] = {
++ { .compatible = "carma,fpga-programmer", },
++ {},
++};
++
++static struct of_platform_driver fpga_of_driver = {
++ .probe = fpga_of_probe,
++ .remove = fpga_of_remove,
++ .driver = {
++ .name = drv_name,
++ .of_match_table = fpga_of_match,
++ .owner = THIS_MODULE,
++ },
++};
++
++/*
++ * Module Init / Exit
++ */
++
++static int __init fpga_init(void)
++{
++ led_trigger_register_simple("fpga", &ledtrig_fpga);
++ return of_register_platform_driver(&fpga_of_driver);
++}
++
++static void __exit fpga_exit(void)
++{
++ of_unregister_platform_driver(&fpga_of_driver);
++ led_trigger_unregister_simple(ledtrig_fpga);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("CARMA Board DATA-FPGA Programmer");
++MODULE_LICENSE("GPL");
++
++module_init(fpga_init);
++module_exit(fpga_exit);commit c186f0e177275e83728d7acfdf4a1b68793a7038
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri Feb 11 13:34:29 2011 +0000
+
+ misc: Add CARMA DATA-FPGA Access Driver
+
+ This driver allows userspace to access the data processing FPGAs on the
+ OVRO CARMA board. It has two modes of operation:
+
+ 1) random access
+
+ This allows users to poke any DATA-FPGA registers by using mmap to map
+ the address region directly into their memory map.
+
+ 2) correlation dumping
+
+ When correlating, the DATA-FPGA's have special requirements for getting
+ the data out of their memory before the next correlation. This nominally
+ happens at 64Hz (every 15.625ms). If the data is not dumped before the
+ next correlation, data is lost.
+
+ The data dumping driver handles buffering up to 1 second worth of
+ correlation data from the FPGAs. This lowers the realtime scheduling
+ requirements for the userspace process reading the device.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+index 4e007c6a4b44..d80dcdee88f3 100644
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -481,5 +481,6 @@ source "drivers/misc/cb710/Kconfig"
+ source "drivers/misc/iwmc3200top/Kconfig"
+ source "drivers/misc/ti-st/Kconfig"
+ source "drivers/misc/lis3lv02d/Kconfig"
++source "drivers/misc/carma/Kconfig"
+
+ endif # MISC_DEVICES
+diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
+index f5468602961f..848e8464faab 100644
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -44,3 +44,4 @@ obj-$(CONFIG_PCH_PHUB) += pch_phub.o
+ obj-y += ti-st/
+ obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o
+ obj-y += lis3lv02d/
++obj-y += carma/
+diff --git a/drivers/misc/carma/Kconfig b/drivers/misc/carma/Kconfig
+new file mode 100644
+index 000000000000..4be183f7e6f1
+--- /dev/null
++++ b/drivers/misc/carma/Kconfig
+@@ -0,0 +1,9 @@
++config CARMA_FPGA
++ tristate "CARMA DATA-FPGA Access Driver"
++ depends on FSL_SOC && PPC_83xx && MEDIA_SUPPORT && HAS_DMA && FSL_DMA
++ select VIDEOBUF_DMA_SG
++ default n
++ help
++ Say Y here to include support for communicating with the data
++ processing FPGAs on the OVRO CARMA board.
++
+diff --git a/drivers/misc/carma/Makefile b/drivers/misc/carma/Makefile
+new file mode 100644
+index 000000000000..0b69fa787953
+--- /dev/null
++++ b/drivers/misc/carma/Makefile
+@@ -0,0 +1 @@
++obj-$(CONFIG_CARMA_FPGA) += carma-fpga.o
+diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
+new file mode 100644
+index 000000000000..3965821fef17
+--- /dev/null
++++ b/drivers/misc/carma/carma-fpga.c
+@@ -0,0 +1,1433 @@
++/*
++ * CARMA DATA-FPGA Access Driver
++ *
++ * Copyright (c) 2009-2011 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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.
++ */
++
++/*
++ * FPGA Memory Dump Format
++ *
++ * FPGA #0 control registers (32 x 32-bit words)
++ * FPGA #1 control registers (32 x 32-bit words)
++ * FPGA #2 control registers (32 x 32-bit words)
++ * FPGA #3 control registers (32 x 32-bit words)
++ * SYSFPGA control registers (32 x 32-bit words)
++ * FPGA #0 correlation array (NUM_CORL0 correlation blocks)
++ * FPGA #1 correlation array (NUM_CORL1 correlation blocks)
++ * FPGA #2 correlation array (NUM_CORL2 correlation blocks)
++ * FPGA #3 correlation array (NUM_CORL3 correlation blocks)
++ *
++ * Each correlation array consists of:
++ *
++ * Correlation Data (2 x NUM_LAGSn x 32-bit words)
++ * Pipeline Metadata (2 x NUM_METAn x 32-bit words)
++ * Quantization Counters (2 x NUM_QCNTn x 32-bit words)
++ *
++ * The NUM_CORLn, NUM_LAGSn, NUM_METAn, and NUM_QCNTn values come from
++ * the FPGA configuration registers. They do not change once the FPGA's
++ * have been programmed, they only change on re-programming.
++ */
++
++/*
++ * Basic Description:
++ *
++ * This driver is used to capture correlation spectra off of the four data
++ * processing FPGAs. The FPGAs are often reprogrammed at runtime, therefore
++ * this driver supports dynamic enable/disable of capture while the device
++ * remains open.
++ *
++ * The nominal capture rate is 64Hz (every 15.625ms). To facilitate this fast
++ * capture rate, all buffers are pre-allocated to avoid any potentially long
++ * running memory allocations while capturing.
++ *
++ * There are two lists and one pointer which are used to keep track of the
++ * different states of data buffers.
++ *
++ * 1) free list
++ * This list holds all empty data buffers which are ready to receive data.
++ *
++ * 2) inflight pointer
++ * This pointer holds the currently inflight data buffer. This buffer is having
++ * data copied into it by the DMA engine.
++ *
++ * 3) used list
++ * This list holds data buffers which have been filled, and are waiting to be
++ * read by userspace.
++ *
++ * All buffers start life on the free list, then move successively to the
++ * inflight pointer, and then to the used list. After they have been read by
++ * userspace, they are moved back to the free list. The cycle repeats as long
++ * as necessary.
++ *
++ * It should be noted that all buffers are mapped and ready for DMA when they
++ * are on any of the three lists. They are only unmapped when they are in the
++ * process of being read by userspace.
++ */
++
++/*
++ * Notes on the IRQ masking scheme:
++ *
++ * The IRQ masking scheme here is different than most other hardware. The only
++ * way for the DATA-FPGAs to detect if the kernel has taken too long to copy
++ * the data is if the status registers are not cleared before the next
++ * correlation data dump is ready.
++ *
++ * The interrupt line is connected to the status registers, such that when they
++ * are cleared, the interrupt is de-asserted. Therein lies our problem. We need
++ * to schedule a long-running DMA operation and return from the interrupt
++ * handler quickly, but we cannot clear the status registers.
++ *
++ * To handle this, the system controller FPGA has the capability to connect the
++ * interrupt line to a user-controlled GPIO pin. This pin is driven high
++ * (unasserted) and left that way. To mask the interrupt, we change the
++ * interrupt source to the GPIO pin. Tada, we hid the interrupt. :)
++ */
++
++#include <linux/of_platform.h>
++#include <linux/dma-mapping.h>
++#include <linux/miscdevice.h>
++#include <linux/interrupt.h>
++#include <linux/dmaengine.h>
++#include <linux/seq_file.h>
++#include <linux/highmem.h>
++#include <linux/debugfs.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/poll.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/kref.h>
++#include <linux/io.h>
++
++#include <media/videobuf-dma-sg.h>
++
++/* system controller registers */
++#define SYS_IRQ_SOURCE_CTL 0x24
++#define SYS_IRQ_OUTPUT_EN 0x28
++#define SYS_IRQ_OUTPUT_DATA 0x2C
++#define SYS_IRQ_INPUT_DATA 0x30
++#define SYS_FPGA_CONFIG_STATUS 0x44
++
++/* GPIO IRQ line assignment */
++#define IRQ_CORL_DONE 0x10
++
++/* FPGA registers */
++#define MMAP_REG_VERSION 0x00
++#define MMAP_REG_CORL_CONF1 0x08
++#define MMAP_REG_CORL_CONF2 0x0C
++#define MMAP_REG_STATUS 0x48
++
++#define SYS_FPGA_BLOCK 0xF0000000
++
++#define DATA_FPGA_START 0x400000
++#define DATA_FPGA_SIZE 0x80000
++
++static const char drv_name[] = "carma-fpga";
++
++#define NUM_FPGA 4
++
++#define MIN_DATA_BUFS 8
++#define MAX_DATA_BUFS 64
++
++struct fpga_info {
++ unsigned int num_lag_ram;
++ unsigned int blk_size;
++};
++
++struct data_buf {
++ struct list_head entry;
++ struct videobuf_dmabuf vb;
++ size_t size;
++};
++
++struct fpga_device {
++ /* character device */
++ struct miscdevice miscdev;
++ struct device *dev;
++ struct mutex mutex;
++
++ /* reference count */
++ struct kref ref;
++
++ /* FPGA registers and information */
++ struct fpga_info info[NUM_FPGA];
++ void __iomem *regs;
++ int irq;
++
++ /* FPGA Physical Address/Size Information */
++ resource_size_t phys_addr;
++ size_t phys_size;
++
++ /* DMA structures */
++ struct sg_table corl_table;
++ unsigned int corl_nents;
++ struct dma_chan *chan;
++
++ /* Protection for all members below */
++ spinlock_t lock;
++
++ /* Device enable/disable flag */
++ bool enabled;
++
++ /* Correlation data buffers */
++ wait_queue_head_t wait;
++ struct list_head free;
++ struct list_head used;
++ struct data_buf *inflight;
++
++ /* Information about data buffers */
++ unsigned int num_dropped;
++ unsigned int num_buffers;
++ size_t bufsize;
++ struct dentry *dbg_entry;
++};
++
++struct fpga_reader {
++ struct fpga_device *priv;
++ struct data_buf *buf;
++ off_t buf_start;
++};
++
++static void fpga_device_release(struct kref *ref)
++{
++ struct fpga_device *priv = container_of(ref, struct fpga_device, ref);
++
++ /* the last reader has exited, cleanup the last bits */
++ mutex_destroy(&priv->mutex);
++ kfree(priv);
++}
++
++/*
++ * Data Buffer Allocation Helpers
++ */
++
++/**
++ * data_free_buffer() - free a single data buffer and all allocated memory
++ * @buf: the buffer to free
++ *
++ * This will free all of the pages allocated to the given data buffer, and
++ * then free the structure itself
++ */
++static void data_free_buffer(struct data_buf *buf)
++{
++ /* It is ok to free a NULL buffer */
++ if (!buf)
++ return;
++
++ /* free all memory */
++ videobuf_dma_free(&buf->vb);
++ kfree(buf);
++}
++
++/**
++ * data_alloc_buffer() - allocate and fill a data buffer with pages
++ * @bytes: the number of bytes required
++ *
++ * This allocates all space needed for a data buffer. It must be mapped before
++ * use in a DMA transaction using videobuf_dma_map().
++ *
++ * Returns NULL on failure
++ */
++static struct data_buf *data_alloc_buffer(const size_t bytes)
++{
++ unsigned int nr_pages;
++ struct data_buf *buf;
++ int ret;
++
++ /* calculate the number of pages necessary */
++ nr_pages = DIV_ROUND_UP(bytes, PAGE_SIZE);
++
++ /* allocate the buffer structure */
++ buf = kzalloc(sizeof(*buf), GFP_KERNEL);
++ if (!buf)
++ goto out_return;
++
++ /* initialize internal fields */
++ INIT_LIST_HEAD(&buf->entry);
++ buf->size = bytes;
++
++ /* allocate the videobuf */
++ videobuf_dma_init(&buf->vb);
++ ret = videobuf_dma_init_kernel(&buf->vb, DMA_FROM_DEVICE, nr_pages);
++ if (ret)
++ goto out_free_buf;
++
++ return buf;
++
++out_free_buf:
++ kfree(buf);
++out_return:
++ return NULL;
++}
++
++/**
++ * data_free_buffers() - free all allocated buffers
++ * @priv: the driver's private data structure
++ *
++ * Free all buffers allocated by the driver (except those currently in the
++ * process of being read by userspace).
++ *
++ * LOCKING: must hold dev->mutex
++ * CONTEXT: user
++ */
++static void data_free_buffers(struct fpga_device *priv)
++{
++ struct data_buf *buf, *tmp;
++
++ /* the device should be stopped, no DMA in progress */
++ BUG_ON(priv->inflight != NULL);
++
++ list_for_each_entry_safe(buf, tmp, &priv->free, entry) {
++ list_del_init(&buf->entry);
++ videobuf_dma_unmap(priv->dev, &buf->vb);
++ data_free_buffer(buf);
++ }
++
++ list_for_each_entry_safe(buf, tmp, &priv->used, entry) {
++ list_del_init(&buf->entry);
++ videobuf_dma_unmap(priv->dev, &buf->vb);
++ data_free_buffer(buf);
++ }
++
++ priv->num_buffers = 0;
++ priv->bufsize = 0;
++}
++
++/**
++ * data_alloc_buffers() - allocate 1 seconds worth of data buffers
++ * @priv: the driver's private data structure
++ *
++ * Allocate enough buffers for a whole second worth of data
++ *
++ * This routine will attempt to degrade nicely by succeeding even if a full
++ * second worth of data buffers could not be allocated, as long as a minimum
++ * number were allocated. In this case, it will print a message to the kernel
++ * log.
++ *
++ * The device must not be modifying any lists when this is called.
++ *
++ * CONTEXT: user
++ * LOCKING: must hold dev->mutex
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_alloc_buffers(struct fpga_device *priv)
++{
++ struct data_buf *buf;
++ int i, ret;
++
++ for (i = 0; i < MAX_DATA_BUFS; i++) {
++
++ /* allocate a buffer */
++ buf = data_alloc_buffer(priv->bufsize);
++ if (!buf)
++ break;
++
++ /* map it for DMA */
++ ret = videobuf_dma_map(priv->dev, &buf->vb);
++ if (ret) {
++ data_free_buffer(buf);
++ break;
++ }
++
++ /* add it to the list of free buffers */
++ list_add_tail(&buf->entry, &priv->free);
++ priv->num_buffers++;
++ }
++
++ /* Make sure we allocated the minimum required number of buffers */
++ if (priv->num_buffers < MIN_DATA_BUFS) {
++ dev_err(priv->dev, "Unable to allocate enough data buffers\n");
++ data_free_buffers(priv);
++ return -ENOMEM;
++ }
++
++ /* Warn if we are running in a degraded state, but do not fail */
++ if (priv->num_buffers < MAX_DATA_BUFS) {
++ dev_warn(priv->dev,
++ "Unable to allocate %d buffers, using %d buffers instead\n",
++ MAX_DATA_BUFS, i);
++ }
++
++ return 0;
++}
++
++/*
++ * DMA Operations Helpers
++ */
++
++/**
++ * fpga_start_addr() - get the physical address a DATA-FPGA
++ * @priv: the driver's private data structure
++ * @fpga: the DATA-FPGA number (zero based)
++ */
++static dma_addr_t fpga_start_addr(struct fpga_device *priv, unsigned int fpga)
++{
++ return priv->phys_addr + 0x400000 + (0x80000 * fpga);
++}
++
++/**
++ * fpga_block_addr() - get the physical address of a correlation data block
++ * @priv: the driver's private data structure
++ * @fpga: the DATA-FPGA number (zero based)
++ * @blknum: the correlation block number (zero based)
++ */
++static dma_addr_t fpga_block_addr(struct fpga_device *priv, unsigned int fpga,
++ unsigned int blknum)
++{
++ return fpga_start_addr(priv, fpga) + (0x10000 * (1 + blknum));
++}
++
++#define REG_BLOCK_SIZE (32 * 4)
++
++/**
++ * data_setup_corl_table() - create the scatterlist for correlation dumps
++ * @priv: the driver's private data structure
++ *
++ * Create the scatterlist for transferring a correlation dump from the
++ * DATA FPGAs. This structure will be reused for each buffer than needs
++ * to be filled with correlation data.
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_setup_corl_table(struct fpga_device *priv)
++{
++ struct sg_table *table = &priv->corl_table;
++ struct scatterlist *sg;
++ struct fpga_info *info;
++ int i, j, ret;
++
++ /* Calculate the number of entries needed */
++ priv->corl_nents = (1 + NUM_FPGA) * REG_BLOCK_SIZE;
++ for (i = 0; i < NUM_FPGA; i++)
++ priv->corl_nents += priv->info[i].num_lag_ram;
++
++ /* Allocate the scatterlist table */
++ ret = sg_alloc_table(table, priv->corl_nents, GFP_KERNEL);
++ if (ret) {
++ dev_err(priv->dev, "unable to allocate DMA table\n");
++ return ret;
++ }
++
++ /* Add the DATA FPGA registers to the scatterlist */
++ sg = table->sgl;
++ for (i = 0; i < NUM_FPGA; i++) {
++ sg_dma_address(sg) = fpga_start_addr(priv, i);
++ sg_dma_len(sg) = REG_BLOCK_SIZE;
++ sg = sg_next(sg);
++ }
++
++ /* Add the SYS-FPGA registers to the scatterlist */
++ sg_dma_address(sg) = SYS_FPGA_BLOCK;
++ sg_dma_len(sg) = REG_BLOCK_SIZE;
++ sg = sg_next(sg);
++
++ /* Add the FPGA correlation data blocks to the scatterlist */
++ for (i = 0; i < NUM_FPGA; i++) {
++ info = &priv->info[i];
++ for (j = 0; j < info->num_lag_ram; j++) {
++ sg_dma_address(sg) = fpga_block_addr(priv, i, j);
++ sg_dma_len(sg) = info->blk_size;
++ sg = sg_next(sg);
++ }
++ }
++
++ /*
++ * All physical addresses and lengths are present in the structure
++ * now. It can be reused for every FPGA DATA interrupt
++ */
++ return 0;
++}
++
++/*
++ * FPGA Register Access Helpers
++ */
++
++static void fpga_write_reg(struct fpga_device *priv, unsigned int fpga,
++ unsigned int reg, u32 val)
++{
++ const int fpga_start = DATA_FPGA_START + (fpga * DATA_FPGA_SIZE);
++ iowrite32be(val, priv->regs + fpga_start + reg);
++}
++
++static u32 fpga_read_reg(struct fpga_device *priv, unsigned int fpga,
++ unsigned int reg)
++{
++ const int fpga_start = DATA_FPGA_START + (fpga * DATA_FPGA_SIZE);
++ return ioread32be(priv->regs + fpga_start + reg);
++}
++
++/**
++ * data_calculate_bufsize() - calculate the data buffer size required
++ * @priv: the driver's private data structure
++ *
++ * Calculate the total buffer size needed to hold a single block
++ * of correlation data
++ *
++ * CONTEXT: user
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_calculate_bufsize(struct fpga_device *priv)
++{
++ u32 num_corl, num_lags, num_meta, num_qcnt, num_pack;
++ u32 conf1, conf2, version;
++ u32 num_lag_ram, blk_size;
++ int i;
++
++ /* Each buffer starts with the 5 FPGA register areas */
++ priv->bufsize = (1 + NUM_FPGA) * REG_BLOCK_SIZE;
++
++ /* Read and store the configuration data for each FPGA */
++ for (i = 0; i < NUM_FPGA; i++) {
++ version = fpga_read_reg(priv, i, MMAP_REG_VERSION);
++ conf1 = fpga_read_reg(priv, i, MMAP_REG_CORL_CONF1);
++ conf2 = fpga_read_reg(priv, i, MMAP_REG_CORL_CONF2);
++
++ /* minor version 2 and later */
++ if ((version & 0x000000FF) >= 2) {
++ num_corl = (conf1 & 0x000000F0) >> 4;
++ num_pack = (conf1 & 0x00000F00) >> 8;
++ num_lags = (conf1 & 0x00FFF000) >> 12;
++ num_meta = (conf1 & 0x7F000000) >> 24;
++ num_qcnt = (conf2 & 0x00000FFF) >> 0;
++ } else {
++ num_corl = (conf1 & 0x000000F0) >> 4;
++ num_pack = 1; /* implied */
++ num_lags = (conf1 & 0x000FFF00) >> 8;
++ num_meta = (conf1 & 0x7FF00000) >> 20;
++ num_qcnt = (conf2 & 0x00000FFF) >> 0;
++ }
++
++ num_lag_ram = (num_corl + num_pack - 1) / num_pack;
++ blk_size = ((num_pack * num_lags) + num_meta + num_qcnt) * 8;
++
++ priv->info[i].num_lag_ram = num_lag_ram;
++ priv->info[i].blk_size = blk_size;
++ priv->bufsize += num_lag_ram * blk_size;
++
++ dev_dbg(priv->dev, "FPGA %d NUM_CORL: %d\n", i, num_corl);
++ dev_dbg(priv->dev, "FPGA %d NUM_PACK: %d\n", i, num_pack);
++ dev_dbg(priv->dev, "FPGA %d NUM_LAGS: %d\n", i, num_lags);
++ dev_dbg(priv->dev, "FPGA %d NUM_META: %d\n", i, num_meta);
++ dev_dbg(priv->dev, "FPGA %d NUM_QCNT: %d\n", i, num_qcnt);
++ dev_dbg(priv->dev, "FPGA %d BLK_SIZE: %d\n", i, blk_size);
++ }
++
++ dev_dbg(priv->dev, "TOTAL BUFFER SIZE: %zu bytes\n", priv->bufsize);
++ return 0;
++}
++
++/*
++ * Interrupt Handling
++ */
++
++/**
++ * data_disable_interrupts() - stop the device from generating interrupts
++ * @priv: the driver's private data structure
++ *
++ * Hide interrupts by switching to GPIO interrupt source
++ *
++ * LOCKING: must hold dev->lock
++ */
++static void data_disable_interrupts(struct fpga_device *priv)
++{
++ /* hide the interrupt by switching the IRQ driver to GPIO */
++ iowrite32be(0x2F, priv->regs + SYS_IRQ_SOURCE_CTL);
++}
++
++/**
++ * data_enable_interrupts() - allow the device to generate interrupts
++ * @priv: the driver's private data structure
++ *
++ * Unhide interrupts by switching to the FPGA interrupt source. At the
++ * same time, clear the DATA-FPGA status registers.
++ *
++ * LOCKING: must hold dev->lock
++ */
++static void data_enable_interrupts(struct fpga_device *priv)
++{
++ /* clear the actual FPGA corl_done interrupt */
++ fpga_write_reg(priv, 0, MMAP_REG_STATUS, 0x0);
++ fpga_write_reg(priv, 1, MMAP_REG_STATUS, 0x0);
++ fpga_write_reg(priv, 2, MMAP_REG_STATUS, 0x0);
++ fpga_write_reg(priv, 3, MMAP_REG_STATUS, 0x0);
++
++ /* flush the writes */
++ fpga_read_reg(priv, 0, MMAP_REG_STATUS);
++
++ /* switch back to the external interrupt source */
++ iowrite32be(0x3F, priv->regs + SYS_IRQ_SOURCE_CTL);
++}
++
++/**
++ * data_dma_cb() - DMAEngine callback for DMA completion
++ * @data: the driver's private data structure
++ *
++ * Complete a DMA transfer from the DATA-FPGA's
++ *
++ * This is called via the DMA callback mechanism, and will handle moving the
++ * completed DMA transaction to the used list, and then wake any processes
++ * waiting for new data
++ *
++ * CONTEXT: any, softirq expected
++ */
++static void data_dma_cb(void *data)
++{
++ struct fpga_device *priv = data;
++ unsigned long flags;
++
++ spin_lock_irqsave(&priv->lock, flags);
++
++ /* If there is no inflight buffer, we've got a bug */
++ BUG_ON(priv->inflight == NULL);
++
++ /* Move the inflight buffer onto the used list */
++ list_move_tail(&priv->inflight->entry, &priv->used);
++ priv->inflight = NULL;
++
++ /* clear the FPGA status and re-enable interrupts */
++ data_enable_interrupts(priv);
++
++ spin_unlock_irqrestore(&priv->lock, flags);
++
++ /*
++ * We've changed both the inflight and used lists, so we need
++ * to wake up any processes that are blocking for those events
++ */
++ wake_up(&priv->wait);
++}
++
++/**
++ * data_submit_dma() - prepare and submit the required DMA to fill a buffer
++ * @priv: the driver's private data structure
++ * @buf: the data buffer
++ *
++ * Prepare and submit the necessary DMA transactions to fill a correlation
++ * data buffer.
++ *
++ * LOCKING: must hold dev->lock
++ * CONTEXT: hardirq only
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf)
++{
++ struct scatterlist *dst_sg, *src_sg;
++ unsigned int dst_nents, src_nents;
++ struct dma_chan *chan = priv->chan;
++ struct dma_async_tx_descriptor *tx;
++ dma_cookie_t cookie;
++ dma_addr_t dst, src;
++
++ dst_sg = buf->vb.sglist;
++ dst_nents = buf->vb.sglen;
++
++ src_sg = priv->corl_table.sgl;
++ src_nents = priv->corl_nents;
++
++ /*
++ * All buffers passed to this function should be ready and mapped
++ * for DMA already. Therefore, we don't need to do anything except
++ * submit it to the Freescale DMA Engine for processing
++ */
++
++ /* setup the scatterlist to scatterlist transfer */
++ tx = chan->device->device_prep_dma_sg(chan,
++ dst_sg, dst_nents,
++ src_sg, src_nents,
++ 0);
++ if (!tx) {
++ dev_err(priv->dev, "unable to prep scatterlist DMA\n");
++ return -ENOMEM;
++ }
++
++ /* submit the transaction to the DMA controller */
++ cookie = tx->tx_submit(tx);
++ if (dma_submit_error(cookie)) {
++ dev_err(priv->dev, "unable to submit scatterlist DMA\n");
++ return -ENOMEM;
++ }
++
++ /* Prepare the re-read of the SYS-FPGA block */
++ dst = sg_dma_address(dst_sg) + (NUM_FPGA * REG_BLOCK_SIZE);
++ src = SYS_FPGA_BLOCK;
++ tx = chan->device->device_prep_dma_memcpy(chan, dst, src,
++ REG_BLOCK_SIZE,
++ DMA_PREP_INTERRUPT);
++ if (!tx) {
++ dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");
++ return -ENOMEM;
++ }
++
++ /* Setup the callback */
++ tx->callback = data_dma_cb;
++ tx->callback_param = priv;
++
++ /* submit the transaction to the DMA controller */
++ cookie = tx->tx_submit(tx);
++ if (dma_submit_error(cookie)) {
++ dev_err(priv->dev, "unable to submit SYS-FPGA DMA\n");
++ return -ENOMEM;
++ }
++
++ return 0;
++}
++
++#define CORL_DONE 0x1
++#define CORL_ERR 0x2
++
++static irqreturn_t data_irq(int irq, void *dev_id)
++{
++ struct fpga_device *priv = dev_id;
++ bool submitted = false;
++ struct data_buf *buf;
++ u32 status;
++ int i;
++
++ /* detect spurious interrupts via FPGA status */
++ for (i = 0; i < 4; i++) {
++ status = fpga_read_reg(priv, i, MMAP_REG_STATUS);
++ if (!(status & (CORL_DONE | CORL_ERR))) {
++ dev_err(priv->dev, "spurious irq detected (FPGA)\n");
++ return IRQ_NONE;
++ }
++ }
++
++ /* detect spurious interrupts via raw IRQ pin readback */
++ status = ioread32be(priv->regs + SYS_IRQ_INPUT_DATA);
++ if (status & IRQ_CORL_DONE) {
++ dev_err(priv->dev, "spurious irq detected (IRQ)\n");
++ return IRQ_NONE;
++ }
++
++ spin_lock(&priv->lock);
++
++ /* hide the interrupt by switching the IRQ driver to GPIO */
++ data_disable_interrupts(priv);
++
++ /* If there are no free buffers, drop this data */
++ if (list_empty(&priv->free)) {
++ priv->num_dropped++;
++ goto out;
++ }
++
++ buf = list_first_entry(&priv->free, struct data_buf, entry);
++ list_del_init(&buf->entry);
++ BUG_ON(buf->size != priv->bufsize);
++
++ /* Submit a DMA transfer to get the correlation data */
++ if (data_submit_dma(priv, buf)) {
++ dev_err(priv->dev, "Unable to setup DMA transfer\n");
++ list_move_tail(&buf->entry, &priv->free);
++ goto out;
++ }
++
++ /* Save the buffer for the DMA callback */
++ priv->inflight = buf;
++ submitted = true;
++
++ /* Start the DMA Engine */
++ dma_async_memcpy_issue_pending(priv->chan);
++
++out:
++ /* If no DMA was submitted, re-enable interrupts */
++ if (!submitted)
++ data_enable_interrupts(priv);
++
++ spin_unlock(&priv->lock);
++ return IRQ_HANDLED;
++}
++
++/*
++ * Realtime Device Enable Helpers
++ */
++
++/**
++ * data_device_enable() - enable the device for buffered dumping
++ * @priv: the driver's private data structure
++ *
++ * Enable the device for buffered dumping. Allocates buffers and hooks up
++ * the interrupt handler. When this finishes, data will come pouring in.
++ *
++ * LOCKING: must hold dev->mutex
++ * CONTEXT: user context only
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_device_enable(struct fpga_device *priv)
++{
++ u32 val;
++ int ret;
++
++ /* multiple enables are safe: they do nothing */
++ if (priv->enabled)
++ return 0;
++
++ /* check that the FPGAs are programmed */
++ val = ioread32be(priv->regs + SYS_FPGA_CONFIG_STATUS);
++ if (!(val & (1 << 18))) {
++ dev_err(priv->dev, "DATA-FPGAs are not enabled\n");
++ return -ENODATA;
++ }
++
++ /* read the FPGAs to calculate the buffer size */
++ ret = data_calculate_bufsize(priv);
++ if (ret) {
++ dev_err(priv->dev, "unable to calculate buffer size\n");
++ goto out_error;
++ }
++
++ /* allocate the correlation data buffers */
++ ret = data_alloc_buffers(priv);
++ if (ret) {
++ dev_err(priv->dev, "unable to allocate buffers\n");
++ goto out_error;
++ }
++
++ /* setup the source scatterlist for dumping correlation data */
++ ret = data_setup_corl_table(priv);
++ if (ret) {
++ dev_err(priv->dev, "unable to setup correlation DMA table\n");
++ goto out_error;
++ }
++
++ /* hookup the irq handler */
++ ret = request_irq(priv->irq, data_irq, IRQF_SHARED, drv_name, priv);
++ if (ret) {
++ dev_err(priv->dev, "unable to request IRQ handler\n");
++ goto out_error;
++ }
++
++ /* switch to the external FPGA IRQ line */
++ data_enable_interrupts(priv);
++
++ /* success, we're enabled */
++ priv->enabled = true;
++ return 0;
++
++out_error:
++ sg_free_table(&priv->corl_table);
++ priv->corl_nents = 0;
++
++ data_free_buffers(priv);
++ return ret;
++}
++
++/**
++ * data_device_disable() - disable the device for buffered dumping
++ * @priv: the driver's private data structure
++ *
++ * Disable the device for buffered dumping. Stops new DMA transactions from
++ * being generated, waits for all outstanding DMA to complete, and then frees
++ * all buffers.
++ *
++ * LOCKING: must hold dev->mutex
++ * CONTEXT: user only
++ *
++ * Returns 0 on success, -ERRNO otherwise
++ */
++static int data_device_disable(struct fpga_device *priv)
++{
++ int ret;
++
++ /* allow multiple disable */
++ if (!priv->enabled)
++ return 0;
++
++ /* switch to the internal GPIO IRQ line */
++ data_disable_interrupts(priv);
++
++ /* unhook the irq handler */
++ free_irq(priv->irq, priv);
++
++ /*
++ * wait for all outstanding DMA to complete
++ *
++ * Device interrupts are disabled, therefore another buffer cannot
++ * be marked inflight.
++ */
++ ret = wait_event_interruptible(priv->wait, priv->inflight == NULL);
++ if (ret)
++ return ret;
++
++ /* free the correlation table */
++ sg_free_table(&priv->corl_table);
++ priv->corl_nents = 0;
++
++ /*
++ * We are taking the spinlock not to protect priv->enabled, but instead
++ * to make sure that there are no readers in the process of altering
++ * the free or used lists while we are setting this flag.
++ */
++ spin_lock_irq(&priv->lock);
++ priv->enabled = false;
++ spin_unlock_irq(&priv->lock);
++
++ /* free all buffers: the free and used lists are not being changed */
++ data_free_buffers(priv);
++ return 0;
++}
++
++/*
++ * DEBUGFS Interface
++ */
++#ifdef CONFIG_DEBUG_FS
++
++/*
++ * Count the number of entries in the given list
++ */
++static unsigned int list_num_entries(struct list_head *list)
++{
++ struct list_head *entry;
++ unsigned int ret = 0;
++
++ list_for_each(entry, list)
++ ret++;
++
++ return ret;
++}
++
++static int data_debug_show(struct seq_file *f, void *offset)
++{
++ struct fpga_device *priv = f->private;
++ int ret;
++
++ /*
++ * Lock the mutex first, so that we get an accurate value for enable
++ * Lock the spinlock next, to get accurate list counts
++ */
++ ret = mutex_lock_interruptible(&priv->mutex);
++ if (ret)
++ return ret;
++
++ spin_lock_irq(&priv->lock);
++
++ seq_printf(f, "enabled: %d\n", priv->enabled);
++ seq_printf(f, "bufsize: %d\n", priv->bufsize);
++ seq_printf(f, "num_buffers: %d\n", priv->num_buffers);
++ seq_printf(f, "num_free: %d\n", list_num_entries(&priv->free));
++ seq_printf(f, "inflight: %d\n", priv->inflight != NULL);
++ seq_printf(f, "num_used: %d\n", list_num_entries(&priv->used));
++ seq_printf(f, "num_dropped: %d\n", priv->num_dropped);
++
++ spin_unlock_irq(&priv->lock);
++ mutex_unlock(&priv->mutex);
++ return 0;
++}
++
++static int data_debug_open(struct inode *inode, struct file *file)
++{
++ return single_open(file, data_debug_show, inode->i_private);
++}
++
++static const struct file_operations data_debug_fops = {
++ .owner = THIS_MODULE,
++ .open = data_debug_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
++static int data_debugfs_init(struct fpga_device *priv)
++{
++ priv->dbg_entry = debugfs_create_file(drv_name, S_IRUGO, NULL, priv,
++ &data_debug_fops);
++ if (IS_ERR(priv->dbg_entry))
++ return PTR_ERR(priv->dbg_entry);
++
++ return 0;
++}
++
++static void data_debugfs_exit(struct fpga_device *priv)
++{
++ debugfs_remove(priv->dbg_entry);
++}
++
++#else
++
++static inline int data_debugfs_init(struct fpga_device *priv)
++{
++ return 0;
++}
++
++static inline void data_debugfs_exit(struct fpga_device *priv)
++{
++}
++
++#endif /* CONFIG_DEBUG_FS */
++
++/*
++ * SYSFS Attributes
++ */
++
++static ssize_t data_en_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct fpga_device *priv = dev_get_drvdata(dev);
++ return snprintf(buf, PAGE_SIZE, "%u\n", priv->enabled);
++}
++
++static ssize_t data_en_set(struct device *dev, struct device_attribute *attr,
++ const char *buf, size_t count)
++{
++ struct fpga_device *priv = dev_get_drvdata(dev);
++ unsigned long enable;
++ int ret;
++
++ ret = strict_strtoul(buf, 0, &enable);
++ if (ret) {
++ dev_err(priv->dev, "unable to parse enable input\n");
++ return -EINVAL;
++ }
++
++ ret = mutex_lock_interruptible(&priv->mutex);
++ if (ret)
++ return ret;
++
++ if (enable)
++ ret = data_device_enable(priv);
++ else
++ ret = data_device_disable(priv);
++
++ if (ret) {
++ dev_err(priv->dev, "device %s failed\n",
++ enable ? "enable" : "disable");
++ count = ret;
++ goto out_unlock;
++ }
++
++out_unlock:
++ mutex_unlock(&priv->mutex);
++ return count;
++}
++
++static DEVICE_ATTR(enable, S_IWUSR | S_IRUGO, data_en_show, data_en_set);
++
++static struct attribute *data_sysfs_attrs[] = {
++ &dev_attr_enable.attr,
++ NULL,
++};
++
++static const struct attribute_group rt_sysfs_attr_group = {
++ .attrs = data_sysfs_attrs,
++};
++
++/*
++ * FPGA Realtime Data Character Device
++ */
++
++static int data_open(struct inode *inode, struct file *filp)
++{
++ /*
++ * The miscdevice layer puts our struct miscdevice into the
++ * filp->private_data field. We use this to find our private
++ * data and then overwrite it with our own private structure.
++ */
++ struct fpga_device *priv = container_of(filp->private_data,
++ struct fpga_device, miscdev);
++ struct fpga_reader *reader;
++ int ret;
++
++ /* allocate private data */
++ reader = kzalloc(sizeof(*reader), GFP_KERNEL);
++ if (!reader)
++ return -ENOMEM;
++
++ reader->priv = priv;
++ reader->buf = NULL;
++
++ filp->private_data = reader;
++ ret = nonseekable_open(inode, filp);
++ if (ret) {
++ dev_err(priv->dev, "nonseekable-open failed\n");
++ kfree(reader);
++ return ret;
++ }
++
++ /*
++ * success, increase the reference count of the private data structure
++ * so that it doesn't disappear if the device is unbound
++ */
++ kref_get(&priv->ref);
++ return 0;
++}
++
++static int data_release(struct inode *inode, struct file *filp)
++{
++ struct fpga_reader *reader = filp->private_data;
++ struct fpga_device *priv = reader->priv;
++
++ /* free the per-reader structure */
++ data_free_buffer(reader->buf);
++ kfree(reader);
++ filp->private_data = NULL;
++
++ /* decrement our reference count to the private data */
++ kref_put(&priv->ref, fpga_device_release);
++ return 0;
++}
++
++static ssize_t data_read(struct file *filp, char __user *ubuf, size_t count,
++ loff_t *f_pos)
++{
++ struct fpga_reader *reader = filp->private_data;
++ struct fpga_device *priv = reader->priv;
++ struct list_head *used = &priv->used;
++ struct data_buf *dbuf;
++ size_t avail;
++ void *data;
++ int ret;
++
++ /* check if we already have a partial buffer */
++ if (reader->buf) {
++ dbuf = reader->buf;
++ goto have_buffer;
++ }
++
++ spin_lock_irq(&priv->lock);
++
++ /* Block until there is at least one buffer on the used list */
++ while (list_empty(used)) {
++ spin_unlock_irq(&priv->lock);
++
++ if (filp->f_flags & O_NONBLOCK)
++ return -EAGAIN;
++
++ ret = wait_event_interruptible(priv->wait, !list_empty(used));
++ if (ret)
++ return ret;
++
++ spin_lock_irq(&priv->lock);
++ }
++
++ /* Grab the first buffer off of the used list */
++ dbuf = list_first_entry(used, struct data_buf, entry);
++ list_del_init(&dbuf->entry);
++
++ spin_unlock_irq(&priv->lock);
++
++ /* Buffers are always mapped: unmap it */
++ videobuf_dma_unmap(priv->dev, &dbuf->vb);
++
++ /* save the buffer for later */
++ reader->buf = dbuf;
++ reader->buf_start = 0;
++
++have_buffer:
++ /* Get the number of bytes available */
++ avail = dbuf->size - reader->buf_start;
++ data = dbuf->vb.vaddr + reader->buf_start;
++
++ /* Get the number of bytes we can transfer */
++ count = min(count, avail);
++
++ /* Copy the data to the userspace buffer */
++ if (copy_to_user(ubuf, data, count))
++ return -EFAULT;
++
++ /* Update the amount of available space */
++ avail -= count;
++
++ /*
++ * If there is still some data available, save the buffer for the
++ * next userspace call to read() and return
++ */
++ if (avail > 0) {
++ reader->buf_start += count;
++ reader->buf = dbuf;
++ return count;
++ }
++
++ /*
++ * Get the buffer ready to be reused for DMA
++ *
++ * If it fails, we pretend that the read never happed and return
++ * -EFAULT to userspace. The read will be retried.
++ */
++ ret = videobuf_dma_map(priv->dev, &dbuf->vb);
++ if (ret) {
++ dev_err(priv->dev, "unable to remap buffer for DMA\n");
++ return -EFAULT;
++ }
++
++ /* Lock against concurrent enable/disable */
++ spin_lock_irq(&priv->lock);
++
++ /* the reader is finished with this buffer */
++ reader->buf = NULL;
++
++ /*
++ * One of two things has happened, the device is disabled, or the
++ * device has been reconfigured underneath us. In either case, we
++ * should just throw away the buffer.
++ */
++ if (!priv->enabled || dbuf->size != priv->bufsize) {
++ videobuf_dma_unmap(priv->dev, &dbuf->vb);
++ data_free_buffer(dbuf);
++ goto out_unlock;
++ }
++
++ /* The buffer is safe to reuse, so add it back to the free list */
++ list_add_tail(&dbuf->entry, &priv->free);
++
++out_unlock:
++ spin_unlock_irq(&priv->lock);
++ return count;
++}
++
++static unsigned int data_poll(struct file *filp, struct poll_table_struct *tbl)
++{
++ struct fpga_reader *reader = filp->private_data;
++ struct fpga_device *priv = reader->priv;
++ unsigned int mask = 0;
++
++ poll_wait(filp, &priv->wait, tbl);
++
++ if (!list_empty(&priv->used))
++ mask |= POLLIN | POLLRDNORM;
++
++ return mask;
++}
++
++static int data_mmap(struct file *filp, struct vm_area_struct *vma)
++{
++ struct fpga_reader *reader = filp->private_data;
++ struct fpga_device *priv = reader->priv;
++ unsigned long offset, vsize, psize, addr;
++
++ /* VMA properties */
++ offset = vma->vm_pgoff << PAGE_SHIFT;
++ vsize = vma->vm_end - vma->vm_start;
++ psize = priv->phys_size - offset;
++ addr = (priv->phys_addr + offset) >> PAGE_SHIFT;
++
++ /* Check against the FPGA region's physical memory size */
++ if (vsize > psize) {
++ dev_err(priv->dev, "requested mmap mapping too large\n");
++ return -EINVAL;
++ }
++
++ /* IO memory (stop cacheing) */
++ vma->vm_flags |= VM_IO | VM_RESERVED;
++ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
++
++ return io_remap_pfn_range(vma, vma->vm_start, addr, vsize,
++ vma->vm_page_prot);
++}
++
++static const struct file_operations data_fops = {
++ .owner = THIS_MODULE,
++ .open = data_open,
++ .release = data_release,
++ .read = data_read,
++ .poll = data_poll,
++ .mmap = data_mmap,
++ .llseek = no_llseek,
++};
++
++/*
++ * OpenFirmware Device Subsystem
++ */
++
++static bool dma_filter(struct dma_chan *chan, void *data)
++{
++ /*
++ * DMA Channel #0 is used for the FPGA Programmer, so ignore it
++ *
++ * This probably won't survive an unload/load cycle of the Freescale
++ * DMAEngine driver, but that won't be a problem
++ */
++ if (chan->chan_id == 0 && chan->device->dev_id == 0)
++ return false;
++
++ return true;
++}
++
++static int data_of_probe(struct platform_device *op,
++ const struct of_device_id *match)
++{
++ struct device_node *of_node = op->dev.of_node;
++ struct device *this_device;
++ struct fpga_device *priv;
++ struct resource res;
++ dma_cap_mask_t mask;
++ int ret;
++
++ /* Allocate private data */
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ if (!priv) {
++ dev_err(&op->dev, "Unable to allocate device private data\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ dev_set_drvdata(&op->dev, priv);
++ priv->dev = &op->dev;
++ kref_init(&priv->ref);
++ mutex_init(&priv->mutex);
++
++ dev_set_drvdata(priv->dev, priv);
++ spin_lock_init(&priv->lock);
++ INIT_LIST_HEAD(&priv->free);
++ INIT_LIST_HEAD(&priv->used);
++ init_waitqueue_head(&priv->wait);
++
++ /* Setup the misc device */
++ priv->miscdev.minor = MISC_DYNAMIC_MINOR;
++ priv->miscdev.name = drv_name;
++ priv->miscdev.fops = &data_fops;
++
++ /* Get the physical address of the FPGA registers */
++ ret = of_address_to_resource(of_node, 0, &res);
++ if (ret) {
++ dev_err(&op->dev, "Unable to find FPGA physical address\n");
++ ret = -ENODEV;
++ goto out_free_priv;
++ }
++
++ priv->phys_addr = res.start;
++ priv->phys_size = resource_size(&res);
++
++ /* ioremap the registers for use */
++ priv->regs = of_iomap(of_node, 0);
++ if (!priv->regs) {
++ dev_err(&op->dev, "Unable to ioremap registers\n");
++ ret = -ENOMEM;
++ goto out_free_priv;
++ }
++
++ dma_cap_zero(mask);
++ dma_cap_set(DMA_MEMCPY, mask);
++ dma_cap_set(DMA_INTERRUPT, mask);
++ dma_cap_set(DMA_SLAVE, mask);
++ dma_cap_set(DMA_SG, mask);
++
++ /* Request a DMA channel */
++ priv->chan = dma_request_channel(mask, dma_filter, NULL);
++ if (!priv->chan) {
++ dev_err(&op->dev, "Unable to request DMA channel\n");
++ ret = -ENODEV;
++ goto out_unmap_regs;
++ }
++
++ /* Find the correct IRQ number */
++ priv->irq = irq_of_parse_and_map(of_node, 0);
++ if (priv->irq == NO_IRQ) {
++ dev_err(&op->dev, "Unable to find IRQ line\n");
++ ret = -ENODEV;
++ goto out_release_dma;
++ }
++
++ /* Drive the GPIO for FPGA IRQ high (no interrupt) */
++ iowrite32be(IRQ_CORL_DONE, priv->regs + SYS_IRQ_OUTPUT_DATA);
++
++ /* Register the miscdevice */
++ ret = misc_register(&priv->miscdev);
++ if (ret) {
++ dev_err(&op->dev, "Unable to register miscdevice\n");
++ goto out_irq_dispose_mapping;
++ }
++
++ /* Create the debugfs files */
++ ret = data_debugfs_init(priv);
++ if (ret) {
++ dev_err(&op->dev, "Unable to create debugfs files\n");
++ goto out_misc_deregister;
++ }
++
++ /* Create the sysfs files */
++ this_device = priv->miscdev.this_device;
++ dev_set_drvdata(this_device, priv);
++ ret = sysfs_create_group(&this_device->kobj, &rt_sysfs_attr_group);
++ if (ret) {
++ dev_err(&op->dev, "Unable to create sysfs files\n");
++ goto out_data_debugfs_exit;
++ }
++
++ dev_info(&op->dev, "CARMA FPGA Realtime Data Driver Loaded\n");
++ return 0;
++
++out_data_debugfs_exit:
++ data_debugfs_exit(priv);
++out_misc_deregister:
++ misc_deregister(&priv->miscdev);
++out_irq_dispose_mapping:
++ irq_dispose_mapping(priv->irq);
++out_release_dma:
++ dma_release_channel(priv->chan);
++out_unmap_regs:
++ iounmap(priv->regs);
++out_free_priv:
++ kref_put(&priv->ref, fpga_device_release);
++out_return:
++ return ret;
++}
++
++static int data_of_remove(struct platform_device *op)
++{
++ struct fpga_device *priv = dev_get_drvdata(&op->dev);
++ struct device *this_device = priv->miscdev.this_device;
++
++ /* remove all sysfs files, now the device cannot be re-enabled */
++ sysfs_remove_group(&this_device->kobj, &rt_sysfs_attr_group);
++
++ /* remove all debugfs files */
++ data_debugfs_exit(priv);
++
++ /* disable the device from generating data */
++ data_device_disable(priv);
++
++ /* remove the character device to stop new readers from appearing */
++ misc_deregister(&priv->miscdev);
++
++ /* cleanup everything not needed by readers */
++ irq_dispose_mapping(priv->irq);
++ dma_release_channel(priv->chan);
++ iounmap(priv->regs);
++
++ /* release our reference */
++ kref_put(&priv->ref, fpga_device_release);
++ return 0;
++}
++
++static struct of_device_id data_of_match[] = {
++ { .compatible = "carma,carma-fpga", },
++ {},
++};
++
++static struct of_platform_driver data_of_driver = {
++ .probe = data_of_probe,
++ .remove = data_of_remove,
++ .driver = {
++ .name = drv_name,
++ .of_match_table = data_of_match,
++ .owner = THIS_MODULE,
++ },
++};
++
++/*
++ * Module Init / Exit
++ */
++
++static int __init data_init(void)
++{
++ return of_register_platform_driver(&data_of_driver);
++}
++
++static void __exit data_exit(void)
++{
++ of_unregister_platform_driver(&data_of_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("CARMA DATA-FPGA Access Driver");
++MODULE_LICENSE("GPL");
++
++module_init(data_init);
++module_exit(data_exit);commit 8faa7cf828bca1745a4ed599876567f5afc47544
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu Apr 7 10:33:03 2011 -0700
+
+ dt/fsldma: fix build warning caused by of_platform_device changes
+
+ Commit 000061245a6797d542854106463b6b20fbdcb12e, "dt/powerpc:
+ Eliminate users of of_platform_{,un}register_driver" forgot to convert
+ the type of structure passed into platform_device_register() when it
+ was converted from of_platform_device_register. Fix it.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 6b396759e7f5..8a781540590c 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -1448,7 +1448,7 @@ static const struct of_device_id fsldma_of_ids[] = {
+ {}
+ };
+
+-static struct of_platform_driver fsldma_of_driver = {
++static struct platform_driver fsldma_of_driver = {
+ .driver = {
+ .name = "fsl-elo-dma",
+ .owner = THIS_MODULE,commit a00ae34ac8bc8a5897d9b6b9b685c39b955b14b9
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:55:01 2011 +0000
+
+ fsldma: make halt behave nicely on all supported controllers
+
+ The original dma_halt() function set the CA (channel abort) bit on both
+ the 83xx and 85xx controllers. This is incorrect on the 83xx, where this
+ bit means TEM (transfer error mask) instead. The 83xx doesn't support
+ channel abort, so we only do this operation on 85xx.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index d300de456c90..8670a5012122 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -221,13 +221,26 @@ static void dma_halt(struct fsldma_chan *chan)
+ u32 mode;
+ int i;
+
++ /* read the mode register */
+ mode = DMA_IN(chan, &chan->regs->mr, 32);
+- mode |= FSL_DMA_MR_CA;
+- DMA_OUT(chan, &chan->regs->mr, mode, 32);
+
+- mode &= ~(FSL_DMA_MR_CS | FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA);
++ /*
++ * The 85xx controller supports channel abort, which will stop
++ * the current transfer. On 83xx, this bit is the transfer error
++ * mask bit, which should not be changed.
++ */
++ if ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
++ mode |= FSL_DMA_MR_CA;
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
++
++ mode &= ~FSL_DMA_MR_CA;
++ }
++
++ /* stop the DMA controller */
++ mode &= ~(FSL_DMA_MR_CS | FSL_DMA_MR_EMS_EN);
+ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+
++ /* wait for the DMA controller to become idle */
+ for (i = 0; i < 100; i++) {
+ if (dma_is_idle(chan))
+ return;commit dc8d4091575ba81e886ebcdfd1e559c981f82f86
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:55:00 2011 +0000
+
+ fsldma: reduce locking during descriptor cleanup
+
+ This merges the fsl_chan_ld_cleanup() function into the dma_do_tasklet()
+ function to reduce locking overhead. In the best case, we will be able
+ to keep the DMA controller busy while we are freeing used descriptors.
+ In all cases, the spinlock is grabbed two times fewer than before on
+ each transaction.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 526579df6033..d300de456c90 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -881,66 +881,16 @@ static void fsldma_cleanup_descriptor(struct fsldma_chan *chan,
+ dma_pool_free(chan->desc_pool, desc, txd->phys);
+ }
+
+-/**
+- * fsl_chan_ld_cleanup - Clean up link descriptors
+- * @chan : Freescale DMA channel
+- *
+- * This function is run after the queue of running descriptors has been
+- * executed by the DMA engine. It will run any callbacks, and then free
+- * the descriptors.
+- *
+- * HARDWARE STATE: idle
+- */
+-static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+-{
+- struct fsl_desc_sw *desc, *_desc;
+- LIST_HEAD(ld_cleanup);
+- unsigned long flags;
+-
+- spin_lock_irqsave(&chan->desc_lock, flags);
+-
+- /* update the cookie if we have some descriptors to cleanup */
+- if (!list_empty(&chan->ld_running)) {
+- dma_cookie_t cookie;
+-
+- desc = to_fsl_desc(chan->ld_running.prev);
+- cookie = desc->async_tx.cookie;
+-
+- chan->completed_cookie = cookie;
+- chan_dbg(chan, "completed cookie=%d\n", cookie);
+- }
+-
+- /*
+- * move the descriptors to a temporary list so we can drop the lock
+- * during the entire cleanup operation
+- */
+- list_splice_tail_init(&chan->ld_running, &ld_cleanup);
+-
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+-
+- /* Run the callback for each descriptor, in order */
+- list_for_each_entry_safe(desc, _desc, &ld_cleanup, node) {
+-
+- /* Remove from the list of transactions */
+- list_del(&desc->node);
+-
+- /* Run all cleanup for this descriptor */
+- fsldma_cleanup_descriptor(chan, desc);
+- }
+-}
+-
+ /**
+ * fsl_chan_xfer_ld_queue - transfer any pending transactions
+ * @chan : Freescale DMA channel
+ *
+ * HARDWARE STATE: idle
++ * LOCKING: must hold chan->desc_lock
+ */
+ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ {
+ struct fsl_desc_sw *desc;
+- unsigned long flags;
+-
+- spin_lock_irqsave(&chan->desc_lock, flags);
+
+ /*
+ * If the list of pending descriptors is empty, then we
+@@ -948,7 +898,7 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ */
+ if (list_empty(&chan->ld_pending)) {
+ chan_dbg(chan, "no pending LDs\n");
+- goto out_unlock;
++ return;
+ }
+
+ /*
+@@ -958,7 +908,7 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ */
+ if (!chan->idle) {
+ chan_dbg(chan, "DMA controller still busy\n");
+- goto out_unlock;
++ return;
+ }
+
+ /*
+@@ -996,9 +946,6 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+
+ dma_start(chan);
+ chan->idle = false;
+-
+-out_unlock:
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+@@ -1008,7 +955,11 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ static void fsl_dma_memcpy_issue_pending(struct dma_chan *dchan)
+ {
+ struct fsldma_chan *chan = to_fsl_chan(dchan);
++ unsigned long flags;
++
++ spin_lock_irqsave(&chan->desc_lock, flags);
+ fsl_chan_xfer_ld_queue(chan);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+@@ -1109,20 +1060,53 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ static void dma_do_tasklet(unsigned long data)
+ {
+ struct fsldma_chan *chan = (struct fsldma_chan *)data;
++ struct fsl_desc_sw *desc, *_desc;
++ LIST_HEAD(ld_cleanup);
+ unsigned long flags;
+
+ chan_dbg(chan, "tasklet entry\n");
+
+- /* run all callbacks, free all used descriptors */
+- fsl_chan_ld_cleanup(chan);
+-
+- /* the channel is now idle */
+ spin_lock_irqsave(&chan->desc_lock, flags);
++
++ /* update the cookie if we have some descriptors to cleanup */
++ if (!list_empty(&chan->ld_running)) {
++ dma_cookie_t cookie;
++
++ desc = to_fsl_desc(chan->ld_running.prev);
++ cookie = desc->async_tx.cookie;
++
++ chan->completed_cookie = cookie;
++ chan_dbg(chan, "completed_cookie=%d\n", cookie);
++ }
++
++ /*
++ * move the descriptors to a temporary list so we can drop the lock
++ * during the entire cleanup operation
++ */
++ list_splice_tail_init(&chan->ld_running, &ld_cleanup);
++
++ /* the hardware is now idle and ready for more */
+ chan->idle = true;
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+
+- /* start any pending transactions automatically */
++ /*
++ * Start any pending transactions automatically
++ *
++ * In the ideal case, we keep the DMA controller busy while we go
++ * ahead and free the descriptors below.
++ */
+ fsl_chan_xfer_ld_queue(chan);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++
++ /* Run the callback for each descriptor, in order */
++ list_for_each_entry_safe(desc, _desc, &ld_cleanup, node) {
++
++ /* Remove from the list of transactions */
++ list_del(&desc->node);
++
++ /* Run all cleanup for this descriptor */
++ fsldma_cleanup_descriptor(chan, desc);
++ }
++
+ chan_dbg(chan, "tasklet exit\n");
+ }
+
+ commit 9c4d1e7bdeb1ed4dc0c3341d40662a6fbc5f2dc2
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:59 2011 +0000
+
+ fsldma: support async_tx dependencies and automatic unmapping
+
+ Previous to this patch, the dma_run_dependencies() function has been
+ called while holding desc_lock. This function can call tx_submit() for
+ other descriptors, which may try to re-grab the lock. Avoid this by
+ moving the descriptors to be cleaned up to a temporary list, and
+ dropping the lock before cleanup.
+
+ At the same time, add support for automatic unmapping of src and dst
+ buffers, as offered by the DMAEngine API.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 6e9ad6edc4af..526579df6033 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -83,6 +83,11 @@ static void set_desc_cnt(struct fsldma_chan *chan,
+ hw->count = CPU_TO_DMA(chan, count, 32);
+ }
+
++static u32 get_desc_cnt(struct fsldma_chan *chan, struct fsl_desc_sw *desc)
++{
++ return DMA_TO_CPU(chan, desc->hw.count, 32);
++}
++
+ static void set_desc_src(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t src)
+ {
+@@ -93,6 +98,16 @@ static void set_desc_src(struct fsldma_chan *chan,
+ hw->src_addr = CPU_TO_DMA(chan, snoop_bits | src, 64);
+ }
+
++static dma_addr_t get_desc_src(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
++{
++ u64 snoop_bits;
++
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
++ ? ((u64)FSL_DMA_SATR_SREADTYPE_SNOOP_READ << 32) : 0;
++ return DMA_TO_CPU(chan, desc->hw.src_addr, 64) & ~snoop_bits;
++}
++
+ static void set_desc_dst(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t dst)
+ {
+@@ -103,6 +118,16 @@ static void set_desc_dst(struct fsldma_chan *chan,
+ hw->dst_addr = CPU_TO_DMA(chan, snoop_bits | dst, 64);
+ }
+
++static dma_addr_t get_desc_dst(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
++{
++ u64 snoop_bits;
++
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
++ ? ((u64)FSL_DMA_DATR_DWRITETYPE_SNOOP_WRITE << 32) : 0;
++ return DMA_TO_CPU(chan, desc->hw.dst_addr, 64) & ~snoop_bits;
++}
++
+ static void set_desc_next(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t next)
+ {
+@@ -805,6 +830,57 @@ static int fsl_dma_device_control(struct dma_chan *dchan,
+ return 0;
+ }
+
++/**
++ * fsldma_cleanup_descriptor - cleanup and free a single link descriptor
++ * @chan: Freescale DMA channel
++ * @desc: descriptor to cleanup and free
++ *
++ * This function is used on a descriptor which has been executed by the DMA
++ * controller. It will run any callbacks, submit any dependencies, and then
++ * free the descriptor.
++ */
++static void fsldma_cleanup_descriptor(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
++{
++ struct dma_async_tx_descriptor *txd = &desc->async_tx;
++ struct device *dev = chan->common.device->dev;
++ dma_addr_t src = get_desc_src(chan, desc);
++ dma_addr_t dst = get_desc_dst(chan, desc);
++ u32 len = get_desc_cnt(chan, desc);
++
++ /* Run the link descriptor callback function */
++ if (txd->callback) {
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p callback\n", desc);
++#endif
++ txd->callback(txd->callback_param);
++ }
++
++ /* Run any dependencies */
++ dma_run_dependencies(txd);
++
++ /* Unmap the dst buffer, if requested */
++ if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
++ if (txd->flags & DMA_COMPL_DEST_UNMAP_SINGLE)
++ dma_unmap_single(dev, dst, len, DMA_FROM_DEVICE);
++ else
++ dma_unmap_page(dev, dst, len, DMA_FROM_DEVICE);
++ }
++
++ /* Unmap the src buffer, if requested */
++ if (!(txd->flags & DMA_COMPL_SKIP_SRC_UNMAP)) {
++ if (txd->flags & DMA_COMPL_SRC_UNMAP_SINGLE)
++ dma_unmap_single(dev, src, len, DMA_TO_DEVICE);
++ else
++ dma_unmap_page(dev, src, len, DMA_TO_DEVICE);
++ }
++
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p free\n", desc);
++#endif
++ dma_pool_free(chan->desc_pool, desc, txd->phys);
++}
++
+ /**
+ * fsl_chan_ld_cleanup - Clean up link descriptors
+ * @chan : Freescale DMA channel
+@@ -818,56 +894,39 @@ static int fsl_dma_device_control(struct dma_chan *dchan,
+ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ {
+ struct fsl_desc_sw *desc, *_desc;
++ LIST_HEAD(ld_cleanup);
+ unsigned long flags;
+
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- /* if the ld_running list is empty, there is nothing to do */
+- if (list_empty(&chan->ld_running)) {
+- chan_dbg(chan, "no descriptors to cleanup\n");
+- goto out_unlock;
++ /* update the cookie if we have some descriptors to cleanup */
++ if (!list_empty(&chan->ld_running)) {
++ dma_cookie_t cookie;
++
++ desc = to_fsl_desc(chan->ld_running.prev);
++ cookie = desc->async_tx.cookie;
++
++ chan->completed_cookie = cookie;
++ chan_dbg(chan, "completed cookie=%d\n", cookie);
+ }
+
+ /*
+- * Get the last descriptor, update the cookie to it
+- *
+- * This is done before callbacks run so that clients can check the
+- * status of their DMA transfer inside the callback.
++ * move the descriptors to a temporary list so we can drop the lock
++ * during the entire cleanup operation
+ */
+- desc = to_fsl_desc(chan->ld_running.prev);
+- chan->completed_cookie = desc->async_tx.cookie;
+- chan_dbg(chan, "completed_cookie = %d\n", chan->completed_cookie);
++ list_splice_tail_init(&chan->ld_running, &ld_cleanup);
++
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+
+ /* Run the callback for each descriptor, in order */
+- list_for_each_entry_safe(desc, _desc, &chan->ld_running, node) {
+- dma_async_tx_callback callback;
+- void *callback_param;
++ list_for_each_entry_safe(desc, _desc, &ld_cleanup, node) {
+
+- /* Remove from the list of running transactions */
++ /* Remove from the list of transactions */
+ list_del(&desc->node);
+
+- /* Run the link descriptor callback function */
+- callback = desc->async_tx.callback;
+- callback_param = desc->async_tx.callback_param;
+- if (callback) {
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+-#ifdef FSL_DMA_LD_DEBUG
+- chan_dbg(chan, "LD %p callback\n", desc);
+-#endif
+- callback(callback_param);
+- spin_lock_irqsave(&chan->desc_lock, flags);
+- }
+-
+- /* Run any dependencies, then free the descriptor */
+- dma_run_dependencies(&desc->async_tx);
+-#ifdef FSL_DMA_LD_DEBUG
+- chan_dbg(chan, "LD %p free\n", desc);
+-#endif
+- dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
++ /* Run all cleanup for this descriptor */
++ fsldma_cleanup_descriptor(chan, desc);
+ }
+-
+-out_unlock:
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**commit f04cd40701deace2efb9edd7120e59366bda2118
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:58 2011 +0000
+
+ fsldma: fix controller lockups
+
+ Enabling poisoning in the dmapool API quickly showed that the DMA
+ controller was fetching descriptors that should not have been in use.
+ This has caused intermittent controller lockups during testing.
+
+ I have been unable to figure out the exact set of conditions which cause
+ this to happen. However, I believe it is related to the driver using the
+ hardware registers to track whether the controller is busy or not. The
+ code can incorrectly decide that the hardware is idle due to lag between
+ register writes and the hardware actually becoming busy.
+
+ To fix this, the driver has been reworked to explicitly track the state
+ of the hardware, rather than try to guess what it is doing based on the
+ register values.
+
+ This has passed dmatest with 10 threads per channel, 100000 iterations
+ per thread several times without error. Previously, this would fail
+ within a few seconds.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 5da1a4a817e3..6e9ad6edc4af 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -68,11 +68,6 @@ static dma_addr_t get_cdar(struct fsldma_chan *chan)
+ return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
+ }
+
+-static dma_addr_t get_ndar(struct fsldma_chan *chan)
+-{
+- return DMA_IN(chan, &chan->regs->ndar, 64);
+-}
+-
+ static u32 get_bcr(struct fsldma_chan *chan)
+ {
+ return DMA_IN(chan, &chan->regs->bcr, 32);
+@@ -143,13 +138,11 @@ static void dma_init(struct fsldma_chan *chan)
+ case FSL_DMA_IP_85XX:
+ /* Set the channel to below modes:
+ * EIE - Error interrupt enable
+- * EOSIE - End of segments interrupt enable (basic mode)
+ * EOLNIE - End of links interrupt enable
+ * BWC - Bandwidth sharing among channels
+ */
+ DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_BWC
+- | FSL_DMA_MR_EIE | FSL_DMA_MR_EOLNIE
+- | FSL_DMA_MR_EOSIE, 32);
++ | FSL_DMA_MR_EIE | FSL_DMA_MR_EOLNIE, 32);
+ break;
+ case FSL_DMA_IP_83XX:
+ /* Set the channel to below modes:
+@@ -168,25 +161,32 @@ static int dma_is_idle(struct fsldma_chan *chan)
+ return (!(sr & FSL_DMA_SR_CB)) || (sr & FSL_DMA_SR_CH);
+ }
+
++/*
++ * Start the DMA controller
++ *
++ * Preconditions:
++ * - the CDAR register must point to the start descriptor
++ * - the MRn[CS] bit must be cleared
++ */
+ static void dma_start(struct fsldma_chan *chan)
+ {
+ u32 mode;
+
+ mode = DMA_IN(chan, &chan->regs->mr, 32);
+
+- if ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
+- if (chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
+- DMA_OUT(chan, &chan->regs->bcr, 0, 32);
+- mode |= FSL_DMA_MR_EMP_EN;
+- } else {
+- mode &= ~FSL_DMA_MR_EMP_EN;
+- }
++ if (chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
++ DMA_OUT(chan, &chan->regs->bcr, 0, 32);
++ mode |= FSL_DMA_MR_EMP_EN;
++ } else {
++ mode &= ~FSL_DMA_MR_EMP_EN;
+ }
+
+- if (chan->feature & FSL_DMA_CHAN_START_EXT)
++ if (chan->feature & FSL_DMA_CHAN_START_EXT) {
+ mode |= FSL_DMA_MR_EMS_EN;
+- else
++ } else {
++ mode &= ~FSL_DMA_MR_EMS_EN;
+ mode |= FSL_DMA_MR_CS;
++ }
+
+ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+ }
+@@ -760,14 +760,15 @@ static int fsl_dma_device_control(struct dma_chan *dchan,
+
+ switch (cmd) {
+ case DMA_TERMINATE_ALL:
++ spin_lock_irqsave(&chan->desc_lock, flags);
++
+ /* Halt the DMA engine */
+ dma_halt(chan);
+
+- spin_lock_irqsave(&chan->desc_lock, flags);
+-
+ /* Remove and free all of the descriptors in the LD queue */
+ fsldma_free_desc_list(chan, &chan->ld_pending);
+ fsldma_free_desc_list(chan, &chan->ld_running);
++ chan->idle = true;
+
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ return 0;
+@@ -805,76 +806,43 @@ static int fsl_dma_device_control(struct dma_chan *dchan,
+ }
+
+ /**
+- * fsl_dma_update_completed_cookie - Update the completed cookie.
++ * fsl_chan_ld_cleanup - Clean up link descriptors
+ * @chan : Freescale DMA channel
+ *
+- * CONTEXT: hardirq
++ * This function is run after the queue of running descriptors has been
++ * executed by the DMA engine. It will run any callbacks, and then free
++ * the descriptors.
++ *
++ * HARDWARE STATE: idle
+ */
+-static void fsl_dma_update_completed_cookie(struct fsldma_chan *chan)
++static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ {
+- struct fsl_desc_sw *desc;
++ struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+- dma_cookie_t cookie;
+
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
++ /* if the ld_running list is empty, there is nothing to do */
+ if (list_empty(&chan->ld_running)) {
+- chan_dbg(chan, "no running descriptors\n");
++ chan_dbg(chan, "no descriptors to cleanup\n");
+ goto out_unlock;
+ }
+
+- /* Get the last descriptor, update the cookie to that */
++ /*
++ * Get the last descriptor, update the cookie to it
++ *
++ * This is done before callbacks run so that clients can check the
++ * status of their DMA transfer inside the callback.
++ */
+ desc = to_fsl_desc(chan->ld_running.prev);
+- if (dma_is_idle(chan))
+- cookie = desc->async_tx.cookie;
+- else {
+- cookie = desc->async_tx.cookie - 1;
+- if (unlikely(cookie < DMA_MIN_COOKIE))
+- cookie = DMA_MAX_COOKIE;
+- }
+-
+- chan->completed_cookie = cookie;
+-
+-out_unlock:
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+-}
+-
+-/**
+- * fsldma_desc_status - Check the status of a descriptor
+- * @chan: Freescale DMA channel
+- * @desc: DMA SW descriptor
+- *
+- * This function will return the status of the given descriptor
+- */
+-static enum dma_status fsldma_desc_status(struct fsldma_chan *chan,
+- struct fsl_desc_sw *desc)
+-{
+- return dma_async_is_complete(desc->async_tx.cookie,
+- chan->completed_cookie,
+- chan->common.cookie);
+-}
+-
+-/**
+- * fsl_chan_ld_cleanup - Clean up link descriptors
+- * @chan : Freescale DMA channel
+- *
+- * This function clean up the ld_queue of DMA channel.
+- */
+-static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+-{
+- struct fsl_desc_sw *desc, *_desc;
+- unsigned long flags;
+-
+- spin_lock_irqsave(&chan->desc_lock, flags);
++ chan->completed_cookie = desc->async_tx.cookie;
++ chan_dbg(chan, "completed_cookie = %d\n", chan->completed_cookie);
+
+- chan_dbg(chan, "chan completed_cookie = %d\n", chan->completed_cookie);
++ /* Run the callback for each descriptor, in order */
+ list_for_each_entry_safe(desc, _desc, &chan->ld_running, node) {
+ dma_async_tx_callback callback;
+ void *callback_param;
+
+- if (fsldma_desc_status(chan, desc) == DMA_IN_PROGRESS)
+- break;
+-
+ /* Remove from the list of running transactions */
+ list_del(&desc->node);
+
+@@ -898,6 +866,7 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+
++out_unlock:
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+@@ -905,10 +874,7 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ * fsl_chan_xfer_ld_queue - transfer any pending transactions
+ * @chan : Freescale DMA channel
+ *
+- * This will make sure that any pending transactions will be run.
+- * If the DMA controller is idle, it will be started. Otherwise,
+- * the DMA controller's interrupt handler will start any pending
+- * transactions when it becomes idle.
++ * HARDWARE STATE: idle
+ */
+ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ {
+@@ -927,22 +893,15 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ }
+
+ /*
+- * The DMA controller is not idle, which means the interrupt
+- * handler will start any queued transactions when it runs
+- * at the end of the current transaction
++ * The DMA controller is not idle, which means that the interrupt
++ * handler will start any queued transactions when it runs after
++ * this transaction finishes
+ */
+- if (!dma_is_idle(chan)) {
++ if (!chan->idle) {
+ chan_dbg(chan, "DMA controller still busy\n");
+ goto out_unlock;
+ }
+
+- /*
+- * TODO:
+- * make sure the dma_halt() function really un-wedges the
+- * controller as much as possible
+- */
+- dma_halt(chan);
+-
+ /*
+ * If there are some link descriptors which have not been
+ * transferred, we need to start the controller
+@@ -952,15 +911,32 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ * Move all elements from the queue of pending transactions
+ * onto the list of running transactions
+ */
++ chan_dbg(chan, "idle, starting controller\n");
+ desc = list_first_entry(&chan->ld_pending, struct fsl_desc_sw, node);
+ list_splice_tail_init(&chan->ld_pending, &chan->ld_running);
+
++ /*
++ * The 85xx DMA controller doesn't clear the channel start bit
++ * automatically at the end of a transfer. Therefore we must clear
++ * it in software before starting the transfer.
++ */
++ if ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
++ u32 mode;
++
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
++ mode &= ~FSL_DMA_MR_CS;
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
++ }
++
+ /*
+ * Program the descriptor's address into the DMA controller,
+ * then start the DMA transaction
+ */
+ set_cdar(chan, desc->async_tx.phys);
++ get_cdar(chan);
++
+ dma_start(chan);
++ chan->idle = false;
+
+ out_unlock:
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+@@ -985,16 +961,18 @@ static enum dma_status fsl_tx_status(struct dma_chan *dchan,
+ struct dma_tx_state *txstate)
+ {
+ struct fsldma_chan *chan = to_fsl_chan(dchan);
+- dma_cookie_t last_used;
+ dma_cookie_t last_complete;
++ dma_cookie_t last_used;
++ unsigned long flags;
+
+- fsl_chan_ld_cleanup(chan);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- last_used = dchan->cookie;
+ last_complete = chan->completed_cookie;
++ last_used = dchan->cookie;
+
+- dma_set_tx_state(txstate, last_complete, last_used, 0);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+
++ dma_set_tx_state(txstate, last_complete, last_used, 0);
+ return dma_async_is_complete(cookie, last_complete, last_used);
+ }
+
+@@ -1005,8 +983,6 @@ static enum dma_status fsl_tx_status(struct dma_chan *dchan,
+ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ {
+ struct fsldma_chan *chan = data;
+- int update_cookie = 0;
+- int xfer_ld_q = 0;
+ u32 stat;
+
+ /* save and clear the status register */
+@@ -1014,6 +990,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ set_sr(chan, stat);
+ chan_dbg(chan, "irq: stat = 0x%x\n", stat);
+
++ /* check that this was really our device */
+ stat &= ~(FSL_DMA_SR_CB | FSL_DMA_SR_CH);
+ if (!stat)
+ return IRQ_NONE;
+@@ -1028,28 +1005,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ */
+ if (stat & FSL_DMA_SR_PE) {
+ chan_dbg(chan, "irq: Programming Error INT\n");
+- if (get_bcr(chan) == 0) {
+- /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+- * Now, update the completed cookie, and continue the
+- * next uncompleted transfer.
+- */
+- update_cookie = 1;
+- xfer_ld_q = 1;
+- }
+ stat &= ~FSL_DMA_SR_PE;
+- }
+-
+- /*
+- * If the link descriptor segment transfer finishes,
+- * we will recycle the used descriptor.
+- */
+- if (stat & FSL_DMA_SR_EOSI) {
+- chan_dbg(chan, "irq: End-of-segments INT\n");
+- chan_dbg(chan, "irq: clndar 0x%llx, nlndar 0x%llx\n",
+- (unsigned long long)get_cdar(chan),
+- (unsigned long long)get_ndar(chan));
+- stat &= ~FSL_DMA_SR_EOSI;
+- update_cookie = 1;
++ if (get_bcr(chan) != 0)
++ chan_err(chan, "Programming Error!\n");
+ }
+
+ /*
+@@ -1059,8 +1017,6 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ if (stat & FSL_DMA_SR_EOCDI) {
+ chan_dbg(chan, "irq: End-of-Chain link INT\n");
+ stat &= ~FSL_DMA_SR_EOCDI;
+- update_cookie = 1;
+- xfer_ld_q = 1;
+ }
+
+ /*
+@@ -1071,25 +1027,44 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ if (stat & FSL_DMA_SR_EOLNI) {
+ chan_dbg(chan, "irq: End-of-link INT\n");
+ stat &= ~FSL_DMA_SR_EOLNI;
+- xfer_ld_q = 1;
+ }
+
+- if (update_cookie)
+- fsl_dma_update_completed_cookie(chan);
+- if (xfer_ld_q)
+- fsl_chan_xfer_ld_queue(chan);
++ /* check that the DMA controller is really idle */
++ if (!dma_is_idle(chan))
++ chan_err(chan, "irq: controller not idle!\n");
++
++ /* check that we handled all of the bits */
+ if (stat)
+- chan_dbg(chan, "irq: unhandled sr 0x%08x\n", stat);
++ chan_err(chan, "irq: unhandled sr 0x%08x\n", stat);
+
+- chan_dbg(chan, "irq: Exit\n");
++ /*
++ * Schedule the tasklet to handle all cleanup of the current
++ * transaction. It will start a new transaction if there is
++ * one pending.
++ */
+ tasklet_schedule(&chan->tasklet);
++ chan_dbg(chan, "irq: Exit\n");
+ return IRQ_HANDLED;
+ }
+
+ static void dma_do_tasklet(unsigned long data)
+ {
+ struct fsldma_chan *chan = (struct fsldma_chan *)data;
++ unsigned long flags;
++
++ chan_dbg(chan, "tasklet entry\n");
++
++ /* run all callbacks, free all used descriptors */
+ fsl_chan_ld_cleanup(chan);
++
++ /* the channel is now idle */
++ spin_lock_irqsave(&chan->desc_lock, flags);
++ chan->idle = true;
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++
++ /* start any pending transactions automatically */
++ fsl_chan_xfer_ld_queue(chan);
++ chan_dbg(chan, "tasklet exit\n");
+ }
+
+ static irqreturn_t fsldma_ctrl_irq(int irq, void *data)
+@@ -1269,6 +1244,7 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ spin_lock_init(&chan->desc_lock);
+ INIT_LIST_HEAD(&chan->ld_pending);
+ INIT_LIST_HEAD(&chan->ld_running);
++ chan->idle = true;
+
+ chan->common.device = &fdev->common;
+
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index 49189dacd5f4..9cb5aa57c677 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -148,6 +148,7 @@ struct fsldma_chan {
+ int id; /* Raw id of this channel */
+ struct tasklet_struct tasklet;
+ u32 feature;
++ bool idle; /* DMA controller is idle */
+
+ void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
+ void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);commit 31f4306c83a2daa3e348056b720de511bffe5a9b
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:57 2011 +0000
+
+ fsldma: minor codingstyle and consistency fixes
+
+ This fixes some minor violations of the coding style. It also changes
+ the style of the device_prep_dma_*() function definitions so they are
+ identical.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 82b8e9f9c7bf..5da1a4a817e3 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -89,7 +89,7 @@ static void set_desc_cnt(struct fsldma_chan *chan,
+ }
+
+ static void set_desc_src(struct fsldma_chan *chan,
+- struct fsl_dma_ld_hw *hw, dma_addr_t src)
++ struct fsl_dma_ld_hw *hw, dma_addr_t src)
+ {
+ u64 snoop_bits;
+
+@@ -99,7 +99,7 @@ static void set_desc_src(struct fsldma_chan *chan,
+ }
+
+ static void set_desc_dst(struct fsldma_chan *chan,
+- struct fsl_dma_ld_hw *hw, dma_addr_t dst)
++ struct fsl_dma_ld_hw *hw, dma_addr_t dst)
+ {
+ u64 snoop_bits;
+
+@@ -109,7 +109,7 @@ static void set_desc_dst(struct fsldma_chan *chan,
+ }
+
+ static void set_desc_next(struct fsldma_chan *chan,
+- struct fsl_dma_ld_hw *hw, dma_addr_t next)
++ struct fsl_dma_ld_hw *hw, dma_addr_t next)
+ {
+ u64 snoop_bits;
+
+@@ -118,8 +118,7 @@ static void set_desc_next(struct fsldma_chan *chan,
+ hw->next_ln_addr = CPU_TO_DMA(chan, snoop_bits | next, 64);
+ }
+
+-static void set_ld_eol(struct fsldma_chan *chan,
+- struct fsl_desc_sw *desc)
++static void set_ld_eol(struct fsldma_chan *chan, struct fsl_desc_sw *desc)
+ {
+ u64 snoop_bits;
+
+@@ -338,8 +337,7 @@ static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
+ chan->feature &= ~FSL_DMA_CHAN_START_EXT;
+ }
+
+-static void append_ld_queue(struct fsldma_chan *chan,
+- struct fsl_desc_sw *desc)
++static void append_ld_queue(struct fsldma_chan *chan, struct fsl_desc_sw *desc)
+ {
+ struct fsl_desc_sw *tail = to_fsl_desc(chan->ld_pending.prev);
+
+@@ -380,8 +378,8 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ cookie = chan->common.cookie;
+ list_for_each_entry(child, &desc->tx_list, node) {
+ cookie++;
+- if (cookie < 0)
+- cookie = 1;
++ if (cookie < DMA_MIN_COOKIE)
++ cookie = DMA_MIN_COOKIE;
+
+ child->async_tx.cookie = cookie;
+ }
+@@ -402,8 +400,7 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ *
+ * Return - The descriptor allocated. NULL for failed.
+ */
+-static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+- struct fsldma_chan *chan)
++static struct fsl_desc_sw *fsl_dma_alloc_descriptor(struct fsldma_chan *chan)
+ {
+ struct fsl_desc_sw *desc;
+ dma_addr_t pdesc;
+@@ -427,7 +424,6 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+ return desc;
+ }
+
+-
+ /**
+ * fsl_dma_alloc_chan_resources - Allocate resources for DMA channel.
+ * @chan : Freescale DMA channel
+@@ -537,14 +533,15 @@ fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
+ /* Insert the link descriptor to the LD ring */
+ list_add_tail(&new->node, &new->tx_list);
+
+- /* Set End-of-link to the last link descriptor of new list*/
++ /* Set End-of-link to the last link descriptor of new list */
+ set_ld_eol(chan, new);
+
+ return &new->async_tx;
+ }
+
+-static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+- struct dma_chan *dchan, dma_addr_t dma_dst, dma_addr_t dma_src,
++static struct dma_async_tx_descriptor *
++fsl_dma_prep_memcpy(struct dma_chan *dchan,
++ dma_addr_t dma_dst, dma_addr_t dma_src,
+ size_t len, unsigned long flags)
+ {
+ struct fsldma_chan *chan;
+@@ -594,7 +591,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ new->async_tx.flags = flags; /* client is in control of this ack */
+ new->async_tx.cookie = -EBUSY;
+
+- /* Set End-of-link to the last link descriptor of new list*/
++ /* Set End-of-link to the last link descriptor of new list */
+ set_ld_eol(chan, new);
+
+ return &first->async_tx;
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index 113e7134010b..49189dacd5f4 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -102,8 +102,8 @@ struct fsl_desc_sw {
+ } __attribute__((aligned(32)));
+
+ struct fsldma_chan_regs {
+- u32 mr; /* 0x00 - Mode Register */
+- u32 sr; /* 0x04 - Status Register */
++ u32 mr; /* 0x00 - Mode Register */
++ u32 sr; /* 0x04 - Status Register */
+ u64 cdar; /* 0x08 - Current descriptor address register */
+ u64 sar; /* 0x10 - Source Address Register */
+ u64 dar; /* 0x18 - Destination Address Register */commit 0ab09c36818ca88f65c88f4d8c6d067fbf10578d
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:56 2011 +0000
+
+ fsldma: improve link descriptor debugging
+
+ This adds better tracking to link descriptor allocations, callbacks, and
+ frees. This makes it much easier to track errors with link descriptors.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index e535cd13f7cc..82b8e9f9c7bf 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -420,6 +420,10 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+ desc->async_tx.tx_submit = fsl_dma_tx_submit;
+ desc->async_tx.phys = pdesc;
+
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p allocated\n", desc);
++#endif
++
+ return desc;
+ }
+
+@@ -470,6 +474,9 @@ static void fsldma_free_desc_list(struct fsldma_chan *chan,
+
+ list_for_each_entry_safe(desc, _desc, list, node) {
+ list_del(&desc->node);
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p free\n", desc);
++#endif
+ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+ }
+@@ -481,6 +488,9 @@ static void fsldma_free_desc_list_reverse(struct fsldma_chan *chan,
+
+ list_for_each_entry_safe_reverse(desc, _desc, list, node) {
+ list_del(&desc->node);
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p free\n", desc);
++#endif
+ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+ }
+@@ -557,9 +567,6 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ chan_err(chan, "%s\n", msg_ld_oom);
+ goto fail;
+ }
+-#ifdef FSL_DMA_LD_DEBUG
+- chan_dbg(chan, "new link desc alloc %p\n", new);
+-#endif
+
+ copy = min(len, (size_t)FSL_DMA_BCR_MAX_CNT);
+
+@@ -645,9 +652,6 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_sg(struct dma_chan *dchan,
+ chan_err(chan, "%s\n", msg_ld_oom);
+ goto fail;
+ }
+-#ifdef FSL_DMA_LD_DEBUG
+- chan_dbg(chan, "new link desc alloc %p\n", new);
+-#endif
+
+ set_desc_cnt(chan, &new->hw, len);
+ set_desc_src(chan, &new->hw, src);
+@@ -882,13 +886,18 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ callback_param = desc->async_tx.callback_param;
+ if (callback) {
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
++#ifdef FSL_DMA_LD_DEBUG
+ chan_dbg(chan, "LD %p callback\n", desc);
++#endif
+ callback(callback_param);
+ spin_lock_irqsave(&chan->desc_lock, flags);
+ }
+
+ /* Run any dependencies, then free the descriptor */
+ dma_run_dependencies(&desc->async_tx);
++#ifdef FSL_DMA_LD_DEBUG
++ chan_dbg(chan, "LD %p free\n", desc);
++#endif
+ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+ commit b158471ef63bf399165db96e945a828096502d9d
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:55 2011 +0000
+
+ fsldma: use channel name in printk output
+
+ This makes debugging the driver much easier when multiple channels are
+ running concurrently. In addition, you can see how much descriptor
+ memory each channel has allocated via the dmapool API in sysfs.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 2e1af4555b0f..e535cd13f7cc 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -37,7 +37,12 @@
+
+ #include "fsldma.h"
+
+-static const char msg_ld_oom[] = "No free memory for link descriptor\n";
++#define chan_dbg(chan, fmt, arg...) \
++ dev_dbg(chan->dev, "%s: " fmt, chan->name, ##arg)
++#define chan_err(chan, fmt, arg...) \
++ dev_err(chan->dev, "%s: " fmt, chan->name, ##arg)
++
++static const char msg_ld_oom[] = "No free memory for link descriptor";
+
+ /*
+ * Register Helpers
+@@ -207,7 +212,7 @@ static void dma_halt(struct fsldma_chan *chan)
+ }
+
+ if (!dma_is_idle(chan))
+- dev_err(chan->dev, "DMA halt timeout!\n");
++ chan_err(chan, "DMA halt timeout!\n");
+ }
+
+ /**
+@@ -405,7 +410,7 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+
+ desc = dma_pool_alloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
+ if (!desc) {
+- dev_dbg(chan->dev, "out of memory for link desc\n");
++ chan_dbg(chan, "out of memory for link descriptor\n");
+ return NULL;
+ }
+
+@@ -439,13 +444,11 @@ static int fsl_dma_alloc_chan_resources(struct dma_chan *dchan)
+ * We need the descriptor to be aligned to 32bytes
+ * for meeting FSL DMA specification requirement.
+ */
+- chan->desc_pool = dma_pool_create("fsl_dma_engine_desc_pool",
+- chan->dev,
++ chan->desc_pool = dma_pool_create(chan->name, chan->dev,
+ sizeof(struct fsl_desc_sw),
+ __alignof__(struct fsl_desc_sw), 0);
+ if (!chan->desc_pool) {
+- dev_err(chan->dev, "unable to allocate channel %d "
+- "descriptor pool\n", chan->id);
++ chan_err(chan, "unable to allocate descriptor pool\n");
+ return -ENOMEM;
+ }
+
+@@ -491,7 +494,7 @@ static void fsl_dma_free_chan_resources(struct dma_chan *dchan)
+ struct fsldma_chan *chan = to_fsl_chan(dchan);
+ unsigned long flags;
+
+- dev_dbg(chan->dev, "Free all channel resources.\n");
++ chan_dbg(chan, "free all channel resources\n");
+ spin_lock_irqsave(&chan->desc_lock, flags);
+ fsldma_free_desc_list(chan, &chan->ld_pending);
+ fsldma_free_desc_list(chan, &chan->ld_running);
+@@ -514,7 +517,7 @@ fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
+
+ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(chan->dev, msg_ld_oom);
++ chan_err(chan, "%s\n", msg_ld_oom);
+ return NULL;
+ }
+
+@@ -551,11 +554,11 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ /* Allocate the link descriptor from DMA pool */
+ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(chan->dev, msg_ld_oom);
++ chan_err(chan, "%s\n", msg_ld_oom);
+ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(chan->dev, "new link desc alloc %p\n", new);
++ chan_dbg(chan, "new link desc alloc %p\n", new);
+ #endif
+
+ copy = min(len, (size_t)FSL_DMA_BCR_MAX_CNT);
+@@ -639,11 +642,11 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_sg(struct dma_chan *dchan,
+ /* allocate and populate the descriptor */
+ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(chan->dev, msg_ld_oom);
++ chan_err(chan, "%s\n", msg_ld_oom);
+ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(chan->dev, "new link desc alloc %p\n", new);
++ chan_dbg(chan, "new link desc alloc %p\n", new);
+ #endif
+
+ set_desc_cnt(chan, &new->hw, len);
+@@ -815,7 +818,7 @@ static void fsl_dma_update_completed_cookie(struct fsldma_chan *chan)
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+ if (list_empty(&chan->ld_running)) {
+- dev_dbg(chan->dev, "no running descriptors\n");
++ chan_dbg(chan, "no running descriptors\n");
+ goto out_unlock;
+ }
+
+@@ -863,7 +866,7 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- dev_dbg(chan->dev, "chan completed_cookie = %d\n", chan->completed_cookie);
++ chan_dbg(chan, "chan completed_cookie = %d\n", chan->completed_cookie);
+ list_for_each_entry_safe(desc, _desc, &chan->ld_running, node) {
+ dma_async_tx_callback callback;
+ void *callback_param;
+@@ -879,7 +882,7 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ callback_param = desc->async_tx.callback_param;
+ if (callback) {
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+- dev_dbg(chan->dev, "LD %p callback\n", desc);
++ chan_dbg(chan, "LD %p callback\n", desc);
+ callback(callback_param);
+ spin_lock_irqsave(&chan->desc_lock, flags);
+ }
+@@ -913,7 +916,7 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ * don't need to do any work at all
+ */
+ if (list_empty(&chan->ld_pending)) {
+- dev_dbg(chan->dev, "no pending LDs\n");
++ chan_dbg(chan, "no pending LDs\n");
+ goto out_unlock;
+ }
+
+@@ -923,7 +926,7 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ * at the end of the current transaction
+ */
+ if (!dma_is_idle(chan)) {
+- dev_dbg(chan->dev, "DMA controller still busy\n");
++ chan_dbg(chan, "DMA controller still busy\n");
+ goto out_unlock;
+ }
+
+@@ -1003,14 +1006,14 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ /* save and clear the status register */
+ stat = get_sr(chan);
+ set_sr(chan, stat);
+- dev_dbg(chan->dev, "irq: channel %d, stat = 0x%x\n", chan->id, stat);
++ chan_dbg(chan, "irq: stat = 0x%x\n", stat);
+
+ stat &= ~(FSL_DMA_SR_CB | FSL_DMA_SR_CH);
+ if (!stat)
+ return IRQ_NONE;
+
+ if (stat & FSL_DMA_SR_TE)
+- dev_err(chan->dev, "Transfer Error!\n");
++ chan_err(chan, "Transfer Error!\n");
+
+ /*
+ * Programming Error
+@@ -1018,7 +1021,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * triger a PE interrupt.
+ */
+ if (stat & FSL_DMA_SR_PE) {
+- dev_dbg(chan->dev, "irq: Programming Error INT\n");
++ chan_dbg(chan, "irq: Programming Error INT\n");
+ if (get_bcr(chan) == 0) {
+ /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+ * Now, update the completed cookie, and continue the
+@@ -1035,8 +1038,8 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * we will recycle the used descriptor.
+ */
+ if (stat & FSL_DMA_SR_EOSI) {
+- dev_dbg(chan->dev, "irq: End-of-segments INT\n");
+- dev_dbg(chan->dev, "irq: clndar 0x%llx, nlndar 0x%llx\n",
++ chan_dbg(chan, "irq: End-of-segments INT\n");
++ chan_dbg(chan, "irq: clndar 0x%llx, nlndar 0x%llx\n",
+ (unsigned long long)get_cdar(chan),
+ (unsigned long long)get_ndar(chan));
+ stat &= ~FSL_DMA_SR_EOSI;
+@@ -1048,7 +1051,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * and start the next transfer if it exist.
+ */
+ if (stat & FSL_DMA_SR_EOCDI) {
+- dev_dbg(chan->dev, "irq: End-of-Chain link INT\n");
++ chan_dbg(chan, "irq: End-of-Chain link INT\n");
+ stat &= ~FSL_DMA_SR_EOCDI;
+ update_cookie = 1;
+ xfer_ld_q = 1;
+@@ -1060,7 +1063,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * prepare next transfer.
+ */
+ if (stat & FSL_DMA_SR_EOLNI) {
+- dev_dbg(chan->dev, "irq: End-of-link INT\n");
++ chan_dbg(chan, "irq: End-of-link INT\n");
+ stat &= ~FSL_DMA_SR_EOLNI;
+ xfer_ld_q = 1;
+ }
+@@ -1070,9 +1073,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ if (xfer_ld_q)
+ fsl_chan_xfer_ld_queue(chan);
+ if (stat)
+- dev_dbg(chan->dev, "irq: unhandled sr 0x%02x\n", stat);
++ chan_dbg(chan, "irq: unhandled sr 0x%08x\n", stat);
+
+- dev_dbg(chan->dev, "irq: Exit\n");
++ chan_dbg(chan, "irq: Exit\n");
+ tasklet_schedule(&chan->tasklet);
+ return IRQ_HANDLED;
+ }
+@@ -1128,7 +1131,7 @@ static void fsldma_free_irqs(struct fsldma_device *fdev)
+ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
+ chan = fdev->chan[i];
+ if (chan && chan->irq != NO_IRQ) {
+- dev_dbg(fdev->dev, "free channel %d IRQ\n", chan->id);
++ chan_dbg(chan, "free per-channel IRQ\n");
+ free_irq(chan->irq, chan);
+ }
+ }
+@@ -1155,19 +1158,16 @@ static int fsldma_request_irqs(struct fsldma_device *fdev)
+ continue;
+
+ if (chan->irq == NO_IRQ) {
+- dev_err(fdev->dev, "no interrupts property defined for "
+- "DMA channel %d. Please fix your "
+- "device tree\n", chan->id);
++ chan_err(chan, "interrupts property missing in device tree\n");
+ ret = -ENODEV;
+ goto out_unwind;
+ }
+
+- dev_dbg(fdev->dev, "request channel %d IRQ\n", chan->id);
++ chan_dbg(chan, "request per-channel IRQ\n");
+ ret = request_irq(chan->irq, fsldma_chan_irq, IRQF_SHARED,
+ "fsldma-chan", chan);
+ if (ret) {
+- dev_err(fdev->dev, "unable to request IRQ for DMA "
+- "channel %d\n", chan->id);
++ chan_err(chan, "unable to request per-channel IRQ\n");
+ goto out_unwind;
+ }
+ }
+@@ -1242,6 +1242,7 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+
+ fdev->chan[chan->id] = chan;
+ tasklet_init(&chan->tasklet, dma_do_tasklet, (unsigned long)chan);
++ snprintf(chan->name, sizeof(chan->name), "chan%d", chan->id);
+
+ /* Initialize the channel */
+ dma_init(chan);
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index ba9f403c0fbe..113e7134010b 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -135,6 +135,7 @@ struct fsldma_device {
+ #define FSL_DMA_CHAN_START_EXT 0x00002000
+
+ struct fsldma_chan {
++ char name[8]; /* Channel name */
+ struct fsldma_chan_regs __iomem *regs;
+ dma_cookie_t completed_cookie; /* The maximum cookie completed */
+ spinlock_t desc_lock; /* Descriptor operation lock */commit e8bd84df27c5921a9ac866aef06e044590ac118f
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:54 2011 +0000
+
+ fsldma: move related helper functions near each other
+
+ This is a purely cosmetic cleanup. It is nice to have related functions
+ right next to each other in the code.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 4de947a450fc..2e1af4555b0f 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -39,33 +39,9 @@
+
+ static const char msg_ld_oom[] = "No free memory for link descriptor\n";
+
+-static void dma_init(struct fsldma_chan *chan)
+-{
+- /* Reset the channel */
+- DMA_OUT(chan, &chan->regs->mr, 0, 32);
+-
+- switch (chan->feature & FSL_DMA_IP_MASK) {
+- case FSL_DMA_IP_85XX:
+- /* Set the channel to below modes:
+- * EIE - Error interrupt enable
+- * EOSIE - End of segments interrupt enable (basic mode)
+- * EOLNIE - End of links interrupt enable
+- * BWC - Bandwidth sharing among channels
+- */
+- DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_BWC
+- | FSL_DMA_MR_EIE | FSL_DMA_MR_EOLNIE
+- | FSL_DMA_MR_EOSIE, 32);
+- break;
+- case FSL_DMA_IP_83XX:
+- /* Set the channel to below modes:
+- * EOTIE - End-of-transfer interrupt enable
+- * PRC_RM - PCI read multiple
+- */
+- DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_EOTIE
+- | FSL_DMA_MR_PRC_RM, 32);
+- break;
+- }
+-}
++/*
++ * Register Helpers
++ */
+
+ static void set_sr(struct fsldma_chan *chan, u32 val)
+ {
+@@ -77,6 +53,30 @@ static u32 get_sr(struct fsldma_chan *chan)
+ return DMA_IN(chan, &chan->regs->sr, 32);
+ }
+
++static void set_cdar(struct fsldma_chan *chan, dma_addr_t addr)
++{
++ DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
++}
++
++static dma_addr_t get_cdar(struct fsldma_chan *chan)
++{
++ return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
++}
++
++static dma_addr_t get_ndar(struct fsldma_chan *chan)
++{
++ return DMA_IN(chan, &chan->regs->ndar, 64);
++}
++
++static u32 get_bcr(struct fsldma_chan *chan)
++{
++ return DMA_IN(chan, &chan->regs->bcr, 32);
++}
++
++/*
++ * Descriptor Helpers
++ */
++
+ static void set_desc_cnt(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, u32 count)
+ {
+@@ -113,24 +113,49 @@ static void set_desc_next(struct fsldma_chan *chan,
+ hw->next_ln_addr = CPU_TO_DMA(chan, snoop_bits | next, 64);
+ }
+
+-static void set_cdar(struct fsldma_chan *chan, dma_addr_t addr)
++static void set_ld_eol(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
+ {
+- DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
+-}
++ u64 snoop_bits;
+
+-static dma_addr_t get_cdar(struct fsldma_chan *chan)
+-{
+- return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
+-}
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
++ ? FSL_DMA_SNEN : 0;
+
+-static dma_addr_t get_ndar(struct fsldma_chan *chan)
+-{
+- return DMA_IN(chan, &chan->regs->ndar, 64);
++ desc->hw.next_ln_addr = CPU_TO_DMA(chan,
++ DMA_TO_CPU(chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
++ | snoop_bits, 64);
+ }
+
+-static u32 get_bcr(struct fsldma_chan *chan)
++/*
++ * DMA Engine Hardware Control Helpers
++ */
++
++static void dma_init(struct fsldma_chan *chan)
+ {
+- return DMA_IN(chan, &chan->regs->bcr, 32);
++ /* Reset the channel */
++ DMA_OUT(chan, &chan->regs->mr, 0, 32);
++
++ switch (chan->feature & FSL_DMA_IP_MASK) {
++ case FSL_DMA_IP_85XX:
++ /* Set the channel to below modes:
++ * EIE - Error interrupt enable
++ * EOSIE - End of segments interrupt enable (basic mode)
++ * EOLNIE - End of links interrupt enable
++ * BWC - Bandwidth sharing among channels
++ */
++ DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_BWC
++ | FSL_DMA_MR_EIE | FSL_DMA_MR_EOLNIE
++ | FSL_DMA_MR_EOSIE, 32);
++ break;
++ case FSL_DMA_IP_83XX:
++ /* Set the channel to below modes:
++ * EOTIE - End-of-transfer interrupt enable
++ * PRC_RM - PCI read multiple
++ */
++ DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_EOTIE
++ | FSL_DMA_MR_PRC_RM, 32);
++ break;
++ }
+ }
+
+ static int dma_is_idle(struct fsldma_chan *chan)
+@@ -185,19 +210,6 @@ static void dma_halt(struct fsldma_chan *chan)
+ dev_err(chan->dev, "DMA halt timeout!\n");
+ }
+
+-static void set_ld_eol(struct fsldma_chan *chan,
+- struct fsl_desc_sw *desc)
+-{
+- u64 snoop_bits;
+-
+- snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
+- ? FSL_DMA_SNEN : 0;
+-
+- desc->hw.next_ln_addr = CPU_TO_DMA(chan,
+- DMA_TO_CPU(chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
+- | snoop_bits, 64);
+-}
+-
+ /**
+ * fsl_chan_set_src_loop_size - Set source address hold transfer size
+ * @chan : Freescale DMA channelcommit b203bd3f6b9c3db3b1979c2ff79bb2b9be8f03a3
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Mar 3 07:54:53 2011 +0000
+
+ dmatest: fix automatic buffer unmap type
+
+ The dmatest code relies on the DMAEngine API to automatically call
+ dma_unmap_single() on src buffers. The flags it passes are incorrect,
+ fix them.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
+index 5589358b684d..7e1b0aa0ca50 100644
+--- a/drivers/dma/dmatest.c
++++ b/drivers/dma/dmatest.c
+@@ -285,7 +285,12 @@ static int dmatest_func(void *data)
+
+ set_user_nice(current, 10);
+
+- flags = DMA_CTRL_ACK | DMA_COMPL_SKIP_DEST_UNMAP | DMA_PREP_INTERRUPT;
++ /*
++ * src buffers are freed by the DMAEngine code with dma_unmap_single()
++ * dst buffers are freed by ourselves below
++ */
++ flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT
++ | DMA_COMPL_SKIP_DEST_UNMAP | DMA_COMPL_SRC_UNMAP_SINGLE;
+
+ while (!kthread_should_stop()
+ && !(iterations && total_tests >= iterations)) {commit 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Mon Dec 13 11:42:30 2010 -0500
+
+ hwmon: (ltc4215) make sysfs file match the alarm cause
+
+ The ltc4215 driver used the chip's "power good" status bit to provide
+ the power1_alarm file. This is wrong: the chip is really reporting the
+ status of one of the monitored voltages.
+
+ Change the sysfs file from power1_alarm to in2_min_alarm instead. This
+ matches the voltage that the chip is raising an alarm for.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
+
+diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
+index 00d975eb5b83..c7e6d8e81656 100644
+--- a/drivers/hwmon/ltc4215.c
++++ b/drivers/hwmon/ltc4215.c
+@@ -205,7 +205,6 @@ LTC4215_ALARM(curr1_max_alarm, (1 << 2), LTC4215_STATUS);
+
+ /* Power (virtual) */
+ LTC4215_POWER(power1_input);
+-LTC4215_ALARM(power1_alarm, (1 << 3), LTC4215_STATUS);
+
+ /* Input Voltage */
+ LTC4215_VOLTAGE(in1_input, LTC4215_ADIN);
+@@ -214,6 +213,7 @@ LTC4215_ALARM(in1_min_alarm, (1 << 1), LTC4215_STATUS);
+
+ /* Output Voltage */
+ LTC4215_VOLTAGE(in2_input, LTC4215_SOURCE);
++LTC4215_ALARM(in2_min_alarm, (1 << 3), LTC4215_STATUS);
+
+ /* Finally, construct an array of pointers to members of the above objects,
+ * as required for sysfs_create_group()
+@@ -223,13 +223,13 @@ static struct attribute *ltc4215_attributes[] = {
+ &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
+
+ &sensor_dev_attr_power1_input.dev_attr.attr,
+- &sensor_dev_attr_power1_alarm.dev_attr.attr,
+
+ &sensor_dev_attr_in1_input.dev_attr.attr,
+ &sensor_dev_attr_in1_max_alarm.dev_attr.attr,
+ &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
+
+ &sensor_dev_attr_in2_input.dev_attr.attr,
++ &sensor_dev_attr_in2_min_alarm.dev_attr.attr,
+
+ NULL,
+ };commit 0d688662aab9d80078be82aa5aea561346643298
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Sep 30 11:46:47 2010 +0000
+
+ ste_dma40: implement support for scatterlist to scatterlist copy
+
+ Now that the DMAEngine API has support for scatterlist to scatterlist
+ copy, implement support for the STE DMA40 DMA controller.
+
+ Cc: Linus Walleij <linus.ml.walleij@gmail.com>
+ Acked-by: Per Fridén <per.friden@stericsson.com>
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
+index 17e2600a00cf..d5fd098e22e8 100644
+--- a/drivers/dma/ste_dma40.c
++++ b/drivers/dma/ste_dma40.c
+@@ -1857,6 +1857,18 @@ static struct dma_async_tx_descriptor *d40_prep_memcpy(struct dma_chan *chan,
+ return NULL;
+ }
+
++static struct dma_async_tx_descriptor *
++d40_prep_sg(struct dma_chan *chan,
++ struct scatterlist *dst_sg, unsigned int dst_nents,
++ struct scatterlist *src_sg, unsigned int src_nents,
++ unsigned long dma_flags)
++{
++ if (dst_nents != src_nents)
++ return NULL;
++
++ return stedma40_memcpy_sg(chan, dst_sg, src_sg, dst_nents, dma_flags);
++}
++
+ static int d40_prep_slave_sg_log(struct d40_desc *d40d,
+ struct d40_chan *d40c,
+ struct scatterlist *sgl,
+@@ -2281,6 +2293,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
+ base->dma_slave.device_alloc_chan_resources = d40_alloc_chan_resources;
+ base->dma_slave.device_free_chan_resources = d40_free_chan_resources;
+ base->dma_slave.device_prep_dma_memcpy = d40_prep_memcpy;
++ base->dma_slave.device_prep_dma_sg = d40_prep_sg;
+ base->dma_slave.device_prep_slave_sg = d40_prep_slave_sg;
+ base->dma_slave.device_tx_status = d40_tx_status;
+ base->dma_slave.device_issue_pending = d40_issue_pending;
+@@ -2301,10 +2314,12 @@ static int __init d40_dmaengine_init(struct d40_base *base,
+
+ dma_cap_zero(base->dma_memcpy.cap_mask);
+ dma_cap_set(DMA_MEMCPY, base->dma_memcpy.cap_mask);
++ dma_cap_set(DMA_SG, base->dma_slave.cap_mask);
+
+ base->dma_memcpy.device_alloc_chan_resources = d40_alloc_chan_resources;
+ base->dma_memcpy.device_free_chan_resources = d40_free_chan_resources;
+ base->dma_memcpy.device_prep_dma_memcpy = d40_prep_memcpy;
++ base->dma_slave.device_prep_dma_sg = d40_prep_sg;
+ base->dma_memcpy.device_prep_slave_sg = d40_prep_slave_sg;
+ base->dma_memcpy.device_tx_status = d40_tx_status;
+ base->dma_memcpy.device_issue_pending = d40_issue_pending;
+@@ -2331,10 +2346,12 @@ static int __init d40_dmaengine_init(struct d40_base *base,
+ dma_cap_zero(base->dma_both.cap_mask);
+ dma_cap_set(DMA_SLAVE, base->dma_both.cap_mask);
+ dma_cap_set(DMA_MEMCPY, base->dma_both.cap_mask);
++ dma_cap_set(DMA_SG, base->dma_slave.cap_mask);
+
+ base->dma_both.device_alloc_chan_resources = d40_alloc_chan_resources;
+ base->dma_both.device_free_chan_resources = d40_free_chan_resources;
+ base->dma_both.device_prep_dma_memcpy = d40_prep_memcpy;
++ base->dma_slave.device_prep_dma_sg = d40_prep_sg;
+ base->dma_both.device_prep_slave_sg = d40_prep_slave_sg;
+ base->dma_both.device_tx_status = d40_tx_status;
+ base->dma_both.device_issue_pending = d40_issue_pending;commit 968f19ae802fdc6b6b6b5af6fe79cf23d281be0f
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Sep 30 11:46:46 2010 +0000
+
+ fsldma: improved DMA_SLAVE support
+
+ Now that the generic DMAEngine API has support for scatterlist to
+ scatterlist copying, the device_prep_slave_sg() portion of the
+ DMA_SLAVE API is no longer necessary and has been removed.
+
+ However, the device_control() portion of the DMA_SLAVE API is still
+ useful to control device specific parameters, such as externally
+ controlled DMA transfers and maximum burst length.
+
+ A special dma_ctrl_cmd has been added to enable externally controlled
+ DMA transfers. This is currently specific to the Freescale DMA
+ controller, but can easily be made generic when another user is found.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/arch/powerpc/include/asm/fsldma.h b/arch/powerpc/include/asm/fsldma.h
+deleted file mode 100644
+index debc5ed96d6e..000000000000
+--- a/arch/powerpc/include/asm/fsldma.h
++++ /dev/null
+@@ -1,137 +0,0 @@
+-/*
+- * Freescale MPC83XX / MPC85XX DMA Controller
+- *
+- * Copyright (c) 2009 Ira W. Snyder <iws@ovro.caltech.edu>
+- *
+- * This file is licensed under the terms of the GNU General Public License
+- * version 2. This program is licensed "as is" without any warranty of any
+- * kind, whether express or implied.
+- */
+-
+-#ifndef __ARCH_POWERPC_ASM_FSLDMA_H__
+-#define __ARCH_POWERPC_ASM_FSLDMA_H__
+-
+-#include <linux/slab.h>
+-#include <linux/dmaengine.h>
+-
+-/*
+- * Definitions for the Freescale DMA controller's DMA_SLAVE implemention
+- *
+- * The Freescale DMA_SLAVE implementation was designed to handle many-to-many
+- * transfers. An example usage would be an accelerated copy between two
+- * scatterlists. Another example use would be an accelerated copy from
+- * multiple non-contiguous device buffers into a single scatterlist.
+- *
+- * A DMA_SLAVE transaction is defined by a struct fsl_dma_slave. This
+- * structure contains a list of hardware addresses that should be copied
+- * to/from the scatterlist passed into device_prep_slave_sg(). The structure
+- * also has some fields to enable hardware-specific features.
+- */
+-
+-/**
+- * struct fsl_dma_hw_addr
+- * @entry: linked list entry
+- * @address: the hardware address
+- * @length: length to transfer
+- *
+- * Holds a single physical hardware address / length pair for use
+- * with the DMAEngine DMA_SLAVE API.
+- */
+-struct fsl_dma_hw_addr {
+- struct list_head entry;
+-
+- dma_addr_t address;
+- size_t length;
+-};
+-
+-/**
+- * struct fsl_dma_slave
+- * @addresses: a linked list of struct fsl_dma_hw_addr structures
+- * @request_count: value for DMA request count
+- * @src_loop_size: setup and enable constant source-address DMA transfers
+- * @dst_loop_size: setup and enable constant destination address DMA transfers
+- * @external_start: enable externally started DMA transfers
+- * @external_pause: enable externally paused DMA transfers
+- *
+- * Holds a list of address / length pairs for use with the DMAEngine
+- * DMA_SLAVE API implementation for the Freescale DMA controller.
+- */
+-struct fsl_dma_slave {
+-
+- /* List of hardware address/length pairs */
+- struct list_head addresses;
+-
+- /* Support for extra controller features */
+- unsigned int request_count;
+- unsigned int src_loop_size;
+- unsigned int dst_loop_size;
+- bool external_start;
+- bool external_pause;
+-};
+-
+-/**
+- * fsl_dma_slave_append - add an address/length pair to a struct fsl_dma_slave
+- * @slave: the &struct fsl_dma_slave to add to
+- * @address: the hardware address to add
+- * @length: the length of bytes to transfer from @address
+- *
+- * Add a hardware address/length pair to a struct fsl_dma_slave. Returns 0 on
+- * success, -ERRNO otherwise.
+- */
+-static inline int fsl_dma_slave_append(struct fsl_dma_slave *slave,
+- dma_addr_t address, size_t length)
+-{
+- struct fsl_dma_hw_addr *addr;
+-
+- addr = kzalloc(sizeof(*addr), GFP_ATOMIC);
+- if (!addr)
+- return -ENOMEM;
+-
+- INIT_LIST_HEAD(&addr->entry);
+- addr->address = address;
+- addr->length = length;
+-
+- list_add_tail(&addr->entry, &slave->addresses);
+- return 0;
+-}
+-
+-/**
+- * fsl_dma_slave_free - free a struct fsl_dma_slave
+- * @slave: the struct fsl_dma_slave to free
+- *
+- * Free a struct fsl_dma_slave and all associated address/length pairs
+- */
+-static inline void fsl_dma_slave_free(struct fsl_dma_slave *slave)
+-{
+- struct fsl_dma_hw_addr *addr, *tmp;
+-
+- if (slave) {
+- list_for_each_entry_safe(addr, tmp, &slave->addresses, entry) {
+- list_del(&addr->entry);
+- kfree(addr);
+- }
+-
+- kfree(slave);
+- }
+-}
+-
+-/**
+- * fsl_dma_slave_alloc - allocate a struct fsl_dma_slave
+- * @gfp: the flags to pass to kmalloc when allocating this structure
+- *
+- * Allocate a struct fsl_dma_slave for use by the DMA_SLAVE API. Returns a new
+- * struct fsl_dma_slave on success, or NULL on failure.
+- */
+-static inline struct fsl_dma_slave *fsl_dma_slave_alloc(gfp_t gfp)
+-{
+- struct fsl_dma_slave *slave;
+-
+- slave = kzalloc(sizeof(*slave), gfp);
+- if (!slave)
+- return NULL;
+-
+- INIT_LIST_HEAD(&slave->addresses);
+- return slave;
+-}
+-
+-#endif /* __ARCH_POWERPC_ASM_FSLDMA_H__ */
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 1ed29d10a5fa..286c3ac6bdcc 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -35,7 +35,6 @@
+ #include <linux/dmapool.h>
+ #include <linux/of_platform.h>
+
+-#include <asm/fsldma.h>
+ #include "fsldma.h"
+
+ static const char msg_ld_oom[] = "No free memory for link descriptor\n";
+@@ -719,207 +718,70 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ struct dma_chan *dchan, struct scatterlist *sgl, unsigned int sg_len,
+ enum dma_data_direction direction, unsigned long flags)
+ {
+- struct fsldma_chan *chan;
+- struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
+- struct fsl_dma_slave *slave;
+- size_t copy;
+-
+- int i;
+- struct scatterlist *sg;
+- size_t sg_used;
+- size_t hw_used;
+- struct fsl_dma_hw_addr *hw;
+- dma_addr_t dma_dst, dma_src;
+-
+- if (!dchan)
+- return NULL;
+-
+- if (!dchan->private)
+- return NULL;
+-
+- chan = to_fsl_chan(dchan);
+- slave = dchan->private;
+-
+- if (list_empty(&slave->addresses))
+- return NULL;
+-
+- hw = list_first_entry(&slave->addresses, struct fsl_dma_hw_addr, entry);
+- hw_used = 0;
+-
+ /*
+- * Build the hardware transaction to copy from the scatterlist to
+- * the hardware, or from the hardware to the scatterlist
++ * This operation is not supported on the Freescale DMA controller
+ *
+- * If you are copying from the hardware to the scatterlist and it
+- * takes two hardware entries to fill an entire page, then both
+- * hardware entries will be coalesced into the same page
+- *
+- * If you are copying from the scatterlist to the hardware and a
+- * single page can fill two hardware entries, then the data will
+- * be read out of the page into the first hardware entry, and so on
++ * However, we need to provide the function pointer to allow the
++ * device_control() method to work.
+ */
+- for_each_sg(sgl, sg, sg_len, i) {
+- sg_used = 0;
+-
+- /* Loop until the entire scatterlist entry is used */
+- while (sg_used < sg_dma_len(sg)) {
+-
+- /*
+- * If we've used up the current hardware address/length
+- * pair, we need to load a new one
+- *
+- * This is done in a while loop so that descriptors with
+- * length == 0 will be skipped
+- */
+- while (hw_used >= hw->length) {
+-
+- /*
+- * If the current hardware entry is the last
+- * entry in the list, we're finished
+- */
+- if (list_is_last(&hw->entry, &slave->addresses))
+- goto finished;
+-
+- /* Get the next hardware address/length pair */
+- hw = list_entry(hw->entry.next,
+- struct fsl_dma_hw_addr, entry);
+- hw_used = 0;
+- }
+-
+- /* Allocate the link descriptor from DMA pool */
+- new = fsl_dma_alloc_descriptor(chan);
+- if (!new) {
+- dev_err(chan->dev, "No free memory for "
+- "link descriptor\n");
+- goto fail;
+- }
+-#ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(chan->dev, "new link desc alloc %p\n", new);
+-#endif
+-
+- /*
+- * Calculate the maximum number of bytes to transfer,
+- * making sure it is less than the DMA controller limit
+- */
+- copy = min_t(size_t, sg_dma_len(sg) - sg_used,
+- hw->length - hw_used);
+- copy = min_t(size_t, copy, FSL_DMA_BCR_MAX_CNT);
+-
+- /*
+- * DMA_FROM_DEVICE
+- * from the hardware to the scatterlist
+- *
+- * DMA_TO_DEVICE
+- * from the scatterlist to the hardware
+- */
+- if (direction == DMA_FROM_DEVICE) {
+- dma_src = hw->address + hw_used;
+- dma_dst = sg_dma_address(sg) + sg_used;
+- } else {
+- dma_src = sg_dma_address(sg) + sg_used;
+- dma_dst = hw->address + hw_used;
+- }
+-
+- /* Fill in the descriptor */
+- set_desc_cnt(chan, &new->hw, copy);
+- set_desc_src(chan, &new->hw, dma_src);
+- set_desc_dst(chan, &new->hw, dma_dst);
+-
+- /*
+- * If this is not the first descriptor, chain the
+- * current descriptor after the previous descriptor
+- */
+- if (!first) {
+- first = new;
+- } else {
+- set_desc_next(chan, &prev->hw,
+- new->async_tx.phys);
+- }
+-
+- new->async_tx.cookie = 0;
+- async_tx_ack(&new->async_tx);
+-
+- prev = new;
+- sg_used += copy;
+- hw_used += copy;
+-
+- /* Insert the link descriptor into the LD ring */
+- list_add_tail(&new->node, &first->tx_list);
+- }
+- }
+-
+-finished:
+-
+- /* All of the hardware address/length pairs had length == 0 */
+- if (!first || !new)
+- return NULL;
+-
+- new->async_tx.flags = flags;
+- new->async_tx.cookie = -EBUSY;
+-
+- /* Set End-of-link to the last link descriptor of new list */
+- set_ld_eol(chan, new);
+-
+- /* Enable extra controller features */
+- if (chan->set_src_loop_size)
+- chan->set_src_loop_size(chan, slave->src_loop_size);
+-
+- if (chan->set_dst_loop_size)
+- chan->set_dst_loop_size(chan, slave->dst_loop_size);
+-
+- if (chan->toggle_ext_start)
+- chan->toggle_ext_start(chan, slave->external_start);
+-
+- if (chan->toggle_ext_pause)
+- chan->toggle_ext_pause(chan, slave->external_pause);
+-
+- if (chan->set_request_count)
+- chan->set_request_count(chan, slave->request_count);
+-
+- return &first->async_tx;
+-
+-fail:
+- /* If first was not set, then we failed to allocate the very first
+- * descriptor, and we're done */
+- if (!first)
+- return NULL;
+-
+- /*
+- * First is set, so all of the descriptors we allocated have been added
+- * to first->tx_list, INCLUDING "first" itself. Therefore we
+- * must traverse the list backwards freeing each descriptor in turn
+- *
+- * We're re-using variables for the loop, oh well
+- */
+- fsldma_free_desc_list_reverse(chan, &first->tx_list);
+ return NULL;
+ }
+
+ static int fsl_dma_device_control(struct dma_chan *dchan,
+ enum dma_ctrl_cmd cmd, unsigned long arg)
+ {
++ struct dma_slave_config *config;
+ struct fsldma_chan *chan;
+ unsigned long flags;
+-
+- /* Only supports DMA_TERMINATE_ALL */
+- if (cmd != DMA_TERMINATE_ALL)
+- return -ENXIO;
++ int size;
+
+ if (!dchan)
+ return -EINVAL;
+
+ chan = to_fsl_chan(dchan);
+
+- /* Halt the DMA engine */
+- dma_halt(chan);
++ switch (cmd) {
++ case DMA_TERMINATE_ALL:
++ /* Halt the DMA engine */
++ dma_halt(chan);
+
+- spin_lock_irqsave(&chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- /* Remove and free all of the descriptors in the LD queue */
+- fsldma_free_desc_list(chan, &chan->ld_pending);
+- fsldma_free_desc_list(chan, &chan->ld_running);
++ /* Remove and free all of the descriptors in the LD queue */
++ fsldma_free_desc_list(chan, &chan->ld_pending);
++ fsldma_free_desc_list(chan, &chan->ld_running);
+
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++ return 0;
++
++ case DMA_SLAVE_CONFIG:
++ config = (struct dma_slave_config *)arg;
++
++ /* make sure the channel supports setting burst size */
++ if (!chan->set_request_count)
++ return -ENXIO;
++
++ /* we set the controller burst size depending on direction */
++ if (config->direction == DMA_TO_DEVICE)
++ size = config->dst_addr_width * config->dst_maxburst;
++ else
++ size = config->src_addr_width * config->src_maxburst;
++
++ chan->set_request_count(chan, size);
++ return 0;
++
++ case FSLDMA_EXTERNAL_START:
++
++ /* make sure the channel supports external start */
++ if (!chan->toggle_ext_start)
++ return -ENXIO;
++
++ chan->toggle_ext_start(chan, arg);
++ return 0;
++
++ default:
++ return -ENXIO;
++ }
+
+ return 0;
+ }
+diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
+index 2c9ee98f6c77..885f35211675 100644
+--- a/include/linux/dmaengine.h
++++ b/include/linux/dmaengine.h
+@@ -120,12 +120,15 @@ enum dma_ctrl_flags {
+ * configuration data in statically from the platform). An additional
+ * argument of struct dma_slave_config must be passed in with this
+ * command.
++ * @FSLDMA_EXTERNAL_START: this command will put the Freescale DMA controller
++ * into external start mode.
+ */
+ enum dma_ctrl_cmd {
+ DMA_TERMINATE_ALL,
+ DMA_PAUSE,
+ DMA_RESUME,
+ DMA_SLAVE_CONFIG,
++ FSLDMA_EXTERNAL_START,
+ };
+
+ /**
+ commit c14330417ef2050f4bf38ac20e125785fea14351
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Sep 30 11:46:45 2010 +0000
+
+ fsldma: implement support for scatterlist to scatterlist copy
+
+ Now that the DMAEngine API has support for scatterlist to scatterlist
+ copy, implement support for the Freescale DMA controller.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index cea08bed9cf9..1ed29d10a5fa 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -38,6 +38,8 @@
+ #include <asm/fsldma.h>
+ #include "fsldma.h"
+
++static const char msg_ld_oom[] = "No free memory for link descriptor\n";
++
+ static void dma_init(struct fsldma_chan *chan)
+ {
+ /* Reset the channel */
+@@ -499,7 +501,7 @@ fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
+
+ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(chan->dev, "No free memory for link descriptor\n");
++ dev_err(chan->dev, msg_ld_oom);
+ return NULL;
+ }
+
+@@ -536,8 +538,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ /* Allocate the link descriptor from DMA pool */
+ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(chan->dev,
+- "No free memory for link descriptor\n");
++ dev_err(chan->dev, msg_ld_oom);
+ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+@@ -583,6 +584,125 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ return NULL;
+ }
+
++static struct dma_async_tx_descriptor *fsl_dma_prep_sg(struct dma_chan *dchan,
++ struct scatterlist *dst_sg, unsigned int dst_nents,
++ struct scatterlist *src_sg, unsigned int src_nents,
++ unsigned long flags)
++{
++ struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
++ struct fsldma_chan *chan = to_fsl_chan(dchan);
++ size_t dst_avail, src_avail;
++ dma_addr_t dst, src;
++ size_t len;
++
++ /* basic sanity checks */
++ if (dst_nents == 0 || src_nents == 0)
++ return NULL;
++
++ if (dst_sg == NULL || src_sg == NULL)
++ return NULL;
++
++ /*
++ * TODO: should we check that both scatterlists have the same
++ * TODO: number of bytes in total? Is that really an error?
++ */
++
++ /* get prepared for the loop */
++ dst_avail = sg_dma_len(dst_sg);
++ src_avail = sg_dma_len(src_sg);
++
++ /* run until we are out of scatterlist entries */
++ while (true) {
++
++ /* create the largest transaction possible */
++ len = min_t(size_t, src_avail, dst_avail);
++ len = min_t(size_t, len, FSL_DMA_BCR_MAX_CNT);
++ if (len == 0)
++ goto fetch;
++
++ dst = sg_dma_address(dst_sg) + sg_dma_len(dst_sg) - dst_avail;
++ src = sg_dma_address(src_sg) + sg_dma_len(src_sg) - src_avail;
++
++ /* allocate and populate the descriptor */
++ new = fsl_dma_alloc_descriptor(chan);
++ if (!new) {
++ dev_err(chan->dev, msg_ld_oom);
++ goto fail;
++ }
++#ifdef FSL_DMA_LD_DEBUG
++ dev_dbg(chan->dev, "new link desc alloc %p\n", new);
++#endif
++
++ set_desc_cnt(chan, &new->hw, len);
++ set_desc_src(chan, &new->hw, src);
++ set_desc_dst(chan, &new->hw, dst);
++
++ if (!first)
++ first = new;
++ else
++ set_desc_next(chan, &prev->hw, new->async_tx.phys);
++
++ new->async_tx.cookie = 0;
++ async_tx_ack(&new->async_tx);
++ prev = new;
++
++ /* Insert the link descriptor to the LD ring */
++ list_add_tail(&new->node, &first->tx_list);
++
++ /* update metadata */
++ dst_avail -= len;
++ src_avail -= len;
++
++fetch:
++ /* fetch the next dst scatterlist entry */
++ if (dst_avail == 0) {
++
++ /* no more entries: we're done */
++ if (dst_nents == 0)
++ break;
++
++ /* fetch the next entry: if there are no more: done */
++ dst_sg = sg_next(dst_sg);
++ if (dst_sg == NULL)
++ break;
++
++ dst_nents--;
++ dst_avail = sg_dma_len(dst_sg);
++ }
++
++ /* fetch the next src scatterlist entry */
++ if (src_avail == 0) {
++
++ /* no more entries: we're done */
++ if (src_nents == 0)
++ break;
++
++ /* fetch the next entry: if there are no more: done */
++ src_sg = sg_next(src_sg);
++ if (src_sg == NULL)
++ break;
++
++ src_nents--;
++ src_avail = sg_dma_len(src_sg);
++ }
++ }
++
++ new->async_tx.flags = flags; /* client is in control of this ack */
++ new->async_tx.cookie = -EBUSY;
++
++ /* Set End-of-link to the last link descriptor of new list */
++ set_ld_eol(chan, new);
++
++ return &first->async_tx;
++
++fail:
++ if (!first)
++ return NULL;
++
++ fsldma_free_desc_list_reverse(chan, &first->tx_list);
++ return NULL;
++}
++
+ /**
+ * fsl_dma_prep_slave_sg - prepare descriptors for a DMA_SLAVE transaction
+ * @chan: DMA channel
+@@ -1327,11 +1447,13 @@ static int __devinit fsldma_of_probe(struct platform_device *op,
+
+ dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
+ dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
++ dma_cap_set(DMA_SG, fdev->common.cap_mask);
+ dma_cap_set(DMA_SLAVE, fdev->common.cap_mask);
+ fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources;
+ fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources;
+ fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt;
+ fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy;
++ fdev->common.device_prep_dma_sg = fsl_dma_prep_sg;
+ fdev->common.device_tx_status = fsl_tx_status;
+ fdev->common.device_issue_pending = fsl_dma_memcpy_issue_pending;
+ fdev->common.device_prep_slave_sg = fsl_dma_prep_slave_sg;commit a86ee03ce6f279ebe581a7a8c0c4393eaeb789ee
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu Sep 30 11:46:44 2010 +0000
+
+ dma: add support for scatterlist to scatterlist copy
+
+ This adds support for scatterlist to scatterlist DMA transfers. A
+ similar interface is exposed by the fsldma driver (through the DMA_SLAVE
+ API) and by the ste_dma40 driver (through an exported function).
+
+ This patch paves the way for making this type of copy operation a part
+ of the generic DMAEngine API. Futher patches will add support in
+ individual drivers.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
+index 9d31d5eb95c1..db403b8ccabd 100644
+--- a/drivers/dma/dmaengine.c
++++ b/drivers/dma/dmaengine.c
+@@ -690,6 +690,8 @@ int dma_async_device_register(struct dma_device *device)
+ !device->device_prep_dma_memset);
+ BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) &&
+ !device->device_prep_dma_interrupt);
++ BUG_ON(dma_has_cap(DMA_SG, device->cap_mask) &&
++ !device->device_prep_dma_sg);
+ BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
+ !device->device_prep_slave_sg);
+ BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
+diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
+index e2106495cc11..2c9ee98f6c77 100644
+--- a/include/linux/dmaengine.h
++++ b/include/linux/dmaengine.h
+@@ -64,6 +64,7 @@ enum dma_transaction_type {
+ DMA_PQ_VAL,
+ DMA_MEMSET,
+ DMA_INTERRUPT,
++ DMA_SG,
+ DMA_PRIVATE,
+ DMA_ASYNC_TX,
+ DMA_SLAVE,
+@@ -473,6 +474,11 @@ struct dma_device {
+ unsigned long flags);
+ struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)(
+ struct dma_chan *chan, unsigned long flags);
++ struct dma_async_tx_descriptor *(*device_prep_dma_sg)(
++ struct dma_chan *chan,
++ struct scatterlist *dst_sg, unsigned int dst_nents,
++ struct scatterlist *src_sg, unsigned int src_nents,
++ unsigned long flags);
+
+ struct dma_async_tx_descriptor *(*device_prep_slave_sg)(
+ struct dma_chan *chan, struct scatterlist *sgl,commit 399f1e30ac17b77d383444aff480c7390f5adf2a
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu Sep 30 15:15:27 2010 -0700
+
+ kfifo: fix scatterlist usage
+
+ The kfifo_dma family of functions use sg_mark_end() on the last element in
+ their scatterlist. This forces use of a fresh scatterlist for each DMA
+ operation, which makes recycling a single scatterlist impossible.
+
+ Change the behavior of the kfifo_dma functions to match the usage of the
+ dma_map_sg function. This means that users must respect the returned
+ nents value. The sample code is updated to reflect the change.
+
+ This bug is trivial to cause: call kfifo_dma_in_prepare() such that it
+ prepares a scatterlist with a single entry comprising the whole fifo.
+ This is the case when you map the entirety of a newly created empty fifo.
+ This causes the setup_sgl() function to mark the first scatterlist entry
+ as the end of the chain, no matter what comes after it.
+
+ Afterwards, add and remove some data from the fifo such that another call
+ to kfifo_dma_in_prepare() will create two scatterlist entries. It returns
+ nents=2. However, due to the previous sg_mark_end() call, sg_is_last()
+ will now return true for the first scatterlist element. This causes the
+ sample code to print a single scatterlist element when it should print
+ two.
+
+ By removing the call to sg_mark_end(), we make the API as similar as
+ possible to the DMA mapping API. All users are required to respect the
+ returned nents.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Stefani Seibold <stefani@seibold.net>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/kernel/kfifo.c b/kernel/kfifo.c
+index 6b5580c57644..01a0700e873f 100644
+--- a/kernel/kfifo.c
++++ b/kernel/kfifo.c
+@@ -365,8 +365,6 @@ static unsigned int setup_sgl(struct __kfifo *fifo, struct scatterlist *sgl,
+ n = setup_sgl_buf(sgl, fifo->data + off, nents, l);
+ n += setup_sgl_buf(sgl + n, fifo->data, nents - n, len - l);
+
+- if (n)
+- sg_mark_end(sgl + n - 1);
+ return n;
+ }
+
+diff --git a/samples/kfifo/dma-example.c b/samples/kfifo/dma-example.c
+index ee03a4f0b64f..06473791c08a 100644
+--- a/samples/kfifo/dma-example.c
++++ b/samples/kfifo/dma-example.c
+@@ -24,6 +24,7 @@ static int __init example_init(void)
+ {
+ int i;
+ unsigned int ret;
++ unsigned int nents;
+ struct scatterlist sg[10];
+
+ printk(KERN_INFO "DMA fifo test start\n");
+@@ -61,9 +62,9 @@ static int __init example_init(void)
+ * byte at the beginning, after the kfifo_skip().
+ */
+ sg_init_table(sg, ARRAY_SIZE(sg));
+- ret = kfifo_dma_in_prepare(&fifo, sg, ARRAY_SIZE(sg), FIFO_SIZE);
+- printk(KERN_INFO "DMA sgl entries: %d\n", ret);
+- if (!ret) {
++ nents = kfifo_dma_in_prepare(&fifo, sg, ARRAY_SIZE(sg), FIFO_SIZE);
++ printk(KERN_INFO "DMA sgl entries: %d\n", nents);
++ if (!nents) {
+ /* fifo is full and no sgl was created */
+ printk(KERN_WARNING "error kfifo_dma_in_prepare\n");
+ return -EIO;
+@@ -71,7 +72,7 @@ static int __init example_init(void)
+
+ /* receive data */
+ printk(KERN_INFO "scatterlist for receive:\n");
+- for (i = 0; i < ARRAY_SIZE(sg); i++) {
++ for (i = 0; i < nents; i++) {
+ printk(KERN_INFO
+ "sg[%d] -> "
+ "page_link 0x%.8lx offset 0x%.8x length 0x%.8x\n",
+@@ -91,16 +92,16 @@ static int __init example_init(void)
+ kfifo_dma_in_finish(&fifo, ret);
+
+ /* Prepare to transmit data, example: 8 bytes */
+- ret = kfifo_dma_out_prepare(&fifo, sg, ARRAY_SIZE(sg), 8);
+- printk(KERN_INFO "DMA sgl entries: %d\n", ret);
+- if (!ret) {
++ nents = kfifo_dma_out_prepare(&fifo, sg, ARRAY_SIZE(sg), 8);
++ printk(KERN_INFO "DMA sgl entries: %d\n", nents);
++ if (!nents) {
+ /* no data was available and no sgl was created */
+ printk(KERN_WARNING "error kfifo_dma_out_prepare\n");
+ return -EIO;
+ }
+
+ printk(KERN_INFO "scatterlist for transmit:\n");
+- for (i = 0; i < ARRAY_SIZE(sg); i++) {
++ for (i = 0; i < nents; i++) {
+ printk(KERN_INFO
+ "sg[%d] -> "
+ "page_link 0x%.8lx offset 0x%.8x length 0x%.8x\n",commit 94131e174fedd9f3f9bb148cee4be12f2d46d68e +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Thu Sep 9 16:37:58 2010 -0700 + + arch/powerpc/include/asm/fsldma.h needs slab.h + + The slab.h header is required to use the kmalloc() family of functions. + Due to recent kernel changes, this header must be directly included by + code that calls into the memory allocator. + + Without this patch, any code which includes this header fails to build. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Cc: Dan Williams <dan.j.williams@intel.com> + Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/arch/powerpc/include/asm/fsldma.h b/arch/powerpc/include/asm/fsldma.h +index a67aeed17d40..debc5ed96d6e 100644 +--- a/arch/powerpc/include/asm/fsldma.h ++++ b/arch/powerpc/include/asm/fsldma.h +@@ -11,6 +11,7 @@ + #ifndef __ARCH_POWERPC_ASM_FSLDMA_H__ + #define __ARCH_POWERPC_ASM_FSLDMA_H__ + ++#include <linux/slab.h> + #include <linux/dmaengine.h> + + /*
commit 5950ec8d3e47a08ec0b678a0e0ba5d1b9b62dd8e
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Sat Aug 14 21:08:49 2010 +0200
+
+ hwmon: (ltc4245) Expose all GPIO pins as analog voltages
+
+ Add support for exposing all GPIO pins as analog voltages. Though this is
+ not an ideal use of the chip, some hardware engineers may decide that the
+ LTC4245 meets their design requirements when studying the datasheet.
+
+ The GPIO pins are sampled in round-robin fashion, meaning that a slow
+ reader will see stale data. A userspace application can detect this,
+ because it will get -EAGAIN when reading from a sysfs file which contains
+ stale data.
+
+ Users can choose to use this feature on a per-chip basis by using either
+ platform data or the OF device tree (where applicable).
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Jean Delvare <khali@linux-fr.org>
+
+diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
+index 86b5880d8502..b478b0864965 100644
+--- a/Documentation/hwmon/ltc4245
++++ b/Documentation/hwmon/ltc4245
+@@ -72,9 +72,31 @@ in6_min_alarm 5v output undervoltage alarm
+ in7_min_alarm 3v output undervoltage alarm
+ in8_min_alarm Vee (-12v) output undervoltage alarm
+
+-in9_input GPIO voltage data
++in9_input GPIO voltage data (see note 1)
++in10_input GPIO voltage data (see note 1)
++in11_input GPIO voltage data (see note 1)
+
+ power1_input 12v power usage (mW)
+ power2_input 5v power usage (mW)
+ power3_input 3v power usage (mW)
+ power4_input Vee (-12v) power usage (mW)
++
++
++Note 1
++------
++
++If you have NOT configured the driver to sample all GPIO pins as analog
++voltages, then the in10_input and in11_input sysfs attributes will not be
++created. The driver will sample the GPIO pin that is currently connected to the
++ADC as an analog voltage, and report the value in in9_input.
++
++If you have configured the driver to sample all GPIO pins as analog voltages,
++then they will be sampled in round-robin fashion. If userspace reads too
++slowly, -EAGAIN will be returned when you read the sysfs attribute containing
++the sensor reading.
++
++The LTC4245 chip can be configured to sample all GPIO pins with two methods:
++1) platform data -- see include/linux/i2c/ltc4245.h
++2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip
++
++The default mode of operation is to sample a single GPIO pin.
+diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
+index 21d201befc2c..659308329308 100644
+--- a/drivers/hwmon/ltc4245.c
++++ b/drivers/hwmon/ltc4245.c
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/hwmon.h>
+ #include <linux/hwmon-sysfs.h>
++#include <linux/i2c/ltc4245.h>
+
+ /* Here are names of the chip's registers (a.k.a. commands) */
+ enum ltc4245_cmd {
+@@ -60,8 +61,72 @@ struct ltc4245_data {
+
+ /* Voltage registers */
+ u8 vregs[0x0d];
++
++ /* GPIO ADC registers */
++ bool use_extra_gpios;
++ int gpios[3];
+ };
+
++/*
++ * Update the readings from the GPIO pins. If the driver has been configured to
++ * sample all GPIO's as analog voltages, a round-robin sampling method is used.
++ * Otherwise, only the configured GPIO pin is sampled.
++ *
++ * LOCKING: must hold data->update_lock
++ */
++static void ltc4245_update_gpios(struct device *dev)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct ltc4245_data *data = i2c_get_clientdata(client);
++ u8 gpio_curr, gpio_next, gpio_reg;
++ int i;
++
++ /* no extra gpio support, we're basically done */
++ if (!data->use_extra_gpios) {
++ data->gpios[0] = data->vregs[LTC4245_GPIOADC - 0x10];
++ return;
++ }
++
++ /*
++ * If the last reading was too long ago, then we mark all old GPIO
++ * readings as stale by setting them to -EAGAIN
++ */
++ if (time_after(jiffies, data->last_updated + 5 * HZ)) {
++ dev_dbg(&client->dev, "Marking GPIOs invalid\n");
++ for (i = 0; i < ARRAY_SIZE(data->gpios); i++)
++ data->gpios[i] = -EAGAIN;
++ }
++
++ /*
++ * Get the current GPIO pin
++ *
++ * The datasheet calls these GPIO[1-3], but we'll calculate the zero
++ * based array index instead, and call them GPIO[0-2]. This is much
++ * easier to think about.
++ */
++ gpio_curr = (data->cregs[LTC4245_GPIO] & 0xc0) >> 6;
++ if (gpio_curr > 0)
++ gpio_curr -= 1;
++
++ /* Read the GPIO voltage from the GPIOADC register */
++ data->gpios[gpio_curr] = data->vregs[LTC4245_GPIOADC - 0x10];
++
++ /* Find the next GPIO pin to read */
++ gpio_next = (gpio_curr + 1) % ARRAY_SIZE(data->gpios);
++
++ /*
++ * Calculate the correct setting for the GPIO register so it will
++ * sample the next GPIO pin
++ */
++ gpio_reg = (data->cregs[LTC4245_GPIO] & 0x3f) | ((gpio_next + 1) << 6);
++
++ /* Update the GPIO register */
++ i2c_smbus_write_byte_data(client, LTC4245_GPIO, gpio_reg);
++
++ /* Update saved data */
++ data->cregs[LTC4245_GPIO] = gpio_reg;
++}
++
+ static struct ltc4245_data *ltc4245_update_device(struct device *dev)
+ {
+ struct i2c_client *client = to_i2c_client(dev);
+@@ -93,6 +158,9 @@ static struct ltc4245_data *ltc4245_update_device(struct device *dev)
+ data->vregs[i] = val;
+ }
+
++ /* Update GPIO readings */
++ ltc4245_update_gpios(dev);
++
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+@@ -233,6 +301,22 @@ static ssize_t ltc4245_show_alarm(struct device *dev,
+ return snprintf(buf, PAGE_SIZE, "%u\n", (reg & mask) ? 1 : 0);
+ }
+
++static ssize_t ltc4245_show_gpio(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
++ struct ltc4245_data *data = ltc4245_update_device(dev);
++ int val = data->gpios[attr->index];
++
++ /* handle stale GPIO's */
++ if (val < 0)
++ return val;
++
++ /* Convert to millivolts and print */
++ return snprintf(buf, PAGE_SIZE, "%u\n", val * 10);
++}
++
+ /* These macros are used below in constructing device attribute objects
+ * for use with sysfs_create_group() to make a sysfs device file
+ * for each register.
+@@ -254,6 +338,10 @@ static ssize_t ltc4245_show_alarm(struct device *dev,
+ static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
+ ltc4245_show_alarm, NULL, (mask), reg)
+
++#define LTC4245_GPIO_VOLTAGE(name, gpio_num) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4245_show_gpio, NULL, gpio_num)
++
+ /* Construct a sensor_device_attribute structure for each register */
+
+ /* Input voltages */
+@@ -293,7 +381,9 @@ LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2);
+ LTC4245_ALARM(in8_min_alarm, (1 << 3), LTC4245_FAULT2);
+
+ /* GPIO voltages */
+-LTC4245_VOLTAGE(in9_input, LTC4245_GPIOADC);
++LTC4245_GPIO_VOLTAGE(in9_input, 0);
++LTC4245_GPIO_VOLTAGE(in10_input, 1);
++LTC4245_GPIO_VOLTAGE(in11_input, 2);
+
+ /* Power Consumption (virtual) */
+ LTC4245_POWER(power1_input, LTC4245_12VSENSE);
+@@ -304,7 +394,7 @@ LTC4245_POWER(power4_input, LTC4245_VEESENSE);
+ /* Finally, construct an array of pointers to members of the above objects,
+ * as required for sysfs_create_group()
+ */
+-static struct attribute *ltc4245_attributes[] = {
++static struct attribute *ltc4245_std_attributes[] = {
+ &sensor_dev_attr_in1_input.dev_attr.attr,
+ &sensor_dev_attr_in2_input.dev_attr.attr,
+ &sensor_dev_attr_in3_input.dev_attr.attr,
+@@ -345,10 +435,77 @@ static struct attribute *ltc4245_attributes[] = {
+ NULL,
+ };
+
+-static const struct attribute_group ltc4245_group = {
+- .attrs = ltc4245_attributes,
++static struct attribute *ltc4245_gpio_attributes[] = {
++ &sensor_dev_attr_in10_input.dev_attr.attr,
++ &sensor_dev_attr_in11_input.dev_attr.attr,
++ NULL,
++};
++
++static const struct attribute_group ltc4245_std_group = {
++ .attrs = ltc4245_std_attributes,
++};
++
++static const struct attribute_group ltc4245_gpio_group = {
++ .attrs = ltc4245_gpio_attributes,
+ };
+
++static int ltc4245_sysfs_create_groups(struct i2c_client *client)
++{
++ struct ltc4245_data *data = i2c_get_clientdata(client);
++ struct device *dev = &client->dev;
++ int ret;
++
++ /* register the standard sysfs attributes */
++ ret = sysfs_create_group(&dev->kobj, <c4245_std_group);
++ if (ret) {
++ dev_err(dev, "unable to register standard attributes\n");
++ return ret;
++ }
++
++ /* if we're using the extra gpio support, register it's attributes */
++ if (data->use_extra_gpios) {
++ ret = sysfs_create_group(&dev->kobj, <c4245_gpio_group);
++ if (ret) {
++ dev_err(dev, "unable to register gpio attributes\n");
++ sysfs_remove_group(&dev->kobj, <c4245_std_group);
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++static void ltc4245_sysfs_remove_groups(struct i2c_client *client)
++{
++ struct ltc4245_data *data = i2c_get_clientdata(client);
++ struct device *dev = &client->dev;
++
++ if (data->use_extra_gpios)
++ sysfs_remove_group(&dev->kobj, <c4245_gpio_group);
++
++ sysfs_remove_group(&dev->kobj, <c4245_std_group);
++}
++
++static bool ltc4245_use_extra_gpios(struct i2c_client *client)
++{
++ struct ltc4245_platform_data *pdata = dev_get_platdata(&client->dev);
++#ifdef CONFIG_OF
++ struct device_node *np = client->dev.of_node;
++#endif
++
++ /* prefer platform data */
++ if (pdata)
++ return pdata->use_extra_gpios;
++
++#ifdef CONFIG_OF
++ /* fallback on OF */
++ if (of_find_property(np, "ltc4245,use-extra-gpios", NULL))
++ return true;
++#endif
++
++ return false;
++}
++
+ static int ltc4245_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+ {
+@@ -367,15 +524,16 @@ static int ltc4245_probe(struct i2c_client *client,
+
+ i2c_set_clientdata(client, data);
+ mutex_init(&data->update_lock);
++ data->use_extra_gpios = ltc4245_use_extra_gpios(client);
+
+ /* Initialize the LTC4245 chip */
+ i2c_smbus_write_byte_data(client, LTC4245_FAULT1, 0x00);
+ i2c_smbus_write_byte_data(client, LTC4245_FAULT2, 0x00);
+
+ /* Register sysfs hooks */
+- ret = sysfs_create_group(&client->dev.kobj, <c4245_group);
++ ret = ltc4245_sysfs_create_groups(client);
+ if (ret)
+- goto out_sysfs_create_group;
++ goto out_sysfs_create_groups;
+
+ data->hwmon_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->hwmon_dev)) {
+@@ -386,8 +544,8 @@ static int ltc4245_probe(struct i2c_client *client,
+ return 0;
+
+ out_hwmon_device_register:
+- sysfs_remove_group(&client->dev.kobj, <c4245_group);
+-out_sysfs_create_group:
++ ltc4245_sysfs_remove_groups(client);
++out_sysfs_create_groups:
+ kfree(data);
+ out_kzalloc:
+ return ret;
+@@ -398,8 +556,7 @@ static int ltc4245_remove(struct i2c_client *client)
+ struct ltc4245_data *data = i2c_get_clientdata(client);
+
+ hwmon_device_unregister(data->hwmon_dev);
+- sysfs_remove_group(&client->dev.kobj, <c4245_group);
+-
++ ltc4245_sysfs_remove_groups(client);
+ kfree(data);
+
+ return 0;
+diff --git a/include/linux/i2c/ltc4245.h b/include/linux/i2c/ltc4245.h
+new file mode 100644
+index 000000000000..56bda4be0016
+--- /dev/null
++++ b/include/linux/i2c/ltc4245.h
+@@ -0,0 +1,21 @@
++/*
++ * Platform Data for LTC4245 hardware monitor chip
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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 LINUX_LTC4245_H
++#define LINUX_LTC4245_H
++
++#include <linux/types.h>
++
++struct ltc4245_platform_data {
++ bool use_extra_gpios;
++};
++
++#endif /* LINUX_LTC4245_H */commit 800e69fbd2faea906cabd10ddb77e36410f2bd9c
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Apr 7 10:08:01 2010 +0200
+
+ gpio: Add support for Janz VMOD-TTL Digital IO module
+
+ The Janz VMOD-TTL is a MODULbus daughterboard which fits onto any MODULbus
+ carrier board. It essentially consists of some various logic and a Zilog
+ Z8536 CIO Counter/Timer and Parallel IO Unit.
+
+ The board must be physically configured with jumpers to enable a user to
+ drive output signals. I am only interested in outputs, so I have made this
+ driver as simple as possible. It only supports a very minimal subset of the
+ features provided by the Z8536 chip.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
+
+diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
+index 56eb0c59c512..0e9c16b5bbce 100644
+--- a/drivers/gpio/Kconfig
++++ b/drivers/gpio/Kconfig
+@@ -325,4 +325,14 @@ config GPIO_UCB1400
+ To compile this driver as a module, choose M here: the
+ module will be called ucb1400_gpio.
+
++comment "MODULbus GPIO expanders:"
++
++config GPIO_JANZ_TTL
++ tristate "Janz VMOD-TTL Digital IO Module"
++ depends on MFD_JANZ_CMODIO
++ help
++ This enables support for the Janz VMOD-TTL Digital IO module.
++ This driver provides support for driving the pins in output
++ mode only. Input mode is not supported.
++
+ endif
+diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
+index d3226d395a90..94a96c51c741 100644
+--- a/drivers/gpio/Makefile
++++ b/drivers/gpio/Makefile
+@@ -29,3 +29,4 @@ obj-$(CONFIG_GPIO_WM8350) += wm8350-gpiolib.o
+ obj-$(CONFIG_GPIO_WM8994) += wm8994-gpio.o
+ obj-$(CONFIG_GPIO_SCH) += sch_gpio.o
+ obj-$(CONFIG_GPIO_RDC321X) += rdc321x-gpio.o
++obj-$(CONFIG_GPIO_JANZ_TTL) += janz-ttl.o
+diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
+new file mode 100644
+index 000000000000..813ac077e5d7
+--- /dev/null
++++ b/drivers/gpio/janz-ttl.c
+@@ -0,0 +1,258 @@
++/*
++ * Janz MODULbus VMOD-TTL GPIO Driver
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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/module.h>
++#include <linux/init.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/gpio.h>
++#include <linux/slab.h>
++
++#include <linux/mfd/janz.h>
++
++#define DRV_NAME "janz-ttl"
++
++#define PORTA_DIRECTION 0x23
++#define PORTB_DIRECTION 0x2B
++#define PORTC_DIRECTION 0x06
++#define PORTA_IOCTL 0x24
++#define PORTB_IOCTL 0x2C
++#define PORTC_IOCTL 0x07
++
++#define MASTER_INT_CTL 0x00
++#define MASTER_CONF_CTL 0x01
++
++#define CONF_PAE (1 << 2)
++#define CONF_PBE (1 << 7)
++#define CONF_PCE (1 << 4)
++
++struct ttl_control_regs {
++ __be16 portc;
++ __be16 portb;
++ __be16 porta;
++ __be16 control;
++};
++
++struct ttl_module {
++ struct gpio_chip gpio;
++
++ /* base address of registers */
++ struct ttl_control_regs __iomem *regs;
++
++ u8 portc_shadow;
++ u8 portb_shadow;
++ u8 porta_shadow;
++
++ spinlock_t lock;
++};
++
++static int ttl_get_value(struct gpio_chip *gpio, unsigned offset)
++{
++ struct ttl_module *mod = dev_get_drvdata(gpio->dev);
++ u8 *shadow;
++ int ret;
++
++ if (offset < 8) {
++ shadow = &mod->porta_shadow;
++ } else if (offset < 16) {
++ shadow = &mod->portb_shadow;
++ offset -= 8;
++ } else {
++ shadow = &mod->portc_shadow;
++ offset -= 16;
++ }
++
++ spin_lock(&mod->lock);
++ ret = *shadow & (1 << offset);
++ spin_unlock(&mod->lock);
++ return ret;
++}
++
++static void ttl_set_value(struct gpio_chip *gpio, unsigned offset, int value)
++{
++ struct ttl_module *mod = dev_get_drvdata(gpio->dev);
++ void __iomem *port;
++ u8 *shadow;
++
++ if (offset < 8) {
++ port = &mod->regs->porta;
++ shadow = &mod->porta_shadow;
++ } else if (offset < 16) {
++ port = &mod->regs->portb;
++ shadow = &mod->portb_shadow;
++ offset -= 8;
++ } else {
++ port = &mod->regs->portc;
++ shadow = &mod->portc_shadow;
++ offset -= 16;
++ }
++
++ spin_lock(&mod->lock);
++ if (value)
++ *shadow |= (1 << offset);
++ else
++ *shadow &= ~(1 << offset);
++
++ iowrite16be(*shadow, port);
++ spin_unlock(&mod->lock);
++}
++
++static void __devinit ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
++{
++ iowrite16be(reg, &mod->regs->control);
++ iowrite16be(val, &mod->regs->control);
++}
++
++static void __devinit ttl_setup_device(struct ttl_module *mod)
++{
++ /* reset the device to a known state */
++ iowrite16be(0x0000, &mod->regs->control);
++ iowrite16be(0x0001, &mod->regs->control);
++ iowrite16be(0x0000, &mod->regs->control);
++
++ /* put all ports in open-drain mode */
++ ttl_write_reg(mod, PORTA_IOCTL, 0x00ff);
++ ttl_write_reg(mod, PORTB_IOCTL, 0x00ff);
++ ttl_write_reg(mod, PORTC_IOCTL, 0x000f);
++
++ /* set all ports as outputs */
++ ttl_write_reg(mod, PORTA_DIRECTION, 0x0000);
++ ttl_write_reg(mod, PORTB_DIRECTION, 0x0000);
++ ttl_write_reg(mod, PORTC_DIRECTION, 0x0000);
++
++ /* set all ports to drive zeroes */
++ iowrite16be(0x0000, &mod->regs->porta);
++ iowrite16be(0x0000, &mod->regs->portb);
++ iowrite16be(0x0000, &mod->regs->portc);
++
++ /* enable all ports */
++ ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);
++}
++
++static int __devinit ttl_probe(struct platform_device *pdev)
++{
++ struct janz_platform_data *pdata;
++ struct device *dev = &pdev->dev;
++ struct ttl_module *mod;
++ struct gpio_chip *gpio;
++ struct resource *res;
++ int ret;
++
++ pdata = pdev->dev.platform_data;
++ if (!pdata) {
++ dev_err(dev, "no platform data\n");
++ ret = -ENXIO;
++ goto out_return;
++ }
++
++ mod = kzalloc(sizeof(*mod), GFP_KERNEL);
++ if (!mod) {
++ dev_err(dev, "unable to allocate private data\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ platform_set_drvdata(pdev, mod);
++ spin_lock_init(&mod->lock);
++
++ /* get access to the MODULbus registers for this module */
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (!res) {
++ dev_err(dev, "MODULbus registers not found\n");
++ ret = -ENODEV;
++ goto out_free_mod;
++ }
++
++ mod->regs = ioremap(res->start, resource_size(res));
++ if (!mod->regs) {
++ dev_err(dev, "MODULbus registers not ioremap\n");
++ ret = -ENOMEM;
++ goto out_free_mod;
++ }
++
++ ttl_setup_device(mod);
++
++ /* Initialize the GPIO data structures */
++ gpio = &mod->gpio;
++ gpio->dev = &pdev->dev;
++ gpio->label = pdev->name;
++ gpio->get = ttl_get_value;
++ gpio->set = ttl_set_value;
++ gpio->owner = THIS_MODULE;
++
++ /* request dynamic allocation */
++ gpio->base = -1;
++ gpio->ngpio = 20;
++
++ ret = gpiochip_add(gpio);
++ if (ret) {
++ dev_err(dev, "unable to add GPIO chip\n");
++ goto out_iounmap_regs;
++ }
++
++ dev_info(&pdev->dev, "module %d: registered GPIO device\n",
++ pdata->modno);
++ return 0;
++
++out_iounmap_regs:
++ iounmap(mod->regs);
++out_free_mod:
++ kfree(mod);
++out_return:
++ return ret;
++}
++
++static int __devexit ttl_remove(struct platform_device *pdev)
++{
++ struct ttl_module *mod = platform_get_drvdata(pdev);
++ struct device *dev = &pdev->dev;
++ int ret;
++
++ ret = gpiochip_remove(&mod->gpio);
++ if (ret) {
++ dev_err(dev, "unable to remove GPIO chip\n");
++ return ret;
++ }
++
++ iounmap(mod->regs);
++ kfree(mod);
++ return 0;
++}
++
++static struct platform_driver ttl_driver = {
++ .driver = {
++ .name = DRV_NAME,
++ .owner = THIS_MODULE,
++ },
++ .probe = ttl_probe,
++ .remove = __devexit_p(ttl_remove),
++};
++
++static int __init ttl_init(void)
++{
++ return platform_driver_register(&ttl_driver);
++}
++
++static void __exit ttl_exit(void)
++{
++ platform_driver_unregister(&ttl_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("Janz MODULbus VMOD-TTL Driver");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:janz-ttl");
++
++module_init(ttl_init);
++module_exit(ttl_exit);commit 631eb227849e3bfdec2d2e628ee5a3f962db82e2
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Mon Mar 29 09:58:51 2010 -0700
+
+ can: Add support for Janz VMOD-ICAN3 Intelligent CAN module
+
+ The Janz VMOD-ICAN3 is a MODULbus daughterboard which fits onto any
+ MODULbus carrier board. It is an intelligent CAN controller with a
+ microcontroller and associated firmware.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Acked-by: Wolfgang Grandegger <wg@grandegger.com>
+ Acked-by: David S. Miller <davem@davemloft.net>
+ Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
+
+diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
+index 05b751719bd5..2c5227c02fa0 100644
+--- a/drivers/net/can/Kconfig
++++ b/drivers/net/can/Kconfig
+@@ -63,6 +63,16 @@ config CAN_BFIN
+ To compile this driver as a module, choose M here: the
+ module will be called bfin_can.
+
++config CAN_JANZ_ICAN3
++ tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
++ depends on CAN_DEV && MFD_JANZ_CMODIO
++ ---help---
++ Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
++ connects to a MODULbus carrier board.
++
++ This driver can also be built as a module. If so, the module will be
++ called janz-ican3.ko.
++
+ source "drivers/net/can/mscan/Kconfig"
+
+ source "drivers/net/can/sja1000/Kconfig"
+diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
+index 7a702f28d01c..9047cd066fea 100644
+--- a/drivers/net/can/Makefile
++++ b/drivers/net/can/Makefile
+@@ -15,5 +15,6 @@ obj-$(CONFIG_CAN_AT91) += at91_can.o
+ obj-$(CONFIG_CAN_TI_HECC) += ti_hecc.o
+ obj-$(CONFIG_CAN_MCP251X) += mcp251x.o
+ obj-$(CONFIG_CAN_BFIN) += bfin_can.o
++obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ican3.o
+
+ ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
+diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
+new file mode 100644
+index 000000000000..6e533dcc36c0
+--- /dev/null
++++ b/drivers/net/can/janz-ican3.c
+@@ -0,0 +1,1830 @@
++/*
++ * Janz MODULbus VMOD-ICAN3 CAN Interface Driver
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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/module.h>
++#include <linux/init.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++
++#include <linux/netdevice.h>
++#include <linux/can.h>
++#include <linux/can/dev.h>
++#include <linux/can/error.h>
++
++#include <linux/mfd/janz.h>
++
++/* the DPM has 64k of memory, organized into 256x 256 byte pages */
++#define DPM_NUM_PAGES 256
++#define DPM_PAGE_SIZE 256
++#define DPM_PAGE_ADDR(p) ((p) * DPM_PAGE_SIZE)
++
++/* JANZ ICAN3 "old-style" host interface queue page numbers */
++#define QUEUE_OLD_CONTROL 0
++#define QUEUE_OLD_RB0 1
++#define QUEUE_OLD_RB1 2
++#define QUEUE_OLD_WB0 3
++#define QUEUE_OLD_WB1 4
++
++/* Janz ICAN3 "old-style" host interface control registers */
++#define MSYNC_PEER 0x00 /* ICAN only */
++#define MSYNC_LOCL 0x01 /* host only */
++#define TARGET_RUNNING 0x02
++
++#define MSYNC_RB0 0x01
++#define MSYNC_RB1 0x02
++#define MSYNC_RBLW 0x04
++#define MSYNC_RB_MASK (MSYNC_RB0 | MSYNC_RB1)
++
++#define MSYNC_WB0 0x10
++#define MSYNC_WB1 0x20
++#define MSYNC_WBLW 0x40
++#define MSYNC_WB_MASK (MSYNC_WB0 | MSYNC_WB1)
++
++/* Janz ICAN3 "new-style" host interface queue page numbers */
++#define QUEUE_TOHOST 5
++#define QUEUE_FROMHOST_MID 6
++#define QUEUE_FROMHOST_HIGH 7
++#define QUEUE_FROMHOST_LOW 8
++
++/* The first free page in the DPM is #9 */
++#define DPM_FREE_START 9
++
++/* Janz ICAN3 "new-style" and "fast" host interface descriptor flags */
++#define DESC_VALID 0x80
++#define DESC_WRAP 0x40
++#define DESC_INTERRUPT 0x20
++#define DESC_IVALID 0x10
++#define DESC_LEN(len) (len)
++
++/* Janz ICAN3 Firmware Messages */
++#define MSG_CONNECTI 0x02
++#define MSG_DISCONNECT 0x03
++#define MSG_IDVERS 0x04
++#define MSG_MSGLOST 0x05
++#define MSG_NEWHOSTIF 0x08
++#define MSG_INQUIRY 0x0a
++#define MSG_SETAFILMASK 0x10
++#define MSG_INITFDPMQUEUE 0x11
++#define MSG_HWCONF 0x12
++#define MSG_FMSGLOST 0x15
++#define MSG_CEVTIND 0x37
++#define MSG_CBTRREQ 0x41
++#define MSG_COFFREQ 0x42
++#define MSG_CONREQ 0x43
++#define MSG_CCONFREQ 0x47
++
++/*
++ * Janz ICAN3 CAN Inquiry Message Types
++ *
++ * NOTE: there appears to be a firmware bug here. You must send
++ * NOTE: INQUIRY_STATUS and expect to receive an INQUIRY_EXTENDED
++ * NOTE: response. The controller never responds to a message with
++ * NOTE: the INQUIRY_EXTENDED subspec :(
++ */
++#define INQUIRY_STATUS 0x00
++#define INQUIRY_TERMINATION 0x01
++#define INQUIRY_EXTENDED 0x04
++
++/* Janz ICAN3 CAN Set Acceptance Filter Mask Message Types */
++#define SETAFILMASK_REJECT 0x00
++#define SETAFILMASK_FASTIF 0x02
++
++/* Janz ICAN3 CAN Hardware Configuration Message Types */
++#define HWCONF_TERMINATE_ON 0x01
++#define HWCONF_TERMINATE_OFF 0x00
++
++/* Janz ICAN3 CAN Event Indication Message Types */
++#define CEVTIND_EI 0x01
++#define CEVTIND_DOI 0x02
++#define CEVTIND_LOST 0x04
++#define CEVTIND_FULL 0x08
++#define CEVTIND_BEI 0x10
++
++#define CEVTIND_CHIP_SJA1000 0x02
++
++#define ICAN3_BUSERR_QUOTA_MAX 255
++
++/* Janz ICAN3 CAN Frame Conversion */
++#define ICAN3_ECHO 0x10
++#define ICAN3_EFF_RTR 0x40
++#define ICAN3_SFF_RTR 0x10
++#define ICAN3_EFF 0x80
++
++#define ICAN3_CAN_TYPE_MASK 0x0f
++#define ICAN3_CAN_TYPE_SFF 0x00
++#define ICAN3_CAN_TYPE_EFF 0x01
++
++#define ICAN3_CAN_DLC_MASK 0x0f
++
++/*
++ * SJA1000 Status and Error Register Definitions
++ *
++ * Copied from drivers/net/can/sja1000/sja1000.h
++ */
++
++/* status register content */
++#define SR_BS 0x80
++#define SR_ES 0x40
++#define SR_TS 0x20
++#define SR_RS 0x10
++#define SR_TCS 0x08
++#define SR_TBS 0x04
++#define SR_DOS 0x02
++#define SR_RBS 0x01
++
++#define SR_CRIT (SR_BS|SR_ES)
++
++/* ECC register */
++#define ECC_SEG 0x1F
++#define ECC_DIR 0x20
++#define ECC_ERR 6
++#define ECC_BIT 0x00
++#define ECC_FORM 0x40
++#define ECC_STUFF 0x80
++#define ECC_MASK 0xc0
++
++/* Number of buffers for use in the "new-style" host interface */
++#define ICAN3_NEW_BUFFERS 16
++
++/* Number of buffers for use in the "fast" host interface */
++#define ICAN3_TX_BUFFERS 512
++#define ICAN3_RX_BUFFERS 1024
++
++/* SJA1000 Clock Input */
++#define ICAN3_CAN_CLOCK 8000000
++
++/* Driver Name */
++#define DRV_NAME "janz-ican3"
++
++/* DPM Control Registers -- starts at offset 0x100 in the MODULbus registers */
++struct ican3_dpm_control {
++ /* window address register */
++ u8 window_address;
++ u8 unused1;
++
++ /*
++ * Read access: clear interrupt from microcontroller
++ * Write access: send interrupt to microcontroller
++ */
++ u8 interrupt;
++ u8 unused2;
++
++ /* write-only: reset all hardware on the module */
++ u8 hwreset;
++ u8 unused3;
++
++ /* write-only: generate an interrupt to the TPU */
++ u8 tpuinterrupt;
++};
++
++struct ican3_dev {
++
++ /* must be the first member */
++ struct can_priv can;
++
++ /* CAN network device */
++ struct net_device *ndev;
++ struct napi_struct napi;
++
++ /* Device for printing */
++ struct device *dev;
++
++ /* module number */
++ unsigned int num;
++
++ /* base address of registers and IRQ */
++ struct janz_cmodio_onboard_regs __iomem *ctrl;
++ struct ican3_dpm_control __iomem *dpmctrl;
++ void __iomem *dpm;
++ int irq;
++
++ /* CAN bus termination status */
++ struct completion termination_comp;
++ bool termination_enabled;
++
++ /* CAN bus error status registers */
++ struct completion buserror_comp;
++ struct can_berr_counter bec;
++
++ /* old and new style host interface */
++ unsigned int iftype;
++
++ /*
++ * Any function which changes the current DPM page must hold this
++ * lock while it is performing data accesses. This ensures that the
++ * function will not be preempted and end up reading data from a
++ * different DPM page than it expects.
++ */
++ spinlock_t lock;
++
++ /* new host interface */
++ unsigned int rx_int;
++ unsigned int rx_num;
++ unsigned int tx_num;
++
++ /* fast host interface */
++ unsigned int fastrx_start;
++ unsigned int fastrx_int;
++ unsigned int fastrx_num;
++ unsigned int fasttx_start;
++ unsigned int fasttx_num;
++
++ /* first free DPM page */
++ unsigned int free_page;
++};
++
++struct ican3_msg {
++ u8 control;
++ u8 spec;
++ __le16 len;
++ u8 data[252];
++};
++
++struct ican3_new_desc {
++ u8 control;
++ u8 pointer;
++};
++
++struct ican3_fast_desc {
++ u8 control;
++ u8 command;
++ u8 data[14];
++};
++
++/* write to the window basic address register */
++static inline void ican3_set_page(struct ican3_dev *mod, unsigned int page)
++{
++ BUG_ON(page >= DPM_NUM_PAGES);
++ iowrite8(page, &mod->dpmctrl->window_address);
++}
++
++/*
++ * ICAN3 "old-style" host interface
++ */
++
++/*
++ * Recieve a message from the ICAN3 "old-style" firmware interface
++ *
++ * LOCKING: must hold mod->lock
++ *
++ * returns 0 on success, -ENOMEM when no message exists
++ */
++static int ican3_old_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ unsigned int mbox, mbox_page;
++ u8 locl, peer, xord;
++
++ /* get the MSYNC registers */
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ peer = ioread8(mod->dpm + MSYNC_PEER);
++ locl = ioread8(mod->dpm + MSYNC_LOCL);
++ xord = locl ^ peer;
++
++ if ((xord & MSYNC_RB_MASK) == 0x00) {
++ dev_dbg(mod->dev, "no mbox for reading\n");
++ return -ENOMEM;
++ }
++
++ /* find the first free mbox to read */
++ if ((xord & MSYNC_RB_MASK) == MSYNC_RB_MASK)
++ mbox = (xord & MSYNC_RBLW) ? MSYNC_RB0 : MSYNC_RB1;
++ else
++ mbox = (xord & MSYNC_RB0) ? MSYNC_RB0 : MSYNC_RB1;
++
++ /* copy the message */
++ mbox_page = (mbox == MSYNC_RB0) ? QUEUE_OLD_RB0 : QUEUE_OLD_RB1;
++ ican3_set_page(mod, mbox_page);
++ memcpy_fromio(msg, mod->dpm, sizeof(*msg));
++
++ /*
++ * notify the firmware that the read buffer is available
++ * for it to fill again
++ */
++ locl ^= mbox;
++
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ iowrite8(locl, mod->dpm + MSYNC_LOCL);
++ return 0;
++}
++
++/*
++ * Send a message through the "old-style" firmware interface
++ *
++ * LOCKING: must hold mod->lock
++ *
++ * returns 0 on success, -ENOMEM when no free space exists
++ */
++static int ican3_old_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ unsigned int mbox, mbox_page;
++ u8 locl, peer, xord;
++
++ /* get the MSYNC registers */
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ peer = ioread8(mod->dpm + MSYNC_PEER);
++ locl = ioread8(mod->dpm + MSYNC_LOCL);
++ xord = locl ^ peer;
++
++ if ((xord & MSYNC_WB_MASK) == MSYNC_WB_MASK) {
++ dev_err(mod->dev, "no mbox for writing\n");
++ return -ENOMEM;
++ }
++
++ /* calculate a free mbox to use */
++ mbox = (xord & MSYNC_WB0) ? MSYNC_WB1 : MSYNC_WB0;
++
++ /* copy the message to the DPM */
++ mbox_page = (mbox == MSYNC_WB0) ? QUEUE_OLD_WB0 : QUEUE_OLD_WB1;
++ ican3_set_page(mod, mbox_page);
++ memcpy_toio(mod->dpm, msg, sizeof(*msg));
++
++ locl ^= mbox;
++ if (mbox == MSYNC_WB1)
++ locl |= MSYNC_WBLW;
++
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ iowrite8(locl, mod->dpm + MSYNC_LOCL);
++ return 0;
++}
++
++/*
++ * ICAN3 "new-style" Host Interface Setup
++ */
++
++static void __devinit ican3_init_new_host_interface(struct ican3_dev *mod)
++{
++ struct ican3_new_desc desc;
++ unsigned long flags;
++ void __iomem *dst;
++ int i;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ /* setup the internal datastructures for RX */
++ mod->rx_num = 0;
++ mod->rx_int = 0;
++
++ /* tohost queue descriptors are in page 5 */
++ ican3_set_page(mod, QUEUE_TOHOST);
++ dst = mod->dpm;
++
++ /* initialize the tohost (rx) queue descriptors: pages 9-24 */
++ for (i = 0; i < ICAN3_NEW_BUFFERS; i++) {
++ desc.control = DESC_INTERRUPT | DESC_LEN(1); /* I L=1 */
++ desc.pointer = mod->free_page;
++
++ /* set wrap flag on last buffer */
++ if (i == ICAN3_NEW_BUFFERS - 1)
++ desc.control |= DESC_WRAP;
++
++ memcpy_toio(dst, &desc, sizeof(desc));
++ dst += sizeof(desc);
++ mod->free_page++;
++ }
++
++ /* fromhost (tx) mid queue descriptors are in page 6 */
++ ican3_set_page(mod, QUEUE_FROMHOST_MID);
++ dst = mod->dpm;
++
++ /* setup the internal datastructures for TX */
++ mod->tx_num = 0;
++
++ /* initialize the fromhost mid queue descriptors: pages 25-40 */
++ for (i = 0; i < ICAN3_NEW_BUFFERS; i++) {
++ desc.control = DESC_VALID | DESC_LEN(1); /* V L=1 */
++ desc.pointer = mod->free_page;
++
++ /* set wrap flag on last buffer */
++ if (i == ICAN3_NEW_BUFFERS - 1)
++ desc.control |= DESC_WRAP;
++
++ memcpy_toio(dst, &desc, sizeof(desc));
++ dst += sizeof(desc);
++ mod->free_page++;
++ }
++
++ /* fromhost hi queue descriptors are in page 7 */
++ ican3_set_page(mod, QUEUE_FROMHOST_HIGH);
++ dst = mod->dpm;
++
++ /* initialize only a single buffer in the fromhost hi queue (unused) */
++ desc.control = DESC_VALID | DESC_WRAP | DESC_LEN(1); /* VW L=1 */
++ desc.pointer = mod->free_page;
++ memcpy_toio(dst, &desc, sizeof(desc));
++ mod->free_page++;
++
++ /* fromhost low queue descriptors are in page 8 */
++ ican3_set_page(mod, QUEUE_FROMHOST_LOW);
++ dst = mod->dpm;
++
++ /* initialize only a single buffer in the fromhost low queue (unused) */
++ desc.control = DESC_VALID | DESC_WRAP | DESC_LEN(1); /* VW L=1 */
++ desc.pointer = mod->free_page;
++ memcpy_toio(dst, &desc, sizeof(desc));
++ mod->free_page++;
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++}
++
++/*
++ * ICAN3 Fast Host Interface Setup
++ */
++
++static void __devinit ican3_init_fast_host_interface(struct ican3_dev *mod)
++{
++ struct ican3_fast_desc desc;
++ unsigned long flags;
++ unsigned int addr;
++ void __iomem *dst;
++ int i;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ /* save the start recv page */
++ mod->fastrx_start = mod->free_page;
++ mod->fastrx_num = 0;
++ mod->fastrx_int = 0;
++
++ /* build a single fast tohost queue descriptor */
++ memset(&desc, 0, sizeof(desc));
++ desc.control = 0x00;
++ desc.command = 1;
++
++ /* build the tohost queue descriptor ring in memory */
++ addr = 0;
++ for (i = 0; i < ICAN3_RX_BUFFERS; i++) {
++
++ /* set the wrap bit on the last buffer */
++ if (i == ICAN3_RX_BUFFERS - 1)
++ desc.control |= DESC_WRAP;
++
++ /* switch to the correct page */
++ ican3_set_page(mod, mod->free_page);
++
++ /* copy the descriptor to the DPM */
++ dst = mod->dpm + addr;
++ memcpy_toio(dst, &desc, sizeof(desc));
++ addr += sizeof(desc);
++
++ /* move to the next page if necessary */
++ if (addr >= DPM_PAGE_SIZE) {
++ addr = 0;
++ mod->free_page++;
++ }
++ }
++
++ /* make sure we page-align the next queue */
++ if (addr != 0)
++ mod->free_page++;
++
++ /* save the start xmit page */
++ mod->fasttx_start = mod->free_page;
++ mod->fasttx_num = 0;
++
++ /* build a single fast fromhost queue descriptor */
++ memset(&desc, 0, sizeof(desc));
++ desc.control = DESC_VALID;
++ desc.command = 1;
++
++ /* build the fromhost queue descriptor ring in memory */
++ addr = 0;
++ for (i = 0; i < ICAN3_TX_BUFFERS; i++) {
++
++ /* set the wrap bit on the last buffer */
++ if (i == ICAN3_TX_BUFFERS - 1)
++ desc.control |= DESC_WRAP;
++
++ /* switch to the correct page */
++ ican3_set_page(mod, mod->free_page);
++
++ /* copy the descriptor to the DPM */
++ dst = mod->dpm + addr;
++ memcpy_toio(dst, &desc, sizeof(desc));
++ addr += sizeof(desc);
++
++ /* move to the next page if necessary */
++ if (addr >= DPM_PAGE_SIZE) {
++ addr = 0;
++ mod->free_page++;
++ }
++ }
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++}
++
++/*
++ * ICAN3 "new-style" Host Interface Message Helpers
++ */
++
++/*
++ * LOCKING: must hold mod->lock
++ */
++static int ican3_new_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ struct ican3_new_desc desc;
++ void __iomem *desc_addr = mod->dpm + (mod->tx_num * sizeof(desc));
++
++ /* switch to the fromhost mid queue, and read the buffer descriptor */
++ ican3_set_page(mod, QUEUE_FROMHOST_MID);
++ memcpy_fromio(&desc, desc_addr, sizeof(desc));
++
++ if (!(desc.control & DESC_VALID)) {
++ dev_dbg(mod->dev, "%s: no free buffers\n", __func__);
++ return -ENOMEM;
++ }
++
++ /* switch to the data page, copy the data */
++ ican3_set_page(mod, desc.pointer);
++ memcpy_toio(mod->dpm, msg, sizeof(*msg));
++
++ /* switch back to the descriptor, set the valid bit, write it back */
++ ican3_set_page(mod, QUEUE_FROMHOST_MID);
++ desc.control ^= DESC_VALID;
++ memcpy_toio(desc_addr, &desc, sizeof(desc));
++
++ /* update the tx number */
++ mod->tx_num = (desc.control & DESC_WRAP) ? 0 : (mod->tx_num + 1);
++ return 0;
++}
++
++/*
++ * LOCKING: must hold mod->lock
++ */
++static int ican3_new_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ struct ican3_new_desc desc;
++ void __iomem *desc_addr = mod->dpm + (mod->rx_num * sizeof(desc));
++
++ /* switch to the tohost queue, and read the buffer descriptor */
++ ican3_set_page(mod, QUEUE_TOHOST);
++ memcpy_fromio(&desc, desc_addr, sizeof(desc));
++
++ if (!(desc.control & DESC_VALID)) {
++ dev_dbg(mod->dev, "%s: no buffers to recv\n", __func__);
++ return -ENOMEM;
++ }
++
++ /* switch to the data page, copy the data */
++ ican3_set_page(mod, desc.pointer);
++ memcpy_fromio(msg, mod->dpm, sizeof(*msg));
++
++ /* switch back to the descriptor, toggle the valid bit, write it back */
++ ican3_set_page(mod, QUEUE_TOHOST);
++ desc.control ^= DESC_VALID;
++ memcpy_toio(desc_addr, &desc, sizeof(desc));
++
++ /* update the rx number */
++ mod->rx_num = (desc.control & DESC_WRAP) ? 0 : (mod->rx_num + 1);
++ return 0;
++}
++
++/*
++ * Message Send / Recv Helpers
++ */
++
++static int ican3_send_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ unsigned long flags;
++ int ret;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ if (mod->iftype == 0)
++ ret = ican3_old_send_msg(mod, msg);
++ else
++ ret = ican3_new_send_msg(mod, msg);
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++ return ret;
++}
++
++static int ican3_recv_msg(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ unsigned long flags;
++ int ret;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ if (mod->iftype == 0)
++ ret = ican3_old_recv_msg(mod, msg);
++ else
++ ret = ican3_new_recv_msg(mod, msg);
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++ return ret;
++}
++
++/*
++ * Quick Pre-constructed Messages
++ */
++
++static int __devinit ican3_msg_connect(struct ican3_dev *mod)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_CONNECTI;
++ msg.len = cpu_to_le16(0);
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int __devexit ican3_msg_disconnect(struct ican3_dev *mod)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_DISCONNECT;
++ msg.len = cpu_to_le16(0);
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int __devinit ican3_msg_newhostif(struct ican3_dev *mod)
++{
++ struct ican3_msg msg;
++ int ret;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_NEWHOSTIF;
++ msg.len = cpu_to_le16(0);
++
++ /* If we're not using the old interface, switching seems bogus */
++ WARN_ON(mod->iftype != 0);
++
++ ret = ican3_send_msg(mod, &msg);
++ if (ret)
++ return ret;
++
++ /* mark the module as using the new host interface */
++ mod->iftype = 1;
++ return 0;
++}
++
++static int __devinit ican3_msg_fasthostif(struct ican3_dev *mod)
++{
++ struct ican3_msg msg;
++ unsigned int addr;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_INITFDPMQUEUE;
++ msg.len = cpu_to_le16(8);
++
++ /* write the tohost queue start address */
++ addr = DPM_PAGE_ADDR(mod->fastrx_start);
++ msg.data[0] = addr & 0xff;
++ msg.data[1] = (addr >> 8) & 0xff;
++ msg.data[2] = (addr >> 16) & 0xff;
++ msg.data[3] = (addr >> 24) & 0xff;
++
++ /* write the fromhost queue start address */
++ addr = DPM_PAGE_ADDR(mod->fasttx_start);
++ msg.data[4] = addr & 0xff;
++ msg.data[5] = (addr >> 8) & 0xff;
++ msg.data[6] = (addr >> 16) & 0xff;
++ msg.data[7] = (addr >> 24) & 0xff;
++
++ /* If we're not using the new interface yet, we cannot do this */
++ WARN_ON(mod->iftype != 1);
++
++ return ican3_send_msg(mod, &msg);
++}
++
++/*
++ * Setup the CAN filter to either accept or reject all
++ * messages from the CAN bus.
++ */
++static int __devinit ican3_set_id_filter(struct ican3_dev *mod, bool accept)
++{
++ struct ican3_msg msg;
++ int ret;
++
++ /* Standard Frame Format */
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_SETAFILMASK;
++ msg.len = cpu_to_le16(5);
++ msg.data[0] = 0x00; /* IDLo LSB */
++ msg.data[1] = 0x00; /* IDLo MSB */
++ msg.data[2] = 0xff; /* IDHi LSB */
++ msg.data[3] = 0x07; /* IDHi MSB */
++
++ /* accept all frames for fast host if, or reject all frames */
++ msg.data[4] = accept ? SETAFILMASK_FASTIF : SETAFILMASK_REJECT;
++
++ ret = ican3_send_msg(mod, &msg);
++ if (ret)
++ return ret;
++
++ /* Extended Frame Format */
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_SETAFILMASK;
++ msg.len = cpu_to_le16(13);
++ msg.data[0] = 0; /* MUX = 0 */
++ msg.data[1] = 0x00; /* IDLo LSB */
++ msg.data[2] = 0x00;
++ msg.data[3] = 0x00;
++ msg.data[4] = 0x20; /* IDLo MSB */
++ msg.data[5] = 0xff; /* IDHi LSB */
++ msg.data[6] = 0xff;
++ msg.data[7] = 0xff;
++ msg.data[8] = 0x3f; /* IDHi MSB */
++
++ /* accept all frames for fast host if, or reject all frames */
++ msg.data[9] = accept ? SETAFILMASK_FASTIF : SETAFILMASK_REJECT;
++
++ return ican3_send_msg(mod, &msg);
++}
++
++/*
++ * Bring the CAN bus online or offline
++ */
++static int ican3_set_bus_state(struct ican3_dev *mod, bool on)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = on ? MSG_CONREQ : MSG_COFFREQ;
++ msg.len = cpu_to_le16(0);
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int ican3_set_termination(struct ican3_dev *mod, bool on)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_HWCONF;
++ msg.len = cpu_to_le16(2);
++ msg.data[0] = 0x00;
++ msg.data[1] = on ? HWCONF_TERMINATE_ON : HWCONF_TERMINATE_OFF;
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int ican3_send_inquiry(struct ican3_dev *mod, u8 subspec)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_INQUIRY;
++ msg.len = cpu_to_le16(2);
++ msg.data[0] = subspec;
++ msg.data[1] = 0x00;
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int ican3_set_buserror(struct ican3_dev *mod, u8 quota)
++{
++ struct ican3_msg msg;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_CCONFREQ;
++ msg.len = cpu_to_le16(2);
++ msg.data[0] = 0x00;
++ msg.data[1] = quota;
++
++ return ican3_send_msg(mod, &msg);
++}
++
++/*
++ * ICAN3 to Linux CAN Frame Conversion
++ */
++
++static void ican3_to_can_frame(struct ican3_dev *mod,
++ struct ican3_fast_desc *desc,
++ struct can_frame *cf)
++{
++ if ((desc->command & ICAN3_CAN_TYPE_MASK) == ICAN3_CAN_TYPE_SFF) {
++ if (desc->data[1] & ICAN3_SFF_RTR)
++ cf->can_id |= CAN_RTR_FLAG;
++
++ cf->can_id |= desc->data[0] << 3;
++ cf->can_id |= (desc->data[1] & 0xe0) >> 5;
++ cf->can_dlc = desc->data[1] & ICAN3_CAN_DLC_MASK;
++ memcpy(cf->data, &desc->data[2], sizeof(cf->data));
++ } else {
++ cf->can_dlc = desc->data[0] & ICAN3_CAN_DLC_MASK;
++ if (desc->data[0] & ICAN3_EFF_RTR)
++ cf->can_id |= CAN_RTR_FLAG;
++
++ if (desc->data[0] & ICAN3_EFF) {
++ cf->can_id |= CAN_EFF_FLAG;
++ cf->can_id |= desc->data[2] << 21; /* 28-21 */
++ cf->can_id |= desc->data[3] << 13; /* 20-13 */
++ cf->can_id |= desc->data[4] << 5; /* 12-5 */
++ cf->can_id |= (desc->data[5] & 0xf8) >> 3;
++ } else {
++ cf->can_id |= desc->data[2] << 3; /* 10-3 */
++ cf->can_id |= desc->data[3] >> 5; /* 2-0 */
++ }
++
++ memcpy(cf->data, &desc->data[6], sizeof(cf->data));
++ }
++}
++
++static void can_frame_to_ican3(struct ican3_dev *mod,
++ struct can_frame *cf,
++ struct ican3_fast_desc *desc)
++{
++ /* clear out any stale data in the descriptor */
++ memset(desc->data, 0, sizeof(desc->data));
++
++ /* we always use the extended format, with the ECHO flag set */
++ desc->command = ICAN3_CAN_TYPE_EFF;
++ desc->data[0] |= cf->can_dlc;
++ desc->data[1] |= ICAN3_ECHO;
++
++ if (cf->can_id & CAN_RTR_FLAG)
++ desc->data[0] |= ICAN3_EFF_RTR;
++
++ /* pack the id into the correct places */
++ if (cf->can_id & CAN_EFF_FLAG) {
++ desc->data[0] |= ICAN3_EFF;
++ desc->data[2] = (cf->can_id & 0x1fe00000) >> 21; /* 28-21 */
++ desc->data[3] = (cf->can_id & 0x001fe000) >> 13; /* 20-13 */
++ desc->data[4] = (cf->can_id & 0x00001fe0) >> 5; /* 12-5 */
++ desc->data[5] = (cf->can_id & 0x0000001f) << 3; /* 4-0 */
++ } else {
++ desc->data[2] = (cf->can_id & 0x7F8) >> 3; /* bits 10-3 */
++ desc->data[3] = (cf->can_id & 0x007) << 5; /* bits 2-0 */
++ }
++
++ /* copy the data bits into the descriptor */
++ memcpy(&desc->data[6], cf->data, sizeof(cf->data));
++}
++
++/*
++ * Interrupt Handling
++ */
++
++/*
++ * Handle an ID + Version message response from the firmware. We never generate
++ * this message in production code, but it is very useful when debugging to be
++ * able to display this message.
++ */
++static void ican3_handle_idvers(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ dev_dbg(mod->dev, "IDVERS response: %s\n", msg->data);
++}
++
++static void ican3_handle_msglost(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ struct net_device *dev = mod->ndev;
++ struct net_device_stats *stats = &dev->stats;
++ struct can_frame *cf;
++ struct sk_buff *skb;
++
++ /*
++ * Report that communication messages with the microcontroller firmware
++ * are being lost. These are never CAN frames, so we do not generate an
++ * error frame for userspace
++ */
++ if (msg->spec == MSG_MSGLOST) {
++ dev_err(mod->dev, "lost %d control messages\n", msg->data[0]);
++ return;
++ }
++
++ /*
++ * Oops, this indicates that we have lost messages in the fast queue,
++ * which are exclusively CAN messages. Our driver isn't reading CAN
++ * frames fast enough.
++ *
++ * We'll pretend that the SJA1000 told us that it ran out of buffer
++ * space, because there is not a better message for this.
++ */
++ skb = alloc_can_err_skb(dev, &cf);
++ if (skb) {
++ cf->can_id |= CAN_ERR_CRTL;
++ cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
++ stats->rx_errors++;
++ stats->rx_bytes += cf->can_dlc;
++ netif_rx(skb);
++ }
++}
++
++/*
++ * Handle CAN Event Indication Messages from the firmware
++ *
++ * The ICAN3 firmware provides the values of some SJA1000 registers when it
++ * generates this message. The code below is largely copied from the
++ * drivers/net/can/sja1000/sja1000.c file, and adapted as necessary
++ */
++static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ struct net_device *dev = mod->ndev;
++ struct net_device_stats *stats = &dev->stats;
++ enum can_state state = mod->can.state;
++ u8 status, isrc, rxerr, txerr;
++ struct can_frame *cf;
++ struct sk_buff *skb;
++
++ /* we can only handle the SJA1000 part */
++ if (msg->data[1] != CEVTIND_CHIP_SJA1000) {
++ dev_err(mod->dev, "unable to handle errors on non-SJA1000\n");
++ return -ENODEV;
++ }
++
++ /* check the message length for sanity */
++ if (le16_to_cpu(msg->len) < 6) {
++ dev_err(mod->dev, "error message too short\n");
++ return -EINVAL;
++ }
++
++ skb = alloc_can_err_skb(dev, &cf);
++ if (skb == NULL)
++ return -ENOMEM;
++
++ isrc = msg->data[0];
++ status = msg->data[3];
++ rxerr = msg->data[4];
++ txerr = msg->data[5];
++
++ /* data overrun interrupt */
++ if (isrc == CEVTIND_DOI || isrc == CEVTIND_LOST) {
++ dev_dbg(mod->dev, "data overrun interrupt\n");
++ cf->can_id |= CAN_ERR_CRTL;
++ cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
++ stats->rx_over_errors++;
++ stats->rx_errors++;
++ }
++
++ /* error warning + passive interrupt */
++ if (isrc == CEVTIND_EI) {
++ dev_dbg(mod->dev, "error warning + passive interrupt\n");
++ if (status & SR_BS) {
++ state = CAN_STATE_BUS_OFF;
++ cf->can_id |= CAN_ERR_BUSOFF;
++ can_bus_off(dev);
++ } else if (status & SR_ES) {
++ if (rxerr >= 128 || txerr >= 128)
++ state = CAN_STATE_ERROR_PASSIVE;
++ else
++ state = CAN_STATE_ERROR_WARNING;
++ } else {
++ state = CAN_STATE_ERROR_ACTIVE;
++ }
++ }
++
++ /* bus error interrupt */
++ if (isrc == CEVTIND_BEI) {
++ u8 ecc = msg->data[2];
++
++ dev_dbg(mod->dev, "bus error interrupt\n");
++ mod->can.can_stats.bus_error++;
++ stats->rx_errors++;
++ cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
++
++ switch (ecc & ECC_MASK) {
++ case ECC_BIT:
++ cf->data[2] |= CAN_ERR_PROT_BIT;
++ break;
++ case ECC_FORM:
++ cf->data[2] |= CAN_ERR_PROT_FORM;
++ break;
++ case ECC_STUFF:
++ cf->data[2] |= CAN_ERR_PROT_STUFF;
++ break;
++ default:
++ cf->data[2] |= CAN_ERR_PROT_UNSPEC;
++ cf->data[3] = ecc & ECC_SEG;
++ break;
++ }
++
++ if ((ecc & ECC_DIR) == 0)
++ cf->data[2] |= CAN_ERR_PROT_TX;
++
++ cf->data[6] = txerr;
++ cf->data[7] = rxerr;
++ }
++
++ if (state != mod->can.state && (state == CAN_STATE_ERROR_WARNING ||
++ state == CAN_STATE_ERROR_PASSIVE)) {
++ cf->can_id |= CAN_ERR_CRTL;
++ if (state == CAN_STATE_ERROR_WARNING) {
++ mod->can.can_stats.error_warning++;
++ cf->data[1] = (txerr > rxerr) ?
++ CAN_ERR_CRTL_TX_WARNING :
++ CAN_ERR_CRTL_RX_WARNING;
++ } else {
++ mod->can.can_stats.error_passive++;
++ cf->data[1] = (txerr > rxerr) ?
++ CAN_ERR_CRTL_TX_PASSIVE :
++ CAN_ERR_CRTL_RX_PASSIVE;
++ }
++
++ cf->data[6] = txerr;
++ cf->data[7] = rxerr;
++ }
++
++ mod->can.state = state;
++ stats->rx_errors++;
++ stats->rx_bytes += cf->can_dlc;
++ netif_rx(skb);
++ return 0;
++}
++
++static void ican3_handle_inquiry(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ switch (msg->data[0]) {
++ case INQUIRY_STATUS:
++ case INQUIRY_EXTENDED:
++ mod->bec.rxerr = msg->data[5];
++ mod->bec.txerr = msg->data[6];
++ complete(&mod->buserror_comp);
++ break;
++ case INQUIRY_TERMINATION:
++ mod->termination_enabled = msg->data[6] & HWCONF_TERMINATE_ON;
++ complete(&mod->termination_comp);
++ break;
++ default:
++ dev_err(mod->dev, "recieved an unknown inquiry response\n");
++ break;
++ }
++}
++
++static void ican3_handle_unknown_message(struct ican3_dev *mod,
++ struct ican3_msg *msg)
++{
++ dev_warn(mod->dev, "recieved unknown message: spec 0x%.2x length %d\n",
++ msg->spec, le16_to_cpu(msg->len));
++}
++
++/*
++ * Handle a control message from the firmware
++ */
++static void ican3_handle_message(struct ican3_dev *mod, struct ican3_msg *msg)
++{
++ dev_dbg(mod->dev, "%s: modno %d spec 0x%.2x len %d bytes\n", __func__,
++ mod->num, msg->spec, le16_to_cpu(msg->len));
++
++ switch (msg->spec) {
++ case MSG_IDVERS:
++ ican3_handle_idvers(mod, msg);
++ break;
++ case MSG_MSGLOST:
++ case MSG_FMSGLOST:
++ ican3_handle_msglost(mod, msg);
++ break;
++ case MSG_CEVTIND:
++ ican3_handle_cevtind(mod, msg);
++ break;
++ case MSG_INQUIRY:
++ ican3_handle_inquiry(mod, msg);
++ break;
++ default:
++ ican3_handle_unknown_message(mod, msg);
++ break;
++ }
++}
++
++/*
++ * Check that there is room in the TX ring to transmit another skb
++ *
++ * LOCKING: must hold mod->lock
++ */
++static bool ican3_txok(struct ican3_dev *mod)
++{
++ struct ican3_fast_desc __iomem *desc;
++ u8 control;
++
++ /* copy the control bits of the descriptor */
++ ican3_set_page(mod, mod->fasttx_start + (mod->fasttx_num / 16));
++ desc = mod->dpm + ((mod->fasttx_num % 16) * sizeof(*desc));
++ control = ioread8(&desc->control);
++
++ /* if the control bits are not valid, then we have no more space */
++ if (!(control & DESC_VALID))
++ return false;
++
++ return true;
++}
++
++/*
++ * Recieve one CAN frame from the hardware
++ *
++ * This works like the core of a NAPI function, but is intended to be called
++ * from workqueue context instead. This driver already needs a workqueue to
++ * process control messages, so we use the workqueue instead of using NAPI.
++ * This was done to simplify locking.
++ *
++ * CONTEXT: must be called from user context
++ */
++static int ican3_recv_skb(struct ican3_dev *mod)
++{
++ struct net_device *ndev = mod->ndev;
++ struct net_device_stats *stats = &ndev->stats;
++ struct ican3_fast_desc desc;
++ void __iomem *desc_addr;
++ struct can_frame *cf;
++ struct sk_buff *skb;
++ unsigned long flags;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ /* copy the whole descriptor */
++ ican3_set_page(mod, mod->fastrx_start + (mod->fastrx_num / 16));
++ desc_addr = mod->dpm + ((mod->fastrx_num % 16) * sizeof(desc));
++ memcpy_fromio(&desc, desc_addr, sizeof(desc));
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++
++ /* check that we actually have a CAN frame */
++ if (!(desc.control & DESC_VALID))
++ return -ENOBUFS;
++
++ /* allocate an skb */
++ skb = alloc_can_skb(ndev, &cf);
++ if (unlikely(skb == NULL)) {
++ stats->rx_dropped++;
++ goto err_noalloc;
++ }
++
++ /* convert the ICAN3 frame into Linux CAN format */
++ ican3_to_can_frame(mod, &desc, cf);
++
++ /* receive the skb, update statistics */
++ netif_receive_skb(skb);
++ stats->rx_packets++;
++ stats->rx_bytes += cf->can_dlc;
++
++err_noalloc:
++ /* toggle the valid bit and return the descriptor to the ring */
++ desc.control ^= DESC_VALID;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ ican3_set_page(mod, mod->fastrx_start + (mod->fastrx_num / 16));
++ memcpy_toio(desc_addr, &desc, 1);
++
++ /* update the next buffer pointer */
++ mod->fastrx_num = (desc.control & DESC_WRAP) ? 0
++ : (mod->fastrx_num + 1);
++
++ /* there are still more buffers to process */
++ spin_unlock_irqrestore(&mod->lock, flags);
++ return 0;
++}
++
++static int ican3_napi(struct napi_struct *napi, int budget)
++{
++ struct ican3_dev *mod = container_of(napi, struct ican3_dev, napi);
++ struct ican3_msg msg;
++ unsigned long flags;
++ int received = 0;
++ int ret;
++
++ /* process all communication messages */
++ while (true) {
++ ret = ican3_recv_msg(mod, &msg);
++ if (ret)
++ break;
++
++ ican3_handle_message(mod, &msg);
++ }
++
++ /* process all CAN frames from the fast interface */
++ while (received < budget) {
++ ret = ican3_recv_skb(mod);
++ if (ret)
++ break;
++
++ received++;
++ }
++
++ /* We have processed all packets that the adapter had, but it
++ * was less than our budget, stop polling */
++ if (received < budget)
++ napi_complete(napi);
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ /* Wake up the transmit queue if necessary */
++ if (netif_queue_stopped(mod->ndev) && ican3_txok(mod))
++ netif_wake_queue(mod->ndev);
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++
++ /* re-enable interrupt generation */
++ iowrite8(1 << mod->num, &mod->ctrl->int_enable);
++ return received;
++}
++
++static irqreturn_t ican3_irq(int irq, void *dev_id)
++{
++ struct ican3_dev *mod = dev_id;
++ u8 stat;
++
++ /*
++ * The interrupt status register on this device reports interrupts
++ * as zeroes instead of using ones like most other devices
++ */
++ stat = ioread8(&mod->ctrl->int_disable) & (1 << mod->num);
++ if (stat == (1 << mod->num))
++ return IRQ_NONE;
++
++ /* clear the MODULbus interrupt from the microcontroller */
++ ioread8(&mod->dpmctrl->interrupt);
++
++ /* disable interrupt generation, schedule the NAPI poller */
++ iowrite8(1 << mod->num, &mod->ctrl->int_disable);
++ napi_schedule(&mod->napi);
++ return IRQ_HANDLED;
++}
++
++/*
++ * Firmware reset, startup, and shutdown
++ */
++
++/*
++ * Reset an ICAN module to its power-on state
++ *
++ * CONTEXT: no network device registered
++ * LOCKING: work function disabled
++ */
++static int ican3_reset_module(struct ican3_dev *mod)
++{
++ u8 val = 1 << mod->num;
++ unsigned long start;
++ u8 runold, runnew;
++
++ /* disable interrupts so no more work is scheduled */
++ iowrite8(1 << mod->num, &mod->ctrl->int_disable);
++
++ /* flush any pending work */
++ flush_scheduled_work();
++
++ /* the first unallocated page in the DPM is #9 */
++ mod->free_page = DPM_FREE_START;
++
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ runold = ioread8(mod->dpm + TARGET_RUNNING);
++
++ /* reset the module */
++ iowrite8(val, &mod->ctrl->reset_assert);
++ iowrite8(val, &mod->ctrl->reset_deassert);
++
++ /* wait until the module has finished resetting and is running */
++ start = jiffies;
++ do {
++ ican3_set_page(mod, QUEUE_OLD_CONTROL);
++ runnew = ioread8(mod->dpm + TARGET_RUNNING);
++ if (runnew == (runold ^ 0xff))
++ return 0;
++
++ msleep(10);
++ } while (time_before(jiffies, start + HZ / 4));
++
++ dev_err(mod->dev, "failed to reset CAN module\n");
++ return -ETIMEDOUT;
++}
++
++static void __devexit ican3_shutdown_module(struct ican3_dev *mod)
++{
++ ican3_msg_disconnect(mod);
++ ican3_reset_module(mod);
++}
++
++/*
++ * Startup an ICAN module, bringing it into fast mode
++ */
++static int __devinit ican3_startup_module(struct ican3_dev *mod)
++{
++ int ret;
++
++ ret = ican3_reset_module(mod);
++ if (ret) {
++ dev_err(mod->dev, "unable to reset module\n");
++ return ret;
++ }
++
++ /* re-enable interrupts so we can send messages */
++ iowrite8(1 << mod->num, &mod->ctrl->int_enable);
++
++ ret = ican3_msg_connect(mod);
++ if (ret) {
++ dev_err(mod->dev, "unable to connect to module\n");
++ return ret;
++ }
++
++ ican3_init_new_host_interface(mod);
++ ret = ican3_msg_newhostif(mod);
++ if (ret) {
++ dev_err(mod->dev, "unable to switch to new-style interface\n");
++ return ret;
++ }
++
++ /* default to "termination on" */
++ ret = ican3_set_termination(mod, true);
++ if (ret) {
++ dev_err(mod->dev, "unable to enable termination\n");
++ return ret;
++ }
++
++ /* default to "bus errors enabled" */
++ ret = ican3_set_buserror(mod, ICAN3_BUSERR_QUOTA_MAX);
++ if (ret) {
++ dev_err(mod->dev, "unable to set bus-error\n");
++ return ret;
++ }
++
++ ican3_init_fast_host_interface(mod);
++ ret = ican3_msg_fasthostif(mod);
++ if (ret) {
++ dev_err(mod->dev, "unable to switch to fast host interface\n");
++ return ret;
++ }
++
++ ret = ican3_set_id_filter(mod, true);
++ if (ret) {
++ dev_err(mod->dev, "unable to set acceptance filter\n");
++ return ret;
++ }
++
++ return 0;
++}
++
++/*
++ * CAN Network Device
++ */
++
++static int ican3_open(struct net_device *ndev)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ u8 quota;
++ int ret;
++
++ /* open the CAN layer */
++ ret = open_candev(ndev);
++ if (ret) {
++ dev_err(mod->dev, "unable to start CAN layer\n");
++ return ret;
++ }
++
++ /* set the bus error generation state appropriately */
++ if (mod->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
++ quota = ICAN3_BUSERR_QUOTA_MAX;
++ else
++ quota = 0;
++
++ ret = ican3_set_buserror(mod, quota);
++ if (ret) {
++ dev_err(mod->dev, "unable to set bus-error\n");
++ close_candev(ndev);
++ return ret;
++ }
++
++ /* bring the bus online */
++ ret = ican3_set_bus_state(mod, true);
++ if (ret) {
++ dev_err(mod->dev, "unable to set bus-on\n");
++ close_candev(ndev);
++ return ret;
++ }
++
++ /* start up the network device */
++ mod->can.state = CAN_STATE_ERROR_ACTIVE;
++ netif_start_queue(ndev);
++
++ return 0;
++}
++
++static int ican3_stop(struct net_device *ndev)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ int ret;
++
++ /* stop the network device xmit routine */
++ netif_stop_queue(ndev);
++ mod->can.state = CAN_STATE_STOPPED;
++
++ /* bring the bus offline, stop receiving packets */
++ ret = ican3_set_bus_state(mod, false);
++ if (ret) {
++ dev_err(mod->dev, "unable to set bus-off\n");
++ return ret;
++ }
++
++ /* close the CAN layer */
++ close_candev(ndev);
++ return 0;
++}
++
++static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ struct net_device_stats *stats = &ndev->stats;
++ struct can_frame *cf = (struct can_frame *)skb->data;
++ struct ican3_fast_desc desc;
++ void __iomem *desc_addr;
++ unsigned long flags;
++
++ spin_lock_irqsave(&mod->lock, flags);
++
++ /* check that we can actually transmit */
++ if (!ican3_txok(mod)) {
++ dev_err(mod->dev, "no free descriptors, stopping queue\n");
++ netif_stop_queue(ndev);
++ spin_unlock_irqrestore(&mod->lock, flags);
++ return NETDEV_TX_BUSY;
++ }
++
++ /* copy the control bits of the descriptor */
++ ican3_set_page(mod, mod->fasttx_start + (mod->fasttx_num / 16));
++ desc_addr = mod->dpm + ((mod->fasttx_num % 16) * sizeof(desc));
++ memset(&desc, 0, sizeof(desc));
++ memcpy_fromio(&desc, desc_addr, 1);
++
++ /* convert the Linux CAN frame into ICAN3 format */
++ can_frame_to_ican3(mod, cf, &desc);
++
++ /*
++ * the programming manual says that you must set the IVALID bit, then
++ * interrupt, then set the valid bit. Quite weird, but it seems to be
++ * required for this to work
++ */
++ desc.control |= DESC_IVALID;
++ memcpy_toio(desc_addr, &desc, sizeof(desc));
++
++ /* generate a MODULbus interrupt to the microcontroller */
++ iowrite8(0x01, &mod->dpmctrl->interrupt);
++
++ desc.control ^= DESC_VALID;
++ memcpy_toio(desc_addr, &desc, sizeof(desc));
++
++ /* update the next buffer pointer */
++ mod->fasttx_num = (desc.control & DESC_WRAP) ? 0
++ : (mod->fasttx_num + 1);
++
++ /* update statistics */
++ stats->tx_packets++;
++ stats->tx_bytes += cf->can_dlc;
++ kfree_skb(skb);
++
++ /*
++ * This hardware doesn't have TX-done notifications, so we'll try and
++ * emulate it the best we can using ECHO skbs. Get the next TX
++ * descriptor, and see if we have room to send. If not, stop the queue.
++ * It will be woken when the ECHO skb for the current packet is recv'd.
++ */
++
++ /* copy the control bits of the descriptor */
++ if (!ican3_txok(mod))
++ netif_stop_queue(ndev);
++
++ spin_unlock_irqrestore(&mod->lock, flags);
++ return NETDEV_TX_OK;
++}
++
++static const struct net_device_ops ican3_netdev_ops = {
++ .ndo_open = ican3_open,
++ .ndo_stop = ican3_stop,
++ .ndo_start_xmit = ican3_xmit,
++};
++
++/*
++ * Low-level CAN Device
++ */
++
++/* This structure was stolen from drivers/net/can/sja1000/sja1000.c */
++static struct can_bittiming_const ican3_bittiming_const = {
++ .name = DRV_NAME,
++ .tseg1_min = 1,
++ .tseg1_max = 16,
++ .tseg2_min = 1,
++ .tseg2_max = 8,
++ .sjw_max = 4,
++ .brp_min = 1,
++ .brp_max = 64,
++ .brp_inc = 1,
++};
++
++/*
++ * This routine was stolen from drivers/net/can/sja1000/sja1000.c
++ *
++ * The bittiming register command for the ICAN3 just sets the bit timing
++ * registers on the SJA1000 chip directly
++ */
++static int ican3_set_bittiming(struct net_device *ndev)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ struct can_bittiming *bt = &mod->can.bittiming;
++ struct ican3_msg msg;
++ u8 btr0, btr1;
++
++ btr0 = ((bt->brp - 1) & 0x3f) | (((bt->sjw - 1) & 0x3) << 6);
++ btr1 = ((bt->prop_seg + bt->phase_seg1 - 1) & 0xf) |
++ (((bt->phase_seg2 - 1) & 0x7) << 4);
++ if (mod->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
++ btr1 |= 0x80;
++
++ memset(&msg, 0, sizeof(msg));
++ msg.spec = MSG_CBTRREQ;
++ msg.len = cpu_to_le16(4);
++ msg.data[0] = 0x00;
++ msg.data[1] = 0x00;
++ msg.data[2] = btr0;
++ msg.data[3] = btr1;
++
++ return ican3_send_msg(mod, &msg);
++}
++
++static int ican3_set_mode(struct net_device *ndev, enum can_mode mode)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ int ret;
++
++ if (mode != CAN_MODE_START)
++ return -ENOTSUPP;
++
++ /* bring the bus online */
++ ret = ican3_set_bus_state(mod, true);
++ if (ret) {
++ dev_err(mod->dev, "unable to set bus-on\n");
++ return ret;
++ }
++
++ /* start up the network device */
++ mod->can.state = CAN_STATE_ERROR_ACTIVE;
++
++ if (netif_queue_stopped(ndev))
++ netif_wake_queue(ndev);
++
++ return 0;
++}
++
++static int ican3_get_berr_counter(const struct net_device *ndev,
++ struct can_berr_counter *bec)
++{
++ struct ican3_dev *mod = netdev_priv(ndev);
++ int ret;
++
++ ret = ican3_send_inquiry(mod, INQUIRY_STATUS);
++ if (ret)
++ return ret;
++
++ ret = wait_for_completion_timeout(&mod->buserror_comp, HZ);
++ if (ret <= 0) {
++ dev_info(mod->dev, "%s timed out\n", __func__);
++ return -ETIMEDOUT;
++ }
++
++ bec->rxerr = mod->bec.rxerr;
++ bec->txerr = mod->bec.txerr;
++ return 0;
++}
++
++/*
++ * Sysfs Attributes
++ */
++
++static ssize_t ican3_sysfs_show_term(struct device *dev,
++ struct device_attribute *attr,
++ char *buf)
++{
++ struct ican3_dev *mod = netdev_priv(to_net_dev(dev));
++ int ret;
++
++ ret = ican3_send_inquiry(mod, INQUIRY_TERMINATION);
++ if (ret)
++ return ret;
++
++ ret = wait_for_completion_timeout(&mod->termination_comp, HZ);
++ if (ret <= 0) {
++ dev_info(mod->dev, "%s timed out\n", __func__);
++ return -ETIMEDOUT;
++ }
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", mod->termination_enabled);
++}
++
++static ssize_t ican3_sysfs_set_term(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf, size_t count)
++{
++ struct ican3_dev *mod = netdev_priv(to_net_dev(dev));
++ unsigned long enable;
++ int ret;
++
++ if (strict_strtoul(buf, 0, &enable))
++ return -EINVAL;
++
++ ret = ican3_set_termination(mod, enable);
++ if (ret)
++ return ret;
++
++ return count;
++}
++
++static DEVICE_ATTR(termination, S_IWUGO | S_IRUGO, ican3_sysfs_show_term,
++ ican3_sysfs_set_term);
++
++static struct attribute *ican3_sysfs_attrs[] = {
++ &dev_attr_termination.attr,
++ NULL,
++};
++
++static struct attribute_group ican3_sysfs_attr_group = {
++ .attrs = ican3_sysfs_attrs,
++};
++
++/*
++ * PCI Subsystem
++ */
++
++static int __devinit ican3_probe(struct platform_device *pdev)
++{
++ struct janz_platform_data *pdata;
++ struct net_device *ndev;
++ struct ican3_dev *mod;
++ struct resource *res;
++ struct device *dev;
++ int ret;
++
++ pdata = pdev->dev.platform_data;
++ if (!pdata)
++ return -ENXIO;
++
++ dev_dbg(&pdev->dev, "probe: module number %d\n", pdata->modno);
++
++ /* save the struct device for printing */
++ dev = &pdev->dev;
++
++ /* allocate the CAN device and private data */
++ ndev = alloc_candev(sizeof(*mod), 0);
++ if (!ndev) {
++ dev_err(dev, "unable to allocate CANdev\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ platform_set_drvdata(pdev, ndev);
++ mod = netdev_priv(ndev);
++ mod->ndev = ndev;
++ mod->dev = &pdev->dev;
++ mod->num = pdata->modno;
++ netif_napi_add(ndev, &mod->napi, ican3_napi, ICAN3_RX_BUFFERS);
++ spin_lock_init(&mod->lock);
++ init_completion(&mod->termination_comp);
++ init_completion(&mod->buserror_comp);
++
++ /* setup device-specific sysfs attributes */
++ ndev->sysfs_groups[0] = &ican3_sysfs_attr_group;
++
++ /* the first unallocated page in the DPM is 9 */
++ mod->free_page = DPM_FREE_START;
++
++ ndev->netdev_ops = &ican3_netdev_ops;
++ ndev->flags |= IFF_ECHO;
++ SET_NETDEV_DEV(ndev, &pdev->dev);
++
++ mod->can.clock.freq = ICAN3_CAN_CLOCK;
++ mod->can.bittiming_const = &ican3_bittiming_const;
++ mod->can.do_set_bittiming = ican3_set_bittiming;
++ mod->can.do_set_mode = ican3_set_mode;
++ mod->can.do_get_berr_counter = ican3_get_berr_counter;
++ mod->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES
++ | CAN_CTRLMODE_BERR_REPORTING;
++
++ /* find our IRQ number */
++ mod->irq = platform_get_irq(pdev, 0);
++ if (mod->irq < 0) {
++ dev_err(dev, "IRQ line not found\n");
++ ret = -ENODEV;
++ goto out_free_ndev;
++ }
++
++ ndev->irq = mod->irq;
++
++ /* get access to the MODULbus registers for this module */
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (!res) {
++ dev_err(dev, "MODULbus registers not found\n");
++ ret = -ENODEV;
++ goto out_free_ndev;
++ }
++
++ mod->dpm = ioremap(res->start, resource_size(res));
++ if (!mod->dpm) {
++ dev_err(dev, "MODULbus registers not ioremap\n");
++ ret = -ENOMEM;
++ goto out_free_ndev;
++ }
++
++ mod->dpmctrl = mod->dpm + DPM_PAGE_SIZE;
++
++ /* get access to the control registers for this module */
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
++ if (!res) {
++ dev_err(dev, "CONTROL registers not found\n");
++ ret = -ENODEV;
++ goto out_iounmap_dpm;
++ }
++
++ mod->ctrl = ioremap(res->start, resource_size(res));
++ if (!mod->ctrl) {
++ dev_err(dev, "CONTROL registers not ioremap\n");
++ ret = -ENOMEM;
++ goto out_iounmap_dpm;
++ }
++
++ /* disable our IRQ, then hookup the IRQ handler */
++ iowrite8(1 << mod->num, &mod->ctrl->int_disable);
++ ret = request_irq(mod->irq, ican3_irq, IRQF_SHARED, DRV_NAME, mod);
++ if (ret) {
++ dev_err(dev, "unable to request IRQ\n");
++ goto out_iounmap_ctrl;
++ }
++
++ /* reset and initialize the CAN controller into fast mode */
++ napi_enable(&mod->napi);
++ ret = ican3_startup_module(mod);
++ if (ret) {
++ dev_err(dev, "%s: unable to start CANdev\n", __func__);
++ goto out_free_irq;
++ }
++
++ /* register with the Linux CAN layer */
++ ret = register_candev(ndev);
++ if (ret) {
++ dev_err(dev, "%s: unable to register CANdev\n", __func__);
++ goto out_free_irq;
++ }
++
++ dev_info(dev, "module %d: registered CAN device\n", pdata->modno);
++ return 0;
++
++out_free_irq:
++ napi_disable(&mod->napi);
++ iowrite8(1 << mod->num, &mod->ctrl->int_disable);
++ free_irq(mod->irq, mod);
++out_iounmap_ctrl:
++ iounmap(mod->ctrl);
++out_iounmap_dpm:
++ iounmap(mod->dpm);
++out_free_ndev:
++ free_candev(ndev);
++out_return:
++ return ret;
++}
++
++static int __devexit ican3_remove(struct platform_device *pdev)
++{
++ struct net_device *ndev = platform_get_drvdata(pdev);
++ struct ican3_dev *mod = netdev_priv(ndev);
++
++ /* unregister the netdevice, stop interrupts */
++ unregister_netdev(ndev);
++ napi_disable(&mod->napi);
++ iowrite8(1 << mod->num, &mod->ctrl->int_disable);
++ free_irq(mod->irq, mod);
++
++ /* put the module into reset */
++ ican3_shutdown_module(mod);
++
++ /* unmap all registers */
++ iounmap(mod->ctrl);
++ iounmap(mod->dpm);
++
++ free_candev(ndev);
++
++ return 0;
++}
++
++static struct platform_driver ican3_driver = {
++ .driver = {
++ .name = DRV_NAME,
++ .owner = THIS_MODULE,
++ },
++ .probe = ican3_probe,
++ .remove = __devexit_p(ican3_remove),
++};
++
++static int __init ican3_init(void)
++{
++ return platform_driver_register(&ican3_driver);
++}
++
++static void __exit ican3_exit(void)
++{
++ platform_driver_unregister(&ican3_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("Janz MODULbus VMOD-ICAN3 Driver");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:janz-ican3");
++
++module_init(ican3_init);
++module_exit(ican3_exit);commit bd3581323cc02aefc79a21780a4ca8c578642892
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Apr 7 09:43:00 2010 +0200
+
+ mfd: Janz CMOD-IO PCI MODULbus Carrier Board support
+
+ The Janz CMOD-IO PCI MODULbus carrier board is a PCI to MODULbus bridge,
+ which may host many different types of MODULbus daughterboards, including
+ CAN and GPIO controllers.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Reviewed-by: Wolfgang Grandegger <wg@grandegger.com>
+ Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
+
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index 93d0e31c0438..05c137d16b04 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -418,6 +418,16 @@ config MFD_RDC321X
+ southbridge which provides access to GPIOs and Watchdog using the
+ southbridge PCI device configuration space.
+
++config MFD_JANZ_CMODIO
++ tristate "Support for Janz CMOD-IO PCI MODULbus Carrier Board"
++ select MFD_CORE
++ depends on PCI
++ help
++ This is the core driver for the Janz CMOD-IO PCI MODULbus
++ carrier board. This device is a PCI to MODULbus bridge which may
++ host many different types of MODULbus daughterboards, including
++ CAN and GPIO controllers.
++
+ endmenu
+
+ menu "Multimedia Capabilities Port drivers"
+diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
+index f177e064b31b..21eff85b288a 100644
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -65,3 +65,4 @@ obj-$(CONFIG_MFD_TIMBERDALE) += timberdale.o
+ obj-$(CONFIG_PMIC_ADP5520) += adp5520.o
+ obj-$(CONFIG_LPC_SCH) += lpc_sch.o
+ obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o
++obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
+diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
+new file mode 100644
+index 000000000000..9ed630799acc
+--- /dev/null
++++ b/drivers/mfd/janz-cmodio.c
+@@ -0,0 +1,304 @@
++/*
++ * Janz CMOD-IO MODULbus Carrier Board PCI Driver
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * Lots of inspiration and code was copied from drivers/mfd/sm501.c
++ *
++ * 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/module.h>
++#include <linux/init.h>
++#include <linux/pci.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/mfd/core.h>
++
++#include <linux/mfd/janz.h>
++
++#define DRV_NAME "janz-cmodio"
++
++/* Size of each MODULbus module in PCI BAR4 */
++#define CMODIO_MODULBUS_SIZE 0x200
++
++/* Maximum number of MODULbus modules on a CMOD-IO carrier board */
++#define CMODIO_MAX_MODULES 4
++
++/* Module Parameters */
++static unsigned int num_modules = CMODIO_MAX_MODULES;
++static unsigned char *modules[CMODIO_MAX_MODULES] = {
++ "empty", "empty", "empty", "empty",
++};
++
++module_param_array(modules, charp, &num_modules, S_IRUGO);
++MODULE_PARM_DESC(modules, "MODULbus modules attached to the carrier board");
++
++/* Unique Device Id */
++static unsigned int cmodio_id;
++
++struct cmodio_device {
++ /* Parent PCI device */
++ struct pci_dev *pdev;
++
++ /* PLX control registers */
++ struct janz_cmodio_onboard_regs __iomem *ctrl;
++
++ /* hex switch position */
++ u8 hex;
++
++ /* mfd-core API */
++ struct mfd_cell cells[CMODIO_MAX_MODULES];
++ struct resource resources[3 * CMODIO_MAX_MODULES];
++ struct janz_platform_data pdata[CMODIO_MAX_MODULES];
++};
++
++/*
++ * Subdevices using the mfd-core API
++ */
++
++static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,
++ char *name, unsigned int devno,
++ unsigned int modno)
++{
++ struct janz_platform_data *pdata;
++ struct mfd_cell *cell;
++ struct resource *res;
++ struct pci_dev *pci;
++
++ pci = priv->pdev;
++ cell = &priv->cells[devno];
++ res = &priv->resources[devno * 3];
++ pdata = &priv->pdata[devno];
++
++ cell->name = name;
++ cell->resources = res;
++ cell->num_resources = 3;
++
++ /* Setup the subdevice ID -- must be unique */
++ cell->id = cmodio_id++;
++
++ /* Add platform data */
++ pdata->modno = modno;
++ cell->platform_data = pdata;
++ cell->data_size = sizeof(*pdata);
++
++ /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */
++ res->flags = IORESOURCE_MEM;
++ res->parent = &pci->resource[3];
++ res->start = pci->resource[3].start + (CMODIO_MODULBUS_SIZE * modno);
++ res->end = res->start + CMODIO_MODULBUS_SIZE - 1;
++ res++;
++
++ /* PLX Control Registers -- PCI BAR4 is interrupt and other registers */
++ res->flags = IORESOURCE_MEM;
++ res->parent = &pci->resource[4];
++ res->start = pci->resource[4].start;
++ res->end = pci->resource[4].end;
++ res++;
++
++ /*
++ * IRQ
++ *
++ * The start and end fields are used as an offset to the irq_base
++ * parameter passed into the mfd_add_devices() function call. All
++ * devices share the same IRQ.
++ */
++ res->flags = IORESOURCE_IRQ;
++ res->parent = NULL;
++ res->start = 0;
++ res->end = 0;
++ res++;
++
++ return 0;
++}
++
++/* Probe each submodule using kernel parameters */
++static int __devinit cmodio_probe_submodules(struct cmodio_device *priv)
++{
++ struct pci_dev *pdev = priv->pdev;
++ unsigned int num_probed = 0;
++ char *name;
++ int i;
++
++ for (i = 0; i < num_modules; i++) {
++ name = modules[i];
++ if (!strcmp(name, "") || !strcmp(name, "empty"))
++ continue;
++
++ dev_dbg(&priv->pdev->dev, "MODULbus %d: name %s\n", i, name);
++ cmodio_setup_subdevice(priv, name, num_probed, i);
++ num_probed++;
++ }
++
++ /* print an error message if no modules were probed */
++ if (num_probed == 0) {
++ dev_err(&priv->pdev->dev, "no MODULbus modules specified, "
++ "please set the ``modules'' kernel "
++ "parameter according to your "
++ "hardware configuration\n");
++ return -ENODEV;
++ }
++
++ return mfd_add_devices(&pdev->dev, 0, priv->cells,
++ num_probed, NULL, pdev->irq);
++}
++
++/*
++ * SYSFS Attributes
++ */
++
++static ssize_t mbus_show(struct device *dev, struct device_attribute *attr,
++ char *buf)
++{
++ struct cmodio_device *priv = dev_get_drvdata(dev);
++
++ return snprintf(buf, PAGE_SIZE, "%x\n", priv->hex);
++}
++
++static DEVICE_ATTR(modulbus_number, S_IRUGO, mbus_show, NULL);
++
++static struct attribute *cmodio_sysfs_attrs[] = {
++ &dev_attr_modulbus_number.attr,
++ NULL,
++};
++
++static const struct attribute_group cmodio_sysfs_attr_group = {
++ .attrs = cmodio_sysfs_attrs,
++};
++
++/*
++ * PCI Driver
++ */
++
++static int __devinit cmodio_pci_probe(struct pci_dev *dev,
++ const struct pci_device_id *id)
++{
++ struct cmodio_device *priv;
++ int ret;
++
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ if (!priv) {
++ dev_err(&dev->dev, "unable to allocate private data\n");
++ ret = -ENOMEM;
++ goto out_return;
++ }
++
++ pci_set_drvdata(dev, priv);
++ priv->pdev = dev;
++
++ /* Hardware Initialization */
++ ret = pci_enable_device(dev);
++ if (ret) {
++ dev_err(&dev->dev, "unable to enable device\n");
++ goto out_free_priv;
++ }
++
++ pci_set_master(dev);
++ ret = pci_request_regions(dev, DRV_NAME);
++ if (ret) {
++ dev_err(&dev->dev, "unable to request regions\n");
++ goto out_pci_disable_device;
++ }
++
++ /* Onboard configuration registers */
++ priv->ctrl = pci_ioremap_bar(dev, 4);
++ if (!priv->ctrl) {
++ dev_err(&dev->dev, "unable to remap onboard regs\n");
++ ret = -ENOMEM;
++ goto out_pci_release_regions;
++ }
++
++ /* Read the hex switch on the carrier board */
++ priv->hex = ioread8(&priv->ctrl->int_enable);
++
++ /* Add the MODULbus number (hex switch value) to the device's sysfs */
++ ret = sysfs_create_group(&dev->dev.kobj, &cmodio_sysfs_attr_group);
++ if (ret) {
++ dev_err(&dev->dev, "unable to create sysfs attributes\n");
++ goto out_unmap_ctrl;
++ }
++
++ /*
++ * Disable all interrupt lines, each submodule will enable its
++ * own interrupt line if needed
++ */
++ iowrite8(0xf, &priv->ctrl->int_disable);
++
++ /* Register drivers for all submodules */
++ ret = cmodio_probe_submodules(priv);
++ if (ret) {
++ dev_err(&dev->dev, "unable to probe submodules\n");
++ goto out_sysfs_remove_group;
++ }
++
++ return 0;
++
++out_sysfs_remove_group:
++ sysfs_remove_group(&dev->dev.kobj, &cmodio_sysfs_attr_group);
++out_unmap_ctrl:
++ iounmap(priv->ctrl);
++out_pci_release_regions:
++ pci_release_regions(dev);
++out_pci_disable_device:
++ pci_disable_device(dev);
++out_free_priv:
++ kfree(priv);
++out_return:
++ return ret;
++}
++
++static void __devexit cmodio_pci_remove(struct pci_dev *dev)
++{
++ struct cmodio_device *priv = pci_get_drvdata(dev);
++
++ mfd_remove_devices(&dev->dev);
++ sysfs_remove_group(&dev->dev.kobj, &cmodio_sysfs_attr_group);
++ iounmap(priv->ctrl);
++ pci_release_regions(dev);
++ pci_disable_device(dev);
++ kfree(priv);
++}
++
++#define PCI_VENDOR_ID_JANZ 0x13c3
++
++/* The list of devices that this module will support */
++static DEFINE_PCI_DEVICE_TABLE(cmodio_pci_ids) = {
++ { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_JANZ, 0x0101 },
++ { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_JANZ, 0x0100 },
++ { 0, }
++};
++MODULE_DEVICE_TABLE(pci, cmodio_pci_ids);
++
++static struct pci_driver cmodio_pci_driver = {
++ .name = DRV_NAME,
++ .id_table = cmodio_pci_ids,
++ .probe = cmodio_pci_probe,
++ .remove = __devexit_p(cmodio_pci_remove),
++};
++
++/*
++ * Module Init / Exit
++ */
++
++static int __init cmodio_init(void)
++{
++ return pci_register_driver(&cmodio_pci_driver);
++}
++
++static void __exit cmodio_exit(void)
++{
++ pci_unregister_driver(&cmodio_pci_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("Janz CMOD-IO PCI MODULbus Carrier Board Driver");
++MODULE_LICENSE("GPL");
++
++module_init(cmodio_init);
++module_exit(cmodio_exit);
+diff --git a/include/linux/mfd/janz.h b/include/linux/mfd/janz.h
+new file mode 100644
+index 000000000000..e9994c469803
+--- /dev/null
++++ b/include/linux/mfd/janz.h
+@@ -0,0 +1,54 @@
++/*
++ * Common Definitions for Janz MODULbus devices
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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 JANZ_H
++#define JANZ_H
++
++struct janz_platform_data {
++ /* MODULbus Module Number */
++ unsigned int modno;
++};
++
++/* PLX bridge chip onboard registers */
++struct janz_cmodio_onboard_regs {
++ u8 unused1;
++
++ /*
++ * Read access: interrupt status
++ * Write access: interrupt disable
++ */
++ u8 int_disable;
++ u8 unused2;
++
++ /*
++ * Read access: MODULbus number (hex switch)
++ * Write access: interrupt enable
++ */
++ u8 int_enable;
++ u8 unused3;
++
++ /* write-only */
++ u8 reset_assert;
++ u8 unused4;
++
++ /* write-only */
++ u8 reset_deassert;
++ u8 unused5;
++
++ /* read-write access to serial EEPROM */
++ u8 eep;
++ u8 unused6;
++
++ /* write-only access to EEPROM chip select */
++ u8 enid;
++};
++
++#endif /* JANZ_H */commit df16dd53c575d0cb9dbee20a3149927c862a9ff6
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu May 27 19:59:02 2010 +0200
+
+ hwmon: (ltc4245) Read only one GPIO pin
+
+ Read only one of the GPIO pins as an analog voltage. The ADC can be
+ switched to a different GPIO pin at runtime, but this is not supported.
+
+ Previously, this driver would report the analog voltage of the currently
+ selected GPIO pin as all three GPIO voltages: in9_input, in10_input and
+ in11_input.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Jean Delvare <khali@linux-fr.org>
+ Cc: stable@kernel.org
+
+diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
+index 02838a47d862..86b5880d8502 100644
+--- a/Documentation/hwmon/ltc4245
++++ b/Documentation/hwmon/ltc4245
+@@ -72,9 +72,7 @@ in6_min_alarm 5v output undervoltage alarm
+ in7_min_alarm 3v output undervoltage alarm
+ in8_min_alarm Vee (-12v) output undervoltage alarm
+
+-in9_input GPIO #1 voltage data
+-in10_input GPIO #2 voltage data
+-in11_input GPIO #3 voltage data
++in9_input GPIO voltage data
+
+ power1_input 12v power usage (mW)
+ power2_input 5v power usage (mW)
+diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
+index 65c232a9d0c5..21d201befc2c 100644
+--- a/drivers/hwmon/ltc4245.c
++++ b/drivers/hwmon/ltc4245.c
+@@ -45,9 +45,7 @@ enum ltc4245_cmd {
+ LTC4245_VEEIN = 0x19,
+ LTC4245_VEESENSE = 0x1a,
+ LTC4245_VEEOUT = 0x1b,
+- LTC4245_GPIOADC1 = 0x1c,
+- LTC4245_GPIOADC2 = 0x1d,
+- LTC4245_GPIOADC3 = 0x1e,
++ LTC4245_GPIOADC = 0x1c,
+ };
+
+ struct ltc4245_data {
+@@ -61,7 +59,7 @@ struct ltc4245_data {
+ u8 cregs[0x08];
+
+ /* Voltage registers */
+- u8 vregs[0x0f];
++ u8 vregs[0x0d];
+ };
+
+ static struct ltc4245_data *ltc4245_update_device(struct device *dev)
+@@ -86,7 +84,7 @@ static struct ltc4245_data *ltc4245_update_device(struct device *dev)
+ data->cregs[i] = val;
+ }
+
+- /* Read voltage registers -- 0x10 to 0x1f */
++ /* Read voltage registers -- 0x10 to 0x1c */
+ for (i = 0; i < ARRAY_SIZE(data->vregs); i++) {
+ val = i2c_smbus_read_byte_data(client, i+0x10);
+ if (unlikely(val < 0))
+@@ -128,9 +126,7 @@ static int ltc4245_get_voltage(struct device *dev, u8 reg)
+ case LTC4245_VEEOUT:
+ voltage = regval * -55;
+ break;
+- case LTC4245_GPIOADC1:
+- case LTC4245_GPIOADC2:
+- case LTC4245_GPIOADC3:
++ case LTC4245_GPIOADC:
+ voltage = regval * 10;
+ break;
+ default:
+@@ -297,9 +293,7 @@ LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2);
+ LTC4245_ALARM(in8_min_alarm, (1 << 3), LTC4245_FAULT2);
+
+ /* GPIO voltages */
+-LTC4245_VOLTAGE(in9_input, LTC4245_GPIOADC1);
+-LTC4245_VOLTAGE(in10_input, LTC4245_GPIOADC2);
+-LTC4245_VOLTAGE(in11_input, LTC4245_GPIOADC3);
++LTC4245_VOLTAGE(in9_input, LTC4245_GPIOADC);
+
+ /* Power Consumption (virtual) */
+ LTC4245_POWER(power1_input, LTC4245_12VSENSE);
+@@ -342,8 +336,6 @@ static struct attribute *ltc4245_attributes[] = {
+ &sensor_dev_attr_in8_min_alarm.dev_attr.attr,
+
+ &sensor_dev_attr_in9_input.dev_attr.attr,
+- &sensor_dev_attr_in10_input.dev_attr.attr,
+- &sensor_dev_attr_in11_input.dev_attr.attr,
+
+ &sensor_dev_attr_power1_input.dev_attr.attr,
+ &sensor_dev_attr_power2_input.dev_attr.attr,commit d2b847d489ee4e9921bc61f47c3d0e992692fc0f +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Thu May 27 19:58:45 2010 +0200 + + hwmon: Add description of the update_rate sysfs attribute + + The update_rate attribute can be used by drivers to let userspace choose + the update rate of the chip, if it is configurable. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Jean Delvare <khali@linux-fr.org> + +diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface +index 3de6b0bcb147..d4e2917c6f18 100644 +--- a/Documentation/hwmon/sysfs-interface ++++ b/Documentation/hwmon/sysfs-interface +@@ -80,9 +80,9 @@ All entries (except name) are optional, and should only be created in a + given driver if the chip has the feature. + + +-******** +-* Name * +-******** ++********************* ++* Global attributes * ++********************* + + name The chip name. + This should be a short, lowercase string, not containing +@@ -91,6 +91,13 @@ name The chip name. + I2C devices get this attribute created automatically. + RO + ++update_rate The rate at which the chip will update readings. ++ Unit: millisecond ++ RW ++ Some devices have a variable update rate. This attribute ++ can be used to change the update rate to the desired ++ frequency. ++ + + ************ + * Voltages *+
commit 8c3c7a256f7ab142dfbcee2d8633dbce5a36fde7
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu May 27 19:58:44 2010 +0200
+
+ hwmon: (lm90) Use programmed update rate
+
+ The lm90 driver programs the sensor chip to update its readings at 2 Hz
+ (500 ms between readings). However, the driver only does reads from the
+ chip at intervals of 2 * HZ (2000 ms between readings). Change the driver
+ update rate to the programmed update rate.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Jean Delvare <khali@linux-fr.org>
+
+diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
+index 7cc2708871ab..760ef72eea56 100644
+--- a/drivers/hwmon/lm90.c
++++ b/drivers/hwmon/lm90.c
+@@ -982,7 +982,8 @@ static struct lm90_data *lm90_update_device(struct device *dev)
+
+ mutex_lock(&data->update_lock);
+
+- if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
++ if (time_after(jiffies, data->last_updated + HZ / 2 + HZ / 10)
++ || !data->valid) {
+ u8 h, l;
+
+ dev_dbg(&client->dev, "Updating lm90 data.\n");commit 3f6ea84a3035cc0ef7488f8e93bc76766799e082
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Thu Apr 1 11:43:30 2010 -0700
+
+ PCI: read memory ranges out of Broadcom CNB20LE host bridge
+
+ Read the memory ranges behind the Broadcom CNB20LE host bridge out of the
+ hardware. This allows PCI hotplugging to work, since we know which memory
+ range to allocate PCI BAR's from.
+
+ The x86 PCI code automatically prefers the ACPI _CRS information when it is
+ available. In that case, this information is not used.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 9458685902bd..677b87d60a36 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1931,6 +1931,14 @@ config PCI_MMCONFIG
+ bool "Support mmconfig PCI config space access"
+ depends on X86_64 && PCI && ACPI
+
++config PCI_CNB20LE_QUIRK
++ bool "Read CNB20LE Host Bridge Windows"
++ depends on PCI
++ help
++ Read the PCI windows out of the CNB20LE host bridge. This allows
++ PCI hotplug to work on systems with the CNB20LE chipset which do
++ not have ACPI.
++
+ config DMAR
+ bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
+ depends on PCI_MSI && ACPI && EXPERIMENTAL
+diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
+index b110d97fb925..a0207a7fdf39 100644
+--- a/arch/x86/pci/Makefile
++++ b/arch/x86/pci/Makefile
+@@ -18,6 +18,8 @@ obj-$(CONFIG_X86_MRST) += mrst.o
+ obj-y += common.o early.o
+ obj-y += amd_bus.o bus_numa.o
+
++obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o
++
+ ifeq ($(CONFIG_PCI_DEBUG),y)
+ EXTRA_CFLAGS += -DDEBUG
+ endif
+diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c
+new file mode 100644
+index 000000000000..0846a5bbbfbd
+--- /dev/null
++++ b/arch/x86/pci/broadcom_bus.c
+@@ -0,0 +1,101 @@
++/*
++ * Read address ranges from a Broadcom CNB20LE Host Bridge
++ *
++ * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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/delay.h>
++#include <linux/dmi.h>
++#include <linux/pci.h>
++#include <linux/init.h>
++#include <asm/pci_x86.h>
++
++#include "bus_numa.h"
++
++static void __devinit cnb20le_res(struct pci_dev *dev)
++{
++ struct pci_root_info *info;
++ struct resource res;
++ u16 word1, word2;
++ u8 fbus, lbus;
++ int i;
++
++ /*
++ * The x86_pci_root_bus_res_quirks() function already refuses to use
++ * this information if ACPI _CRS was used. Therefore, we don't bother
++ * checking if ACPI is enabled, and just generate the information
++ * for both the ACPI _CRS and no ACPI cases.
++ */
++
++ info = &pci_root_info[pci_root_num];
++ pci_root_num++;
++
++ /* read the PCI bus numbers */
++ pci_read_config_byte(dev, 0x44, &fbus);
++ pci_read_config_byte(dev, 0x45, &lbus);
++ info->bus_min = fbus;
++ info->bus_max = lbus;
++
++ /*
++ * Add the legacy IDE ports on bus 0
++ *
++ * These do not exist anywhere in the bridge registers, AFAICT. I do
++ * not have the datasheet, so this is the best I can do.
++ */
++ if (fbus == 0) {
++ update_res(info, 0x01f0, 0x01f7, IORESOURCE_IO, 0);
++ update_res(info, 0x03f6, 0x03f6, IORESOURCE_IO, 0);
++ update_res(info, 0x0170, 0x0177, IORESOURCE_IO, 0);
++ update_res(info, 0x0376, 0x0376, IORESOURCE_IO, 0);
++ update_res(info, 0xffa0, 0xffaf, IORESOURCE_IO, 0);
++ }
++
++ /* read the non-prefetchable memory window */
++ pci_read_config_word(dev, 0xc0, &word1);
++ pci_read_config_word(dev, 0xc2, &word2);
++ if (word1 != word2) {
++ res.start = (word1 << 16) | 0x0000;
++ res.end = (word2 << 16) | 0xffff;
++ res.flags = IORESOURCE_MEM;
++ update_res(info, res.start, res.end, res.flags, 0);
++ }
++
++ /* read the prefetchable memory window */
++ pci_read_config_word(dev, 0xc4, &word1);
++ pci_read_config_word(dev, 0xc6, &word2);
++ if (word1 != word2) {
++ res.start = (word1 << 16) | 0x0000;
++ res.end = (word2 << 16) | 0xffff;
++ res.flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
++ update_res(info, res.start, res.end, res.flags, 0);
++ }
++
++ /* read the IO port window */
++ pci_read_config_word(dev, 0xd0, &word1);
++ pci_read_config_word(dev, 0xd2, &word2);
++ if (word1 != word2) {
++ res.start = word1;
++ res.end = word2;
++ res.flags = IORESOURCE_IO;
++ update_res(info, res.start, res.end, res.flags, 0);
++ }
++
++ /* print information about this host bridge */
++ res.start = fbus;
++ res.end = lbus;
++ res.flags = IORESOURCE_BUS;
++ dev_info(&dev->dev, "CNB20LE PCI Host Bridge (domain %04x %pR)\n",
++ pci_domain_nr(dev->bus), &res);
++
++ for (i = 0; i < info->res_num; i++)
++ dev_info(&dev->dev, "host bridge window %pR\n", &info->res[i]);
++}
++
++DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
++ cnb20le_res);
++commit ac6ec5b1de5d1d5afcbe88d73c05df71dca0ac39
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Mon Dec 21 16:26:45 2009 -0800
+
+ serial: 8250_pci: add support for MCS9865 / SYBA 6x Serial Port Card
+
+ This patch is heavily based on an earlier patch found on the linux-serial
+ mailing list [1], written by Darius Augulis.
+
+ The previous incarnation of this patch only supported a 2x serial port
+ card. I have added support for my SYBA 6x serial port card, and tested on
+ x86.
+
+ [1]: http://marc.info/?l=linux-serial&m=124975806304760
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Darius Augulis <augulis.darius@gmail.com>
+ Cc: Greg KH <greg@kroah.com>
+ Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
+index ad113b0f62db..0950fa40684f 100644
+--- a/drivers/parport/parport_pc.c
++++ b/drivers/parport/parport_pc.c
+@@ -2908,6 +2908,7 @@ enum parport_pc_pci_cards {
+ netmos_9805,
+ netmos_9815,
+ netmos_9901,
++ netmos_9865,
+ quatech_sppxp100,
+ };
+
+@@ -2989,6 +2990,7 @@ static struct parport_pc_pci {
+ /* netmos_9805 */ { 1, { { 0, -1 }, } },
+ /* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } },
+ /* netmos_9901 */ { 1, { { 0, -1 }, } },
++ /* netmos_9865 */ { 1, { { 0, -1 }, } },
+ /* quatech_sppxp100 */ { 1, { { 0, 1 }, } },
+ };
+
+@@ -3092,6 +3094,10 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
+ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,
+ 0xA000, 0x2000, 0, 0, netmos_9901 },
++ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
++ 0xA000, 0x1000, 0, 0, netmos_9865 },
++ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
++ 0xA000, 0x2000, 0, 0, netmos_9865 },
+ /* Quatech SPPXP-100 Parallel port PCI ExpressCard */
+ { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
+diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
+index b28af13c45a1..8b18c3ce3898 100644
+--- a/drivers/serial/8250_pci.c
++++ b/drivers/serial/8250_pci.c
+@@ -760,7 +760,8 @@ static int pci_netmos_init(struct pci_dev *dev)
+ /* subdevice 0x00PS means <P> parallel, <S> serial */
+ unsigned int num_serial = dev->subsystem_device & 0xf;
+
+- if (dev->device == PCI_DEVICE_ID_NETMOS_9901)
++ if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
++ (dev->device == PCI_DEVICE_ID_NETMOS_9865))
+ return 0;
+ if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+ dev->subsystem_device == 0x0299)
+@@ -1479,6 +1480,7 @@ enum pci_board_num_t {
+
+ pbn_b0_bt_1_115200,
+ pbn_b0_bt_2_115200,
++ pbn_b0_bt_4_115200,
+ pbn_b0_bt_8_115200,
+
+ pbn_b0_bt_1_460800,
+@@ -1703,6 +1705,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
+ .base_baud = 115200,
+ .uart_offset = 8,
+ },
++ [pbn_b0_bt_4_115200] = {
++ .flags = FL_BASE0|FL_BASE_BARS,
++ .num_ports = 4,
++ .base_baud = 115200,
++ .uart_offset = 8,
++ },
+ [pbn_b0_bt_8_115200] = {
+ .flags = FL_BASE0|FL_BASE_BARS,
+ .num_ports = 8,
+@@ -3648,6 +3656,18 @@ static struct pci_device_id serial_pci_tbl[] = {
+ 0xA000, 0x1000,
+ 0, 0, pbn_b0_1_115200 },
+
++ /*
++ * Best Connectivity PCI Multi I/O cards
++ */
++
++ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
++ 0xA000, 0x1000,
++ 0, 0, pbn_b0_1_115200 },
++
++ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9865,
++ 0xA000, 0x3004,
++ 0, 0, pbn_b0_bt_4_115200 },
++
+ /*
+ * These entries match devices with class COMMUNICATION_SERIAL,
+ * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
+diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
+index 0be824320580..3ec4003f5e64 100644
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2697,6 +2697,7 @@
+ #define PCI_DEVICE_ID_NETMOS_9835 0x9835
+ #define PCI_DEVICE_ID_NETMOS_9845 0x9845
+ #define PCI_DEVICE_ID_NETMOS_9855 0x9855
++#define PCI_DEVICE_ID_NETMOS_9865 0x9865
+ #define PCI_DEVICE_ID_NETMOS_9901 0x9901
+
+ #define PCI_VENDOR_ID_3COM_2 0xa727commit 9c3a50b7d7ec45da34e73cac66cde12dd6092dd8
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:06 2010 +0000
+
+ fsldma: major cleanups and fixes
+
+ Fix locking. Use two queues in the driver, one for pending transacions, and
+ one for transactions which are actually running on the hardware. Call
+ dma_run_dependencies() on descriptor cleanup so that the async_tx API works
+ correctly.
+
+ There are a number of places throughout the code where lists of descriptors
+ are freed in a loop. Create functions to handle this, and use them instead
+ of open-coding the loop each time.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 7b5f88cb495b..19011c20390b 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -61,7 +61,6 @@ static void dma_init(struct fsldma_chan *chan)
+ | FSL_DMA_MR_PRC_RM, 32);
+ break;
+ }
+-
+ }
+
+ static void set_sr(struct fsldma_chan *chan, u32 val)
+@@ -120,11 +119,6 @@ static dma_addr_t get_cdar(struct fsldma_chan *chan)
+ return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
+ }
+
+-static void set_ndar(struct fsldma_chan *chan, dma_addr_t addr)
+-{
+- DMA_OUT(chan, &chan->regs->ndar, addr, 64);
+-}
+-
+ static dma_addr_t get_ndar(struct fsldma_chan *chan)
+ {
+ return DMA_IN(chan, &chan->regs->ndar, 64);
+@@ -178,11 +172,12 @@ static void dma_halt(struct fsldma_chan *chan)
+
+ for (i = 0; i < 100; i++) {
+ if (dma_is_idle(chan))
+- break;
++ return;
++
+ udelay(10);
+ }
+
+- if (i >= 100 && !dma_is_idle(chan))
++ if (!dma_is_idle(chan))
+ dev_err(chan->dev, "DMA halt timeout!\n");
+ }
+
+@@ -199,27 +194,6 @@ static void set_ld_eol(struct fsldma_chan *chan,
+ | snoop_bits, 64);
+ }
+
+-static void append_ld_queue(struct fsldma_chan *chan,
+- struct fsl_desc_sw *new_desc)
+-{
+- struct fsl_desc_sw *queue_tail = to_fsl_desc(chan->ld_queue.prev);
+-
+- if (list_empty(&chan->ld_queue))
+- return;
+-
+- /* Link to the new descriptor physical address and
+- * Enable End-of-segment interrupt for
+- * the last link descriptor.
+- * (the previous node's next link descriptor)
+- *
+- * For FSL_DMA_IP_83xx, the snoop enable bit need be set.
+- */
+- queue_tail->hw.next_ln_addr = CPU_TO_DMA(chan,
+- new_desc->async_tx.phys | FSL_DMA_EOSIE |
+- (((chan->feature & FSL_DMA_IP_MASK)
+- == FSL_DMA_IP_83XX) ? FSL_DMA_SNEN : 0), 64);
+-}
+-
+ /**
+ * fsl_chan_set_src_loop_size - Set source address hold transfer size
+ * @chan : Freescale DMA channel
+@@ -343,6 +317,31 @@ static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
+ chan->feature &= ~FSL_DMA_CHAN_START_EXT;
+ }
+
++static void append_ld_queue(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
++{
++ struct fsl_desc_sw *tail = to_fsl_desc(chan->ld_pending.prev);
++
++ if (list_empty(&chan->ld_pending))
++ goto out_splice;
++
++ /*
++ * Add the hardware descriptor to the chain of hardware descriptors
++ * that already exists in memory.
++ *
++ * This will un-set the EOL bit of the existing transaction, and the
++ * last link in this transaction will become the EOL descriptor.
++ */
++ set_desc_next(chan, &tail->hw, desc->async_tx.phys);
++
++ /*
++ * Add the software descriptor and all children to the list
++ * of pending transactions
++ */
++out_splice:
++ list_splice_tail_init(&desc->tx_list, &chan->ld_pending);
++}
++
+ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ {
+ struct fsldma_chan *chan = to_fsl_chan(tx->chan);
+@@ -351,9 +350,12 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ unsigned long flags;
+ dma_cookie_t cookie;
+
+- /* cookie increment and adding to ld_queue must be atomic */
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
++ /*
++ * assign cookies to all of the software descriptors
++ * that make up this transaction
++ */
+ cookie = chan->common.cookie;
+ list_for_each_entry(child, &desc->tx_list, node) {
+ cookie++;
+@@ -364,8 +366,9 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ }
+
+ chan->common.cookie = cookie;
++
++ /* put this transaction onto the tail of the pending queue */
+ append_ld_queue(chan, desc);
+- list_splice_init(&desc->tx_list, chan->ld_queue.prev);
+
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+
+@@ -381,20 +384,22 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+ struct fsldma_chan *chan)
+ {
++ struct fsl_desc_sw *desc;
+ dma_addr_t pdesc;
+- struct fsl_desc_sw *desc_sw;
+-
+- desc_sw = dma_pool_alloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
+- if (desc_sw) {
+- memset(desc_sw, 0, sizeof(struct fsl_desc_sw));
+- INIT_LIST_HEAD(&desc_sw->tx_list);
+- dma_async_tx_descriptor_init(&desc_sw->async_tx,
+- &chan->common);
+- desc_sw->async_tx.tx_submit = fsl_dma_tx_submit;
+- desc_sw->async_tx.phys = pdesc;
++
++ desc = dma_pool_alloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
++ if (!desc) {
++ dev_dbg(chan->dev, "out of memory for link desc\n");
++ return NULL;
+ }
+
+- return desc_sw;
++ memset(desc, 0, sizeof(*desc));
++ INIT_LIST_HEAD(&desc->tx_list);
++ dma_async_tx_descriptor_init(&desc->async_tx, &chan->common);
++ desc->async_tx.tx_submit = fsl_dma_tx_submit;
++ desc->async_tx.phys = pdesc;
++
++ return desc;
+ }
+
+
+@@ -414,21 +419,53 @@ static int fsl_dma_alloc_chan_resources(struct dma_chan *dchan)
+ if (chan->desc_pool)
+ return 1;
+
+- /* We need the descriptor to be aligned to 32bytes
++ /*
++ * We need the descriptor to be aligned to 32bytes
+ * for meeting FSL DMA specification requirement.
+ */
+ chan->desc_pool = dma_pool_create("fsl_dma_engine_desc_pool",
+- chan->dev, sizeof(struct fsl_desc_sw),
+- 32, 0);
++ chan->dev,
++ sizeof(struct fsl_desc_sw),
++ __alignof__(struct fsl_desc_sw), 0);
+ if (!chan->desc_pool) {
+- dev_err(chan->dev, "No memory for channel %d "
+- "descriptor dma pool.\n", chan->id);
+- return 0;
++ dev_err(chan->dev, "unable to allocate channel %d "
++ "descriptor pool\n", chan->id);
++ return -ENOMEM;
+ }
+
++ /* there is at least one descriptor free to be allocated */
+ return 1;
+ }
+
++/**
++ * fsldma_free_desc_list - Free all descriptors in a queue
++ * @chan: Freescae DMA channel
++ * @list: the list to free
++ *
++ * LOCKING: must hold chan->desc_lock
++ */
++static void fsldma_free_desc_list(struct fsldma_chan *chan,
++ struct list_head *list)
++{
++ struct fsl_desc_sw *desc, *_desc;
++
++ list_for_each_entry_safe(desc, _desc, list, node) {
++ list_del(&desc->node);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
++ }
++}
++
++static void fsldma_free_desc_list_reverse(struct fsldma_chan *chan,
++ struct list_head *list)
++{
++ struct fsl_desc_sw *desc, *_desc;
++
++ list_for_each_entry_safe_reverse(desc, _desc, list, node) {
++ list_del(&desc->node);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
++ }
++}
++
+ /**
+ * fsl_dma_free_chan_resources - Free all resources of the channel.
+ * @chan : Freescale DMA channel
+@@ -436,23 +473,15 @@ static int fsl_dma_alloc_chan_resources(struct dma_chan *dchan)
+ static void fsl_dma_free_chan_resources(struct dma_chan *dchan)
+ {
+ struct fsldma_chan *chan = to_fsl_chan(dchan);
+- struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+
+ dev_dbg(chan->dev, "Free all channel resources.\n");
+ spin_lock_irqsave(&chan->desc_lock, flags);
+- list_for_each_entry_safe(desc, _desc, &chan->ld_queue, node) {
+-#ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(chan->dev,
+- "LD %p will be released.\n", desc);
+-#endif
+- list_del(&desc->node);
+- /* free link descriptor */
+- dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+- }
++ fsldma_free_desc_list(chan, &chan->ld_pending);
++ fsldma_free_desc_list(chan, &chan->ld_running);
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+- dma_pool_destroy(chan->desc_pool);
+
++ dma_pool_destroy(chan->desc_pool);
+ chan->desc_pool = NULL;
+ }
+
+@@ -491,7 +520,6 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ {
+ struct fsldma_chan *chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new;
+- struct list_head *list;
+ size_t copy;
+
+ if (!dchan)
+@@ -550,12 +578,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ if (!first)
+ return NULL;
+
+- list = &first->tx_list;
+- list_for_each_entry_safe_reverse(new, prev, list, node) {
+- list_del(&new->node);
+- dma_pool_free(chan->desc_pool, new, new->async_tx.phys);
+- }
+-
++ fsldma_free_desc_list_reverse(chan, &first->tx_list);
+ return NULL;
+ }
+
+@@ -578,7 +601,6 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ struct fsldma_chan *chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
+ struct fsl_dma_slave *slave;
+- struct list_head *tx_list;
+ size_t copy;
+
+ int i;
+@@ -748,19 +770,13 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ *
+ * We're re-using variables for the loop, oh well
+ */
+- tx_list = &first->tx_list;
+- list_for_each_entry_safe_reverse(new, prev, tx_list, node) {
+- list_del_init(&new->node);
+- dma_pool_free(chan->desc_pool, new, new->async_tx.phys);
+- }
+-
++ fsldma_free_desc_list_reverse(chan, &first->tx_list);
+ return NULL;
+ }
+
+ static void fsl_dma_device_terminate_all(struct dma_chan *dchan)
+ {
+ struct fsldma_chan *chan;
+- struct fsl_desc_sw *desc, *tmp;
+ unsigned long flags;
+
+ if (!dchan)
+@@ -774,10 +790,8 @@ static void fsl_dma_device_terminate_all(struct dma_chan *dchan)
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+ /* Remove and free all of the descriptors in the LD queue */
+- list_for_each_entry_safe(desc, tmp, &chan->ld_queue, node) {
+- list_del(&desc->node);
+- dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+- }
++ fsldma_free_desc_list(chan, &chan->ld_pending);
++ fsldma_free_desc_list(chan, &chan->ld_running);
+
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+@@ -785,31 +799,48 @@ static void fsl_dma_device_terminate_all(struct dma_chan *dchan)
+ /**
+ * fsl_dma_update_completed_cookie - Update the completed cookie.
+ * @chan : Freescale DMA channel
++ *
++ * CONTEXT: hardirq
+ */
+ static void fsl_dma_update_completed_cookie(struct fsldma_chan *chan)
+ {
+- struct fsl_desc_sw *cur_desc, *desc;
+- dma_addr_t ld_phy;
+-
+- ld_phy = get_cdar(chan) & FSL_DMA_NLDA_MASK;
++ struct fsl_desc_sw *desc;
++ unsigned long flags;
++ dma_cookie_t cookie;
+
+- if (ld_phy) {
+- cur_desc = NULL;
+- list_for_each_entry(desc, &chan->ld_queue, node)
+- if (desc->async_tx.phys == ld_phy) {
+- cur_desc = desc;
+- break;
+- }
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- if (cur_desc && cur_desc->async_tx.cookie) {
+- if (dma_is_idle(chan))
+- chan->completed_cookie =
+- cur_desc->async_tx.cookie;
+- else
+- chan->completed_cookie =
+- cur_desc->async_tx.cookie - 1;
+- }
++ if (list_empty(&chan->ld_running)) {
++ dev_dbg(chan->dev, "no running descriptors\n");
++ goto out_unlock;
+ }
++
++ /* Get the last descriptor, update the cookie to that */
++ desc = to_fsl_desc(chan->ld_running.prev);
++ if (dma_is_idle(chan))
++ cookie = desc->async_tx.cookie;
++ else
++ cookie = desc->async_tx.cookie - 1;
++
++ chan->completed_cookie = cookie;
++
++out_unlock:
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++}
++
++/**
++ * fsldma_desc_status - Check the status of a descriptor
++ * @chan: Freescale DMA channel
++ * @desc: DMA SW descriptor
++ *
++ * This function will return the status of the given descriptor
++ */
++static enum dma_status fsldma_desc_status(struct fsldma_chan *chan,
++ struct fsl_desc_sw *desc)
++{
++ return dma_async_is_complete(desc->async_tx.cookie,
++ chan->completed_cookie,
++ chan->common.cookie);
+ }
+
+ /**
+@@ -817,8 +848,6 @@ static void fsl_dma_update_completed_cookie(struct fsldma_chan *chan)
+ * @chan : Freescale DMA channel
+ *
+ * This function clean up the ld_queue of DMA channel.
+- * If 'in_intr' is set, the function will move the link descriptor to
+- * the recycle list. Otherwise, free it directly.
+ */
+ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ {
+@@ -827,80 +856,95 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- dev_dbg(chan->dev, "chan completed_cookie = %d\n",
+- chan->completed_cookie);
+- list_for_each_entry_safe(desc, _desc, &chan->ld_queue, node) {
++ dev_dbg(chan->dev, "chan completed_cookie = %d\n", chan->completed_cookie);
++ list_for_each_entry_safe(desc, _desc, &chan->ld_running, node) {
+ dma_async_tx_callback callback;
+ void *callback_param;
+
+- if (dma_async_is_complete(desc->async_tx.cookie,
+- chan->completed_cookie, chan->common.cookie)
+- == DMA_IN_PROGRESS)
++ if (fsldma_desc_status(chan, desc) == DMA_IN_PROGRESS)
+ break;
+
+- callback = desc->async_tx.callback;
+- callback_param = desc->async_tx.callback_param;
+-
+- /* Remove from ld_queue list */
++ /* Remove from the list of running transactions */
+ list_del(&desc->node);
+
+- dev_dbg(chan->dev, "link descriptor %p will be recycle.\n",
+- desc);
+- dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+-
+ /* Run the link descriptor callback function */
++ callback = desc->async_tx.callback;
++ callback_param = desc->async_tx.callback_param;
+ if (callback) {
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+- dev_dbg(chan->dev, "link descriptor %p callback\n",
+- desc);
++ dev_dbg(chan->dev, "LD %p callback\n", desc);
+ callback(callback_param);
+ spin_lock_irqsave(&chan->desc_lock, flags);
+ }
++
++ /* Run any dependencies, then free the descriptor */
++ dma_run_dependencies(&desc->async_tx);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
++
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+- * fsl_chan_xfer_ld_queue - Transfer link descriptors in channel ld_queue.
++ * fsl_chan_xfer_ld_queue - transfer any pending transactions
+ * @chan : Freescale DMA channel
++ *
++ * This will make sure that any pending transactions will be run.
++ * If the DMA controller is idle, it will be started. Otherwise,
++ * the DMA controller's interrupt handler will start any pending
++ * transactions when it becomes idle.
+ */
+ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ {
+- struct list_head *ld_node;
+- dma_addr_t next_dst_addr;
++ struct fsl_desc_sw *desc;
+ unsigned long flags;
+
+ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- if (!dma_is_idle(chan))
++ /*
++ * If the list of pending descriptors is empty, then we
++ * don't need to do any work at all
++ */
++ if (list_empty(&chan->ld_pending)) {
++ dev_dbg(chan->dev, "no pending LDs\n");
+ goto out_unlock;
++ }
+
++ /*
++ * The DMA controller is not idle, which means the interrupt
++ * handler will start any queued transactions when it runs
++ * at the end of the current transaction
++ */
++ if (!dma_is_idle(chan)) {
++ dev_dbg(chan->dev, "DMA controller still busy\n");
++ goto out_unlock;
++ }
++
++ /*
++ * TODO:
++ * make sure the dma_halt() function really un-wedges the
++ * controller as much as possible
++ */
+ dma_halt(chan);
+
+- /* If there are some link descriptors
+- * not transfered in queue. We need to start it.
++ /*
++ * If there are some link descriptors which have not been
++ * transferred, we need to start the controller
+ */
+
+- /* Find the first un-transfer desciptor */
+- for (ld_node = chan->ld_queue.next;
+- (ld_node != &chan->ld_queue)
+- && (dma_async_is_complete(
+- to_fsl_desc(ld_node)->async_tx.cookie,
+- chan->completed_cookie,
+- chan->common.cookie) == DMA_SUCCESS);
+- ld_node = ld_node->next);
+-
+- if (ld_node != &chan->ld_queue) {
+- /* Get the ld start address from ld_queue */
+- next_dst_addr = to_fsl_desc(ld_node)->async_tx.phys;
+- dev_dbg(chan->dev, "xfer LDs staring from 0x%llx\n",
+- (unsigned long long)next_dst_addr);
+- set_cdar(chan, next_dst_addr);
+- dma_start(chan);
+- } else {
+- set_cdar(chan, 0);
+- set_ndar(chan, 0);
+- }
++ /*
++ * Move all elements from the queue of pending transactions
++ * onto the list of running transactions
++ */
++ desc = list_first_entry(&chan->ld_pending, struct fsl_desc_sw, node);
++ list_splice_tail_init(&chan->ld_pending, &chan->ld_running);
++
++ /*
++ * Program the descriptor's address into the DMA controller,
++ * then start the DMA transaction
++ */
++ set_cdar(chan, desc->async_tx.phys);
++ dma_start(chan);
+
+ out_unlock:
+ spin_unlock_irqrestore(&chan->desc_lock, flags);
+@@ -913,30 +957,6 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ static void fsl_dma_memcpy_issue_pending(struct dma_chan *dchan)
+ {
+ struct fsldma_chan *chan = to_fsl_chan(dchan);
+-
+-#ifdef FSL_DMA_LD_DEBUG
+- struct fsl_desc_sw *ld;
+- unsigned long flags;
+-
+- spin_lock_irqsave(&chan->desc_lock, flags);
+- if (list_empty(&chan->ld_queue)) {
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+- return;
+- }
+-
+- dev_dbg(chan->dev, "--memcpy issue--\n");
+- list_for_each_entry(ld, &chan->ld_queue, node) {
+- int i;
+- dev_dbg(chan->dev, "Ch %d, LD %08x\n",
+- chan->id, ld->async_tx.phys);
+- for (i = 0; i < 8; i++)
+- dev_dbg(chan->dev, "LD offset %d: %08x\n",
+- i, *(((u32 *)&ld->hw) + i));
+- }
+- dev_dbg(chan->dev, "----------------\n");
+- spin_unlock_irqrestore(&chan->desc_lock, flags);
+-#endif
+-
+ fsl_chan_xfer_ld_queue(chan);
+ }
+
+@@ -978,10 +998,10 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ int xfer_ld_q = 0;
+ u32 stat;
+
++ /* save and clear the status register */
+ stat = get_sr(chan);
+- dev_dbg(chan->dev, "event: channel %d, stat = 0x%x\n",
+- chan->id, stat);
+- set_sr(chan, stat); /* Clear the event register */
++ set_sr(chan, stat);
++ dev_dbg(chan->dev, "irq: channel %d, stat = 0x%x\n", chan->id, stat);
+
+ stat &= ~(FSL_DMA_SR_CB | FSL_DMA_SR_CH);
+ if (!stat)
+@@ -990,12 +1010,13 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ if (stat & FSL_DMA_SR_TE)
+ dev_err(chan->dev, "Transfer Error!\n");
+
+- /* Programming Error
++ /*
++ * Programming Error
+ * The DMA_INTERRUPT async_tx is a NULL transfer, which will
+ * triger a PE interrupt.
+ */
+ if (stat & FSL_DMA_SR_PE) {
+- dev_dbg(chan->dev, "event: Programming Error INT\n");
++ dev_dbg(chan->dev, "irq: Programming Error INT\n");
+ if (get_bcr(chan) == 0) {
+ /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+ * Now, update the completed cookie, and continue the
+@@ -1007,34 +1028,37 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ stat &= ~FSL_DMA_SR_PE;
+ }
+
+- /* If the link descriptor segment transfer finishes,
++ /*
++ * If the link descriptor segment transfer finishes,
+ * we will recycle the used descriptor.
+ */
+ if (stat & FSL_DMA_SR_EOSI) {
+- dev_dbg(chan->dev, "event: End-of-segments INT\n");
+- dev_dbg(chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",
++ dev_dbg(chan->dev, "irq: End-of-segments INT\n");
++ dev_dbg(chan->dev, "irq: clndar 0x%llx, nlndar 0x%llx\n",
+ (unsigned long long)get_cdar(chan),
+ (unsigned long long)get_ndar(chan));
+ stat &= ~FSL_DMA_SR_EOSI;
+ update_cookie = 1;
+ }
+
+- /* For MPC8349, EOCDI event need to update cookie
++ /*
++ * For MPC8349, EOCDI event need to update cookie
+ * and start the next transfer if it exist.
+ */
+ if (stat & FSL_DMA_SR_EOCDI) {
+- dev_dbg(chan->dev, "event: End-of-Chain link INT\n");
++ dev_dbg(chan->dev, "irq: End-of-Chain link INT\n");
+ stat &= ~FSL_DMA_SR_EOCDI;
+ update_cookie = 1;
+ xfer_ld_q = 1;
+ }
+
+- /* If it current transfer is the end-of-transfer,
++ /*
++ * If it current transfer is the end-of-transfer,
+ * we should clear the Channel Start bit for
+ * prepare next transfer.
+ */
+ if (stat & FSL_DMA_SR_EOLNI) {
+- dev_dbg(chan->dev, "event: End-of-link INT\n");
++ dev_dbg(chan->dev, "irq: End-of-link INT\n");
+ stat &= ~FSL_DMA_SR_EOLNI;
+ xfer_ld_q = 1;
+ }
+@@ -1044,10 +1068,9 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ if (xfer_ld_q)
+ fsl_chan_xfer_ld_queue(chan);
+ if (stat)
+- dev_dbg(chan->dev, "event: unhandled sr 0x%02x\n",
+- stat);
++ dev_dbg(chan->dev, "irq: unhandled sr 0x%02x\n", stat);
+
+- dev_dbg(chan->dev, "event: Exit\n");
++ dev_dbg(chan->dev, "irq: Exit\n");
+ tasklet_schedule(&chan->tasklet);
+ return IRQ_HANDLED;
+ }
+@@ -1235,7 +1258,8 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ }
+
+ spin_lock_init(&chan->desc_lock);
+- INIT_LIST_HEAD(&chan->ld_queue);
++ INIT_LIST_HEAD(&chan->ld_pending);
++ INIT_LIST_HEAD(&chan->ld_running);
+
+ chan->common.device = &fdev->common;
+
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index ea3b19c8708c..cb4d6ff51597 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -131,7 +131,8 @@ struct fsldma_chan {
+ struct fsldma_chan_regs __iomem *regs;
+ dma_cookie_t completed_cookie; /* The maximum cookie completed */
+ spinlock_t desc_lock; /* Descriptor operation lock */
+- struct list_head ld_queue; /* Link descriptors queue */
++ struct list_head ld_pending; /* Link descriptors queue */
++ struct list_head ld_running; /* Link descriptors queue */
+ struct dma_chan common; /* DMA common channel */
+ struct dma_pool *desc_pool; /* Descriptors pool */
+ struct device *dev; /* Channel device */commit a1c03319018061304be28d131073ac13a5cb86fb
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:05 2010 +0000
+
+ fsldma: rename fsl_chan to chan
+
+ The name fsl_chan seems too long, so it has been shortened to chan. There
+ are only a few places where the higher level "struct dma_chan *chan" name
+ conflicts. These have been changed to "struct dma_chan *dchan" instead.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 6a905929ef01..7b5f88cb495b 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -37,19 +37,19 @@
+ #include <asm/fsldma.h>
+ #include "fsldma.h"
+
+-static void dma_init(struct fsldma_chan *fsl_chan)
++static void dma_init(struct fsldma_chan *chan)
+ {
+ /* Reset the channel */
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, 0, 32);
++ DMA_OUT(chan, &chan->regs->mr, 0, 32);
+
+- switch (fsl_chan->feature & FSL_DMA_IP_MASK) {
++ switch (chan->feature & FSL_DMA_IP_MASK) {
+ case FSL_DMA_IP_85XX:
+ /* Set the channel to below modes:
+ * EIE - Error interrupt enable
+ * EOSIE - End of segments interrupt enable (basic mode)
+ * EOLNIE - End of links interrupt enable
+ */
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, FSL_DMA_MR_EIE
++ DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_EIE
+ | FSL_DMA_MR_EOLNIE | FSL_DMA_MR_EOSIE, 32);
+ break;
+ case FSL_DMA_IP_83XX:
+@@ -57,154 +57,154 @@ static void dma_init(struct fsldma_chan *fsl_chan)
+ * EOTIE - End-of-transfer interrupt enable
+ * PRC_RM - PCI read multiple
+ */
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, FSL_DMA_MR_EOTIE
++ DMA_OUT(chan, &chan->regs->mr, FSL_DMA_MR_EOTIE
+ | FSL_DMA_MR_PRC_RM, 32);
+ break;
+ }
+
+ }
+
+-static void set_sr(struct fsldma_chan *fsl_chan, u32 val)
++static void set_sr(struct fsldma_chan *chan, u32 val)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->regs->sr, val, 32);
++ DMA_OUT(chan, &chan->regs->sr, val, 32);
+ }
+
+-static u32 get_sr(struct fsldma_chan *fsl_chan)
++static u32 get_sr(struct fsldma_chan *chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->regs->sr, 32);
++ return DMA_IN(chan, &chan->regs->sr, 32);
+ }
+
+-static void set_desc_cnt(struct fsldma_chan *fsl_chan,
++static void set_desc_cnt(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, u32 count)
+ {
+- hw->count = CPU_TO_DMA(fsl_chan, count, 32);
++ hw->count = CPU_TO_DMA(chan, count, 32);
+ }
+
+-static void set_desc_src(struct fsldma_chan *fsl_chan,
++static void set_desc_src(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t src)
+ {
+ u64 snoop_bits;
+
+- snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
+ ? ((u64)FSL_DMA_SATR_SREADTYPE_SNOOP_READ << 32) : 0;
+- hw->src_addr = CPU_TO_DMA(fsl_chan, snoop_bits | src, 64);
++ hw->src_addr = CPU_TO_DMA(chan, snoop_bits | src, 64);
+ }
+
+-static void set_desc_dst(struct fsldma_chan *fsl_chan,
++static void set_desc_dst(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t dst)
+ {
+ u64 snoop_bits;
+
+- snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
+ ? ((u64)FSL_DMA_DATR_DWRITETYPE_SNOOP_WRITE << 32) : 0;
+- hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dst, 64);
++ hw->dst_addr = CPU_TO_DMA(chan, snoop_bits | dst, 64);
+ }
+
+-static void set_desc_next(struct fsldma_chan *fsl_chan,
++static void set_desc_next(struct fsldma_chan *chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t next)
+ {
+ u64 snoop_bits;
+
+- snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
+ ? FSL_DMA_SNEN : 0;
+- hw->next_ln_addr = CPU_TO_DMA(fsl_chan, snoop_bits | next, 64);
++ hw->next_ln_addr = CPU_TO_DMA(chan, snoop_bits | next, 64);
+ }
+
+-static void set_cdar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
++static void set_cdar(struct fsldma_chan *chan, dma_addr_t addr)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
++ DMA_OUT(chan, &chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
+ }
+
+-static dma_addr_t get_cdar(struct fsldma_chan *fsl_chan)
++static dma_addr_t get_cdar(struct fsldma_chan *chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
++ return DMA_IN(chan, &chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
+ }
+
+-static void set_ndar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
++static void set_ndar(struct fsldma_chan *chan, dma_addr_t addr)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->regs->ndar, addr, 64);
++ DMA_OUT(chan, &chan->regs->ndar, addr, 64);
+ }
+
+-static dma_addr_t get_ndar(struct fsldma_chan *fsl_chan)
++static dma_addr_t get_ndar(struct fsldma_chan *chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->regs->ndar, 64);
++ return DMA_IN(chan, &chan->regs->ndar, 64);
+ }
+
+-static u32 get_bcr(struct fsldma_chan *fsl_chan)
++static u32 get_bcr(struct fsldma_chan *chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->regs->bcr, 32);
++ return DMA_IN(chan, &chan->regs->bcr, 32);
+ }
+
+-static int dma_is_idle(struct fsldma_chan *fsl_chan)
++static int dma_is_idle(struct fsldma_chan *chan)
+ {
+- u32 sr = get_sr(fsl_chan);
++ u32 sr = get_sr(chan);
+ return (!(sr & FSL_DMA_SR_CB)) || (sr & FSL_DMA_SR_CH);
+ }
+
+-static void dma_start(struct fsldma_chan *fsl_chan)
++static void dma_start(struct fsldma_chan *chan)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
+
+- if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
+- if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
+- DMA_OUT(fsl_chan, &fsl_chan->regs->bcr, 0, 32);
++ if ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
++ if (chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
++ DMA_OUT(chan, &chan->regs->bcr, 0, 32);
+ mode |= FSL_DMA_MR_EMP_EN;
+ } else {
+ mode &= ~FSL_DMA_MR_EMP_EN;
+ }
+ }
+
+- if (fsl_chan->feature & FSL_DMA_CHAN_START_EXT)
++ if (chan->feature & FSL_DMA_CHAN_START_EXT)
+ mode |= FSL_DMA_MR_EMS_EN;
+ else
+ mode |= FSL_DMA_MR_CS;
+
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+ }
+
+-static void dma_halt(struct fsldma_chan *fsl_chan)
++static void dma_halt(struct fsldma_chan *chan)
+ {
+ u32 mode;
+ int i;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
+ mode |= FSL_DMA_MR_CA;
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+
+ mode &= ~(FSL_DMA_MR_CS | FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA);
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+
+ for (i = 0; i < 100; i++) {
+- if (dma_is_idle(fsl_chan))
++ if (dma_is_idle(chan))
+ break;
+ udelay(10);
+ }
+
+- if (i >= 100 && !dma_is_idle(fsl_chan))
+- dev_err(fsl_chan->dev, "DMA halt timeout!\n");
++ if (i >= 100 && !dma_is_idle(chan))
++ dev_err(chan->dev, "DMA halt timeout!\n");
+ }
+
+-static void set_ld_eol(struct fsldma_chan *fsl_chan,
++static void set_ld_eol(struct fsldma_chan *chan,
+ struct fsl_desc_sw *desc)
+ {
+ u64 snoop_bits;
+
+- snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
++ snoop_bits = ((chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
+ ? FSL_DMA_SNEN : 0;
+
+- desc->hw.next_ln_addr = CPU_TO_DMA(fsl_chan,
+- DMA_TO_CPU(fsl_chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
++ desc->hw.next_ln_addr = CPU_TO_DMA(chan,
++ DMA_TO_CPU(chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
+ | snoop_bits, 64);
+ }
+
+-static void append_ld_queue(struct fsldma_chan *fsl_chan,
++static void append_ld_queue(struct fsldma_chan *chan,
+ struct fsl_desc_sw *new_desc)
+ {
+- struct fsl_desc_sw *queue_tail = to_fsl_desc(fsl_chan->ld_queue.prev);
++ struct fsl_desc_sw *queue_tail = to_fsl_desc(chan->ld_queue.prev);
+
+- if (list_empty(&fsl_chan->ld_queue))
++ if (list_empty(&chan->ld_queue))
+ return;
+
+ /* Link to the new descriptor physical address and
+@@ -214,15 +214,15 @@ static void append_ld_queue(struct fsldma_chan *fsl_chan,
+ *
+ * For FSL_DMA_IP_83xx, the snoop enable bit need be set.
+ */
+- queue_tail->hw.next_ln_addr = CPU_TO_DMA(fsl_chan,
++ queue_tail->hw.next_ln_addr = CPU_TO_DMA(chan,
+ new_desc->async_tx.phys | FSL_DMA_EOSIE |
+- (((fsl_chan->feature & FSL_DMA_IP_MASK)
++ (((chan->feature & FSL_DMA_IP_MASK)
+ == FSL_DMA_IP_83XX) ? FSL_DMA_SNEN : 0), 64);
+ }
+
+ /**
+ * fsl_chan_set_src_loop_size - Set source address hold transfer size
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ * @size : Address loop size, 0 for disable loop
+ *
+ * The set source address hold transfer size. The source
+@@ -231,11 +231,11 @@ static void append_ld_queue(struct fsldma_chan *fsl_chan,
+ * read data from SA, SA + 1, SA + 2, SA + 3, then loop back to SA,
+ * SA + 1 ... and so on.
+ */
+-static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
++static void fsl_chan_set_src_loop_size(struct fsldma_chan *chan, int size)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
+
+ switch (size) {
+ case 0:
+@@ -249,12 +249,12 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ break;
+ }
+
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+ }
+
+ /**
+ * fsl_chan_set_dst_loop_size - Set destination address hold transfer size
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ * @size : Address loop size, 0 for disable loop
+ *
+ * The set destination address hold transfer size. The destination
+@@ -263,11 +263,11 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ * write data to TA, TA + 1, TA + 2, TA + 3, then loop back to TA,
+ * TA + 1 ... and so on.
+ */
+-static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
++static void fsl_chan_set_dst_loop_size(struct fsldma_chan *chan, int size)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
+
+ switch (size) {
+ case 0:
+@@ -281,12 +281,12 @@ static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
+ break;
+ }
+
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+ }
+
+ /**
+ * fsl_chan_set_request_count - Set DMA Request Count for external control
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ * @size : Number of bytes to transfer in a single request
+ *
+ * The Freescale DMA channel can be controlled by the external signal DREQ#.
+@@ -296,38 +296,38 @@ static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
+ *
+ * A size of 0 disables external pause control. The maximum size is 1024.
+ */
+-static void fsl_chan_set_request_count(struct fsldma_chan *fsl_chan, int size)
++static void fsl_chan_set_request_count(struct fsldma_chan *chan, int size)
+ {
+ u32 mode;
+
+ BUG_ON(size > 1024);
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
++ mode = DMA_IN(chan, &chan->regs->mr, 32);
+ mode |= (__ilog2(size) << 24) & 0x0f000000;
+
+- DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
++ DMA_OUT(chan, &chan->regs->mr, mode, 32);
+ }
+
+ /**
+ * fsl_chan_toggle_ext_pause - Toggle channel external pause status
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ * @enable : 0 is disabled, 1 is enabled.
+ *
+ * The Freescale DMA channel can be controlled by the external signal DREQ#.
+ * The DMA Request Count feature should be used in addition to this feature
+ * to set the number of bytes to transfer before pausing the channel.
+ */
+-static void fsl_chan_toggle_ext_pause(struct fsldma_chan *fsl_chan, int enable)
++static void fsl_chan_toggle_ext_pause(struct fsldma_chan *chan, int enable)
+ {
+ if (enable)
+- fsl_chan->feature |= FSL_DMA_CHAN_PAUSE_EXT;
++ chan->feature |= FSL_DMA_CHAN_PAUSE_EXT;
+ else
+- fsl_chan->feature &= ~FSL_DMA_CHAN_PAUSE_EXT;
++ chan->feature &= ~FSL_DMA_CHAN_PAUSE_EXT;
+ }
+
+ /**
+ * fsl_chan_toggle_ext_start - Toggle channel external start status
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ * @enable : 0 is disabled, 1 is enabled.
+ *
+ * If enable the external start, the channel can be started by an
+@@ -335,26 +335,26 @@ static void fsl_chan_toggle_ext_pause(struct fsldma_chan *fsl_chan, int enable)
+ * transfer immediately. The DMA channel will wait for the
+ * control pin asserted.
+ */
+-static void fsl_chan_toggle_ext_start(struct fsldma_chan *fsl_chan, int enable)
++static void fsl_chan_toggle_ext_start(struct fsldma_chan *chan, int enable)
+ {
+ if (enable)
+- fsl_chan->feature |= FSL_DMA_CHAN_START_EXT;
++ chan->feature |= FSL_DMA_CHAN_START_EXT;
+ else
+- fsl_chan->feature &= ~FSL_DMA_CHAN_START_EXT;
++ chan->feature &= ~FSL_DMA_CHAN_START_EXT;
+ }
+
+ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ {
+- struct fsldma_chan *fsl_chan = to_fsl_chan(tx->chan);
++ struct fsldma_chan *chan = to_fsl_chan(tx->chan);
+ struct fsl_desc_sw *desc = tx_to_fsl_desc(tx);
+ struct fsl_desc_sw *child;
+ unsigned long flags;
+ dma_cookie_t cookie;
+
+ /* cookie increment and adding to ld_queue must be atomic */
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- cookie = fsl_chan->common.cookie;
++ cookie = chan->common.cookie;
+ list_for_each_entry(child, &desc->tx_list, node) {
+ cookie++;
+ if (cookie < 0)
+@@ -363,33 +363,33 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ desc->async_tx.cookie = cookie;
+ }
+
+- fsl_chan->common.cookie = cookie;
+- append_ld_queue(fsl_chan, desc);
+- list_splice_init(&desc->tx_list, fsl_chan->ld_queue.prev);
++ chan->common.cookie = cookie;
++ append_ld_queue(chan, desc);
++ list_splice_init(&desc->tx_list, chan->ld_queue.prev);
+
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+
+ return cookie;
+ }
+
+ /**
+ * fsl_dma_alloc_descriptor - Allocate descriptor from channel's DMA pool.
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ *
+ * Return - The descriptor allocated. NULL for failed.
+ */
+ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+- struct fsldma_chan *fsl_chan)
++ struct fsldma_chan *chan)
+ {
+ dma_addr_t pdesc;
+ struct fsl_desc_sw *desc_sw;
+
+- desc_sw = dma_pool_alloc(fsl_chan->desc_pool, GFP_ATOMIC, &pdesc);
++ desc_sw = dma_pool_alloc(chan->desc_pool, GFP_ATOMIC, &pdesc);
+ if (desc_sw) {
+ memset(desc_sw, 0, sizeof(struct fsl_desc_sw));
+ INIT_LIST_HEAD(&desc_sw->tx_list);
+ dma_async_tx_descriptor_init(&desc_sw->async_tx,
+- &fsl_chan->common);
++ &chan->common);
+ desc_sw->async_tx.tx_submit = fsl_dma_tx_submit;
+ desc_sw->async_tx.phys = pdesc;
+ }
+@@ -400,29 +400,29 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+
+ /**
+ * fsl_dma_alloc_chan_resources - Allocate resources for DMA channel.
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ *
+ * This function will create a dma pool for descriptor allocation.
+ *
+ * Return - The number of descriptors allocated.
+ */
+-static int fsl_dma_alloc_chan_resources(struct dma_chan *chan)
++static int fsl_dma_alloc_chan_resources(struct dma_chan *dchan)
+ {
+- struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *chan = to_fsl_chan(dchan);
+
+ /* Has this channel already been allocated? */
+- if (fsl_chan->desc_pool)
++ if (chan->desc_pool)
+ return 1;
+
+ /* We need the descriptor to be aligned to 32bytes
+ * for meeting FSL DMA specification requirement.
+ */
+- fsl_chan->desc_pool = dma_pool_create("fsl_dma_engine_desc_pool",
+- fsl_chan->dev, sizeof(struct fsl_desc_sw),
++ chan->desc_pool = dma_pool_create("fsl_dma_engine_desc_pool",
++ chan->dev, sizeof(struct fsl_desc_sw),
+ 32, 0);
+- if (!fsl_chan->desc_pool) {
+- dev_err(fsl_chan->dev, "No memory for channel %d "
+- "descriptor dma pool.\n", fsl_chan->id);
++ if (!chan->desc_pool) {
++ dev_err(chan->dev, "No memory for channel %d "
++ "descriptor dma pool.\n", chan->id);
+ return 0;
+ }
+
+@@ -431,45 +431,45 @@ static int fsl_dma_alloc_chan_resources(struct dma_chan *chan)
+
+ /**
+ * fsl_dma_free_chan_resources - Free all resources of the channel.
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ */
+-static void fsl_dma_free_chan_resources(struct dma_chan *chan)
++static void fsl_dma_free_chan_resources(struct dma_chan *dchan)
+ {
+- struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *chan = to_fsl_chan(dchan);
+ struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+
+- dev_dbg(fsl_chan->dev, "Free all channel resources.\n");
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+- list_for_each_entry_safe(desc, _desc, &fsl_chan->ld_queue, node) {
++ dev_dbg(chan->dev, "Free all channel resources.\n");
++ spin_lock_irqsave(&chan->desc_lock, flags);
++ list_for_each_entry_safe(desc, _desc, &chan->ld_queue, node) {
+ #ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(fsl_chan->dev,
++ dev_dbg(chan->dev,
+ "LD %p will be released.\n", desc);
+ #endif
+ list_del(&desc->node);
+ /* free link descriptor */
+- dma_pool_free(fsl_chan->desc_pool, desc, desc->async_tx.phys);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
+- dma_pool_destroy(fsl_chan->desc_pool);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++ dma_pool_destroy(chan->desc_pool);
+
+- fsl_chan->desc_pool = NULL;
++ chan->desc_pool = NULL;
+ }
+
+ static struct dma_async_tx_descriptor *
+-fsl_dma_prep_interrupt(struct dma_chan *chan, unsigned long flags)
++fsl_dma_prep_interrupt(struct dma_chan *dchan, unsigned long flags)
+ {
+- struct fsldma_chan *fsl_chan;
++ struct fsldma_chan *chan;
+ struct fsl_desc_sw *new;
+
+- if (!chan)
++ if (!dchan)
+ return NULL;
+
+- fsl_chan = to_fsl_chan(chan);
++ chan = to_fsl_chan(dchan);
+
+- new = fsl_dma_alloc_descriptor(fsl_chan);
++ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(fsl_chan->dev, "No free memory for link descriptor\n");
++ dev_err(chan->dev, "No free memory for link descriptor\n");
+ return NULL;
+ }
+
+@@ -480,51 +480,51 @@ fsl_dma_prep_interrupt(struct dma_chan *chan, unsigned long flags)
+ list_add_tail(&new->node, &new->tx_list);
+
+ /* Set End-of-link to the last link descriptor of new list*/
+- set_ld_eol(fsl_chan, new);
++ set_ld_eol(chan, new);
+
+ return &new->async_tx;
+ }
+
+ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+- struct dma_chan *chan, dma_addr_t dma_dst, dma_addr_t dma_src,
++ struct dma_chan *dchan, dma_addr_t dma_dst, dma_addr_t dma_src,
+ size_t len, unsigned long flags)
+ {
+- struct fsldma_chan *fsl_chan;
++ struct fsldma_chan *chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new;
+ struct list_head *list;
+ size_t copy;
+
+- if (!chan)
++ if (!dchan)
+ return NULL;
+
+ if (!len)
+ return NULL;
+
+- fsl_chan = to_fsl_chan(chan);
++ chan = to_fsl_chan(dchan);
+
+ do {
+
+ /* Allocate the link descriptor from DMA pool */
+- new = fsl_dma_alloc_descriptor(fsl_chan);
++ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(fsl_chan->dev,
++ dev_err(chan->dev,
+ "No free memory for link descriptor\n");
+ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
++ dev_dbg(chan->dev, "new link desc alloc %p\n", new);
+ #endif
+
+ copy = min(len, (size_t)FSL_DMA_BCR_MAX_CNT);
+
+- set_desc_cnt(fsl_chan, &new->hw, copy);
+- set_desc_src(fsl_chan, &new->hw, dma_src);
+- set_desc_dst(fsl_chan, &new->hw, dma_dst);
++ set_desc_cnt(chan, &new->hw, copy);
++ set_desc_src(chan, &new->hw, dma_src);
++ set_desc_dst(chan, &new->hw, dma_dst);
+
+ if (!first)
+ first = new;
+ else
+- set_desc_next(fsl_chan, &prev->hw, new->async_tx.phys);
++ set_desc_next(chan, &prev->hw, new->async_tx.phys);
+
+ new->async_tx.cookie = 0;
+ async_tx_ack(&new->async_tx);
+@@ -542,7 +542,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ new->async_tx.cookie = -EBUSY;
+
+ /* Set End-of-link to the last link descriptor of new list*/
+- set_ld_eol(fsl_chan, new);
++ set_ld_eol(chan, new);
+
+ return &first->async_tx;
+
+@@ -553,7 +553,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ list = &first->tx_list;
+ list_for_each_entry_safe_reverse(new, prev, list, node) {
+ list_del(&new->node);
+- dma_pool_free(fsl_chan->desc_pool, new, new->async_tx.phys);
++ dma_pool_free(chan->desc_pool, new, new->async_tx.phys);
+ }
+
+ return NULL;
+@@ -572,10 +572,10 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ * chan->private variable.
+ */
+ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+- struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,
++ struct dma_chan *dchan, struct scatterlist *sgl, unsigned int sg_len,
+ enum dma_data_direction direction, unsigned long flags)
+ {
+- struct fsldma_chan *fsl_chan;
++ struct fsldma_chan *chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
+ struct fsl_dma_slave *slave;
+ struct list_head *tx_list;
+@@ -588,14 +588,14 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ struct fsl_dma_hw_addr *hw;
+ dma_addr_t dma_dst, dma_src;
+
+- if (!chan)
++ if (!dchan)
+ return NULL;
+
+- if (!chan->private)
++ if (!dchan->private)
+ return NULL;
+
+- fsl_chan = to_fsl_chan(chan);
+- slave = chan->private;
++ chan = to_fsl_chan(dchan);
++ slave = dchan->private;
+
+ if (list_empty(&slave->addresses))
+ return NULL;
+@@ -644,14 +644,14 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ }
+
+ /* Allocate the link descriptor from DMA pool */
+- new = fsl_dma_alloc_descriptor(fsl_chan);
++ new = fsl_dma_alloc_descriptor(chan);
+ if (!new) {
+- dev_err(fsl_chan->dev, "No free memory for "
++ dev_err(chan->dev, "No free memory for "
+ "link descriptor\n");
+ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+- dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
++ dev_dbg(chan->dev, "new link desc alloc %p\n", new);
+ #endif
+
+ /*
+@@ -678,9 +678,9 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ }
+
+ /* Fill in the descriptor */
+- set_desc_cnt(fsl_chan, &new->hw, copy);
+- set_desc_src(fsl_chan, &new->hw, dma_src);
+- set_desc_dst(fsl_chan, &new->hw, dma_dst);
++ set_desc_cnt(chan, &new->hw, copy);
++ set_desc_src(chan, &new->hw, dma_src);
++ set_desc_dst(chan, &new->hw, dma_dst);
+
+ /*
+ * If this is not the first descriptor, chain the
+@@ -689,7 +689,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ if (!first) {
+ first = new;
+ } else {
+- set_desc_next(fsl_chan, &prev->hw,
++ set_desc_next(chan, &prev->hw,
+ new->async_tx.phys);
+ }
+
+@@ -715,23 +715,23 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ new->async_tx.cookie = -EBUSY;
+
+ /* Set End-of-link to the last link descriptor of new list */
+- set_ld_eol(fsl_chan, new);
++ set_ld_eol(chan, new);
+
+ /* Enable extra controller features */
+- if (fsl_chan->set_src_loop_size)
+- fsl_chan->set_src_loop_size(fsl_chan, slave->src_loop_size);
++ if (chan->set_src_loop_size)
++ chan->set_src_loop_size(chan, slave->src_loop_size);
+
+- if (fsl_chan->set_dst_loop_size)
+- fsl_chan->set_dst_loop_size(fsl_chan, slave->dst_loop_size);
++ if (chan->set_dst_loop_size)
++ chan->set_dst_loop_size(chan, slave->dst_loop_size);
+
+- if (fsl_chan->toggle_ext_start)
+- fsl_chan->toggle_ext_start(fsl_chan, slave->external_start);
++ if (chan->toggle_ext_start)
++ chan->toggle_ext_start(chan, slave->external_start);
+
+- if (fsl_chan->toggle_ext_pause)
+- fsl_chan->toggle_ext_pause(fsl_chan, slave->external_pause);
++ if (chan->toggle_ext_pause)
++ chan->toggle_ext_pause(chan, slave->external_pause);
+
+- if (fsl_chan->set_request_count)
+- fsl_chan->set_request_count(fsl_chan, slave->request_count);
++ if (chan->set_request_count)
++ chan->set_request_count(chan, slave->request_count);
+
+ return &first->async_tx;
+
+@@ -751,62 +751,62 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ tx_list = &first->tx_list;
+ list_for_each_entry_safe_reverse(new, prev, tx_list, node) {
+ list_del_init(&new->node);
+- dma_pool_free(fsl_chan->desc_pool, new, new->async_tx.phys);
++ dma_pool_free(chan->desc_pool, new, new->async_tx.phys);
+ }
+
+ return NULL;
+ }
+
+-static void fsl_dma_device_terminate_all(struct dma_chan *chan)
++static void fsl_dma_device_terminate_all(struct dma_chan *dchan)
+ {
+- struct fsldma_chan *fsl_chan;
++ struct fsldma_chan *chan;
+ struct fsl_desc_sw *desc, *tmp;
+ unsigned long flags;
+
+- if (!chan)
++ if (!dchan)
+ return;
+
+- fsl_chan = to_fsl_chan(chan);
++ chan = to_fsl_chan(dchan);
+
+ /* Halt the DMA engine */
+- dma_halt(fsl_chan);
++ dma_halt(chan);
+
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+ /* Remove and free all of the descriptors in the LD queue */
+- list_for_each_entry_safe(desc, tmp, &fsl_chan->ld_queue, node) {
++ list_for_each_entry_safe(desc, tmp, &chan->ld_queue, node) {
+ list_del(&desc->node);
+- dma_pool_free(fsl_chan->desc_pool, desc, desc->async_tx.phys);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+ }
+
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+ * fsl_dma_update_completed_cookie - Update the completed cookie.
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ */
+-static void fsl_dma_update_completed_cookie(struct fsldma_chan *fsl_chan)
++static void fsl_dma_update_completed_cookie(struct fsldma_chan *chan)
+ {
+ struct fsl_desc_sw *cur_desc, *desc;
+ dma_addr_t ld_phy;
+
+- ld_phy = get_cdar(fsl_chan) & FSL_DMA_NLDA_MASK;
++ ld_phy = get_cdar(chan) & FSL_DMA_NLDA_MASK;
+
+ if (ld_phy) {
+ cur_desc = NULL;
+- list_for_each_entry(desc, &fsl_chan->ld_queue, node)
++ list_for_each_entry(desc, &chan->ld_queue, node)
+ if (desc->async_tx.phys == ld_phy) {
+ cur_desc = desc;
+ break;
+ }
+
+ if (cur_desc && cur_desc->async_tx.cookie) {
+- if (dma_is_idle(fsl_chan))
+- fsl_chan->completed_cookie =
++ if (dma_is_idle(chan))
++ chan->completed_cookie =
+ cur_desc->async_tx.cookie;
+ else
+- fsl_chan->completed_cookie =
++ chan->completed_cookie =
+ cur_desc->async_tx.cookie - 1;
+ }
+ }
+@@ -814,27 +814,27 @@ static void fsl_dma_update_completed_cookie(struct fsldma_chan *fsl_chan)
+
+ /**
+ * fsl_chan_ld_cleanup - Clean up link descriptors
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ *
+ * This function clean up the ld_queue of DMA channel.
+ * If 'in_intr' is set, the function will move the link descriptor to
+ * the recycle list. Otherwise, free it directly.
+ */
+-static void fsl_chan_ld_cleanup(struct fsldma_chan *fsl_chan)
++static void fsl_chan_ld_cleanup(struct fsldma_chan *chan)
+ {
+ struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- dev_dbg(fsl_chan->dev, "chan completed_cookie = %d\n",
+- fsl_chan->completed_cookie);
+- list_for_each_entry_safe(desc, _desc, &fsl_chan->ld_queue, node) {
++ dev_dbg(chan->dev, "chan completed_cookie = %d\n",
++ chan->completed_cookie);
++ list_for_each_entry_safe(desc, _desc, &chan->ld_queue, node) {
+ dma_async_tx_callback callback;
+ void *callback_param;
+
+ if (dma_async_is_complete(desc->async_tx.cookie,
+- fsl_chan->completed_cookie, fsl_chan->common.cookie)
++ chan->completed_cookie, chan->common.cookie)
+ == DMA_IN_PROGRESS)
+ break;
+
+@@ -844,119 +844,119 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *fsl_chan)
+ /* Remove from ld_queue list */
+ list_del(&desc->node);
+
+- dev_dbg(fsl_chan->dev, "link descriptor %p will be recycle.\n",
++ dev_dbg(chan->dev, "link descriptor %p will be recycle.\n",
+ desc);
+- dma_pool_free(fsl_chan->desc_pool, desc, desc->async_tx.phys);
++ dma_pool_free(chan->desc_pool, desc, desc->async_tx.phys);
+
+ /* Run the link descriptor callback function */
+ if (callback) {
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
+- dev_dbg(fsl_chan->dev, "link descriptor %p callback\n",
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
++ dev_dbg(chan->dev, "link descriptor %p callback\n",
+ desc);
+ callback(callback_param);
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+ }
+ }
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+ * fsl_chan_xfer_ld_queue - Transfer link descriptors in channel ld_queue.
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ */
+-static void fsl_chan_xfer_ld_queue(struct fsldma_chan *fsl_chan)
++static void fsl_chan_xfer_ld_queue(struct fsldma_chan *chan)
+ {
+ struct list_head *ld_node;
+ dma_addr_t next_dst_addr;
+ unsigned long flags;
+
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
+
+- if (!dma_is_idle(fsl_chan))
++ if (!dma_is_idle(chan))
+ goto out_unlock;
+
+- dma_halt(fsl_chan);
++ dma_halt(chan);
+
+ /* If there are some link descriptors
+ * not transfered in queue. We need to start it.
+ */
+
+ /* Find the first un-transfer desciptor */
+- for (ld_node = fsl_chan->ld_queue.next;
+- (ld_node != &fsl_chan->ld_queue)
++ for (ld_node = chan->ld_queue.next;
++ (ld_node != &chan->ld_queue)
+ && (dma_async_is_complete(
+ to_fsl_desc(ld_node)->async_tx.cookie,
+- fsl_chan->completed_cookie,
+- fsl_chan->common.cookie) == DMA_SUCCESS);
++ chan->completed_cookie,
++ chan->common.cookie) == DMA_SUCCESS);
+ ld_node = ld_node->next);
+
+- if (ld_node != &fsl_chan->ld_queue) {
++ if (ld_node != &chan->ld_queue) {
+ /* Get the ld start address from ld_queue */
+ next_dst_addr = to_fsl_desc(ld_node)->async_tx.phys;
+- dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",
++ dev_dbg(chan->dev, "xfer LDs staring from 0x%llx\n",
+ (unsigned long long)next_dst_addr);
+- set_cdar(fsl_chan, next_dst_addr);
+- dma_start(fsl_chan);
++ set_cdar(chan, next_dst_addr);
++ dma_start(chan);
+ } else {
+- set_cdar(fsl_chan, 0);
+- set_ndar(fsl_chan, 0);
++ set_cdar(chan, 0);
++ set_ndar(chan, 0);
+ }
+
+ out_unlock:
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ }
+
+ /**
+ * fsl_dma_memcpy_issue_pending - Issue the DMA start command
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ */
+-static void fsl_dma_memcpy_issue_pending(struct dma_chan *chan)
++static void fsl_dma_memcpy_issue_pending(struct dma_chan *dchan)
+ {
+- struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *chan = to_fsl_chan(dchan);
+
+ #ifdef FSL_DMA_LD_DEBUG
+ struct fsl_desc_sw *ld;
+ unsigned long flags;
+
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+- if (list_empty(&fsl_chan->ld_queue)) {
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ spin_lock_irqsave(&chan->desc_lock, flags);
++ if (list_empty(&chan->ld_queue)) {
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ return;
+ }
+
+- dev_dbg(fsl_chan->dev, "--memcpy issue--\n");
+- list_for_each_entry(ld, &fsl_chan->ld_queue, node) {
++ dev_dbg(chan->dev, "--memcpy issue--\n");
++ list_for_each_entry(ld, &chan->ld_queue, node) {
+ int i;
+- dev_dbg(fsl_chan->dev, "Ch %d, LD %08x\n",
+- fsl_chan->id, ld->async_tx.phys);
++ dev_dbg(chan->dev, "Ch %d, LD %08x\n",
++ chan->id, ld->async_tx.phys);
+ for (i = 0; i < 8; i++)
+- dev_dbg(fsl_chan->dev, "LD offset %d: %08x\n",
++ dev_dbg(chan->dev, "LD offset %d: %08x\n",
+ i, *(((u32 *)&ld->hw) + i));
+ }
+- dev_dbg(fsl_chan->dev, "----------------\n");
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++ dev_dbg(chan->dev, "----------------\n");
++ spin_unlock_irqrestore(&chan->desc_lock, flags);
+ #endif
+
+- fsl_chan_xfer_ld_queue(fsl_chan);
++ fsl_chan_xfer_ld_queue(chan);
+ }
+
+ /**
+ * fsl_dma_is_complete - Determine the DMA status
+- * @fsl_chan : Freescale DMA channel
++ * @chan : Freescale DMA channel
+ */
+-static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
++static enum dma_status fsl_dma_is_complete(struct dma_chan *dchan,
+ dma_cookie_t cookie,
+ dma_cookie_t *done,
+ dma_cookie_t *used)
+ {
+- struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *chan = to_fsl_chan(dchan);
+ dma_cookie_t last_used;
+ dma_cookie_t last_complete;
+
+- fsl_chan_ld_cleanup(fsl_chan);
++ fsl_chan_ld_cleanup(chan);
+
+- last_used = chan->cookie;
+- last_complete = fsl_chan->completed_cookie;
++ last_used = dchan->cookie;
++ last_complete = chan->completed_cookie;
+
+ if (done)
+ *done = last_complete;
+@@ -973,30 +973,30 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
+
+ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ {
+- struct fsldma_chan *fsl_chan = data;
+- u32 stat;
++ struct fsldma_chan *chan = data;
+ int update_cookie = 0;
+ int xfer_ld_q = 0;
++ u32 stat;
+
+- stat = get_sr(fsl_chan);
+- dev_dbg(fsl_chan->dev, "event: channel %d, stat = 0x%x\n",
+- fsl_chan->id, stat);
+- set_sr(fsl_chan, stat); /* Clear the event register */
++ stat = get_sr(chan);
++ dev_dbg(chan->dev, "event: channel %d, stat = 0x%x\n",
++ chan->id, stat);
++ set_sr(chan, stat); /* Clear the event register */
+
+ stat &= ~(FSL_DMA_SR_CB | FSL_DMA_SR_CH);
+ if (!stat)
+ return IRQ_NONE;
+
+ if (stat & FSL_DMA_SR_TE)
+- dev_err(fsl_chan->dev, "Transfer Error!\n");
++ dev_err(chan->dev, "Transfer Error!\n");
+
+ /* Programming Error
+ * The DMA_INTERRUPT async_tx is a NULL transfer, which will
+ * triger a PE interrupt.
+ */
+ if (stat & FSL_DMA_SR_PE) {
+- dev_dbg(fsl_chan->dev, "event: Programming Error INT\n");
+- if (get_bcr(fsl_chan) == 0) {
++ dev_dbg(chan->dev, "event: Programming Error INT\n");
++ if (get_bcr(chan) == 0) {
+ /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+ * Now, update the completed cookie, and continue the
+ * next uncompleted transfer.
+@@ -1011,10 +1011,10 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * we will recycle the used descriptor.
+ */
+ if (stat & FSL_DMA_SR_EOSI) {
+- dev_dbg(fsl_chan->dev, "event: End-of-segments INT\n");
+- dev_dbg(fsl_chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",
+- (unsigned long long)get_cdar(fsl_chan),
+- (unsigned long long)get_ndar(fsl_chan));
++ dev_dbg(chan->dev, "event: End-of-segments INT\n");
++ dev_dbg(chan->dev, "event: clndar 0x%llx, nlndar 0x%llx\n",
++ (unsigned long long)get_cdar(chan),
++ (unsigned long long)get_ndar(chan));
+ stat &= ~FSL_DMA_SR_EOSI;
+ update_cookie = 1;
+ }
+@@ -1023,7 +1023,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * and start the next transfer if it exist.
+ */
+ if (stat & FSL_DMA_SR_EOCDI) {
+- dev_dbg(fsl_chan->dev, "event: End-of-Chain link INT\n");
++ dev_dbg(chan->dev, "event: End-of-Chain link INT\n");
+ stat &= ~FSL_DMA_SR_EOCDI;
+ update_cookie = 1;
+ xfer_ld_q = 1;
+@@ -1034,28 +1034,28 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ * prepare next transfer.
+ */
+ if (stat & FSL_DMA_SR_EOLNI) {
+- dev_dbg(fsl_chan->dev, "event: End-of-link INT\n");
++ dev_dbg(chan->dev, "event: End-of-link INT\n");
+ stat &= ~FSL_DMA_SR_EOLNI;
+ xfer_ld_q = 1;
+ }
+
+ if (update_cookie)
+- fsl_dma_update_completed_cookie(fsl_chan);
++ fsl_dma_update_completed_cookie(chan);
+ if (xfer_ld_q)
+- fsl_chan_xfer_ld_queue(fsl_chan);
++ fsl_chan_xfer_ld_queue(chan);
+ if (stat)
+- dev_dbg(fsl_chan->dev, "event: unhandled sr 0x%02x\n",
++ dev_dbg(chan->dev, "event: unhandled sr 0x%02x\n",
+ stat);
+
+- dev_dbg(fsl_chan->dev, "event: Exit\n");
+- tasklet_schedule(&fsl_chan->tasklet);
++ dev_dbg(chan->dev, "event: Exit\n");
++ tasklet_schedule(&chan->tasklet);
+ return IRQ_HANDLED;
+ }
+
+ static void dma_do_tasklet(unsigned long data)
+ {
+- struct fsldma_chan *fsl_chan = (struct fsldma_chan *)data;
+- fsl_chan_ld_cleanup(fsl_chan);
++ struct fsldma_chan *chan = (struct fsldma_chan *)data;
++ fsl_chan_ld_cleanup(chan);
+ }
+
+ static irqreturn_t fsldma_ctrl_irq(int irq, void *data)
+@@ -1171,24 +1171,24 @@ static int fsldma_request_irqs(struct fsldma_device *fdev)
+ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ struct device_node *node, u32 feature, const char *compatible)
+ {
+- struct fsldma_chan *fchan;
++ struct fsldma_chan *chan;
+ struct resource res;
+ int err;
+
+ /* alloc channel */
+- fchan = kzalloc(sizeof(*fchan), GFP_KERNEL);
+- if (!fchan) {
++ chan = kzalloc(sizeof(*chan), GFP_KERNEL);
++ if (!chan) {
+ dev_err(fdev->dev, "no free memory for DMA channels!\n");
+ err = -ENOMEM;
+ goto out_return;
+ }
+
+ /* ioremap registers for use */
+- fchan->regs = of_iomap(node, 0);
+- if (!fchan->regs) {
++ chan->regs = of_iomap(node, 0);
++ if (!chan->regs) {
+ dev_err(fdev->dev, "unable to ioremap registers\n");
+ err = -ENOMEM;
+- goto out_free_fchan;
++ goto out_free_chan;
+ }
+
+ err = of_address_to_resource(node, 0, &res);
+@@ -1197,74 +1197,74 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ goto out_iounmap_regs;
+ }
+
+- fchan->feature = feature;
++ chan->feature = feature;
+ if (!fdev->feature)
+- fdev->feature = fchan->feature;
++ fdev->feature = chan->feature;
+
+ /*
+ * If the DMA device's feature is different than the feature
+ * of its channels, report the bug
+ */
+- WARN_ON(fdev->feature != fchan->feature);
++ WARN_ON(fdev->feature != chan->feature);
+
+- fchan->dev = fdev->dev;
+- fchan->id = ((res.start - 0x100) & 0xfff) >> 7;
+- if (fchan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
++ chan->dev = fdev->dev;
++ chan->id = ((res.start - 0x100) & 0xfff) >> 7;
++ if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
+ dev_err(fdev->dev, "too many channels for device\n");
+ err = -EINVAL;
+ goto out_iounmap_regs;
+ }
+
+- fdev->chan[fchan->id] = fchan;
+- tasklet_init(&fchan->tasklet, dma_do_tasklet, (unsigned long)fchan);
++ fdev->chan[chan->id] = chan;
++ tasklet_init(&chan->tasklet, dma_do_tasklet, (unsigned long)chan);
+
+ /* Initialize the channel */
+- dma_init(fchan);
++ dma_init(chan);
+
+ /* Clear cdar registers */
+- set_cdar(fchan, 0);
++ set_cdar(chan, 0);
+
+- switch (fchan->feature & FSL_DMA_IP_MASK) {
++ switch (chan->feature & FSL_DMA_IP_MASK) {
+ case FSL_DMA_IP_85XX:
+- fchan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
++ chan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
+ case FSL_DMA_IP_83XX:
+- fchan->toggle_ext_start = fsl_chan_toggle_ext_start;
+- fchan->set_src_loop_size = fsl_chan_set_src_loop_size;
+- fchan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
+- fchan->set_request_count = fsl_chan_set_request_count;
++ chan->toggle_ext_start = fsl_chan_toggle_ext_start;
++ chan->set_src_loop_size = fsl_chan_set_src_loop_size;
++ chan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
++ chan->set_request_count = fsl_chan_set_request_count;
+ }
+
+- spin_lock_init(&fchan->desc_lock);
+- INIT_LIST_HEAD(&fchan->ld_queue);
++ spin_lock_init(&chan->desc_lock);
++ INIT_LIST_HEAD(&chan->ld_queue);
+
+- fchan->common.device = &fdev->common;
++ chan->common.device = &fdev->common;
+
+ /* find the IRQ line, if it exists in the device tree */
+- fchan->irq = irq_of_parse_and_map(node, 0);
++ chan->irq = irq_of_parse_and_map(node, 0);
+
+ /* Add the channel to DMA device channel list */
+- list_add_tail(&fchan->common.device_node, &fdev->common.channels);
++ list_add_tail(&chan->common.device_node, &fdev->common.channels);
+ fdev->common.chancnt++;
+
+- dev_info(fdev->dev, "#%d (%s), irq %d\n", fchan->id, compatible,
+- fchan->irq != NO_IRQ ? fchan->irq : fdev->irq);
++ dev_info(fdev->dev, "#%d (%s), irq %d\n", chan->id, compatible,
++ chan->irq != NO_IRQ ? chan->irq : fdev->irq);
+
+ return 0;
+
+ out_iounmap_regs:
+- iounmap(fchan->regs);
+-out_free_fchan:
+- kfree(fchan);
++ iounmap(chan->regs);
++out_free_chan:
++ kfree(chan);
+ out_return:
+ return err;
+ }
+
+-static void fsl_dma_chan_remove(struct fsldma_chan *fchan)
++static void fsl_dma_chan_remove(struct fsldma_chan *chan)
+ {
+- irq_dispose_mapping(fchan->irq);
+- list_del(&fchan->common.device_node);
+- iounmap(fchan->regs);
+- kfree(fchan);
++ irq_dispose_mapping(chan->irq);
++ list_del(&chan->common.device_node);
++ iounmap(chan->regs);
++ kfree(chan);
+ }
+
+ static int __devinit fsldma_of_probe(struct of_device *op,commit d3f620b2c4fecdc8e060b70e8d92d29fc01c6126
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:04 2010 +0000
+
+ fsldma: simplify IRQ probing and handling
+
+ The IRQ probing is needlessly complex. All off the 83xx device trees in
+ arch/powerpc/boot/dts/ specify 5 interrupts per DMA controller: one for the
+ controller, and one for each channel. These interrupts are all attached to
+ the same IRQ line.
+
+ This causes an interesting situation if two channels interrupt at the same
+ time. The per-controller handler will handle the first channel, and the
+ per-channel handler will handle the remaining channels.
+
+ Instead of this mess, we fix the bug in the per-controller handler, and
+ make it handle all channels that generated an interrupt. When a
+ per-controller handler is specified in the device tree, we prefer to use
+ the shared handler instead of the per-channel handler.
+
+ The 85xx/86xx controllers do not have a per-controller interrupt, and
+ instead use a per-channel interrupt. This behavior has not been changed.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/Documentation/powerpc/dts-bindings/fsl/dma.txt b/Documentation/powerpc/dts-bindings/fsl/dma.txt
+index 0732cdd05ba1..2a4b4bce6110 100644
+--- a/Documentation/powerpc/dts-bindings/fsl/dma.txt
++++ b/Documentation/powerpc/dts-bindings/fsl/dma.txt
+@@ -44,21 +44,29 @@ Example:
+ compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+ cell-index = <0>;
+ reg = <0 0x80>;
++ interrupt-parent = <&ipic>;
++ interrupts = <71 8>;
+ };
+ dma-channel@80 {
+ compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+ cell-index = <1>;
+ reg = <0x80 0x80>;
++ interrupt-parent = <&ipic>;
++ interrupts = <71 8>;
+ };
+ dma-channel@100 {
+ compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+ cell-index = <2>;
+ reg = <0x100 0x80>;
++ interrupt-parent = <&ipic>;
++ interrupts = <71 8>;
+ };
+ dma-channel@180 {
+ compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+ cell-index = <3>;
+ reg = <0x180 0x80>;
++ interrupt-parent = <&ipic>;
++ interrupts = <71 8>;
+ };
+ };
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 507b29716bbd..6a905929ef01 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -967,6 +967,10 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
+ return dma_async_is_complete(cookie, last_complete, last_used);
+ }
+
++/*----------------------------------------------------------------------------*/
++/* Interrupt Handling */
++/*----------------------------------------------------------------------------*/
++
+ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ {
+ struct fsldma_chan *fsl_chan = data;
+@@ -1048,24 +1052,116 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ return IRQ_HANDLED;
+ }
+
+-static irqreturn_t fsldma_irq(int irq, void *data)
++static void dma_do_tasklet(unsigned long data)
++{
++ struct fsldma_chan *fsl_chan = (struct fsldma_chan *)data;
++ fsl_chan_ld_cleanup(fsl_chan);
++}
++
++static irqreturn_t fsldma_ctrl_irq(int irq, void *data)
+ {
+ struct fsldma_device *fdev = data;
+- int ch_nr;
+- u32 gsr;
++ struct fsldma_chan *chan;
++ unsigned int handled = 0;
++ u32 gsr, mask;
++ int i;
+
+ gsr = (fdev->feature & FSL_DMA_BIG_ENDIAN) ? in_be32(fdev->regs)
+- : in_le32(fdev->regs);
+- ch_nr = (32 - ffs(gsr)) / 8;
++ : in_le32(fdev->regs);
++ mask = 0xff000000;
++ dev_dbg(fdev->dev, "IRQ: gsr 0x%.8x\n", gsr);
+
+- return fdev->chan[ch_nr] ? fsldma_chan_irq(irq,
+- fdev->chan[ch_nr]) : IRQ_NONE;
++ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
++ chan = fdev->chan[i];
++ if (!chan)
++ continue;
++
++ if (gsr & mask) {
++ dev_dbg(fdev->dev, "IRQ: chan %d\n", chan->id);
++ fsldma_chan_irq(irq, chan);
++ handled++;
++ }
++
++ gsr &= ~mask;
++ mask >>= 8;
++ }
++
++ return IRQ_RETVAL(handled);
+ }
+
+-static void dma_do_tasklet(unsigned long data)
++static void fsldma_free_irqs(struct fsldma_device *fdev)
+ {
+- struct fsldma_chan *fsl_chan = (struct fsldma_chan *)data;
+- fsl_chan_ld_cleanup(fsl_chan);
++ struct fsldma_chan *chan;
++ int i;
++
++ if (fdev->irq != NO_IRQ) {
++ dev_dbg(fdev->dev, "free per-controller IRQ\n");
++ free_irq(fdev->irq, fdev);
++ return;
++ }
++
++ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
++ chan = fdev->chan[i];
++ if (chan && chan->irq != NO_IRQ) {
++ dev_dbg(fdev->dev, "free channel %d IRQ\n", chan->id);
++ free_irq(chan->irq, chan);
++ }
++ }
++}
++
++static int fsldma_request_irqs(struct fsldma_device *fdev)
++{
++ struct fsldma_chan *chan;
++ int ret;
++ int i;
++
++ /* if we have a per-controller IRQ, use that */
++ if (fdev->irq != NO_IRQ) {
++ dev_dbg(fdev->dev, "request per-controller IRQ\n");
++ ret = request_irq(fdev->irq, fsldma_ctrl_irq, IRQF_SHARED,
++ "fsldma-controller", fdev);
++ return ret;
++ }
++
++ /* no per-controller IRQ, use the per-channel IRQs */
++ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
++ chan = fdev->chan[i];
++ if (!chan)
++ continue;
++
++ if (chan->irq == NO_IRQ) {
++ dev_err(fdev->dev, "no interrupts property defined for "
++ "DMA channel %d. Please fix your "
++ "device tree\n", chan->id);
++ ret = -ENODEV;
++ goto out_unwind;
++ }
++
++ dev_dbg(fdev->dev, "request channel %d IRQ\n", chan->id);
++ ret = request_irq(chan->irq, fsldma_chan_irq, IRQF_SHARED,
++ "fsldma-chan", chan);
++ if (ret) {
++ dev_err(fdev->dev, "unable to request IRQ for DMA "
++ "channel %d\n", chan->id);
++ goto out_unwind;
++ }
++ }
++
++ return 0;
++
++out_unwind:
++ for (/* none */; i >= 0; i--) {
++ chan = fdev->chan[i];
++ if (!chan)
++ continue;
++
++ if (chan->irq == NO_IRQ)
++ continue;
++
++ free_irq(chan->irq, chan);
++ }
++
++ return ret;
+ }
+
+ /*----------------------------------------------------------------------------*/
+@@ -1143,29 +1239,18 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+
+ fchan->common.device = &fdev->common;
+
++ /* find the IRQ line, if it exists in the device tree */
++ fchan->irq = irq_of_parse_and_map(node, 0);
++
+ /* Add the channel to DMA device channel list */
+ list_add_tail(&fchan->common.device_node, &fdev->common.channels);
+ fdev->common.chancnt++;
+
+- fchan->irq = irq_of_parse_and_map(node, 0);
+- if (fchan->irq != NO_IRQ) {
+- err = request_irq(fchan->irq, &fsldma_chan_irq,
+- IRQF_SHARED, "fsldma-channel", fchan);
+- if (err) {
+- dev_err(fdev->dev, "unable to request IRQ "
+- "for channel %d\n", fchan->id);
+- goto out_list_del;
+- }
+- }
+-
+ dev_info(fdev->dev, "#%d (%s), irq %d\n", fchan->id, compatible,
+ fchan->irq != NO_IRQ ? fchan->irq : fdev->irq);
+
+ return 0;
+
+-out_list_del:
+- irq_dispose_mapping(fchan->irq);
+- list_del_init(&fchan->common.device_node);
+ out_iounmap_regs:
+ iounmap(fchan->regs);
+ out_free_fchan:
+@@ -1176,11 +1261,7 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+
+ static void fsl_dma_chan_remove(struct fsldma_chan *fchan)
+ {
+- if (fchan->irq != NO_IRQ) {
+- free_irq(fchan->irq, fchan);
+- irq_dispose_mapping(fchan->irq);
+- }
+-
++ irq_dispose_mapping(fchan->irq);
+ list_del(&fchan->common.device_node);
+ iounmap(fchan->regs);
+ kfree(fchan);
+@@ -1211,6 +1292,9 @@ static int __devinit fsldma_of_probe(struct of_device *op,
+ goto out_free_fdev;
+ }
+
++ /* map the channel IRQ if it exists, but don't hookup the handler yet */
++ fdev->irq = irq_of_parse_and_map(op->node, 0);
++
+ dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
+ dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
+ dma_cap_set(DMA_SLAVE, fdev->common.cap_mask);
+@@ -1224,16 +1308,6 @@ static int __devinit fsldma_of_probe(struct of_device *op,
+ fdev->common.device_terminate_all = fsl_dma_device_terminate_all;
+ fdev->common.dev = &op->dev;
+
+- fdev->irq = irq_of_parse_and_map(op->node, 0);
+- if (fdev->irq != NO_IRQ) {
+- err = request_irq(fdev->irq, &fsldma_irq, IRQF_SHARED,
+- "fsldma-device", fdev);
+- if (err) {
+- dev_err(&op->dev, "unable to request IRQ\n");
+- goto out_iounmap_regs;
+- }
+- }
+-
+ dev_set_drvdata(&op->dev, fdev);
+
+ /*
+@@ -1255,12 +1329,24 @@ static int __devinit fsldma_of_probe(struct of_device *op,
+ }
+ }
+
++ /*
++ * Hookup the IRQ handler(s)
++ *
++ * If we have a per-controller interrupt, we prefer that to the
++ * per-channel interrupts to reduce the number of shared interrupt
++ * handlers on the same IRQ line
++ */
++ err = fsldma_request_irqs(fdev);
++ if (err) {
++ dev_err(fdev->dev, "unable to request IRQs\n");
++ goto out_free_fdev;
++ }
++
+ dma_async_device_register(&fdev->common);
+ return 0;
+
+-out_iounmap_regs:
+- iounmap(fdev->regs);
+ out_free_fdev:
++ irq_dispose_mapping(fdev->irq);
+ kfree(fdev);
+ out_return:
+ return err;
+@@ -1274,14 +1360,13 @@ static int fsldma_of_remove(struct of_device *op)
+ fdev = dev_get_drvdata(&op->dev);
+ dma_async_device_unregister(&fdev->common);
+
++ fsldma_free_irqs(fdev);
++
+ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
+ if (fdev->chan[i])
+ fsl_dma_chan_remove(fdev->chan[i]);
+ }
+
+- if (fdev->irq != NO_IRQ)
+- free_irq(fdev->irq, fdev);
+-
+ iounmap(fdev->regs);
+ dev_set_drvdata(&op->dev, NULL);
+ kfree(fdev);commit e7a29151de1bd52081f27f149b68074fac0323be
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:03 2010 +0000
+
+ fsldma: clean up the OF subsystem routines
+
+ This fixes some errors in the cleanup paths of the OF subsystem, including
+ missing checks for ioremap failing. Also, some variables were renamed for
+ brevity.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index c2db7541c22b..507b29716bbd 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -40,7 +40,7 @@
+ static void dma_init(struct fsldma_chan *fsl_chan)
+ {
+ /* Reset the channel */
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, 0, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, 0, 32);
+
+ switch (fsl_chan->feature & FSL_DMA_IP_MASK) {
+ case FSL_DMA_IP_85XX:
+@@ -49,7 +49,7 @@ static void dma_init(struct fsldma_chan *fsl_chan)
+ * EOSIE - End of segments interrupt enable (basic mode)
+ * EOLNIE - End of links interrupt enable
+ */
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, FSL_DMA_MR_EIE
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, FSL_DMA_MR_EIE
+ | FSL_DMA_MR_EOLNIE | FSL_DMA_MR_EOSIE, 32);
+ break;
+ case FSL_DMA_IP_83XX:
+@@ -57,7 +57,7 @@ static void dma_init(struct fsldma_chan *fsl_chan)
+ * EOTIE - End-of-transfer interrupt enable
+ * PRC_RM - PCI read multiple
+ */
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, FSL_DMA_MR_EOTIE
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, FSL_DMA_MR_EOTIE
+ | FSL_DMA_MR_PRC_RM, 32);
+ break;
+ }
+@@ -66,12 +66,12 @@ static void dma_init(struct fsldma_chan *fsl_chan)
+
+ static void set_sr(struct fsldma_chan *fsl_chan, u32 val)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->sr, val, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->sr, val, 32);
+ }
+
+ static u32 get_sr(struct fsldma_chan *fsl_chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->reg_base->sr, 32);
++ return DMA_IN(fsl_chan, &fsl_chan->regs->sr, 32);
+ }
+
+ static void set_desc_cnt(struct fsldma_chan *fsl_chan,
+@@ -112,27 +112,27 @@ static void set_desc_next(struct fsldma_chan *fsl_chan,
+
+ static void set_cdar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->cdar, addr | FSL_DMA_SNEN, 64);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->cdar, addr | FSL_DMA_SNEN, 64);
+ }
+
+ static dma_addr_t get_cdar(struct fsldma_chan *fsl_chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->reg_base->cdar, 64) & ~FSL_DMA_SNEN;
++ return DMA_IN(fsl_chan, &fsl_chan->regs->cdar, 64) & ~FSL_DMA_SNEN;
+ }
+
+ static void set_ndar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
+ {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->ndar, addr, 64);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->ndar, addr, 64);
+ }
+
+ static dma_addr_t get_ndar(struct fsldma_chan *fsl_chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->reg_base->ndar, 64);
++ return DMA_IN(fsl_chan, &fsl_chan->regs->ndar, 64);
+ }
+
+ static u32 get_bcr(struct fsldma_chan *fsl_chan)
+ {
+- return DMA_IN(fsl_chan, &fsl_chan->reg_base->bcr, 32);
++ return DMA_IN(fsl_chan, &fsl_chan->regs->bcr, 32);
+ }
+
+ static int dma_is_idle(struct fsldma_chan *fsl_chan)
+@@ -145,11 +145,11 @@ static void dma_start(struct fsldma_chan *fsl_chan)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
+
+ if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
+ if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->bcr, 0, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->bcr, 0, 32);
+ mode |= FSL_DMA_MR_EMP_EN;
+ } else {
+ mode &= ~FSL_DMA_MR_EMP_EN;
+@@ -161,7 +161,7 @@ static void dma_start(struct fsldma_chan *fsl_chan)
+ else
+ mode |= FSL_DMA_MR_CS;
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+ }
+
+ static void dma_halt(struct fsldma_chan *fsl_chan)
+@@ -169,12 +169,12 @@ static void dma_halt(struct fsldma_chan *fsl_chan)
+ u32 mode;
+ int i;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
+ mode |= FSL_DMA_MR_CA;
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+
+ mode &= ~(FSL_DMA_MR_CS | FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA);
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+
+ for (i = 0; i < 100; i++) {
+ if (dma_is_idle(fsl_chan))
+@@ -235,7 +235,7 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
+
+ switch (size) {
+ case 0:
+@@ -249,7 +249,7 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ break;
+ }
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+ }
+
+ /**
+@@ -267,7 +267,7 @@ static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
+
+ switch (size) {
+ case 0:
+@@ -281,7 +281,7 @@ static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
+ break;
+ }
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+ }
+
+ /**
+@@ -302,10 +302,10 @@ static void fsl_chan_set_request_count(struct fsldma_chan *fsl_chan, int size)
+
+ BUG_ON(size > 1024);
+
+- mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->regs->mr, 32);
+ mode |= (__ilog2(size) << 24) & 0x0f000000;
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->regs->mr, mode, 32);
+ }
+
+ /**
+@@ -967,7 +967,7 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
+ return dma_async_is_complete(cookie, last_complete, last_used);
+ }
+
+-static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
++static irqreturn_t fsldma_chan_irq(int irq, void *data)
+ {
+ struct fsldma_chan *fsl_chan = data;
+ u32 stat;
+@@ -1048,17 +1048,17 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
+ return IRQ_HANDLED;
+ }
+
+-static irqreturn_t fsl_dma_do_interrupt(int irq, void *data)
++static irqreturn_t fsldma_irq(int irq, void *data)
+ {
+ struct fsldma_device *fdev = data;
+ int ch_nr;
+ u32 gsr;
+
+- gsr = (fdev->feature & FSL_DMA_BIG_ENDIAN) ? in_be32(fdev->reg_base)
+- : in_le32(fdev->reg_base);
++ gsr = (fdev->feature & FSL_DMA_BIG_ENDIAN) ? in_be32(fdev->regs)
++ : in_le32(fdev->regs);
+ ch_nr = (32 - ffs(gsr)) / 8;
+
+- return fdev->chan[ch_nr] ? fsl_dma_chan_do_interrupt(irq,
++ return fdev->chan[ch_nr] ? fsldma_chan_irq(irq,
+ fdev->chan[ch_nr]) : IRQ_NONE;
+ }
+
+@@ -1075,140 +1075,142 @@ static void dma_do_tasklet(unsigned long data)
+ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ struct device_node *node, u32 feature, const char *compatible)
+ {
+- struct fsldma_chan *new_fsl_chan;
++ struct fsldma_chan *fchan;
+ struct resource res;
+ int err;
+
+ /* alloc channel */
+- new_fsl_chan = kzalloc(sizeof(*new_fsl_chan), GFP_KERNEL);
+- if (!new_fsl_chan) {
+- dev_err(fdev->dev, "No free memory for allocating "
+- "dma channels!\n");
+- return -ENOMEM;
++ fchan = kzalloc(sizeof(*fchan), GFP_KERNEL);
++ if (!fchan) {
++ dev_err(fdev->dev, "no free memory for DMA channels!\n");
++ err = -ENOMEM;
++ goto out_return;
++ }
++
++ /* ioremap registers for use */
++ fchan->regs = of_iomap(node, 0);
++ if (!fchan->regs) {
++ dev_err(fdev->dev, "unable to ioremap registers\n");
++ err = -ENOMEM;
++ goto out_free_fchan;
+ }
+
+- /* get dma channel register base */
+ err = of_address_to_resource(node, 0, &res);
+ if (err) {
+- dev_err(fdev->dev, "Can't get %s property 'reg'\n",
+- node->full_name);
+- goto err_no_reg;
++ dev_err(fdev->dev, "unable to find 'reg' property\n");
++ goto out_iounmap_regs;
+ }
+
+- new_fsl_chan->feature = feature;
+-
++ fchan->feature = feature;
+ if (!fdev->feature)
+- fdev->feature = new_fsl_chan->feature;
++ fdev->feature = fchan->feature;
+
+- /* If the DMA device's feature is different than its channels',
+- * report the bug.
++ /*
++ * If the DMA device's feature is different than the feature
++ * of its channels, report the bug
+ */
+- WARN_ON(fdev->feature != new_fsl_chan->feature);
+-
+- new_fsl_chan->dev = fdev->dev;
+- new_fsl_chan->reg_base = ioremap(res.start, resource_size(&res));
+- new_fsl_chan->id = ((res.start - 0x100) & 0xfff) >> 7;
+- if (new_fsl_chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
+- dev_err(fdev->dev, "There is no %d channel!\n",
+- new_fsl_chan->id);
++ WARN_ON(fdev->feature != fchan->feature);
++
++ fchan->dev = fdev->dev;
++ fchan->id = ((res.start - 0x100) & 0xfff) >> 7;
++ if (fchan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
++ dev_err(fdev->dev, "too many channels for device\n");
+ err = -EINVAL;
+- goto err_no_chan;
++ goto out_iounmap_regs;
+ }
+- fdev->chan[new_fsl_chan->id] = new_fsl_chan;
+- tasklet_init(&new_fsl_chan->tasklet, dma_do_tasklet,
+- (unsigned long)new_fsl_chan);
+
+- /* Init the channel */
+- dma_init(new_fsl_chan);
++ fdev->chan[fchan->id] = fchan;
++ tasklet_init(&fchan->tasklet, dma_do_tasklet, (unsigned long)fchan);
++
++ /* Initialize the channel */
++ dma_init(fchan);
+
+ /* Clear cdar registers */
+- set_cdar(new_fsl_chan, 0);
++ set_cdar(fchan, 0);
+
+- switch (new_fsl_chan->feature & FSL_DMA_IP_MASK) {
++ switch (fchan->feature & FSL_DMA_IP_MASK) {
+ case FSL_DMA_IP_85XX:
+- new_fsl_chan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
++ fchan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
+ case FSL_DMA_IP_83XX:
+- new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
+- new_fsl_chan->set_src_loop_size = fsl_chan_set_src_loop_size;
+- new_fsl_chan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
+- new_fsl_chan->set_request_count = fsl_chan_set_request_count;
++ fchan->toggle_ext_start = fsl_chan_toggle_ext_start;
++ fchan->set_src_loop_size = fsl_chan_set_src_loop_size;
++ fchan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
++ fchan->set_request_count = fsl_chan_set_request_count;
+ }
+
+- spin_lock_init(&new_fsl_chan->desc_lock);
+- INIT_LIST_HEAD(&new_fsl_chan->ld_queue);
++ spin_lock_init(&fchan->desc_lock);
++ INIT_LIST_HEAD(&fchan->ld_queue);
+
+- new_fsl_chan->common.device = &fdev->common;
++ fchan->common.device = &fdev->common;
+
+ /* Add the channel to DMA device channel list */
+- list_add_tail(&new_fsl_chan->common.device_node,
+- &fdev->common.channels);
++ list_add_tail(&fchan->common.device_node, &fdev->common.channels);
+ fdev->common.chancnt++;
+
+- new_fsl_chan->irq = irq_of_parse_and_map(node, 0);
+- if (new_fsl_chan->irq != NO_IRQ) {
+- err = request_irq(new_fsl_chan->irq,
+- &fsl_dma_chan_do_interrupt, IRQF_SHARED,
+- "fsldma-channel", new_fsl_chan);
++ fchan->irq = irq_of_parse_and_map(node, 0);
++ if (fchan->irq != NO_IRQ) {
++ err = request_irq(fchan->irq, &fsldma_chan_irq,
++ IRQF_SHARED, "fsldma-channel", fchan);
+ if (err) {
+- dev_err(fdev->dev, "DMA channel %s request_irq error "
+- "with return %d\n", node->full_name, err);
+- goto err_no_irq;
++ dev_err(fdev->dev, "unable to request IRQ "
++ "for channel %d\n", fchan->id);
++ goto out_list_del;
+ }
+ }
+
+- dev_info(fdev->dev, "#%d (%s), irq %d\n", new_fsl_chan->id,
+- compatible,
+- new_fsl_chan->irq != NO_IRQ ? new_fsl_chan->irq : fdev->irq);
++ dev_info(fdev->dev, "#%d (%s), irq %d\n", fchan->id, compatible,
++ fchan->irq != NO_IRQ ? fchan->irq : fdev->irq);
+
+ return 0;
+
+-err_no_irq:
+- list_del(&new_fsl_chan->common.device_node);
+-err_no_chan:
+- iounmap(new_fsl_chan->reg_base);
+-err_no_reg:
+- kfree(new_fsl_chan);
++out_list_del:
++ irq_dispose_mapping(fchan->irq);
++ list_del_init(&fchan->common.device_node);
++out_iounmap_regs:
++ iounmap(fchan->regs);
++out_free_fchan:
++ kfree(fchan);
++out_return:
+ return err;
+ }
+
+ static void fsl_dma_chan_remove(struct fsldma_chan *fchan)
+ {
+- if (fchan->irq != NO_IRQ)
++ if (fchan->irq != NO_IRQ) {
+ free_irq(fchan->irq, fchan);
++ irq_dispose_mapping(fchan->irq);
++ }
++
+ list_del(&fchan->common.device_node);
+- iounmap(fchan->reg_base);
++ iounmap(fchan->regs);
+ kfree(fchan);
+ }
+
+-static int __devinit fsldma_of_probe(struct of_device *dev,
++static int __devinit fsldma_of_probe(struct of_device *op,
+ const struct of_device_id *match)
+ {
+- int err;
+ struct fsldma_device *fdev;
+ struct device_node *child;
+- struct resource res;
++ int err;
+
+ fdev = kzalloc(sizeof(*fdev), GFP_KERNEL);
+ if (!fdev) {
+- dev_err(&dev->dev, "No enough memory for 'priv'\n");
+- return -ENOMEM;
++ dev_err(&op->dev, "No enough memory for 'priv'\n");
++ err = -ENOMEM;
++ goto out_return;
+ }
+- fdev->dev = &dev->dev;
++
++ fdev->dev = &op->dev;
+ INIT_LIST_HEAD(&fdev->common.channels);
+
+- /* get DMA controller register base */
+- err = of_address_to_resource(dev->node, 0, &res);
+- if (err) {
+- dev_err(&dev->dev, "Can't get %s property 'reg'\n",
+- dev->node->full_name);
+- goto err_no_reg;
++ /* ioremap the registers for use */
++ fdev->regs = of_iomap(op->node, 0);
++ if (!fdev->regs) {
++ dev_err(&op->dev, "unable to ioremap registers\n");
++ err = -ENOMEM;
++ goto out_free_fdev;
+ }
+
+- dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "
+- "controller at 0x%llx...\n",
+- match->compatible, (unsigned long long)res.start);
+- fdev->reg_base = ioremap(res.start, resource_size(&res));
+-
+ dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
+ dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
+ dma_cap_set(DMA_SLAVE, fdev->common.cap_mask);
+@@ -1220,66 +1222,69 @@ static int __devinit fsldma_of_probe(struct of_device *dev,
+ fdev->common.device_issue_pending = fsl_dma_memcpy_issue_pending;
+ fdev->common.device_prep_slave_sg = fsl_dma_prep_slave_sg;
+ fdev->common.device_terminate_all = fsl_dma_device_terminate_all;
+- fdev->common.dev = &dev->dev;
++ fdev->common.dev = &op->dev;
+
+- fdev->irq = irq_of_parse_and_map(dev->node, 0);
++ fdev->irq = irq_of_parse_and_map(op->node, 0);
+ if (fdev->irq != NO_IRQ) {
+- err = request_irq(fdev->irq, &fsl_dma_do_interrupt, IRQF_SHARED,
+- "fsldma-device", fdev);
++ err = request_irq(fdev->irq, &fsldma_irq, IRQF_SHARED,
++ "fsldma-device", fdev);
+ if (err) {
+- dev_err(&dev->dev, "DMA device request_irq error "
+- "with return %d\n", err);
+- goto err;
++ dev_err(&op->dev, "unable to request IRQ\n");
++ goto out_iounmap_regs;
+ }
+ }
+
+- dev_set_drvdata(&(dev->dev), fdev);
++ dev_set_drvdata(&op->dev, fdev);
+
+- /* We cannot use of_platform_bus_probe() because there is no
+- * of_platform_bus_remove. Instead, we manually instantiate every DMA
++ /*
++ * We cannot use of_platform_bus_probe() because there is no
++ * of_platform_bus_remove(). Instead, we manually instantiate every DMA
+ * channel object.
+ */
+- for_each_child_of_node(dev->node, child) {
+- if (of_device_is_compatible(child, "fsl,eloplus-dma-channel"))
++ for_each_child_of_node(op->node, child) {
++ if (of_device_is_compatible(child, "fsl,eloplus-dma-channel")) {
+ fsl_dma_chan_probe(fdev, child,
+ FSL_DMA_IP_85XX | FSL_DMA_BIG_ENDIAN,
+ "fsl,eloplus-dma-channel");
+- if (of_device_is_compatible(child, "fsl,elo-dma-channel"))
++ }
++
++ if (of_device_is_compatible(child, "fsl,elo-dma-channel")) {
+ fsl_dma_chan_probe(fdev, child,
+ FSL_DMA_IP_83XX | FSL_DMA_LITTLE_ENDIAN,
+ "fsl,elo-dma-channel");
++ }
+ }
+
+ dma_async_device_register(&fdev->common);
+ return 0;
+
+-err:
+- iounmap(fdev->reg_base);
+-err_no_reg:
++out_iounmap_regs:
++ iounmap(fdev->regs);
++out_free_fdev:
+ kfree(fdev);
++out_return:
+ return err;
+ }
+
+-static int fsldma_of_remove(struct of_device *of_dev)
++static int fsldma_of_remove(struct of_device *op)
+ {
+ struct fsldma_device *fdev;
+ unsigned int i;
+
+- fdev = dev_get_drvdata(&of_dev->dev);
+-
++ fdev = dev_get_drvdata(&op->dev);
+ dma_async_device_unregister(&fdev->common);
+
+- for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++)
++ for (i = 0; i < FSL_DMA_MAX_CHANS_PER_DEVICE; i++) {
+ if (fdev->chan[i])
+ fsl_dma_chan_remove(fdev->chan[i]);
++ }
+
+ if (fdev->irq != NO_IRQ)
+ free_irq(fdev->irq, fdev);
+
+- iounmap(fdev->reg_base);
+-
++ iounmap(fdev->regs);
++ dev_set_drvdata(&op->dev, NULL);
+ kfree(fdev);
+- dev_set_drvdata(&of_dev->dev, NULL);
+
+ return 0;
+ }
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index a67b8e3df0fa..ea3b19c8708c 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -108,7 +108,7 @@ struct fsldma_chan;
+ #define FSL_DMA_MAX_CHANS_PER_DEVICE 4
+
+ struct fsldma_device {
+- void __iomem *reg_base; /* DGSR register base */
++ void __iomem *regs; /* DGSR register base */
+ struct device *dev;
+ struct dma_device common;
+ struct fsldma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE];
+@@ -128,7 +128,7 @@ struct fsldma_device {
+ #define FSL_DMA_CHAN_START_EXT 0x00002000
+
+ struct fsldma_chan {
+- struct fsldma_chan_regs __iomem *reg_base;
++ struct fsldma_chan_regs __iomem *regs;
+ dma_cookie_t completed_cookie; /* The maximum cookie completed */
+ spinlock_t desc_lock; /* Descriptor operation lock */
+ struct list_head ld_queue; /* Link descriptors queue */commit 738f5f7e1ae876448cb7d9c82bea258b69386647
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:02 2010 +0000
+
+ fsldma: rename dest to dst for uniformity
+
+ Most functions in the standard library use "dst" as a parameter, rather
+ than "dest". This renames all use of "dest" to "dst" to match the usual
+ convention.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 6795d96e3629..c2db7541c22b 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -90,14 +90,14 @@ static void set_desc_src(struct fsldma_chan *fsl_chan,
+ hw->src_addr = CPU_TO_DMA(fsl_chan, snoop_bits | src, 64);
+ }
+
+-static void set_desc_dest(struct fsldma_chan *fsl_chan,
+- struct fsl_dma_ld_hw *hw, dma_addr_t dest)
++static void set_desc_dst(struct fsldma_chan *fsl_chan,
++ struct fsl_dma_ld_hw *hw, dma_addr_t dst)
+ {
+ u64 snoop_bits;
+
+ snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
+ ? ((u64)FSL_DMA_DATR_DWRITETYPE_SNOOP_WRITE << 32) : 0;
+- hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dest, 64);
++ hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dst, 64);
+ }
+
+ static void set_desc_next(struct fsldma_chan *fsl_chan,
+@@ -253,7 +253,7 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ }
+
+ /**
+- * fsl_chan_set_dest_loop_size - Set destination address hold transfer size
++ * fsl_chan_set_dst_loop_size - Set destination address hold transfer size
+ * @fsl_chan : Freescale DMA channel
+ * @size : Address loop size, 0 for disable loop
+ *
+@@ -263,7 +263,7 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ * write data to TA, TA + 1, TA + 2, TA + 3, then loop back to TA,
+ * TA + 1 ... and so on.
+ */
+-static void fsl_chan_set_dest_loop_size(struct fsldma_chan *fsl_chan, int size)
++static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+@@ -486,7 +486,7 @@ fsl_dma_prep_interrupt(struct dma_chan *chan, unsigned long flags)
+ }
+
+ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+- struct dma_chan *chan, dma_addr_t dma_dest, dma_addr_t dma_src,
++ struct dma_chan *chan, dma_addr_t dma_dst, dma_addr_t dma_src,
+ size_t len, unsigned long flags)
+ {
+ struct fsldma_chan *fsl_chan;
+@@ -519,7 +519,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+
+ set_desc_cnt(fsl_chan, &new->hw, copy);
+ set_desc_src(fsl_chan, &new->hw, dma_src);
+- set_desc_dest(fsl_chan, &new->hw, dma_dest);
++ set_desc_dst(fsl_chan, &new->hw, dma_dst);
+
+ if (!first)
+ first = new;
+@@ -532,7 +532,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ prev = new;
+ len -= copy;
+ dma_src += copy;
+- dma_dest += copy;
++ dma_dst += copy;
+
+ /* Insert the link descriptor to the LD ring */
+ list_add_tail(&new->node, &first->tx_list);
+@@ -680,7 +680,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ /* Fill in the descriptor */
+ set_desc_cnt(fsl_chan, &new->hw, copy);
+ set_desc_src(fsl_chan, &new->hw, dma_src);
+- set_desc_dest(fsl_chan, &new->hw, dma_dst);
++ set_desc_dst(fsl_chan, &new->hw, dma_dst);
+
+ /*
+ * If this is not the first descriptor, chain the
+@@ -721,8 +721,8 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ if (fsl_chan->set_src_loop_size)
+ fsl_chan->set_src_loop_size(fsl_chan, slave->src_loop_size);
+
+- if (fsl_chan->set_dest_loop_size)
+- fsl_chan->set_dest_loop_size(fsl_chan, slave->dst_loop_size);
++ if (fsl_chan->set_dst_loop_size)
++ fsl_chan->set_dst_loop_size(fsl_chan, slave->dst_loop_size);
+
+ if (fsl_chan->toggle_ext_start)
+ fsl_chan->toggle_ext_start(fsl_chan, slave->external_start);
+@@ -867,7 +867,7 @@ static void fsl_chan_ld_cleanup(struct fsldma_chan *fsl_chan)
+ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *fsl_chan)
+ {
+ struct list_head *ld_node;
+- dma_addr_t next_dest_addr;
++ dma_addr_t next_dst_addr;
+ unsigned long flags;
+
+ spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+@@ -892,10 +892,10 @@ static void fsl_chan_xfer_ld_queue(struct fsldma_chan *fsl_chan)
+
+ if (ld_node != &fsl_chan->ld_queue) {
+ /* Get the ld start address from ld_queue */
+- next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
++ next_dst_addr = to_fsl_desc(ld_node)->async_tx.phys;
+ dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",
+- (unsigned long long)next_dest_addr);
+- set_cdar(fsl_chan, next_dest_addr);
++ (unsigned long long)next_dst_addr);
++ set_cdar(fsl_chan, next_dst_addr);
+ dma_start(fsl_chan);
+ } else {
+ set_cdar(fsl_chan, 0);
+@@ -1130,7 +1130,7 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ case FSL_DMA_IP_83XX:
+ new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
+ new_fsl_chan->set_src_loop_size = fsl_chan_set_src_loop_size;
+- new_fsl_chan->set_dest_loop_size = fsl_chan_set_dest_loop_size;
++ new_fsl_chan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
+ new_fsl_chan->set_request_count = fsl_chan_set_request_count;
+ }
+
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index f8c2baa6f41e..a67b8e3df0fa 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -143,7 +143,7 @@ struct fsldma_chan {
+ void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
+ void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);
+ void (*set_src_loop_size)(struct fsldma_chan *fsl_chan, int size);
+- void (*set_dest_loop_size)(struct fsldma_chan *fsl_chan, int size);
++ void (*set_dst_loop_size)(struct fsldma_chan *fsl_chan, int size);
+ void (*set_request_count)(struct fsldma_chan *fsl_chan, int size);
+ };
+ commit a4f56d4b103d4e5d1a59a9118db0185a6bd1a83b
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:01 2010 +0000
+
+ fsldma: rename struct fsl_dma_chan to struct fsldma_chan
+
+ This is the beginning of a cleanup which will change all instances of
+ "fsl_dma" to "fsldma" to match the name of the driver itself.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 0b4e6383f480..6795d96e3629 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -37,7 +37,7 @@
+ #include <asm/fsldma.h>
+ #include "fsldma.h"
+
+-static void dma_init(struct fsl_dma_chan *fsl_chan)
++static void dma_init(struct fsldma_chan *fsl_chan)
+ {
+ /* Reset the channel */
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, 0, 32);
+@@ -64,23 +64,23 @@ static void dma_init(struct fsl_dma_chan *fsl_chan)
+
+ }
+
+-static void set_sr(struct fsl_dma_chan *fsl_chan, u32 val)
++static void set_sr(struct fsldma_chan *fsl_chan, u32 val)
+ {
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->sr, val, 32);
+ }
+
+-static u32 get_sr(struct fsl_dma_chan *fsl_chan)
++static u32 get_sr(struct fsldma_chan *fsl_chan)
+ {
+ return DMA_IN(fsl_chan, &fsl_chan->reg_base->sr, 32);
+ }
+
+-static void set_desc_cnt(struct fsl_dma_chan *fsl_chan,
++static void set_desc_cnt(struct fsldma_chan *fsl_chan,
+ struct fsl_dma_ld_hw *hw, u32 count)
+ {
+ hw->count = CPU_TO_DMA(fsl_chan, count, 32);
+ }
+
+-static void set_desc_src(struct fsl_dma_chan *fsl_chan,
++static void set_desc_src(struct fsldma_chan *fsl_chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t src)
+ {
+ u64 snoop_bits;
+@@ -90,7 +90,7 @@ static void set_desc_src(struct fsl_dma_chan *fsl_chan,
+ hw->src_addr = CPU_TO_DMA(fsl_chan, snoop_bits | src, 64);
+ }
+
+-static void set_desc_dest(struct fsl_dma_chan *fsl_chan,
++static void set_desc_dest(struct fsldma_chan *fsl_chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t dest)
+ {
+ u64 snoop_bits;
+@@ -100,7 +100,7 @@ static void set_desc_dest(struct fsl_dma_chan *fsl_chan,
+ hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dest, 64);
+ }
+
+-static void set_desc_next(struct fsl_dma_chan *fsl_chan,
++static void set_desc_next(struct fsldma_chan *fsl_chan,
+ struct fsl_dma_ld_hw *hw, dma_addr_t next)
+ {
+ u64 snoop_bits;
+@@ -110,38 +110,38 @@ static void set_desc_next(struct fsl_dma_chan *fsl_chan,
+ hw->next_ln_addr = CPU_TO_DMA(fsl_chan, snoop_bits | next, 64);
+ }
+
+-static void set_cdar(struct fsl_dma_chan *fsl_chan, dma_addr_t addr)
++static void set_cdar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
+ {
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->cdar, addr | FSL_DMA_SNEN, 64);
+ }
+
+-static dma_addr_t get_cdar(struct fsl_dma_chan *fsl_chan)
++static dma_addr_t get_cdar(struct fsldma_chan *fsl_chan)
+ {
+ return DMA_IN(fsl_chan, &fsl_chan->reg_base->cdar, 64) & ~FSL_DMA_SNEN;
+ }
+
+-static void set_ndar(struct fsl_dma_chan *fsl_chan, dma_addr_t addr)
++static void set_ndar(struct fsldma_chan *fsl_chan, dma_addr_t addr)
+ {
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->ndar, addr, 64);
+ }
+
+-static dma_addr_t get_ndar(struct fsl_dma_chan *fsl_chan)
++static dma_addr_t get_ndar(struct fsldma_chan *fsl_chan)
+ {
+ return DMA_IN(fsl_chan, &fsl_chan->reg_base->ndar, 64);
+ }
+
+-static u32 get_bcr(struct fsl_dma_chan *fsl_chan)
++static u32 get_bcr(struct fsldma_chan *fsl_chan)
+ {
+ return DMA_IN(fsl_chan, &fsl_chan->reg_base->bcr, 32);
+ }
+
+-static int dma_is_idle(struct fsl_dma_chan *fsl_chan)
++static int dma_is_idle(struct fsldma_chan *fsl_chan)
+ {
+ u32 sr = get_sr(fsl_chan);
+ return (!(sr & FSL_DMA_SR_CB)) || (sr & FSL_DMA_SR_CH);
+ }
+
+-static void dma_start(struct fsl_dma_chan *fsl_chan)
++static void dma_start(struct fsldma_chan *fsl_chan)
+ {
+ u32 mode;
+
+@@ -164,7 +164,7 @@ static void dma_start(struct fsl_dma_chan *fsl_chan)
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+ }
+
+-static void dma_halt(struct fsl_dma_chan *fsl_chan)
++static void dma_halt(struct fsldma_chan *fsl_chan)
+ {
+ u32 mode;
+ int i;
+@@ -186,7 +186,7 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
+ dev_err(fsl_chan->dev, "DMA halt timeout!\n");
+ }
+
+-static void set_ld_eol(struct fsl_dma_chan *fsl_chan,
++static void set_ld_eol(struct fsldma_chan *fsl_chan,
+ struct fsl_desc_sw *desc)
+ {
+ u64 snoop_bits;
+@@ -199,7 +199,7 @@ static void set_ld_eol(struct fsl_dma_chan *fsl_chan,
+ | snoop_bits, 64);
+ }
+
+-static void append_ld_queue(struct fsl_dma_chan *fsl_chan,
++static void append_ld_queue(struct fsldma_chan *fsl_chan,
+ struct fsl_desc_sw *new_desc)
+ {
+ struct fsl_desc_sw *queue_tail = to_fsl_desc(fsl_chan->ld_queue.prev);
+@@ -231,7 +231,7 @@ static void append_ld_queue(struct fsl_dma_chan *fsl_chan,
+ * read data from SA, SA + 1, SA + 2, SA + 3, then loop back to SA,
+ * SA + 1 ... and so on.
+ */
+-static void fsl_chan_set_src_loop_size(struct fsl_dma_chan *fsl_chan, int size)
++static void fsl_chan_set_src_loop_size(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+@@ -263,7 +263,7 @@ static void fsl_chan_set_src_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ * write data to TA, TA + 1, TA + 2, TA + 3, then loop back to TA,
+ * TA + 1 ... and so on.
+ */
+-static void fsl_chan_set_dest_loop_size(struct fsl_dma_chan *fsl_chan, int size)
++static void fsl_chan_set_dest_loop_size(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+@@ -296,7 +296,7 @@ static void fsl_chan_set_dest_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ *
+ * A size of 0 disables external pause control. The maximum size is 1024.
+ */
+-static void fsl_chan_set_request_count(struct fsl_dma_chan *fsl_chan, int size)
++static void fsl_chan_set_request_count(struct fsldma_chan *fsl_chan, int size)
+ {
+ u32 mode;
+
+@@ -317,7 +317,7 @@ static void fsl_chan_set_request_count(struct fsl_dma_chan *fsl_chan, int size)
+ * The DMA Request Count feature should be used in addition to this feature
+ * to set the number of bytes to transfer before pausing the channel.
+ */
+-static void fsl_chan_toggle_ext_pause(struct fsl_dma_chan *fsl_chan, int enable)
++static void fsl_chan_toggle_ext_pause(struct fsldma_chan *fsl_chan, int enable)
+ {
+ if (enable)
+ fsl_chan->feature |= FSL_DMA_CHAN_PAUSE_EXT;
+@@ -335,7 +335,7 @@ static void fsl_chan_toggle_ext_pause(struct fsl_dma_chan *fsl_chan, int enable)
+ * transfer immediately. The DMA channel will wait for the
+ * control pin asserted.
+ */
+-static void fsl_chan_toggle_ext_start(struct fsl_dma_chan *fsl_chan, int enable)
++static void fsl_chan_toggle_ext_start(struct fsldma_chan *fsl_chan, int enable)
+ {
+ if (enable)
+ fsl_chan->feature |= FSL_DMA_CHAN_START_EXT;
+@@ -345,7 +345,7 @@ static void fsl_chan_toggle_ext_start(struct fsl_dma_chan *fsl_chan, int enable)
+
+ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ {
+- struct fsl_dma_chan *fsl_chan = to_fsl_chan(tx->chan);
++ struct fsldma_chan *fsl_chan = to_fsl_chan(tx->chan);
+ struct fsl_desc_sw *desc = tx_to_fsl_desc(tx);
+ struct fsl_desc_sw *child;
+ unsigned long flags;
+@@ -379,7 +379,7 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ * Return - The descriptor allocated. NULL for failed.
+ */
+ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+- struct fsl_dma_chan *fsl_chan)
++ struct fsldma_chan *fsl_chan)
+ {
+ dma_addr_t pdesc;
+ struct fsl_desc_sw *desc_sw;
+@@ -408,7 +408,7 @@ static struct fsl_desc_sw *fsl_dma_alloc_descriptor(
+ */
+ static int fsl_dma_alloc_chan_resources(struct dma_chan *chan)
+ {
+- struct fsl_dma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
+
+ /* Has this channel already been allocated? */
+ if (fsl_chan->desc_pool)
+@@ -435,7 +435,7 @@ static int fsl_dma_alloc_chan_resources(struct dma_chan *chan)
+ */
+ static void fsl_dma_free_chan_resources(struct dma_chan *chan)
+ {
+- struct fsl_dma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
+ struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+
+@@ -459,7 +459,7 @@ static void fsl_dma_free_chan_resources(struct dma_chan *chan)
+ static struct dma_async_tx_descriptor *
+ fsl_dma_prep_interrupt(struct dma_chan *chan, unsigned long flags)
+ {
+- struct fsl_dma_chan *fsl_chan;
++ struct fsldma_chan *fsl_chan;
+ struct fsl_desc_sw *new;
+
+ if (!chan)
+@@ -489,7 +489,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ struct dma_chan *chan, dma_addr_t dma_dest, dma_addr_t dma_src,
+ size_t len, unsigned long flags)
+ {
+- struct fsl_dma_chan *fsl_chan;
++ struct fsldma_chan *fsl_chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new;
+ struct list_head *list;
+ size_t copy;
+@@ -575,7 +575,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+ struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,
+ enum dma_data_direction direction, unsigned long flags)
+ {
+- struct fsl_dma_chan *fsl_chan;
++ struct fsldma_chan *fsl_chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
+ struct fsl_dma_slave *slave;
+ struct list_head *tx_list;
+@@ -759,7 +759,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
+
+ static void fsl_dma_device_terminate_all(struct dma_chan *chan)
+ {
+- struct fsl_dma_chan *fsl_chan;
++ struct fsldma_chan *fsl_chan;
+ struct fsl_desc_sw *desc, *tmp;
+ unsigned long flags;
+
+@@ -786,7 +786,7 @@ static void fsl_dma_device_terminate_all(struct dma_chan *chan)
+ * fsl_dma_update_completed_cookie - Update the completed cookie.
+ * @fsl_chan : Freescale DMA channel
+ */
+-static void fsl_dma_update_completed_cookie(struct fsl_dma_chan *fsl_chan)
++static void fsl_dma_update_completed_cookie(struct fsldma_chan *fsl_chan)
+ {
+ struct fsl_desc_sw *cur_desc, *desc;
+ dma_addr_t ld_phy;
+@@ -820,7 +820,7 @@ static void fsl_dma_update_completed_cookie(struct fsl_dma_chan *fsl_chan)
+ * If 'in_intr' is set, the function will move the link descriptor to
+ * the recycle list. Otherwise, free it directly.
+ */
+-static void fsl_chan_ld_cleanup(struct fsl_dma_chan *fsl_chan)
++static void fsl_chan_ld_cleanup(struct fsldma_chan *fsl_chan)
+ {
+ struct fsl_desc_sw *desc, *_desc;
+ unsigned long flags;
+@@ -864,7 +864,7 @@ static void fsl_chan_ld_cleanup(struct fsl_dma_chan *fsl_chan)
+ * fsl_chan_xfer_ld_queue - Transfer link descriptors in channel ld_queue.
+ * @fsl_chan : Freescale DMA channel
+ */
+-static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
++static void fsl_chan_xfer_ld_queue(struct fsldma_chan *fsl_chan)
+ {
+ struct list_head *ld_node;
+ dma_addr_t next_dest_addr;
+@@ -912,7 +912,7 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
+ */
+ static void fsl_dma_memcpy_issue_pending(struct dma_chan *chan)
+ {
+- struct fsl_dma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
+
+ #ifdef FSL_DMA_LD_DEBUG
+ struct fsl_desc_sw *ld;
+@@ -949,7 +949,7 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
+ dma_cookie_t *done,
+ dma_cookie_t *used)
+ {
+- struct fsl_dma_chan *fsl_chan = to_fsl_chan(chan);
++ struct fsldma_chan *fsl_chan = to_fsl_chan(chan);
+ dma_cookie_t last_used;
+ dma_cookie_t last_complete;
+
+@@ -969,7 +969,7 @@ static enum dma_status fsl_dma_is_complete(struct dma_chan *chan,
+
+ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
+ {
+- struct fsl_dma_chan *fsl_chan = (struct fsl_dma_chan *)data;
++ struct fsldma_chan *fsl_chan = data;
+ u32 stat;
+ int update_cookie = 0;
+ int xfer_ld_q = 0;
+@@ -1050,9 +1050,9 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
+
+ static irqreturn_t fsl_dma_do_interrupt(int irq, void *data)
+ {
+- struct fsl_dma_device *fdev = (struct fsl_dma_device *)data;
+- u32 gsr;
++ struct fsldma_device *fdev = data;
+ int ch_nr;
++ u32 gsr;
+
+ gsr = (fdev->feature & FSL_DMA_BIG_ENDIAN) ? in_be32(fdev->reg_base)
+ : in_le32(fdev->reg_base);
+@@ -1064,19 +1064,23 @@ static irqreturn_t fsl_dma_do_interrupt(int irq, void *data)
+
+ static void dma_do_tasklet(unsigned long data)
+ {
+- struct fsl_dma_chan *fsl_chan = (struct fsl_dma_chan *)data;
++ struct fsldma_chan *fsl_chan = (struct fsldma_chan *)data;
+ fsl_chan_ld_cleanup(fsl_chan);
+ }
+
+-static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
++/*----------------------------------------------------------------------------*/
++/* OpenFirmware Subsystem */
++/*----------------------------------------------------------------------------*/
++
++static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev,
+ struct device_node *node, u32 feature, const char *compatible)
+ {
+- struct fsl_dma_chan *new_fsl_chan;
++ struct fsldma_chan *new_fsl_chan;
+ struct resource res;
+ int err;
+
+ /* alloc channel */
+- new_fsl_chan = kzalloc(sizeof(struct fsl_dma_chan), GFP_KERNEL);
++ new_fsl_chan = kzalloc(sizeof(*new_fsl_chan), GFP_KERNEL);
+ if (!new_fsl_chan) {
+ dev_err(fdev->dev, "No free memory for allocating "
+ "dma channels!\n");
+@@ -1167,7 +1171,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+ return err;
+ }
+
+-static void fsl_dma_chan_remove(struct fsl_dma_chan *fchan)
++static void fsl_dma_chan_remove(struct fsldma_chan *fchan)
+ {
+ if (fchan->irq != NO_IRQ)
+ free_irq(fchan->irq, fchan);
+@@ -1176,15 +1180,15 @@ static void fsl_dma_chan_remove(struct fsl_dma_chan *fchan)
+ kfree(fchan);
+ }
+
+-static int __devinit of_fsl_dma_probe(struct of_device *dev,
++static int __devinit fsldma_of_probe(struct of_device *dev,
+ const struct of_device_id *match)
+ {
+ int err;
+- struct fsl_dma_device *fdev;
++ struct fsldma_device *fdev;
+ struct device_node *child;
+ struct resource res;
+
+- fdev = kzalloc(sizeof(struct fsl_dma_device), GFP_KERNEL);
++ fdev = kzalloc(sizeof(*fdev), GFP_KERNEL);
+ if (!fdev) {
+ dev_err(&dev->dev, "No enough memory for 'priv'\n");
+ return -ENOMEM;
+@@ -1256,9 +1260,9 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
+ return err;
+ }
+
+-static int of_fsl_dma_remove(struct of_device *of_dev)
++static int fsldma_of_remove(struct of_device *of_dev)
+ {
+- struct fsl_dma_device *fdev;
++ struct fsldma_device *fdev;
+ unsigned int i;
+
+ fdev = dev_get_drvdata(&of_dev->dev);
+@@ -1280,39 +1284,43 @@ static int of_fsl_dma_remove(struct of_device *of_dev)
+ return 0;
+ }
+
+-static struct of_device_id of_fsl_dma_ids[] = {
++static struct of_device_id fsldma_of_ids[] = {
+ { .compatible = "fsl,eloplus-dma", },
+ { .compatible = "fsl,elo-dma", },
+ {}
+ };
+
+-static struct of_platform_driver of_fsl_dma_driver = {
+- .name = "fsl-elo-dma",
+- .match_table = of_fsl_dma_ids,
+- .probe = of_fsl_dma_probe,
+- .remove = of_fsl_dma_remove,
++static struct of_platform_driver fsldma_of_driver = {
++ .name = "fsl-elo-dma",
++ .match_table = fsldma_of_ids,
++ .probe = fsldma_of_probe,
++ .remove = fsldma_of_remove,
+ };
+
+-static __init int of_fsl_dma_init(void)
++/*----------------------------------------------------------------------------*/
++/* Module Init / Exit */
++/*----------------------------------------------------------------------------*/
++
++static __init int fsldma_init(void)
+ {
+ int ret;
+
+ pr_info("Freescale Elo / Elo Plus DMA driver\n");
+
+- ret = of_register_platform_driver(&of_fsl_dma_driver);
++ ret = of_register_platform_driver(&fsldma_of_driver);
+ if (ret)
+ pr_err("fsldma: failed to register platform driver\n");
+
+ return ret;
+ }
+
+-static void __exit of_fsl_dma_exit(void)
++static void __exit fsldma_exit(void)
+ {
+- of_unregister_platform_driver(&of_fsl_dma_driver);
++ of_unregister_platform_driver(&fsldma_of_driver);
+ }
+
+-subsys_initcall(of_fsl_dma_init);
+-module_exit(of_fsl_dma_exit);
++subsys_initcall(fsldma_init);
++module_exit(fsldma_exit);
+
+ MODULE_DESCRIPTION("Freescale Elo / Elo Plus DMA driver");
+ MODULE_LICENSE("GPL");
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index dbb5b5cce4c2..f8c2baa6f41e 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -94,7 +94,7 @@ struct fsl_desc_sw {
+ struct dma_async_tx_descriptor async_tx;
+ } __attribute__((aligned(32)));
+
+-struct fsl_dma_chan_regs {
++struct fsldma_chan_regs {
+ u32 mr; /* 0x00 - Mode Register */
+ u32 sr; /* 0x04 - Status Register */
+ u64 cdar; /* 0x08 - Current descriptor address register */
+@@ -104,19 +104,19 @@ struct fsl_dma_chan_regs {
+ u64 ndar; /* 0x24 - Next Descriptor Address Register */
+ };
+
+-struct fsl_dma_chan;
++struct fsldma_chan;
+ #define FSL_DMA_MAX_CHANS_PER_DEVICE 4
+
+-struct fsl_dma_device {
++struct fsldma_device {
+ void __iomem *reg_base; /* DGSR register base */
+ struct device *dev;
+ struct dma_device common;
+- struct fsl_dma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE];
++ struct fsldma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE];
+ u32 feature; /* The same as DMA channels */
+ int irq; /* Channel IRQ */
+ };
+
+-/* Define macros for fsl_dma_chan->feature property */
++/* Define macros for fsldma_chan->feature property */
+ #define FSL_DMA_LITTLE_ENDIAN 0x00000000
+ #define FSL_DMA_BIG_ENDIAN 0x00000001
+
+@@ -127,8 +127,8 @@ struct fsl_dma_device {
+ #define FSL_DMA_CHAN_PAUSE_EXT 0x00001000
+ #define FSL_DMA_CHAN_START_EXT 0x00002000
+
+-struct fsl_dma_chan {
+- struct fsl_dma_chan_regs __iomem *reg_base;
++struct fsldma_chan {
++ struct fsldma_chan_regs __iomem *reg_base;
+ dma_cookie_t completed_cookie; /* The maximum cookie completed */
+ spinlock_t desc_lock; /* Descriptor operation lock */
+ struct list_head ld_queue; /* Link descriptors queue */
+@@ -140,14 +140,14 @@ struct fsl_dma_chan {
+ struct tasklet_struct tasklet;
+ u32 feature;
+
+- void (*toggle_ext_pause)(struct fsl_dma_chan *fsl_chan, int enable);
+- void (*toggle_ext_start)(struct fsl_dma_chan *fsl_chan, int enable);
+- void (*set_src_loop_size)(struct fsl_dma_chan *fsl_chan, int size);
+- void (*set_dest_loop_size)(struct fsl_dma_chan *fsl_chan, int size);
+- void (*set_request_count)(struct fsl_dma_chan *fsl_chan, int size);
++ void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
++ void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);
++ void (*set_src_loop_size)(struct fsldma_chan *fsl_chan, int size);
++ void (*set_dest_loop_size)(struct fsldma_chan *fsl_chan, int size);
++ void (*set_request_count)(struct fsldma_chan *fsl_chan, int size);
+ };
+
+-#define to_fsl_chan(chan) container_of(chan, struct fsl_dma_chan, common)
++#define to_fsl_chan(chan) container_of(chan, struct fsldma_chan, common)
+ #define to_fsl_desc(lh) container_of(lh, struct fsl_desc_sw, node)
+ #define tx_to_fsl_desc(tx) container_of(tx, struct fsl_desc_sw, async_tx)
+ commit 4ce0e953f6286777452bf07c83056342d6b9b257
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:34:00 2010 +0000
+
+ fsldma: remove unused structure members
+
+ Remove some unused members from the fsldma data structures. A few trivial
+ uses of struct resource were converted to use the stack rather than keeping
+ the memory allocated for the lifetime of the driver.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 0bad741765c6..0b4e6383f480 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -1072,6 +1072,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+ struct device_node *node, u32 feature, const char *compatible)
+ {
+ struct fsl_dma_chan *new_fsl_chan;
++ struct resource res;
+ int err;
+
+ /* alloc channel */
+@@ -1083,7 +1084,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+ }
+
+ /* get dma channel register base */
+- err = of_address_to_resource(node, 0, &new_fsl_chan->reg);
++ err = of_address_to_resource(node, 0, &res);
+ if (err) {
+ dev_err(fdev->dev, "Can't get %s property 'reg'\n",
+ node->full_name);
+@@ -1101,10 +1102,8 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+ WARN_ON(fdev->feature != new_fsl_chan->feature);
+
+ new_fsl_chan->dev = fdev->dev;
+- new_fsl_chan->reg_base = ioremap(new_fsl_chan->reg.start,
+- new_fsl_chan->reg.end - new_fsl_chan->reg.start + 1);
+-
+- new_fsl_chan->id = ((new_fsl_chan->reg.start - 0x100) & 0xfff) >> 7;
++ new_fsl_chan->reg_base = ioremap(res.start, resource_size(&res));
++ new_fsl_chan->id = ((res.start - 0x100) & 0xfff) >> 7;
+ if (new_fsl_chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
+ dev_err(fdev->dev, "There is no %d channel!\n",
+ new_fsl_chan->id);
+@@ -1183,6 +1182,7 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
+ int err;
+ struct fsl_dma_device *fdev;
+ struct device_node *child;
++ struct resource res;
+
+ fdev = kzalloc(sizeof(struct fsl_dma_device), GFP_KERNEL);
+ if (!fdev) {
+@@ -1193,7 +1193,7 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
+ INIT_LIST_HEAD(&fdev->common.channels);
+
+ /* get DMA controller register base */
+- err = of_address_to_resource(dev->node, 0, &fdev->reg);
++ err = of_address_to_resource(dev->node, 0, &res);
+ if (err) {
+ dev_err(&dev->dev, "Can't get %s property 'reg'\n",
+ dev->node->full_name);
+@@ -1202,9 +1202,8 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
+
+ dev_info(&dev->dev, "Probe the Freescale DMA driver for %s "
+ "controller at 0x%llx...\n",
+- match->compatible, (unsigned long long)fdev->reg.start);
+- fdev->reg_base = ioremap(fdev->reg.start, fdev->reg.end
+- - fdev->reg.start + 1);
++ match->compatible, (unsigned long long)res.start);
++ fdev->reg_base = ioremap(res.start, resource_size(&res));
+
+ dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
+ dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index 0df14cbb8ca3..dbb5b5cce4c2 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -92,8 +92,6 @@ struct fsl_desc_sw {
+ struct list_head node;
+ struct list_head tx_list;
+ struct dma_async_tx_descriptor async_tx;
+- struct list_head *ld;
+- void *priv;
+ } __attribute__((aligned(32)));
+
+ struct fsl_dma_chan_regs {
+@@ -111,7 +109,6 @@ struct fsl_dma_chan;
+
+ struct fsl_dma_device {
+ void __iomem *reg_base; /* DGSR register base */
+- struct resource reg; /* Resource for register */
+ struct device *dev;
+ struct dma_device common;
+ struct fsl_dma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE];
+@@ -138,7 +135,6 @@ struct fsl_dma_chan {
+ struct dma_chan common; /* DMA common channel */
+ struct dma_pool *desc_pool; /* Descriptors pool */
+ struct device *dev; /* Channel device */
+- struct resource reg; /* Resource for register */
+ int irq; /* Channel IRQ */
+ int id; /* Raw id of this channel */
+ struct tasklet_struct tasklet;
+ commit 272ca655090978bdaa2630fc44fb2c03da5576fd
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 6 13:33:59 2010 +0000
+
+ fsldma: reduce kernel text size
+
+ Some of the functions are written in a way where they use multiple reads
+ and writes where a single read/write pair could suffice. This shrinks the
+ kernel text size measurably, while making the functions easier to
+ understand.
+
+ add/remove: 0/0 grow/shrink: 1/4 up/down: 4/-196 (-192)
+ function old new delta
+ fsl_chan_set_request_count 120 124 +4
+ dma_halt 300 272 -28
+ fsl_chan_set_src_loop_size 208 156 -52
+ fsl_chan_set_dest_loop_size 208 156 -52
+ fsl_chan_xfer_ld_queue 500 436 -64
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 296f9e747fac..0bad741765c6 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -143,43 +143,45 @@ static int dma_is_idle(struct fsl_dma_chan *fsl_chan)
+
+ static void dma_start(struct fsl_dma_chan *fsl_chan)
+ {
+- u32 mr_set = 0;
+-
+- if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->bcr, 0, 32);
+- mr_set |= FSL_DMA_MR_EMP_EN;
+- } else if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
+- & ~FSL_DMA_MR_EMP_EN, 32);
++ u32 mode;
++
++ mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++
++ if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
++ if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->bcr, 0, 32);
++ mode |= FSL_DMA_MR_EMP_EN;
++ } else {
++ mode &= ~FSL_DMA_MR_EMP_EN;
++ }
+ }
+
+ if (fsl_chan->feature & FSL_DMA_CHAN_START_EXT)
+- mr_set |= FSL_DMA_MR_EMS_EN;
++ mode |= FSL_DMA_MR_EMS_EN;
+ else
+- mr_set |= FSL_DMA_MR_CS;
++ mode |= FSL_DMA_MR_CS;
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
+- | mr_set, 32);
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+ }
+
+ static void dma_halt(struct fsl_dma_chan *fsl_chan)
+ {
++ u32 mode;
+ int i;
+
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) | FSL_DMA_MR_CA,
+- 32);
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) & ~(FSL_DMA_MR_CS
+- | FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA), 32);
++ mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode |= FSL_DMA_MR_CA;
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
++
++ mode &= ~(FSL_DMA_MR_CS | FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA);
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+
+ for (i = 0; i < 100; i++) {
+ if (dma_is_idle(fsl_chan))
+ break;
+ udelay(10);
+ }
++
+ if (i >= 100 && !dma_is_idle(fsl_chan))
+ dev_err(fsl_chan->dev, "DMA halt timeout!\n");
+ }
+@@ -231,22 +233,23 @@ static void append_ld_queue(struct fsl_dma_chan *fsl_chan,
+ */
+ static void fsl_chan_set_src_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ {
++ u32 mode;
++
++ mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++
+ switch (size) {
+ case 0:
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) &
+- (~FSL_DMA_MR_SAHE), 32);
++ mode &= ~FSL_DMA_MR_SAHE;
+ break;
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) |
+- FSL_DMA_MR_SAHE | (__ilog2(size) << 14),
+- 32);
++ mode |= FSL_DMA_MR_SAHE | (__ilog2(size) << 14);
+ break;
+ }
++
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+ }
+
+ /**
+@@ -262,22 +265,23 @@ static void fsl_chan_set_src_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ */
+ static void fsl_chan_set_dest_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ {
++ u32 mode;
++
++ mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++
+ switch (size) {
+ case 0:
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) &
+- (~FSL_DMA_MR_DAHE), 32);
++ mode &= ~FSL_DMA_MR_DAHE;
+ break;
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) |
+- FSL_DMA_MR_DAHE | (__ilog2(size) << 16),
+- 32);
++ mode |= FSL_DMA_MR_DAHE | (__ilog2(size) << 16);
+ break;
+ }
++
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+ }
+
+ /**
+@@ -294,11 +298,14 @@ static void fsl_chan_set_dest_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ */
+ static void fsl_chan_set_request_count(struct fsl_dma_chan *fsl_chan, int size)
+ {
++ u32 mode;
++
+ BUG_ON(size > 1024);
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
+- | ((__ilog2(size) << 24) & 0x0f000000),
+- 32);
++
++ mode = DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32);
++ mode |= (__ilog2(size) << 24) & 0x0f000000;
++
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, mode, 32);
+ }
+
+ /**commit 0616fb003d4f799c4be62275242fc7ff9a968f84 +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Mon Oct 26 16:50:10 2009 -0700 + + edac: i5400 fix missing CONFIG_PCI define + + When building without CONFIG_PCI the edac_pci_idx variable is unused, + causing a build-time warning. Wrap the variable in #ifdef CONFIG_PCI, + just like the rest of the PCI support. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Doug Thompson <dougthompson@xmission.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c +index 157f6504f25e..cf27402af97b 100644 +--- a/drivers/edac/mpc85xx_edac.c ++++ b/drivers/edac/mpc85xx_edac.c +@@ -26,7 +26,9 @@ + #include "mpc85xx_edac.h" + + static int edac_dev_idx; ++#ifdef CONFIG_PCI + static int edac_pci_idx; ++#endif + static int edac_mc_idx; + + static u32 orig_ddr_err_disable;
commit b4846251727a38a7f248e41308c060995371dd05
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Wed Sep 23 15:57:25 2009 -0700
+
+ edac: mpc85xx add mpc83xx support
+
+ Add support for the Freescale MPC83xx memory controller to the existing
+ driver for the Freescale MPC85xx memory controller. The only difference
+ between the two processors are in the CS_BNDS register parsing code, which
+ has been changed so it will work on both processors.
+
+ The L2 cache controller does not exist on the MPC83xx, but the OF
+ subsystem will not use the driver if the device is not present in the OF
+ device tree.
+
+ I had to change the nr_pages calculation to make the math work out. I
+ checked it on my board and did the math by hand for a 64GB 85xx using 64K
+ pages. In both cases, nr_pages * PAGE_SIZE comes out to the correct
+ value.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Doug Thompson <dougthompson@xmission.com>
+ Cc: Kumar Gala <galak@gate.crashing.org>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
+index a3ca18e2d7cf..b82ad57c1082 100644
+--- a/drivers/edac/Kconfig
++++ b/drivers/edac/Kconfig
+@@ -176,11 +176,11 @@ config EDAC_I5100
+ San Clemente MCH.
+
+ config EDAC_MPC85XX
+- tristate "Freescale MPC85xx"
+- depends on EDAC_MM_EDAC && FSL_SOC && MPC85xx
++ tristate "Freescale MPC83xx / MPC85xx"
++ depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || MPC85xx)
+ help
+ Support for error detection and correction on the Freescale
+- MPC8560, MPC8540, MPC8548
++ MPC8349, MPC8560, MPC8540, MPC8548
+
+ config EDAC_MV64X60
+ tristate "Marvell MV64x60"
+diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
+index 1dd405e0e550..157f6504f25e 100644
+--- a/drivers/edac/mpc85xx_edac.c
++++ b/drivers/edac/mpc85xx_edac.c
+@@ -41,7 +41,9 @@ static u32 orig_pci_err_en;
+ #endif
+
+ static u32 orig_l2_err_disable;
++#ifdef CONFIG_MPC85xx
+ static u32 orig_hid1[2];
++#endif
+
+ /************************ MC SYSFS parts ***********************************/
+
+@@ -789,19 +791,20 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci)
+ csrow = &mci->csrows[index];
+ cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 +
+ (index * MPC85XX_MC_CS_BNDS_OFS));
+- start = (cs_bnds & 0xfff0000) << 4;
+- end = ((cs_bnds & 0xfff) << 20);
+- if (start)
+- start |= 0xfffff;
+- if (end)
+- end |= 0xfffff;
++
++ start = (cs_bnds & 0xffff0000) >> 16;
++ end = (cs_bnds & 0x0000ffff);
+
+ if (start == end)
+ continue; /* not populated */
+
++ start <<= (24 - PAGE_SHIFT);
++ end <<= (24 - PAGE_SHIFT);
++ end |= (1 << (24 - PAGE_SHIFT)) - 1;
++
+ csrow->first_page = start >> PAGE_SHIFT;
+ csrow->last_page = end >> PAGE_SHIFT;
+- csrow->nr_pages = csrow->last_page + 1 - csrow->first_page;
++ csrow->nr_pages = end + 1 - start;
+ csrow->grain = 8;
+ csrow->mtype = mtype;
+ csrow->dtype = DEV_UNKNOWN;
+@@ -985,6 +988,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
+ { .compatible = "fsl,mpc8560-memory-controller", },
+ { .compatible = "fsl,mpc8568-memory-controller", },
+ { .compatible = "fsl,mpc8572-memory-controller", },
++ { .compatible = "fsl,mpc8349-memory-controller", },
+ { .compatible = "fsl,p2020-memory-controller", },
+ {},
+ };
+@@ -1001,13 +1005,13 @@ static struct of_platform_driver mpc85xx_mc_err_driver = {
+ },
+ };
+
+-
++#ifdef CONFIG_MPC85xx
+ static void __init mpc85xx_mc_clear_rfxe(void *data)
+ {
+ orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
+ mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~0x20000));
+ }
+-
++#endif
+
+ static int __init mpc85xx_mc_init(void)
+ {
+@@ -1040,26 +1044,32 @@ static int __init mpc85xx_mc_init(void)
+ printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
+ #endif
+
++#ifdef CONFIG_MPC85xx
+ /*
+ * need to clear HID1[RFXE] to disable machine check int
+ * so we can catch it
+ */
+ if (edac_op_state == EDAC_OPSTATE_INT)
+ on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);
++#endif
+
+ return 0;
+ }
+
+ module_init(mpc85xx_mc_init);
+
++#ifdef CONFIG_MPC85xx
+ static void __exit mpc85xx_mc_restore_hid1(void *data)
+ {
+ mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
+ }
++#endif
+
+ static void __exit mpc85xx_mc_exit(void)
+ {
++#ifdef CONFIG_MPC85xx
+ on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
++#endif
+ #ifdef CONFIG_PCI
+ of_unregister_platform_driver(&mpc85xx_pci_err_driver);
+ #endifcommit 58f055e5314856a3badfa61fe144347903488989 +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Wed Sep 23 22:59:44 2009 +0200 + + hwmon: (ltc4245) Clear faults at startup + + When power is applied to the ltc4245 chip it sometimes reports spurious + faults, which are exposed as alarms in the hwmon output. Clear the fault + register when the driver is installed to clear the alarms. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Jean Delvare <khali@linux-fr.org> + +diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c +index 034b2c515848..e38964333612 100644 +--- a/drivers/hwmon/ltc4245.c ++++ b/drivers/hwmon/ltc4245.c +@@ -382,7 +382,8 @@ static int ltc4245_probe(struct i2c_client *client, + mutex_init(&data->update_lock); + + /* Initialize the LTC4245 chip */ +- /* TODO */ ++ i2c_smbus_write_byte_data(client, LTC4245_FAULT1, 0x00); ++ i2c_smbus_write_byte_data(client, LTC4245_FAULT2, 0x00); + + /* Register sysfs hooks */ + ret = sysfs_create_group(&client->dev.kobj, <c4245_group);
commit b6b9d69602aec2c869dd2ca730aab2cc58473c2d +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Wed Sep 23 22:59:43 2009 +0200 + + hwmon: (ltc4215) Clear faults at startup + + When power is applied to the ltc4215 chip it sometimes reports spurious + faults. The faults are not yet exposed via sysfs, however it may be useful + for userspace to read the fault register directly with the i2cget command. + Clear the fault register when the driver is installed so userspace doesn't + have to worry about spurious fault indications. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Signed-off-by: Jean Delvare <khali@linux-fr.org> + +diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c +index 9386e2a39211..6c9a04136e0a 100644 +--- a/drivers/hwmon/ltc4215.c ++++ b/drivers/hwmon/ltc4215.c +@@ -259,7 +259,7 @@ static int ltc4215_probe(struct i2c_client *client, + mutex_init(&data->update_lock); + + /* Initialize the LTC4215 chip */ +- /* TODO */ ++ i2c_smbus_write_byte_data(client, LTC4215_FAULT, 0x00); + + /* Register sysfs hooks */ + ret = sysfs_create_group(&client->dev.kobj, <c4215_group);
commit 49dc9efed05ad3e49000097ce1ec31cd3bbc909b
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Sep 23 22:59:41 2009 +0200
+
+ hwmon: (adm1031) Add sysfs files for temperature offsets
+
+ The ADM1030/ADM1031 chips have temperature offset registers, for both the
+ local and remote temperature sensors. Following the example set forth in
+ the LM90/ADM1032 driver, expose the offset registers to userspace.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Jean Delvare <khali@linux-fr.org>
+
+diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
+index 789441830cd8..56905955352c 100644
+--- a/drivers/hwmon/adm1031.c
++++ b/drivers/hwmon/adm1031.c
+@@ -37,6 +37,7 @@
+ #define ADM1031_REG_PWM (0x22)
+ #define ADM1031_REG_FAN_MIN(nr) (0x10 + (nr))
+
++#define ADM1031_REG_TEMP_OFFSET(nr) (0x0d + (nr))
+ #define ADM1031_REG_TEMP_MAX(nr) (0x14 + 4 * (nr))
+ #define ADM1031_REG_TEMP_MIN(nr) (0x15 + 4 * (nr))
+ #define ADM1031_REG_TEMP_CRIT(nr) (0x16 + 4 * (nr))
+@@ -93,6 +94,7 @@ struct adm1031_data {
+ u8 auto_temp_min[3];
+ u8 auto_temp_off[3];
+ u8 auto_temp_max[3];
++ s8 temp_offset[3];
+ s8 temp_min[3];
+ s8 temp_max[3];
+ s8 temp_crit[3];
+@@ -145,6 +147,10 @@ adm1031_write_value(struct i2c_client *client, u8 reg, unsigned int value)
+
+ #define TEMP_FROM_REG_EXT(val, ext) (TEMP_FROM_REG(val) + (ext) * 125)
+
++#define TEMP_OFFSET_TO_REG(val) (TEMP_TO_REG(val) & 0x8f)
++#define TEMP_OFFSET_FROM_REG(val) TEMP_FROM_REG((val) < 0 ? \
++ (val) | 0x70 : (val))
++
+ #define FAN_FROM_REG(reg, div) ((reg) ? (11250 * 60) / ((reg) * (div)) : 0)
+
+ static int FAN_TO_REG(int reg, int div)
+@@ -585,6 +591,14 @@ static ssize_t show_temp(struct device *dev,
+ (((data->ext_temp[nr] >> ((nr - 1) * 3)) & 7));
+ return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data->temp[nr], ext));
+ }
++static ssize_t show_temp_offset(struct device *dev,
++ struct device_attribute *attr, char *buf)
++{
++ int nr = to_sensor_dev_attr(attr)->index;
++ struct adm1031_data *data = adm1031_update_device(dev);
++ return sprintf(buf, "%d\n",
++ TEMP_OFFSET_FROM_REG(data->temp_offset[nr]));
++}
+ static ssize_t show_temp_min(struct device *dev,
+ struct device_attribute *attr, char *buf)
+ {
+@@ -606,6 +620,24 @@ static ssize_t show_temp_crit(struct device *dev,
+ struct adm1031_data *data = adm1031_update_device(dev);
+ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
+ }
++static ssize_t set_temp_offset(struct device *dev,
++ struct device_attribute *attr, const char *buf,
++ size_t count)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct adm1031_data *data = i2c_get_clientdata(client);
++ int nr = to_sensor_dev_attr(attr)->index;
++ int val;
++
++ val = simple_strtol(buf, NULL, 10);
++ val = SENSORS_LIMIT(val, -15000, 15000);
++ mutex_lock(&data->update_lock);
++ data->temp_offset[nr] = TEMP_OFFSET_TO_REG(val);
++ adm1031_write_value(client, ADM1031_REG_TEMP_OFFSET(nr),
++ data->temp_offset[nr]);
++ mutex_unlock(&data->update_lock);
++ return count;
++}
+ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+ {
+@@ -661,6 +693,8 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
+ #define temp_reg(offset) \
+ static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+ show_temp, NULL, offset - 1); \
++static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR, \
++ show_temp_offset, set_temp_offset, offset - 1); \
+ static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \
+ show_temp_min, set_temp_min, offset - 1); \
+ static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \
+@@ -714,6 +748,7 @@ static struct attribute *adm1031_attributes[] = {
+ &sensor_dev_attr_pwm1.dev_attr.attr,
+ &sensor_dev_attr_auto_fan1_channel.dev_attr.attr,
+ &sensor_dev_attr_temp1_input.dev_attr.attr,
++ &sensor_dev_attr_temp1_offset.dev_attr.attr,
+ &sensor_dev_attr_temp1_min.dev_attr.attr,
+ &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+ &sensor_dev_attr_temp1_max.dev_attr.attr,
+@@ -721,6 +756,7 @@ static struct attribute *adm1031_attributes[] = {
+ &sensor_dev_attr_temp1_crit.dev_attr.attr,
+ &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
+ &sensor_dev_attr_temp2_input.dev_attr.attr,
++ &sensor_dev_attr_temp2_offset.dev_attr.attr,
+ &sensor_dev_attr_temp2_min.dev_attr.attr,
+ &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
+ &sensor_dev_attr_temp2_max.dev_attr.attr,
+@@ -757,6 +793,7 @@ static struct attribute *adm1031_attributes_opt[] = {
+ &sensor_dev_attr_pwm2.dev_attr.attr,
+ &sensor_dev_attr_auto_fan2_channel.dev_attr.attr,
+ &sensor_dev_attr_temp3_input.dev_attr.attr,
++ &sensor_dev_attr_temp3_offset.dev_attr.attr,
+ &sensor_dev_attr_temp3_min.dev_attr.attr,
+ &sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
+ &sensor_dev_attr_temp3_max.dev_attr.attr,
+@@ -937,6 +974,9 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
+ }
+ data->temp[chan] = newh;
+
++ data->temp_offset[chan] =
++ adm1031_read_value(client,
++ ADM1031_REG_TEMP_OFFSET(chan));
+ data->temp_min[chan] =
+ adm1031_read_value(client,
+ ADM1031_REG_TEMP_MIN(chan));commit bbea0b6e0d214ef1511b9c6ccf3af26b38f0af7d
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Tue Sep 8 17:53:04 2009 -0700
+
+ fsldma: Add DMA_SLAVE support
+
+ Use the DMA_SLAVE capability of the DMAEngine API to copy/from a
+ scatterlist into an arbitrary list of hardware address/length pairs.
+
+ This allows a single DMA transaction to copy data from several different
+ devices into a scatterlist at the same time.
+
+ This also adds support to enable some controller-specific features such as
+ external start and external pause for a DMA transaction.
+
+ [dan.j.williams@intel.com: rebased on tx_list movement]
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Acked-by: Li Yang <leoli@freescale.com>
+ Acked-by: Kumar Gala <galak@kernel.crashing.org>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/arch/powerpc/include/asm/fsldma.h b/arch/powerpc/include/asm/fsldma.h
+new file mode 100644
+index 000000000000..a67aeed17d40
+--- /dev/null
++++ b/arch/powerpc/include/asm/fsldma.h
+@@ -0,0 +1,136 @@
++/*
++ * Freescale MPC83XX / MPC85XX DMA Controller
++ *
++ * Copyright (c) 2009 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++#ifndef __ARCH_POWERPC_ASM_FSLDMA_H__
++#define __ARCH_POWERPC_ASM_FSLDMA_H__
++
++#include <linux/dmaengine.h>
++
++/*
++ * Definitions for the Freescale DMA controller's DMA_SLAVE implemention
++ *
++ * The Freescale DMA_SLAVE implementation was designed to handle many-to-many
++ * transfers. An example usage would be an accelerated copy between two
++ * scatterlists. Another example use would be an accelerated copy from
++ * multiple non-contiguous device buffers into a single scatterlist.
++ *
++ * A DMA_SLAVE transaction is defined by a struct fsl_dma_slave. This
++ * structure contains a list of hardware addresses that should be copied
++ * to/from the scatterlist passed into device_prep_slave_sg(). The structure
++ * also has some fields to enable hardware-specific features.
++ */
++
++/**
++ * struct fsl_dma_hw_addr
++ * @entry: linked list entry
++ * @address: the hardware address
++ * @length: length to transfer
++ *
++ * Holds a single physical hardware address / length pair for use
++ * with the DMAEngine DMA_SLAVE API.
++ */
++struct fsl_dma_hw_addr {
++ struct list_head entry;
++
++ dma_addr_t address;
++ size_t length;
++};
++
++/**
++ * struct fsl_dma_slave
++ * @addresses: a linked list of struct fsl_dma_hw_addr structures
++ * @request_count: value for DMA request count
++ * @src_loop_size: setup and enable constant source-address DMA transfers
++ * @dst_loop_size: setup and enable constant destination address DMA transfers
++ * @external_start: enable externally started DMA transfers
++ * @external_pause: enable externally paused DMA transfers
++ *
++ * Holds a list of address / length pairs for use with the DMAEngine
++ * DMA_SLAVE API implementation for the Freescale DMA controller.
++ */
++struct fsl_dma_slave {
++
++ /* List of hardware address/length pairs */
++ struct list_head addresses;
++
++ /* Support for extra controller features */
++ unsigned int request_count;
++ unsigned int src_loop_size;
++ unsigned int dst_loop_size;
++ bool external_start;
++ bool external_pause;
++};
++
++/**
++ * fsl_dma_slave_append - add an address/length pair to a struct fsl_dma_slave
++ * @slave: the &struct fsl_dma_slave to add to
++ * @address: the hardware address to add
++ * @length: the length of bytes to transfer from @address
++ *
++ * Add a hardware address/length pair to a struct fsl_dma_slave. Returns 0 on
++ * success, -ERRNO otherwise.
++ */
++static inline int fsl_dma_slave_append(struct fsl_dma_slave *slave,
++ dma_addr_t address, size_t length)
++{
++ struct fsl_dma_hw_addr *addr;
++
++ addr = kzalloc(sizeof(*addr), GFP_ATOMIC);
++ if (!addr)
++ return -ENOMEM;
++
++ INIT_LIST_HEAD(&addr->entry);
++ addr->address = address;
++ addr->length = length;
++
++ list_add_tail(&addr->entry, &slave->addresses);
++ return 0;
++}
++
++/**
++ * fsl_dma_slave_free - free a struct fsl_dma_slave
++ * @slave: the struct fsl_dma_slave to free
++ *
++ * Free a struct fsl_dma_slave and all associated address/length pairs
++ */
++static inline void fsl_dma_slave_free(struct fsl_dma_slave *slave)
++{
++ struct fsl_dma_hw_addr *addr, *tmp;
++
++ if (slave) {
++ list_for_each_entry_safe(addr, tmp, &slave->addresses, entry) {
++ list_del(&addr->entry);
++ kfree(addr);
++ }
++
++ kfree(slave);
++ }
++}
++
++/**
++ * fsl_dma_slave_alloc - allocate a struct fsl_dma_slave
++ * @gfp: the flags to pass to kmalloc when allocating this structure
++ *
++ * Allocate a struct fsl_dma_slave for use by the DMA_SLAVE API. Returns a new
++ * struct fsl_dma_slave on success, or NULL on failure.
++ */
++static inline struct fsl_dma_slave *fsl_dma_slave_alloc(gfp_t gfp)
++{
++ struct fsl_dma_slave *slave;
++
++ slave = kzalloc(sizeof(*slave), gfp);
++ if (!slave)
++ return NULL;
++
++ INIT_LIST_HEAD(&slave->addresses);
++ return slave;
++}
++
++#endif /* __ARCH_POWERPC_ASM_FSLDMA_H__ */
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 7a0cb6064f83..296f9e747fac 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -34,6 +34,7 @@
+ #include <linux/dmapool.h>
+ #include <linux/of_platform.h>
+
++#include <asm/fsldma.h>
+ #include "fsldma.h"
+
+ static void dma_init(struct fsl_dma_chan *fsl_chan)
+@@ -551,6 +552,229 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ return NULL;
+ }
+
++/**
++ * fsl_dma_prep_slave_sg - prepare descriptors for a DMA_SLAVE transaction
++ * @chan: DMA channel
++ * @sgl: scatterlist to transfer to/from
++ * @sg_len: number of entries in @scatterlist
++ * @direction: DMA direction
++ * @flags: DMAEngine flags
++ *
++ * Prepare a set of descriptors for a DMA_SLAVE transaction. Following the
++ * DMA_SLAVE API, this gets the device-specific information from the
++ * chan->private variable.
++ */
++static struct dma_async_tx_descriptor *fsl_dma_prep_slave_sg(
++ struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,
++ enum dma_data_direction direction, unsigned long flags)
++{
++ struct fsl_dma_chan *fsl_chan;
++ struct fsl_desc_sw *first = NULL, *prev = NULL, *new = NULL;
++ struct fsl_dma_slave *slave;
++ struct list_head *tx_list;
++ size_t copy;
++
++ int i;
++ struct scatterlist *sg;
++ size_t sg_used;
++ size_t hw_used;
++ struct fsl_dma_hw_addr *hw;
++ dma_addr_t dma_dst, dma_src;
++
++ if (!chan)
++ return NULL;
++
++ if (!chan->private)
++ return NULL;
++
++ fsl_chan = to_fsl_chan(chan);
++ slave = chan->private;
++
++ if (list_empty(&slave->addresses))
++ return NULL;
++
++ hw = list_first_entry(&slave->addresses, struct fsl_dma_hw_addr, entry);
++ hw_used = 0;
++
++ /*
++ * Build the hardware transaction to copy from the scatterlist to
++ * the hardware, or from the hardware to the scatterlist
++ *
++ * If you are copying from the hardware to the scatterlist and it
++ * takes two hardware entries to fill an entire page, then both
++ * hardware entries will be coalesced into the same page
++ *
++ * If you are copying from the scatterlist to the hardware and a
++ * single page can fill two hardware entries, then the data will
++ * be read out of the page into the first hardware entry, and so on
++ */
++ for_each_sg(sgl, sg, sg_len, i) {
++ sg_used = 0;
++
++ /* Loop until the entire scatterlist entry is used */
++ while (sg_used < sg_dma_len(sg)) {
++
++ /*
++ * If we've used up the current hardware address/length
++ * pair, we need to load a new one
++ *
++ * This is done in a while loop so that descriptors with
++ * length == 0 will be skipped
++ */
++ while (hw_used >= hw->length) {
++
++ /*
++ * If the current hardware entry is the last
++ * entry in the list, we're finished
++ */
++ if (list_is_last(&hw->entry, &slave->addresses))
++ goto finished;
++
++ /* Get the next hardware address/length pair */
++ hw = list_entry(hw->entry.next,
++ struct fsl_dma_hw_addr, entry);
++ hw_used = 0;
++ }
++
++ /* Allocate the link descriptor from DMA pool */
++ new = fsl_dma_alloc_descriptor(fsl_chan);
++ if (!new) {
++ dev_err(fsl_chan->dev, "No free memory for "
++ "link descriptor\n");
++ goto fail;
++ }
++#ifdef FSL_DMA_LD_DEBUG
++ dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
++#endif
++
++ /*
++ * Calculate the maximum number of bytes to transfer,
++ * making sure it is less than the DMA controller limit
++ */
++ copy = min_t(size_t, sg_dma_len(sg) - sg_used,
++ hw->length - hw_used);
++ copy = min_t(size_t, copy, FSL_DMA_BCR_MAX_CNT);
++
++ /*
++ * DMA_FROM_DEVICE
++ * from the hardware to the scatterlist
++ *
++ * DMA_TO_DEVICE
++ * from the scatterlist to the hardware
++ */
++ if (direction == DMA_FROM_DEVICE) {
++ dma_src = hw->address + hw_used;
++ dma_dst = sg_dma_address(sg) + sg_used;
++ } else {
++ dma_src = sg_dma_address(sg) + sg_used;
++ dma_dst = hw->address + hw_used;
++ }
++
++ /* Fill in the descriptor */
++ set_desc_cnt(fsl_chan, &new->hw, copy);
++ set_desc_src(fsl_chan, &new->hw, dma_src);
++ set_desc_dest(fsl_chan, &new->hw, dma_dst);
++
++ /*
++ * If this is not the first descriptor, chain the
++ * current descriptor after the previous descriptor
++ */
++ if (!first) {
++ first = new;
++ } else {
++ set_desc_next(fsl_chan, &prev->hw,
++ new->async_tx.phys);
++ }
++
++ new->async_tx.cookie = 0;
++ async_tx_ack(&new->async_tx);
++
++ prev = new;
++ sg_used += copy;
++ hw_used += copy;
++
++ /* Insert the link descriptor into the LD ring */
++ list_add_tail(&new->node, &first->tx_list);
++ }
++ }
++
++finished:
++
++ /* All of the hardware address/length pairs had length == 0 */
++ if (!first || !new)
++ return NULL;
++
++ new->async_tx.flags = flags;
++ new->async_tx.cookie = -EBUSY;
++
++ /* Set End-of-link to the last link descriptor of new list */
++ set_ld_eol(fsl_chan, new);
++
++ /* Enable extra controller features */
++ if (fsl_chan->set_src_loop_size)
++ fsl_chan->set_src_loop_size(fsl_chan, slave->src_loop_size);
++
++ if (fsl_chan->set_dest_loop_size)
++ fsl_chan->set_dest_loop_size(fsl_chan, slave->dst_loop_size);
++
++ if (fsl_chan->toggle_ext_start)
++ fsl_chan->toggle_ext_start(fsl_chan, slave->external_start);
++
++ if (fsl_chan->toggle_ext_pause)
++ fsl_chan->toggle_ext_pause(fsl_chan, slave->external_pause);
++
++ if (fsl_chan->set_request_count)
++ fsl_chan->set_request_count(fsl_chan, slave->request_count);
++
++ return &first->async_tx;
++
++fail:
++ /* If first was not set, then we failed to allocate the very first
++ * descriptor, and we're done */
++ if (!first)
++ return NULL;
++
++ /*
++ * First is set, so all of the descriptors we allocated have been added
++ * to first->tx_list, INCLUDING "first" itself. Therefore we
++ * must traverse the list backwards freeing each descriptor in turn
++ *
++ * We're re-using variables for the loop, oh well
++ */
++ tx_list = &first->tx_list;
++ list_for_each_entry_safe_reverse(new, prev, tx_list, node) {
++ list_del_init(&new->node);
++ dma_pool_free(fsl_chan->desc_pool, new, new->async_tx.phys);
++ }
++
++ return NULL;
++}
++
++static void fsl_dma_device_terminate_all(struct dma_chan *chan)
++{
++ struct fsl_dma_chan *fsl_chan;
++ struct fsl_desc_sw *desc, *tmp;
++ unsigned long flags;
++
++ if (!chan)
++ return;
++
++ fsl_chan = to_fsl_chan(chan);
++
++ /* Halt the DMA engine */
++ dma_halt(fsl_chan);
++
++ spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++
++ /* Remove and free all of the descriptors in the LD queue */
++ list_for_each_entry_safe(desc, tmp, &fsl_chan->ld_queue, node) {
++ list_del(&desc->node);
++ dma_pool_free(fsl_chan->desc_pool, desc, desc->async_tx.phys);
++ }
++
++ spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
++}
++
+ /**
+ * fsl_dma_update_completed_cookie - Update the completed cookie.
+ * @fsl_chan : Freescale DMA channel
+@@ -977,12 +1201,15 @@ static int __devinit of_fsl_dma_probe(struct of_device *dev,
+
+ dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
+ dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
++ dma_cap_set(DMA_SLAVE, fdev->common.cap_mask);
+ fdev->common.device_alloc_chan_resources = fsl_dma_alloc_chan_resources;
+ fdev->common.device_free_chan_resources = fsl_dma_free_chan_resources;
+ fdev->common.device_prep_dma_interrupt = fsl_dma_prep_interrupt;
+ fdev->common.device_prep_dma_memcpy = fsl_dma_prep_memcpy;
+ fdev->common.device_is_tx_complete = fsl_dma_is_complete;
+ fdev->common.device_issue_pending = fsl_dma_memcpy_issue_pending;
++ fdev->common.device_prep_slave_sg = fsl_dma_prep_slave_sg;
++ fdev->common.device_terminate_all = fsl_dma_device_terminate_all;
+ fdev->common.dev = &dev->dev;
+
+ fdev->irq = irq_of_parse_and_map(dev->node, 0);commit e6c7ecb64e08ef346cb7062b4a5421f00bc602bd
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Tue Sep 8 17:53:04 2009 -0700
+
+ fsldma: split apart external pause and request count features
+
+ When using the Freescale DMA controller in external control mode, both the
+ request count and external pause bits need to be setup correctly. This was
+ being done with the same function.
+
+ The 83xx controller lacks the external pause feature, but has a similar
+ feature called external start. This feature requires that the request count
+ bits be setup correctly.
+
+ Split the function into two parts, to make it possible to use the external
+ start feature on the 83xx controller.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 73dd74823195..7a0cb6064f83 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -280,28 +280,40 @@ static void fsl_chan_set_dest_loop_size(struct fsl_dma_chan *fsl_chan, int size)
+ }
+
+ /**
+- * fsl_chan_toggle_ext_pause - Toggle channel external pause status
++ * fsl_chan_set_request_count - Set DMA Request Count for external control
+ * @fsl_chan : Freescale DMA channel
+- * @size : Pause control size, 0 for disable external pause control.
+- * The maximum is 1024.
++ * @size : Number of bytes to transfer in a single request
++ *
++ * The Freescale DMA channel can be controlled by the external signal DREQ#.
++ * The DMA request count is how many bytes are allowed to transfer before
++ * pausing the channel, after which a new assertion of DREQ# resumes channel
++ * operation.
+ *
+- * The Freescale DMA channel can be controlled by the external
+- * signal DREQ#. The pause control size is how many bytes are allowed
+- * to transfer before pausing the channel, after which a new assertion
+- * of DREQ# resumes channel operation.
++ * A size of 0 disables external pause control. The maximum size is 1024.
+ */
+-static void fsl_chan_toggle_ext_pause(struct fsl_dma_chan *fsl_chan, int size)
++static void fsl_chan_set_request_count(struct fsl_dma_chan *fsl_chan, int size)
+ {
+- if (size > 1024)
+- return;
++ BUG_ON(size > 1024);
++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
++ DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
++ | ((__ilog2(size) << 24) & 0x0f000000),
++ 32);
++}
+
+- if (size) {
+- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+- DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
+- | ((__ilog2(size) << 24) & 0x0f000000),
+- 32);
++/**
++ * fsl_chan_toggle_ext_pause - Toggle channel external pause status
++ * @fsl_chan : Freescale DMA channel
++ * @enable : 0 is disabled, 1 is enabled.
++ *
++ * The Freescale DMA channel can be controlled by the external signal DREQ#.
++ * The DMA Request Count feature should be used in addition to this feature
++ * to set the number of bytes to transfer before pausing the channel.
++ */
++static void fsl_chan_toggle_ext_pause(struct fsl_dma_chan *fsl_chan, int enable)
++{
++ if (enable)
+ fsl_chan->feature |= FSL_DMA_CHAN_PAUSE_EXT;
+- } else
++ else
+ fsl_chan->feature &= ~FSL_DMA_CHAN_PAUSE_EXT;
+ }
+
+@@ -885,6 +897,7 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+ new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
+ new_fsl_chan->set_src_loop_size = fsl_chan_set_src_loop_size;
+ new_fsl_chan->set_dest_loop_size = fsl_chan_set_dest_loop_size;
++ new_fsl_chan->set_request_count = fsl_chan_set_request_count;
+ }
+
+ spin_lock_init(&new_fsl_chan->desc_lock);
+diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
+index 4493afed53f0..0df14cbb8ca3 100644
+--- a/drivers/dma/fsldma.h
++++ b/drivers/dma/fsldma.h
+@@ -144,10 +144,11 @@ struct fsl_dma_chan {
+ struct tasklet_struct tasklet;
+ u32 feature;
+
+- void (*toggle_ext_pause)(struct fsl_dma_chan *fsl_chan, int size);
++ void (*toggle_ext_pause)(struct fsl_dma_chan *fsl_chan, int enable);
+ void (*toggle_ext_start)(struct fsl_dma_chan *fsl_chan, int enable);
+ void (*set_src_loop_size)(struct fsl_dma_chan *fsl_chan, int size);
+ void (*set_dest_loop_size)(struct fsl_dma_chan *fsl_chan, int size);
++ void (*set_request_count)(struct fsl_dma_chan *fsl_chan, int size);
+ };
+
+ #define to_fsl_chan(chan) container_of(chan, struct fsl_dma_chan, common)commit 43a1a3ed6bf5a1b9ae197b4f5f20033baf19db61
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu May 28 09:26:40 2009 +0000
+
+ fsldma: do not clear bandwidth control bits on the 83xx controller
+
+ The 83xx controller does not support the external pause feature. The bit
+ in the mode register that controls external pause on the 85xx controller
+ happens to be part of the bandwidth control settings for the 83xx
+ controller.
+
+ This patch fixes the driver so that it only clears the external pause bit
+ if the hardware is the 85xx controller. When driving the 83xx controller,
+ the bit is left untouched. This follows the existing convention that mode
+ registers settings are not touched unless necessary.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 10bcf0cb0efc..6e60c77a145c 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -147,10 +147,11 @@ static void dma_start(struct fsl_dma_chan *fsl_chan)
+ if (fsl_chan->feature & FSL_DMA_CHAN_PAUSE_EXT) {
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->bcr, 0, 32);
+ mr_set |= FSL_DMA_MR_EMP_EN;
+- } else
++ } else if ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX) {
+ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
+ DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32)
+ & ~FSL_DMA_MR_EMP_EN, 32);
++ }
+
+ if (fsl_chan->feature & FSL_DMA_CHAN_START_EXT)
+ mr_set |= FSL_DMA_MR_EMS_EN;commit be30b226f2ae618cd719e40267d9923db1db9001
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Thu May 28 09:20:42 2009 +0000
+
+ fsldma: enable external start for the 83xx controller
+
+ The 83xx controller has external start capability, but lacks external pause
+ capability. Hook up the external start function pointer for the 83xx
+ controller.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index a1cb25e277b5..10bcf0cb0efc 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -877,9 +877,9 @@ static int __devinit fsl_dma_chan_probe(struct fsl_dma_device *fdev,
+
+ switch (new_fsl_chan->feature & FSL_DMA_IP_MASK) {
+ case FSL_DMA_IP_85XX:
+- new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
+ new_fsl_chan->toggle_ext_pause = fsl_chan_toggle_ext_pause;
+ case FSL_DMA_IP_83XX:
++ new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
+ new_fsl_chan->set_src_loop_size = fsl_chan_set_src_loop_size;
+ new_fsl_chan->set_dest_loop_size = fsl_chan_set_dest_loop_size;
+ }
+ commit a7aea373b4ca428f1be2c1fedd2f26c8e3f2864d +Author: Ira W. Snyder <iws@ovro.caltech.edu> +Date: Thu Apr 23 16:17:54 2009 -0700 + + fsldma: use PCI Read Multiple command + + By default, the Freescale 83xx DMA controller uses the PCI Read Line + command when reading data over the PCI bus. Setting the controller to use + the PCI Read Multiple command instead allows the controller to read much + larger bursts of data, which provides a drastic speed increase. + + The slowdown due to using PCI Read Line was only observed when a PCI-to-PCI + bridge was between the devices trying to communicate. + + A simple test driver showed an increase from 4MB/sec to 116MB/sec when + performing DMA over the PCI bus. Using DMA to transfer between blocks of + local SDRAM showed no change in performance with this patch. The dmatest + driver was also used to verify the correctness of the transfers, and showed + no errors. + + Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> + Acked-by: Timur Tabi <timur@freescale.com> + Acked-by: Kumar Gala <galak@kernel.crashing.org> + Signed-off-by: Dan Williams <dan.j.williams@intel.com> + +diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c +index f18d1bde0439..a1cb25e277b5 100644 +--- a/drivers/dma/fsldma.c ++++ b/drivers/dma/fsldma.c +@@ -12,6 +12,11 @@ + * also fit for MPC8560, MPC8555, MPC8548, MPC8641, and etc. + * The support for MPC8349 DMA contorller is also added. + * ++ * This driver instructs the DMA controller to issue the PCI Read Multiple ++ * command for PCI read operations, instead of using the default PCI Read Line ++ * command. Please be aware that this setting may result in read pre-fetching ++ * on some platforms. ++ * + * This 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 +@@ -49,9 +54,10 @@ static void dma_init(struct fsl_dma_chan *fsl_chan) + case FSL_DMA_IP_83XX: + /* Set the channel to below modes: + * EOTIE - End-of-transfer interrupt enable ++ * PRC_RM - PCI read multiple + */ +- DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, FSL_DMA_MR_EOTIE, +- 32); ++ DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr, FSL_DMA_MR_EOTIE ++ | FSL_DMA_MR_PRC_RM, 32); + break; + } + +diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h +index 4f21a512d848..dc7f26865797 100644 +--- a/drivers/dma/fsldma.h ++++ b/drivers/dma/fsldma.h +@@ -38,6 +38,7 @@ + + /* Special MR definition for MPC8349 */ + #define FSL_DMA_MR_EOTIE 0x00000080 ++#define FSL_DMA_MR_PRC_RM 0x00000800 + + #define FSL_DMA_SR_CH 0x00000020 + #define FSL_DMA_SR_PE 0x00000010
commit 2e077f8e8337e52eef3c39c24c31e103b11a0326
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri May 15 09:59:46 2009 -0700
+
+ fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
+
+ When preparing a memcpy operation, if the kernel fails to allocate memory
+ for a link descriptor after the first link descriptor has already been
+ allocated, then some memory will never be released. Fix the problem by
+ walking the list of allocated descriptors backwards, and freeing the
+ allocated descriptors back into the DMA pool.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Li Yang <leoli@freescale.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index ff9194d7ebb7..15783102bf17 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -462,8 +462,8 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ {
+ struct fsl_dma_chan *fsl_chan;
+ struct fsl_desc_sw *first = NULL, *prev = NULL, *new;
++ struct list_head *list;
+ size_t copy;
+- LIST_HEAD(link_chain);
+
+ if (!chan)
+ return NULL;
+@@ -480,7 +480,7 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ if (!new) {
+ dev_err(fsl_chan->dev,
+ "No free memory for link descriptor\n");
+- return NULL;
++ goto fail;
+ }
+ #ifdef FSL_DMA_LD_DEBUG
+ dev_dbg(fsl_chan->dev, "new link desc alloc %p\n", new);
+@@ -515,7 +515,19 @@ static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
+ /* Set End-of-link to the last link descriptor of new list*/
+ set_ld_eol(fsl_chan, new);
+
+- return first ? &first->async_tx : NULL;
++ return &first->async_tx;
++
++fail:
++ if (!first)
++ return NULL;
++
++ list = &first->async_tx.tx_list;
++ list_for_each_entry_safe_reverse(new, prev, list, node) {
++ list_del(&new->node);
++ dma_pool_free(fsl_chan->desc_pool, new, new->async_tx.phys);
++ }
++
++ return NULL;
+ }
+
+ /**commit 776c8943f2766f2819fafd88fdfbaf418ecd6e41
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri May 15 11:33:20 2009 -0700
+
+ fsldma: snooping is not enabled for last entry in descriptor chain
+
+ On the 83xx controller, snooping is necessary for the DMA controller to
+ ensure cache coherence with the CPU when transferring to/from RAM.
+
+ The last descriptor in a chain will always have the End-of-Chain interrupt
+ bit set, so we can set the snoop bit while adding the End-of-Chain
+ interrupt bit.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Li Yang <leoli@freescale.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 7313a1ae5f83..ff9194d7ebb7 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -179,9 +179,14 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
+ static void set_ld_eol(struct fsl_dma_chan *fsl_chan,
+ struct fsl_desc_sw *desc)
+ {
++ u64 snoop_bits;
++
++ snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_83XX)
++ ? FSL_DMA_SNEN : 0;
++
+ desc->hw.next_ln_addr = CPU_TO_DMA(fsl_chan,
+- DMA_TO_CPU(fsl_chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL,
+- 64);
++ DMA_TO_CPU(fsl_chan, desc->hw.next_ln_addr, 64) | FSL_DMA_EOL
++ | snoop_bits, 64);
+ }
+
+ static void append_ld_queue(struct fsl_dma_chan *fsl_chan,commit bcfb7465c03a8c62c89da374677df56f6b894d44
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Fri May 15 14:27:16 2009 -0700
+
+ fsldma: fix infinite loop on multi-descriptor DMA chain completion
+
+ When creating a DMA transaction with multiple descriptors, the async_tx
+ cookie is set to 0 for each descriptor in the chain, excluding the last
+ descriptor, whose cookie is set to -EBUSY.
+
+ When fsl_dma_tx_submit() is run, it only assigns a cookie to the first
+ descriptor. All of the remaining descriptors keep their original value,
+ including the last descriptor, which is set to -EBUSY.
+
+ After the DMA completes, the driver will update the last completed cookie
+ to be -EBUSY, which is an error code instead of a valid cookie. This causes
+ dma_async_is_complete() to always return DMA_IN_PROGRESS.
+
+ This causes the fsldma driver to never cleanup the queue of link
+ descriptors, and the driver will re-run the DMA transaction on the hardware
+ each time it receives the End-of-Chain interrupt. This causes an infinite
+ loop.
+
+ With this patch, fsl_dma_tx_submit() is changed to assign a cookie to every
+ descriptor in the chain. The rest of the code then works without problems.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Li Yang <leoli@freescale.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index a4151c3bb78b..7313a1ae5f83 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -313,8 +313,8 @@ static void fsl_chan_toggle_ext_start(struct fsl_dma_chan *fsl_chan, int enable)
+
+ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ {
+- struct fsl_desc_sw *desc = tx_to_fsl_desc(tx);
+ struct fsl_dma_chan *fsl_chan = to_fsl_chan(tx->chan);
++ struct fsl_desc_sw *desc;
+ unsigned long flags;
+ dma_cookie_t cookie;
+
+@@ -322,14 +322,17 @@ static dma_cookie_t fsl_dma_tx_submit(struct dma_async_tx_descriptor *tx)
+ spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+
+ cookie = fsl_chan->common.cookie;
+- cookie++;
+- if (cookie < 0)
+- cookie = 1;
+- desc->async_tx.cookie = cookie;
+- fsl_chan->common.cookie = desc->async_tx.cookie;
+-
+- append_ld_queue(fsl_chan, desc);
+- list_splice_init(&desc->async_tx.tx_list, fsl_chan->ld_queue.prev);
++ list_for_each_entry(desc, &tx->tx_list, node) {
++ cookie++;
++ if (cookie < 0)
++ cookie = 1;
++
++ desc->async_tx.cookie = cookie;
++ }
++
++ fsl_chan->common.cookie = cookie;
++ append_ld_queue(fsl_chan, tx_to_fsl_desc(tx));
++ list_splice_init(&tx->tx_list, fsl_chan->ld_queue.prev);
+
+ spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
+ commit 138ef0185177a6d221d24b6aa8f12d867fbbef90
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Tue May 19 15:42:13 2009 -0700
+
+ fsldma: fix "DMA halt timeout!" errors
+
+ When using the DMA controller from multiple threads at the same time, it is
+ possible to get lots of "DMA halt timeout!" errors printed to the kernel
+ log.
+
+ This occurs due to a race between fsl_dma_memcpy_issue_pending() and the
+ interrupt handler, fsl_dma_chan_do_interrupt(). Both call the
+ fsl_chan_xfer_ld_queue() function, which does not protect against
+ concurrent accesses to dma_halt() and dma_start().
+
+ The existing spinlock is moved to cover the dma_halt() and dma_start()
+ functions. Testing shows that the "DMA halt timeout!" errors disappear.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Li Yang <leoli@freescale.com>
+
+diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
+index 391b1bd7098b..a4151c3bb78b 100644
+--- a/drivers/dma/fsldma.c
++++ b/drivers/dma/fsldma.c
+@@ -598,15 +598,16 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
+ dma_addr_t next_dest_addr;
+ unsigned long flags;
+
++ spin_lock_irqsave(&fsl_chan->desc_lock, flags);
++
+ if (!dma_is_idle(fsl_chan))
+- return;
++ goto out_unlock;
+
+ dma_halt(fsl_chan);
+
+ /* If there are some link descriptors
+ * not transfered in queue. We need to start it.
+ */
+- spin_lock_irqsave(&fsl_chan->desc_lock, flags);
+
+ /* Find the first un-transfer desciptor */
+ for (ld_node = fsl_chan->ld_queue.next;
+@@ -617,8 +618,6 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
+ fsl_chan->common.cookie) == DMA_SUCCESS);
+ ld_node = ld_node->next);
+
+- spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
+-
+ if (ld_node != &fsl_chan->ld_queue) {
+ /* Get the ld start address from ld_queue */
+ next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
+@@ -630,6 +629,9 @@ static void fsl_chan_xfer_ld_queue(struct fsl_dma_chan *fsl_chan)
+ set_cdar(fsl_chan, 0);
+ set_ndar(fsl_chan, 0);
+ }
++
++out_unlock:
++ spin_unlock_irqrestore(&fsl_chan->desc_lock, flags);
+ }
+
+ /**commit 72f5de92e199f96cfcea125aefc76c138d8c553c
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Tue Mar 31 15:24:29 2009 -0700
+
+ hwmon: Add LTC4215 driver
+
+ Add Linux support for the Linear Technology LTC4215 Hot Swap controller
+ I2C monitoring interface.
+
+ I have tested the driver with my board, and it appears to work fine. With
+ the power supplies disabled, it reads 11.93V input, 1.93V output, no
+ current and no power. With the supplies enabled, it reads 11.93V input,
+ 11.98V output, no current, no power. I'm not drawing any current at the
+ moment, so this is reasonable. The value in the sense register never
+ reads anything except 0, so I expect to get zero from the current and
+ power calculations.
+
+ I didn't attempt to support changing any of the chip's settings or
+ enabling the FET. I'm not sure even how to do that and still fit within
+ the hwmon framework. :)
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Cc: Jean Delvare <khali@linux-fr.org>
+ Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/Documentation/hwmon/ltc4215 b/Documentation/hwmon/ltc4215
+new file mode 100644
+index 000000000000..2e6a21eb656c
+--- /dev/null
++++ b/Documentation/hwmon/ltc4215
+@@ -0,0 +1,50 @@
++Kernel driver ltc4215
++=====================
++
++Supported chips:
++ * Linear Technology LTC4215
++ Prefix: 'ltc4215'
++ Addresses scanned: 0x44
++ Datasheet:
++ http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1163,P17572,D12697
++
++Author: Ira W. Snyder <iws@ovro.caltech.edu>
++
++
++Description
++-----------
++
++The LTC4215 controller allows a board to be safely inserted and removed
++from a live backplane.
++
++
++Usage Notes
++-----------
++
++This driver does not probe for LTC4215 devices, due to the fact that some
++of the possible addresses are unfriendly to probing. You will need to use
++the "force" parameter to tell the driver where to find the device.
++
++Example: the following will load the driver for an LTC4215 at address 0x44
++on I2C bus #0:
++$ modprobe ltc4215 force=0,0x44
++
++
++Sysfs entries
++-------------
++
++The LTC4215 has built-in limits for overvoltage, undervoltage, and
++undercurrent warnings. This makes it very likely that the reference
++circuit will be used.
++
++in1_input input voltage
++in2_input output voltage
++
++in1_min_alarm input undervoltage alarm
++in1_max_alarm input overvoltage alarm
++
++curr1_input current
++curr1_max_alarm overcurrent alarm
++
++power1_input power usage
++power1_alarm power bad alarm
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 8a91c9971558..bc6810c22dd7 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -571,6 +571,17 @@ config SENSORS_LM93
+ This driver can also be built as a module. If so, the module
+ will be called lm93.
+
++config SENSORS_LTC4215
++ tristate "Linear Technology LTC4215"
++ depends on I2C && EXPERIMENTAL
++ default n
++ help
++ If you say yes here you get support for Linear Technology LTC4215
++ Hot Swap Controller I2C interface.
++
++ This driver can also be built as a module. If so, the module will
++ be called ltc4215.
++
+ config SENSORS_LTC4245
+ tristate "Linear Technology LTC4245"
+ depends on I2C && EXPERIMENTAL
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 81c88822a3eb..4da261d16abf 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -65,6 +65,7 @@ obj-$(CONFIG_SENSORS_LM90) += lm90.o
+ obj-$(CONFIG_SENSORS_LM92) += lm92.o
+ obj-$(CONFIG_SENSORS_LM93) += lm93.o
+ obj-$(CONFIG_SENSORS_LM95241) += lm95241.o
++obj-$(CONFIG_SENSORS_LTC4215) += ltc4215.o
+ obj-$(CONFIG_SENSORS_LTC4245) += ltc4245.o
+ obj-$(CONFIG_SENSORS_MAX1111) += max1111.o
+ obj-$(CONFIG_SENSORS_MAX1619) += max1619.o
+diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c
+new file mode 100644
+index 000000000000..9386e2a39211
+--- /dev/null
++++ b/drivers/hwmon/ltc4215.c
+@@ -0,0 +1,364 @@
++/*
++ * Driver for Linear Technology LTC4215 I2C Hot Swap Controller
++ *
++ * Copyright (C) 2009 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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; version 2 of the License.
++ *
++ * Datasheet:
++ * http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1163,P17572,D12697
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++
++static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
++
++/* Insmod parameters */
++I2C_CLIENT_INSMOD_1(ltc4215);
++
++/* Here are names of the chip's registers (a.k.a. commands) */
++enum ltc4215_cmd {
++ LTC4215_CONTROL = 0x00, /* rw */
++ LTC4215_ALERT = 0x01, /* rw */
++ LTC4215_STATUS = 0x02, /* ro */
++ LTC4215_FAULT = 0x03, /* rw */
++ LTC4215_SENSE = 0x04, /* rw */
++ LTC4215_SOURCE = 0x05, /* rw */
++ LTC4215_ADIN = 0x06, /* rw */
++};
++
++struct ltc4215_data {
++ struct device *hwmon_dev;
++
++ struct mutex update_lock;
++ bool valid;
++ unsigned long last_updated; /* in jiffies */
++
++ /* Registers */
++ u8 regs[7];
++};
++
++static struct ltc4215_data *ltc4215_update_device(struct device *dev)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct ltc4215_data *data = i2c_get_clientdata(client);
++ s32 val;
++ int i;
++
++ mutex_lock(&data->update_lock);
++
++ /* The chip's A/D updates 10 times per second */
++ if (time_after(jiffies, data->last_updated + HZ / 10) || !data->valid) {
++
++ dev_dbg(&client->dev, "Starting ltc4215 update\n");
++
++ /* Read all registers */
++ for (i = 0; i < ARRAY_SIZE(data->regs); i++) {
++ val = i2c_smbus_read_byte_data(client, i);
++ if (unlikely(val < 0))
++ data->regs[i] = 0;
++ else
++ data->regs[i] = val;
++ }
++
++ data->last_updated = jiffies;
++ data->valid = 1;
++ }
++
++ mutex_unlock(&data->update_lock);
++
++ return data;
++}
++
++/* Return the voltage from the given register in millivolts */
++static int ltc4215_get_voltage(struct device *dev, u8 reg)
++{
++ struct ltc4215_data *data = ltc4215_update_device(dev);
++ const u8 regval = data->regs[reg];
++ u32 voltage = 0;
++
++ switch (reg) {
++ case LTC4215_SENSE:
++ /* 151 uV per increment */
++ voltage = regval * 151 / 1000;
++ break;
++ case LTC4215_SOURCE:
++ /* 60.5 mV per increment */
++ voltage = regval * 605 / 10;
++ break;
++ case LTC4215_ADIN:
++ /* The ADIN input is divided by 12.5, and has 4.82 mV
++ * per increment, so we have the additional multiply */
++ voltage = regval * 482 * 125 / 1000;
++ break;
++ default:
++ /* If we get here, the developer messed up */
++ WARN_ON_ONCE(1);
++ break;
++ }
++
++ return voltage;
++}
++
++/* Return the current from the sense resistor in mA */
++static unsigned int ltc4215_get_current(struct device *dev)
++{
++ struct ltc4215_data *data = ltc4215_update_device(dev);
++
++ /* The strange looking conversions that follow are fixed-point
++ * math, since we cannot do floating point in the kernel.
++ *
++ * Step 1: convert sense register to microVolts
++ * Step 2: convert voltage to milliAmperes
++ *
++ * If you play around with the V=IR equation, you come up with
++ * the following: X uV / Y mOhm == Z mA
++ *
++ * With the resistors that are fractions of a milliOhm, we multiply
++ * the voltage and resistance by 10, to shift the decimal point.
++ * Now we can use the normal division operator again.
++ */
++
++ /* Calculate voltage in microVolts (151 uV per increment) */
++ const unsigned int voltage = data->regs[LTC4215_SENSE] * 151;
++
++ /* Calculate current in milliAmperes (4 milliOhm sense resistor) */
++ const unsigned int curr = voltage / 4;
++
++ return curr;
++}
++
++static ssize_t ltc4215_show_voltage(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
++ const int voltage = ltc4215_get_voltage(dev, attr->index);
++
++ return snprintf(buf, PAGE_SIZE, "%d\n", voltage);
++}
++
++static ssize_t ltc4215_show_current(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ const unsigned int curr = ltc4215_get_current(dev);
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", curr);
++}
++
++static ssize_t ltc4215_show_power(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ const unsigned int curr = ltc4215_get_current(dev);
++ const int output_voltage = ltc4215_get_voltage(dev, LTC4215_ADIN);
++
++ /* current in mA * voltage in mV == power in uW */
++ const unsigned int power = abs(output_voltage * curr);
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", power);
++}
++
++static ssize_t ltc4215_show_alarm(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(da);
++ struct ltc4215_data *data = ltc4215_update_device(dev);
++ const u8 reg = data->regs[attr->index];
++ const u32 mask = attr->nr;
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", (reg & mask) ? 1 : 0);
++}
++
++/* These macros are used below in constructing device attribute objects
++ * for use with sysfs_create_group() to make a sysfs device file
++ * for each register.
++ */
++
++#define LTC4215_VOLTAGE(name, ltc4215_cmd_idx) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4215_show_voltage, NULL, ltc4215_cmd_idx)
++
++#define LTC4215_CURRENT(name) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4215_show_current, NULL, 0);
++
++#define LTC4215_POWER(name) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4215_show_power, NULL, 0);
++
++#define LTC4215_ALARM(name, mask, reg) \
++ static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
++ ltc4215_show_alarm, NULL, (mask), reg)
++
++/* Construct a sensor_device_attribute structure for each register */
++
++/* Current */
++LTC4215_CURRENT(curr1_input);
++LTC4215_ALARM(curr1_max_alarm, (1 << 2), LTC4215_STATUS);
++
++/* Power (virtual) */
++LTC4215_POWER(power1_input);
++LTC4215_ALARM(power1_alarm, (1 << 3), LTC4215_STATUS);
++
++/* Input Voltage */
++LTC4215_VOLTAGE(in1_input, LTC4215_ADIN);
++LTC4215_ALARM(in1_max_alarm, (1 << 0), LTC4215_STATUS);
++LTC4215_ALARM(in1_min_alarm, (1 << 1), LTC4215_STATUS);
++
++/* Output Voltage */
++LTC4215_VOLTAGE(in2_input, LTC4215_SOURCE);
++
++/* Finally, construct an array of pointers to members of the above objects,
++ * as required for sysfs_create_group()
++ */
++static struct attribute *ltc4215_attributes[] = {
++ &sensor_dev_attr_curr1_input.dev_attr.attr,
++ &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_power1_input.dev_attr.attr,
++ &sensor_dev_attr_power1_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_in1_input.dev_attr.attr,
++ &sensor_dev_attr_in1_max_alarm.dev_attr.attr,
++ &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_in2_input.dev_attr.attr,
++
++ NULL,
++};
++
++static const struct attribute_group ltc4215_group = {
++ .attrs = ltc4215_attributes,
++};
++
++static int ltc4215_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct ltc4215_data *data;
++ int ret;
++
++ data = kzalloc(sizeof(*data), GFP_KERNEL);
++ if (!data) {
++ ret = -ENOMEM;
++ goto out_kzalloc;
++ }
++
++ i2c_set_clientdata(client, data);
++ mutex_init(&data->update_lock);
++
++ /* Initialize the LTC4215 chip */
++ /* TODO */
++
++ /* Register sysfs hooks */
++ ret = sysfs_create_group(&client->dev.kobj, <c4215_group);
++ if (ret)
++ goto out_sysfs_create_group;
++
++ data->hwmon_dev = hwmon_device_register(&client->dev);
++ if (IS_ERR(data->hwmon_dev)) {
++ ret = PTR_ERR(data->hwmon_dev);
++ goto out_hwmon_device_register;
++ }
++
++ return 0;
++
++out_hwmon_device_register:
++ sysfs_remove_group(&client->dev.kobj, <c4215_group);
++out_sysfs_create_group:
++ kfree(data);
++out_kzalloc:
++ return ret;
++}
++
++static int ltc4215_remove(struct i2c_client *client)
++{
++ struct ltc4215_data *data = i2c_get_clientdata(client);
++
++ hwmon_device_unregister(data->hwmon_dev);
++ sysfs_remove_group(&client->dev.kobj, <c4215_group);
++
++ kfree(data);
++
++ return 0;
++}
++
++static int ltc4215_detect(struct i2c_client *client,
++ int kind,
++ struct i2c_board_info *info)
++{
++ struct i2c_adapter *adapter = client->adapter;
++
++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
++ return -ENODEV;
++
++ if (kind < 0) { /* probed detection - check the chip type */
++ s32 v; /* 8 bits from the chip, or -ERRNO */
++
++ /*
++ * Register 0x01 bit b7 is reserved, expect 0
++ * Register 0x03 bit b6 and b7 are reserved, expect 0
++ */
++ v = i2c_smbus_read_byte_data(client, LTC4215_ALERT);
++ if (v < 0 || (v & (1 << 7)) != 0)
++ return -ENODEV;
++
++ v = i2c_smbus_read_byte_data(client, LTC4215_FAULT);
++ if (v < 0 || (v & ((1 << 6) | (1 << 7))) != 0)
++ return -ENODEV;
++ }
++
++ strlcpy(info->type, "ltc4215", I2C_NAME_SIZE);
++ dev_info(&adapter->dev, "ltc4215 %s at address 0x%02x\n",
++ kind < 0 ? "probed" : "forced",
++ client->addr);
++
++ return 0;
++}
++
++static const struct i2c_device_id ltc4215_id[] = {
++ { "ltc4215", ltc4215 },
++ { }
++};
++MODULE_DEVICE_TABLE(i2c, ltc4215_id);
++
++/* This is the driver that will be inserted */
++static struct i2c_driver ltc4215_driver = {
++ .class = I2C_CLASS_HWMON,
++ .driver = {
++ .name = "ltc4215",
++ },
++ .probe = ltc4215_probe,
++ .remove = ltc4215_remove,
++ .id_table = ltc4215_id,
++ .detect = ltc4215_detect,
++ .address_data = &addr_data,
++};
++
++static int __init ltc4215_init(void)
++{
++ return i2c_add_driver(<c4215_driver);
++}
++
++static void __exit ltc4215_exit(void)
++{
++ i2c_del_driver(<c4215_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("LTC4215 driver");
++MODULE_LICENSE("GPL");
++
++module_init(ltc4215_init);
++module_exit(ltc4215_exit);commit 8527bec548e01a29c6d1928d20d6d3be71861482
+Author: Ira W. Snyder <iws@ovro.caltech.edu>
+Date: Mon Jan 26 21:00:33 2009 -0800
+
+ virtio_net: use correct accessors for scatterlists
+
+ Without this fix, virtio_net makes incorrect usage of scatterlists. It sets
+ the end of the scatterlist chain after the first element, despite the fact
+ that more entries come after it.
+
+ If you try to run dma_map_sg() on one of the scatterlists given to you by
+ add_buf(), you will get a null pointer oops.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
+index 63ef2a8905fb..c68808336c8c 100644
+--- a/drivers/net/virtio_net.c
++++ b/drivers/net/virtio_net.c
+@@ -287,7 +287,7 @@ static void try_fill_recv_maxbufs(struct virtnet_info *vi)
+ skb_put(skb, MAX_PACKET_LEN);
+
+ hdr = skb_vnet_hdr(skb);
+- sg_init_one(sg, hdr, sizeof(*hdr));
++ sg_set_buf(sg, hdr, sizeof(*hdr));
+
+ if (vi->big_packets) {
+ for (i = 0; i < MAX_SKB_FRAGS; i++) {
+@@ -488,9 +488,9 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
+
+ /* Encode metadata header at front. */
+ if (vi->mergeable_rx_bufs)
+- sg_init_one(sg, mhdr, sizeof(*mhdr));
++ sg_set_buf(sg, mhdr, sizeof(*mhdr));
+ else
+- sg_init_one(sg, hdr, sizeof(*hdr));
++ sg_set_buf(sg, hdr, sizeof(*hdr));
+
+ num = skb_to_sgvec(skb, sg+1, 0, skb->len) + 1;
+ commit 6e34b187bc216fc632769fb8b906d3a29ccd8f14
+Author: Ira Snyder <iws@ovro.caltech.edu>
+Date: Wed Jan 7 16:37:32 2009 +0100
+
+ hwmon: Add LTC4245 driver
+
+ Add Linux support for the Linear Technology LTC4245 Multiple Supply Hot
+ Swap controller I2C monitoring interface.
+
+ Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
+ Acked-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Jean Delvare <khali@linux-fr.org>
+
+diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
+new file mode 100644
+index 000000000000..bae7a3adc5d8
+--- /dev/null
++++ b/Documentation/hwmon/ltc4245
+@@ -0,0 +1,81 @@
++Kernel driver ltc4245
++=====================
++
++Supported chips:
++ * Linear Technology LTC4245
++ Prefix: 'ltc4245'
++ Addresses scanned: 0x20-0x3f
++ Datasheet:
++ http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1140,P19392,D13517
++
++Author: Ira W. Snyder <iws@ovro.caltech.edu>
++
++
++Description
++-----------
++
++The LTC4245 controller allows a board to be safely inserted and removed
++from a live backplane in multiple supply systems such as CompactPCI and
++PCI Express.
++
++
++Usage Notes
++-----------
++
++This driver does not probe for LTC4245 devices, due to the fact that some
++of the possible addresses are unfriendly to probing. You will need to use
++the "force" parameter to tell the driver where to find the device.
++
++Example: the following will load the driver for an LTC4245 at address 0x23
++on I2C bus #1:
++$ modprobe ltc4245 force=1,0x23
++
++
++Sysfs entries
++-------------
++
++The LTC4245 has built-in limits for over and under current warnings. This
++makes it very likely that the reference circuit will be used.
++
++This driver uses the values in the datasheet to change the register values
++into the values specified in the sysfs-interface document. The current readings
++rely on the sense resistors listed in Table 2: "Sense Resistor Values".
++
++in1_input 12v input voltage (mV)
++in2_input 5v input voltage (mV)
++in3_input 3v input voltage (mV)
++in4_input Vee (-12v) input voltage (mV)
++
++in1_min_alarm 12v input undervoltage alarm
++in2_min_alarm 5v input undervoltage alarm
++in3_min_alarm 3v input undervoltage alarm
++in4_min_alarm Vee (-12v) input undervoltage alarm
++
++curr1_input 12v current (mA)
++curr2_input 5v current (mA)
++curr3_input 3v current (mA)
++curr4_input Vee (-12v) current (mA)
++
++curr1_max_alarm 12v overcurrent alarm
++curr2_max_alarm 5v overcurrent alarm
++curr3_max_alarm 3v overcurrent alarm
++curr4_max_alarm Vee (-12v) overcurrent alarm
++
++in5_input 12v output voltage (mV)
++in6_input 5v output voltage (mV)
++in7_input 3v output voltage (mV)
++in8_input Vee (-12v) output voltage (mV)
++
++in5_min_alarm 12v output undervoltage alarm
++in6_min_alarm 5v output undervoltage alarm
++in7_min_alarm 3v output undervoltage alarm
++in8_min_alarm Vee (-12v) output undervoltage alarm
++
++in9_input GPIO #1 voltage data
++in10_input GPIO #2 voltage data
++in11_input GPIO #3 voltage data
++
++power1_input 12v power usage (mW)
++power2_input 5v power usage (mW)
++power3_input 3v power usage (mW)
++power4_input Vee (-12v) power usage (mW)
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index cc611e4b7896..1ef1205b4e8c 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -549,6 +549,17 @@ config SENSORS_LM93
+ This driver can also be built as a module. If so, the module
+ will be called lm93.
+
++config SENSORS_LTC4245
++ tristate "Linear Technology LTC4245"
++ depends on I2C && EXPERIMENTAL
++ default n
++ help
++ If you say yes here you get support for Linear Technology LTC4245
++ Multiple Supply Hot Swap Controller I2C interface.
++
++ This driver can also be built as a module. If so, the module will
++ be called ltc4245.
++
+ config SENSORS_MAX1111
+ tristate "Maxim MAX1111 Multichannel, Serial 8-bit ADC chip"
+ depends on SPI_MASTER
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 58fc5be5355d..8fd124eff646 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -62,6 +62,7 @@ obj-$(CONFIG_SENSORS_LM87) += lm87.o
+ obj-$(CONFIG_SENSORS_LM90) += lm90.o
+ obj-$(CONFIG_SENSORS_LM92) += lm92.o
+ obj-$(CONFIG_SENSORS_LM93) += lm93.o
++obj-$(CONFIG_SENSORS_LTC4245) += ltc4245.o
+ obj-$(CONFIG_SENSORS_MAX1111) += max1111.o
+ obj-$(CONFIG_SENSORS_MAX1619) += max1619.o
+ obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
+diff --git a/drivers/hwmon/ltc4245.c b/drivers/hwmon/ltc4245.c
+new file mode 100644
+index 000000000000..034b2c515848
+--- /dev/null
++++ b/drivers/hwmon/ltc4245.c
+@@ -0,0 +1,567 @@
++/*
++ * Driver for Linear Technology LTC4245 I2C Multiple Supply Hot Swap Controller
++ *
++ * Copyright (C) 2008 Ira W. Snyder <iws@ovro.caltech.edu>
++ *
++ * 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; version 2 of the License.
++ *
++ * This driver is based on the ds1621 and ina209 drivers.
++ *
++ * Datasheet:
++ * http://www.linear.com/pc/downloadDocument.do?navId=H0,C1,C1003,C1006,C1140,P19392,D13517
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/err.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/hwmon.h>
++#include <linux/hwmon-sysfs.h>
++
++/* Valid addresses are 0x20 - 0x3f
++ *
++ * For now, we do not probe, since some of these addresses
++ * are known to be unfriendly to probing */
++static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
++
++/* Insmod parameters */
++I2C_CLIENT_INSMOD_1(ltc4245);
++
++/* Here are names of the chip's registers (a.k.a. commands) */
++enum ltc4245_cmd {
++ LTC4245_STATUS = 0x00, /* readonly */
++ LTC4245_ALERT = 0x01,
++ LTC4245_CONTROL = 0x02,
++ LTC4245_ON = 0x03,
++ LTC4245_FAULT1 = 0x04,
++ LTC4245_FAULT2 = 0x05,
++ LTC4245_GPIO = 0x06,
++ LTC4245_ADCADR = 0x07,
++
++ LTC4245_12VIN = 0x10,
++ LTC4245_12VSENSE = 0x11,
++ LTC4245_12VOUT = 0x12,
++ LTC4245_5VIN = 0x13,
++ LTC4245_5VSENSE = 0x14,
++ LTC4245_5VOUT = 0x15,
++ LTC4245_3VIN = 0x16,
++ LTC4245_3VSENSE = 0x17,
++ LTC4245_3VOUT = 0x18,
++ LTC4245_VEEIN = 0x19,
++ LTC4245_VEESENSE = 0x1a,
++ LTC4245_VEEOUT = 0x1b,
++ LTC4245_GPIOADC1 = 0x1c,
++ LTC4245_GPIOADC2 = 0x1d,
++ LTC4245_GPIOADC3 = 0x1e,
++};
++
++struct ltc4245_data {
++ struct device *hwmon_dev;
++
++ struct mutex update_lock;
++ bool valid;
++ unsigned long last_updated; /* in jiffies */
++
++ /* Control registers */
++ u8 cregs[0x08];
++
++ /* Voltage registers */
++ u8 vregs[0x0f];
++};
++
++static struct ltc4245_data *ltc4245_update_device(struct device *dev)
++{
++ struct i2c_client *client = to_i2c_client(dev);
++ struct ltc4245_data *data = i2c_get_clientdata(client);
++ s32 val;
++ int i;
++
++ mutex_lock(&data->update_lock);
++
++ if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
++
++ dev_dbg(&client->dev, "Starting ltc4245 update\n");
++
++ /* Read control registers -- 0x00 to 0x07 */
++ for (i = 0; i < ARRAY_SIZE(data->cregs); i++) {
++ val = i2c_smbus_read_byte_data(client, i);
++ if (unlikely(val < 0))
++ data->cregs[i] = 0;
++ else
++ data->cregs[i] = val;
++ }
++
++ /* Read voltage registers -- 0x10 to 0x1f */
++ for (i = 0; i < ARRAY_SIZE(data->vregs); i++) {
++ val = i2c_smbus_read_byte_data(client, i+0x10);
++ if (unlikely(val < 0))
++ data->vregs[i] = 0;
++ else
++ data->vregs[i] = val;
++ }
++
++ data->last_updated = jiffies;
++ data->valid = 1;
++ }
++
++ mutex_unlock(&data->update_lock);
++
++ return data;
++}
++
++/* Return the voltage from the given register in millivolts */
++static int ltc4245_get_voltage(struct device *dev, u8 reg)
++{
++ struct ltc4245_data *data = ltc4245_update_device(dev);
++ const u8 regval = data->vregs[reg - 0x10];
++ u32 voltage = 0;
++
++ switch (reg) {
++ case LTC4245_12VIN:
++ case LTC4245_12VOUT:
++ voltage = regval * 55;
++ break;
++ case LTC4245_5VIN:
++ case LTC4245_5VOUT:
++ voltage = regval * 22;
++ break;
++ case LTC4245_3VIN:
++ case LTC4245_3VOUT:
++ voltage = regval * 15;
++ break;
++ case LTC4245_VEEIN:
++ case LTC4245_VEEOUT:
++ voltage = regval * -55;
++ break;
++ case LTC4245_GPIOADC1:
++ case LTC4245_GPIOADC2:
++ case LTC4245_GPIOADC3:
++ voltage = regval * 10;
++ break;
++ default:
++ /* If we get here, the developer messed up */
++ WARN_ON_ONCE(1);
++ break;
++ }
++
++ return voltage;
++}
++
++/* Return the current in the given sense register in milliAmperes */
++static unsigned int ltc4245_get_current(struct device *dev, u8 reg)
++{
++ struct ltc4245_data *data = ltc4245_update_device(dev);
++ const u8 regval = data->vregs[reg - 0x10];
++ unsigned int voltage;
++ unsigned int curr;
++
++ /* The strange looking conversions that follow are fixed-point
++ * math, since we cannot do floating point in the kernel.
++ *
++ * Step 1: convert sense register to microVolts
++ * Step 2: convert voltage to milliAmperes
++ *
++ * If you play around with the V=IR equation, you come up with
++ * the following: X uV / Y mOhm == Z mA
++ *
++ * With the resistors that are fractions of a milliOhm, we multiply
++ * the voltage and resistance by 10, to shift the decimal point.
++ * Now we can use the normal division operator again.
++ */
++
++ switch (reg) {
++ case LTC4245_12VSENSE:
++ voltage = regval * 250; /* voltage in uV */
++ curr = voltage / 50; /* sense resistor 50 mOhm */
++ break;
++ case LTC4245_5VSENSE:
++ voltage = regval * 125; /* voltage in uV */
++ curr = (voltage * 10) / 35; /* sense resistor 3.5 mOhm */
++ break;
++ case LTC4245_3VSENSE:
++ voltage = regval * 125; /* voltage in uV */
++ curr = (voltage * 10) / 25; /* sense resistor 2.5 mOhm */
++ break;
++ case LTC4245_VEESENSE:
++ voltage = regval * 250; /* voltage in uV */
++ curr = voltage / 100; /* sense resistor 100 mOhm */
++ break;
++ default:
++ /* If we get here, the developer messed up */
++ WARN_ON_ONCE(1);
++ curr = 0;
++ break;
++ }
++
++ return curr;
++}
++
++static ssize_t ltc4245_show_voltage(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
++ const int voltage = ltc4245_get_voltage(dev, attr->index);
++
++ return snprintf(buf, PAGE_SIZE, "%d\n", voltage);
++}
++
++static ssize_t ltc4245_show_current(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
++ const unsigned int curr = ltc4245_get_current(dev, attr->index);
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", curr);
++}
++
++static ssize_t ltc4245_show_power(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
++ const unsigned int curr = ltc4245_get_current(dev, attr->index);
++ const int output_voltage = ltc4245_get_voltage(dev, attr->index+1);
++
++ /* current in mA * voltage in mV == power in uW */
++ const unsigned int power = abs(output_voltage * curr);
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", power);
++}
++
++static ssize_t ltc4245_show_alarm(struct device *dev,
++ struct device_attribute *da,
++ char *buf)
++{
++ struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(da);
++ struct ltc4245_data *data = ltc4245_update_device(dev);
++ const u8 reg = data->cregs[attr->index];
++ const u32 mask = attr->nr;
++
++ return snprintf(buf, PAGE_SIZE, "%u\n", (reg & mask) ? 1 : 0);
++}
++
++/* These macros are used below in constructing device attribute objects
++ * for use with sysfs_create_group() to make a sysfs device file
++ * for each register.
++ */
++
++#define LTC4245_VOLTAGE(name, ltc4245_cmd_idx) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4245_show_voltage, NULL, ltc4245_cmd_idx)
++
++#define LTC4245_CURRENT(name, ltc4245_cmd_idx) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4245_show_current, NULL, ltc4245_cmd_idx)
++
++#define LTC4245_POWER(name, ltc4245_cmd_idx) \
++ static SENSOR_DEVICE_ATTR(name, S_IRUGO, \
++ ltc4245_show_power, NULL, ltc4245_cmd_idx)
++
++#define LTC4245_ALARM(name, mask, reg) \
++ static SENSOR_DEVICE_ATTR_2(name, S_IRUGO, \
++ ltc4245_show_alarm, NULL, (mask), reg)
++
++/* Construct a sensor_device_attribute structure for each register */
++
++/* Input voltages */
++LTC4245_VOLTAGE(in1_input, LTC4245_12VIN);
++LTC4245_VOLTAGE(in2_input, LTC4245_5VIN);
++LTC4245_VOLTAGE(in3_input, LTC4245_3VIN);
++LTC4245_VOLTAGE(in4_input, LTC4245_VEEIN);
++
++/* Input undervoltage alarms */
++LTC4245_ALARM(in1_min_alarm, (1 << 0), LTC4245_FAULT1);
++LTC4245_ALARM(in2_min_alarm, (1 << 1), LTC4245_FAULT1);
++LTC4245_ALARM(in3_min_alarm, (1 << 2), LTC4245_FAULT1);
++LTC4245_ALARM(in4_min_alarm, (1 << 3), LTC4245_FAULT1);
++
++/* Currents (via sense resistor) */
++LTC4245_CURRENT(curr1_input, LTC4245_12VSENSE);
++LTC4245_CURRENT(curr2_input, LTC4245_5VSENSE);
++LTC4245_CURRENT(curr3_input, LTC4245_3VSENSE);
++LTC4245_CURRENT(curr4_input, LTC4245_VEESENSE);
++
++/* Overcurrent alarms */
++LTC4245_ALARM(curr1_max_alarm, (1 << 4), LTC4245_FAULT1);
++LTC4245_ALARM(curr2_max_alarm, (1 << 5), LTC4245_FAULT1);
++LTC4245_ALARM(curr3_max_alarm, (1 << 6), LTC4245_FAULT1);
++LTC4245_ALARM(curr4_max_alarm, (1 << 7), LTC4245_FAULT1);
++
++/* Output voltages */
++LTC4245_VOLTAGE(in5_input, LTC4245_12VOUT);
++LTC4245_VOLTAGE(in6_input, LTC4245_5VOUT);
++LTC4245_VOLTAGE(in7_input, LTC4245_3VOUT);
++LTC4245_VOLTAGE(in8_input, LTC4245_VEEOUT);
++
++/* Power Bad alarms */
++LTC4245_ALARM(in5_min_alarm, (1 << 0), LTC4245_FAULT2);
++LTC4245_ALARM(in6_min_alarm, (1 << 1), LTC4245_FAULT2);
++LTC4245_ALARM(in7_min_alarm, (1 << 2), LTC4245_FAULT2);
++LTC4245_ALARM(in8_min_alarm, (1 << 3), LTC4245_FAULT2);
++
++/* GPIO voltages */
++LTC4245_VOLTAGE(in9_input, LTC4245_GPIOADC1);
++LTC4245_VOLTAGE(in10_input, LTC4245_GPIOADC2);
++LTC4245_VOLTAGE(in11_input, LTC4245_GPIOADC3);
++
++/* Power Consumption (virtual) */
++LTC4245_POWER(power1_input, LTC4245_12VSENSE);
++LTC4245_POWER(power2_input, LTC4245_5VSENSE);
++LTC4245_POWER(power3_input, LTC4245_3VSENSE);
++LTC4245_POWER(power4_input, LTC4245_VEESENSE);
++
++/* Finally, construct an array of pointers to members of the above objects,
++ * as required for sysfs_create_group()
++ */
++static struct attribute *ltc4245_attributes[] = {
++ &sensor_dev_attr_in1_input.dev_attr.attr,
++ &sensor_dev_attr_in2_input.dev_attr.attr,
++ &sensor_dev_attr_in3_input.dev_attr.attr,
++ &sensor_dev_attr_in4_input.dev_attr.attr,
++
++ &sensor_dev_attr_in1_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in2_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in3_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in4_min_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_curr1_input.dev_attr.attr,
++ &sensor_dev_attr_curr2_input.dev_attr.attr,
++ &sensor_dev_attr_curr3_input.dev_attr.attr,
++ &sensor_dev_attr_curr4_input.dev_attr.attr,
++
++ &sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
++ &sensor_dev_attr_curr2_max_alarm.dev_attr.attr,
++ &sensor_dev_attr_curr3_max_alarm.dev_attr.attr,
++ &sensor_dev_attr_curr4_max_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_in5_input.dev_attr.attr,
++ &sensor_dev_attr_in6_input.dev_attr.attr,
++ &sensor_dev_attr_in7_input.dev_attr.attr,
++ &sensor_dev_attr_in8_input.dev_attr.attr,
++
++ &sensor_dev_attr_in5_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in6_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in7_min_alarm.dev_attr.attr,
++ &sensor_dev_attr_in8_min_alarm.dev_attr.attr,
++
++ &sensor_dev_attr_in9_input.dev_attr.attr,
++ &sensor_dev_attr_in10_input.dev_attr.attr,
++ &sensor_dev_attr_in11_input.dev_attr.attr,
++
++ &sensor_dev_attr_power1_input.dev_attr.attr,
++ &sensor_dev_attr_power2_input.dev_attr.attr,
++ &sensor_dev_attr_power3_input.dev_attr.attr,
++ &sensor_dev_attr_power4_input.dev_attr.attr,
++
++ NULL,
++};
++
++static const struct attribute_group ltc4245_group = {
++ .attrs = ltc4245_attributes,
++};
++
++static int ltc4245_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct ltc4245_data *data;
++ int ret;
++
++ data = kzalloc(sizeof(*data), GFP_KERNEL);
++ if (!data) {
++ ret = -ENOMEM;
++ goto out_kzalloc;
++ }
++
++ i2c_set_clientdata(client, data);
++ mutex_init(&data->update_lock);
++
++ /* Initialize the LTC4245 chip */
++ /* TODO */
++
++ /* Register sysfs hooks */
++ ret = sysfs_create_group(&client->dev.kobj, <c4245_group);
++ if (ret)
++ goto out_sysfs_create_group;
++
++ data->hwmon_dev = hwmon_device_register(&client->dev);
++ if (IS_ERR(data->hwmon_dev)) {
++ ret = PTR_ERR(data->hwmon_dev);
++ goto out_hwmon_device_register;
++ }
++
++ return 0;
++
++out_hwmon_device_register:
++ sysfs_remove_group(&client->dev.kobj, <c4245_group);
++out_sysfs_create_group:
++ kfree(data);
++out_kzalloc:
++ return ret;
++}
++
++static int ltc4245_remove(struct i2c_client *client)
++{
++ struct ltc4245_data *data = i2c_get_clientdata(client);
++
++ hwmon_device_unregister(data->hwmon_dev);
++ sysfs_remove_group(&client->dev.kobj, <c4245_group);
++
++ kfree(data);
++
++ return 0;
++}
++
++/* Check that some bits in a control register appear at all possible
++ * locations without changing value
++ *
++ * @client: the i2c client to use
++ * @reg: the register to read
++ * @bits: the bits to check (0xff checks all bits,
++ * 0x03 checks only the last two bits)
++ *
++ * return -ERRNO if the register read failed
++ * return -ENODEV if the register value doesn't stay constant at all
++ * possible addresses
++ *
++ * return 0 for success
++ */
++static int ltc4245_check_control_reg(struct i2c_client *client, u8 reg, u8 bits)
++{
++ int i;
++ s32 v, voff1, voff2;
++
++ /* Read register and check for error */
++ v = i2c_smbus_read_byte_data(client, reg);
++ if (v < 0)
++ return v;
++
++ v &= bits;
++
++ for (i = 0x00; i < 0xff; i += 0x20) {
++
++ voff1 = i2c_smbus_read_byte_data(client, reg + i);
++ if (voff1 < 0)
++ return voff1;
++
++ voff2 = i2c_smbus_read_byte_data(client, reg + i + 0x08);
++ if (voff2 < 0)
++ return voff2;
++
++ voff1 &= bits;
++ voff2 &= bits;
++
++ if (v != voff1 || v != voff2)
++ return -ENODEV;
++ }
++
++ return 0;
++}
++
++static int ltc4245_detect(struct i2c_client *client,
++ int kind,
++ struct i2c_board_info *info)
++{
++ struct i2c_adapter *adapter = client->adapter;
++
++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
++ return -ENODEV;
++
++ if (kind < 0) { /* probed detection - check the chip type */
++ s32 v; /* 8 bits from the chip, or -ERRNO */
++
++ /* Chip registers 0x00-0x07 are control registers
++ * Chip registers 0x10-0x1f are data registers
++ *
++ * Address bits b7-b5 are ignored. This makes the chip "repeat"
++ * in steps of 0x20. Any control registers should appear with
++ * the same values across all duplicated addresses.
++ *
++ * Register 0x02 bit b2 is reserved, expect 0
++ * Register 0x07 bits b7 to b4 are reserved, expect 0
++ *
++ * Registers 0x01, 0x02 are control registers and should not
++ * change on their own.
++ *
++ * Register 0x06 bits b6 and b7 are control bits, and should
++ * not change on their own.
++ *
++ * Register 0x07 bits b3 to b0 are control bits, and should
++ * not change on their own.
++ */
++
++ /* read register 0x02 reserved bit, expect 0 */
++ v = i2c_smbus_read_byte_data(client, LTC4245_CONTROL);
++ if (v < 0 || (v & 0x04) != 0)
++ return -ENODEV;
++
++ /* read register 0x07 reserved bits, expect 0 */
++ v = i2c_smbus_read_byte_data(client, LTC4245_ADCADR);
++ if (v < 0 || (v & 0xf0) != 0)
++ return -ENODEV;
++
++ /* check that the alert register appears at all locations */
++ if (ltc4245_check_control_reg(client, LTC4245_ALERT, 0xff))
++ return -ENODEV;
++
++ /* check that the control register appears at all locations */
++ if (ltc4245_check_control_reg(client, LTC4245_CONTROL, 0xff))
++ return -ENODEV;
++
++ /* check that register 0x06 bits b6 and b7 stay constant */
++ if (ltc4245_check_control_reg(client, LTC4245_GPIO, 0xc0))
++ return -ENODEV;
++
++ /* check that register 0x07 bits b3-b0 stay constant */
++ if (ltc4245_check_control_reg(client, LTC4245_ADCADR, 0x0f))
++ return -ENODEV;
++ }
++
++ strlcpy(info->type, "ltc4245", I2C_NAME_SIZE);
++ dev_info(&adapter->dev, "ltc4245 %s at address 0x%02x\n",
++ kind < 0 ? "probed" : "forced",
++ client->addr);
++
++ return 0;
++}
++
++static const struct i2c_device_id ltc4245_id[] = {
++ { "ltc4245", ltc4245 },
++ { }
++};
++MODULE_DEVICE_TABLE(i2c, ltc4245_id);
++
++/* This is the driver that will be inserted */
++static struct i2c_driver ltc4245_driver = {
++ .class = I2C_CLASS_HWMON,
++ .driver = {
++ .name = "ltc4245",
++ },
++ .probe = ltc4245_probe,
++ .remove = ltc4245_remove,
++ .id_table = ltc4245_id,
++ .detect = ltc4245_detect,
++ .address_data = &addr_data,
++};
++
++static int __init ltc4245_init(void)
++{
++ return i2c_add_driver(<c4245_driver);
++}
++
++static void __exit ltc4245_exit(void)
++{
++ i2c_del_driver(<c4245_driver);
++}
++
++MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
++MODULE_DESCRIPTION("LTC4245 driver");
++MODULE_LICENSE("GPL");
++
++module_init(ltc4245_init);
++module_exit(ltc4245_exit);commit c87f883edbe969ca68c21dfa8a29674c828c22a3
+Author: Rumen Ivanov Zarev <rzarev@its.caltech.edu>
+Date: Tue Sep 6 13:39:32 2005 -0700
+
+ [PATCH] PCI: Unhide SMBus on Compaq Evo N620c
+
+ Trivial patch against 2.6.13 to unhide SMBus on Compaq Evo N620c laptop using
+ Intel 82855PM chipset.
+
+ Signed-off-by: Rumen Zarev <rzarev@caltech.edu>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
+index 4f0c1bd3674a..11ca44387cb0 100644
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -876,6 +876,12 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
+ case 0xC00C: /* Samsung P35 notebook */
+ asus_hides_smbus = 1;
+ }
++ } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ)) {
++ if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
++ switch(dev->subsystem_device) {
++ case 0x0058: /* Compaq Evo N620c */
++ asus_hides_smbus = 1;
++ }
+ }
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82845_HB, asus_hides_smbus_hostbridge );
+ commit bcdbd6f607bacb51743ac73f13f40d015cb9de53
+Author: RutingZhang <u202112078@hust.edu.cn>
+Date: Tue Nov 21 12:36:20 2023 +0800
+
+ drm/amd/display: remove unnecessary braces to fix coding style
+
+ checkpatch complains that:
+
+ WARNING: braces {} are not necessary for single statement blocks
+ + if (pool->base.irqs != NULL) {
+ + dal_irq_service_destroy(&pool->base.irqs);
+ + }
+
+ Fixed it by removing unnecessary braces to fix the coding style issue.
+
+ Signed-off-by: RutingZhang <u202112078@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
+index c07da45e1e2c..65d337731f56 100644
+--- a/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
+@@ -713,9 +713,8 @@ static void dcn21_resource_destruct(struct dcn21_resource_pool *pool)
+ pool->base.hubps[i] = NULL;
+ }
+
+- if (pool->base.irqs != NULL) {
++ if (pool->base.irqs != NULL)
+ dal_irq_service_destroy(&pool->base.irqs);
+- }
+ }
+
+ for (i = 0; i < pool->base.res_cap->num_ddc; i++) {commit daacef89cd1bb7e345539db10e979e1b78451591
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Fri Sep 1 14:25:48 2023 +0800
+
+ soc: loongson: loongson2_guts: Convert to devm_platform_ioremap_resource()
+
+ Use devm_platform_ioremap_resource() to simplify code.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
+ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+
+diff --git a/drivers/soc/loongson/loongson2_guts.c b/drivers/soc/loongson/loongson2_guts.c
+index bace4bc8e03b..d97c77a9a4a2 100644
+--- a/drivers/soc/loongson/loongson2_guts.c
++++ b/drivers/soc/loongson/loongson2_guts.c
+@@ -94,7 +94,6 @@ static int loongson2_guts_probe(struct platform_device *pdev)
+ {
+ struct device_node *root, *np = pdev->dev.of_node;
+ struct device *dev = &pdev->dev;
+- struct resource *res;
+ const struct loongson2_soc_die_attr *soc_die;
+ const char *machine;
+ u32 svr;
+@@ -106,8 +105,7 @@ static int loongson2_guts_probe(struct platform_device *pdev)
+
+ guts->little_endian = of_property_read_bool(np, "little-endian");
+
+- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+- guts->regs = ioremap(res->start, res->end - res->start + 1);
++ guts->regs = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(guts->regs))
+ return PTR_ERR(guts->regs);
+ commit dc73b20593544f8e1b78dded909296f2777076d0
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Tue Sep 5 09:35:56 2023 +0800
+
+ wifi: ath9k: clean up function ath9k_hif_usb_resume
+
+ In ath9k_hif_usb_resume, the error handling code calls
+ ath9k_hif_usb_dealloc_urbs twice in different paths.
+
+ To unify the error handling code, we move the else branch before
+ the if branch and drop one level of indentation of the if branch.
+
+ In addition, move the ret variable at the end of variable declarations
+ to be reverse x-mas tree order.
+
+ Note that this patch does not incur any functionability change.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
+ Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
+ Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
+ Link: https://lore.kernel.org/r/20230905013556.2595854-1-dzm91@hust.edu.cn
+
+diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
+index e5414435b141..90cfe39aa433 100644
+--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
+@@ -1481,31 +1481,31 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
+ {
+ struct hif_device_usb *hif_dev = usb_get_intfdata(interface);
+ struct htc_target *htc_handle = hif_dev->htc_handle;
+- int ret;
+ const struct firmware *fw;
++ int ret;
+
+ ret = ath9k_hif_usb_alloc_urbs(hif_dev);
+ if (ret)
+ return ret;
+
+- if (hif_dev->flags & HIF_USB_READY) {
+- /* request cached firmware during suspend/resume cycle */
+- ret = request_firmware(&fw, hif_dev->fw_name,
+- &hif_dev->udev->dev);
+- if (ret)
+- goto fail_resume;
+-
+- hif_dev->fw_data = fw->data;
+- hif_dev->fw_size = fw->size;
+- ret = ath9k_hif_usb_download_fw(hif_dev);
+- release_firmware(fw);
+- if (ret)
+- goto fail_resume;
+- } else {
+- ath9k_hif_usb_dealloc_urbs(hif_dev);
+- return -EIO;
++ if (!(hif_dev->flags & HIF_USB_READY)) {
++ ret = -EIO;
++ goto fail_resume;
+ }
+
++ /* request cached firmware during suspend/resume cycle */
++ ret = request_firmware(&fw, hif_dev->fw_name,
++ &hif_dev->udev->dev);
++ if (ret)
++ goto fail_resume;
++
++ hif_dev->fw_data = fw->data;
++ hif_dev->fw_size = fw->size;
++ ret = ath9k_hif_usb_download_fw(hif_dev);
++ release_firmware(fw);
++ if (ret)
++ goto fail_resume;
++
+ mdelay(100);
+
+ ret = ath9k_htc_resume(htc_handle);commit 99e25b17d2a3e3b486b4f6f90a740d51245da1f2 +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Wed Nov 16 09:45:50 2022 +0800 + + pcmcia: typo fix + + themselfves -> themselves + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> + +diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c +index d78091e79a0f..e9e31c638a67 100644 +--- a/drivers/pcmcia/pcmcia_resource.c ++++ b/drivers/pcmcia/pcmcia_resource.c +@@ -684,7 +684,7 @@ EXPORT_SYMBOL(pcmcia_request_io); + * pcmcia_request_irq() is a wrapper around request_irq() which allows + * the PCMCIA core to clean up the registration in pcmcia_disable_device(). + * Drivers are free to use request_irq() directly, but then they need to +- * call free_irq() themselfves, too. Also, only %IRQF_SHARED capable IRQ ++ * call free_irq() themselves, too. Also, only %IRQF_SHARED capable IRQ + * handlers are allowed. + */ + int __must_check pcmcia_request_irq(struct pcmcia_device *p_dev,
commit 1d40165047456923fa4343d519353d9440cd68df
+Author: Guoqing Cai <u202112087@hust.edu.cn>
+Date: Thu Apr 13 17:57:39 2023 +0800
+
+ fs: jbd2: fix an incorrect warn log
+
+ In jbd2_journal_load(), when journal_reset fails, it prints an incorrect
+ warn log.
+
+ Fix this by changing the goto statement to return statement.
+
+ Also, return actual error code from jbd2_journal_recover() and journal_reset().
+
+ Signed-off-by: Guoqing Cai <u202112087@hust.edu.cn>
+ Reviewed-by: Jan Kara <jack@suse.cz>
+ Link: https://lore.kernel.org/r/20230413095740.2222066-1-u202112087@hust.edu.cn
+ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+
+diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
+index fbce16fedaa4..5c223032f77a 100644
+--- a/fs/jbd2/journal.c
++++ b/fs/jbd2/journal.c
+@@ -2089,8 +2089,11 @@ int jbd2_journal_load(journal_t *journal)
+
+ /* Let the recovery code check whether it needs to recover any
+ * data from the journal. */
+- if (jbd2_journal_recover(journal))
+- goto recovery_error;
++ err = jbd2_journal_recover(journal);
++ if (err) {
++ pr_warn("JBD2: journal recovery failed\n");
++ return err;
++ }
+
+ if (journal->j_failed_commit) {
+ printk(KERN_ERR "JBD2: journal transaction %u on %s "
+@@ -2107,15 +2110,14 @@ int jbd2_journal_load(journal_t *journal)
+ /* OK, we've finished with the dynamic journal bits:
+ * reinitialise the dynamic contents of the superblock in memory
+ * and reset them on disk. */
+- if (journal_reset(journal))
+- goto recovery_error;
++ err = journal_reset(journal);
++ if (err) {
++ pr_warn("JBD2: journal reset failed\n");
++ return err;
++ }
+
+ journal->j_flags |= JBD2_LOADED;
+ return 0;
+-
+-recovery_error:
+- printk(KERN_WARNING "JBD2: recovery failed\n");
+- return -EIO;
+ }
+
+ /**commit 061115fbfb2ce5870c9a004d68dc63138c07c782 +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Sun Jul 23 12:04:02 2023 +0800 + + wifi: ath9k: fix printk specifier + + Smatch reports: + + ath_pci_probe() warn: argument 4 to %lx specifier is cast from pointer + ath_ahb_probe() warn: argument 4 to %lx specifier is cast from pointer + + Fix it by modifying %lx to %p in the printk format string. + + Note that with this change, the pointer address will be printed as a + hashed value by default. This is appropriate because the kernel + should not leak kernel pointers to user space in an informational + message. If someone wants to see the real address for debugging + purposes, this can be achieved with the no_hash_pointers kernel option. + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> + Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> + Link: https://lore.kernel.org/r/20230723040403.296723-1-dzm91@hust.edu.cn + +diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c +index 9cd12b20b18d..9bfaadfa6c00 100644 +--- a/drivers/net/wireless/ath/ath9k/ahb.c ++++ b/drivers/net/wireless/ath/ath9k/ahb.c +@@ -132,8 +132,8 @@ static int ath_ahb_probe(struct platform_device *pdev) + + ah = sc->sc_ah; + ath9k_hw_name(ah, hw_name, sizeof(hw_name)); +- wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", +- hw_name, (unsigned long)mem, irq); ++ wiphy_info(hw->wiphy, "%s mem=0x%p, irq=%d\n", ++ hw_name, mem, irq); + + return 0; + +diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c +index a09f9d223f3d..0633589b85c2 100644 +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -988,8 +988,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) + sc->sc_ah->msi_reg = 0; + + ath9k_hw_name(sc->sc_ah, hw_name, sizeof(hw_name)); +- wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n", +- hw_name, (unsigned long)sc->mem, pdev->irq); ++ wiphy_info(hw->wiphy, "%s mem=0x%p, irq=%d\n", ++ hw_name, sc->mem, pdev->irq); + + return 0; +
commit b9c7141f384097fa4fa67d2f72e5731d628aef7c
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Mon Feb 27 18:24:08 2023 +0800
+
+ drivers: usb: smsusb: fix error handling code in smsusb_init_device
+
+ The previous commit 4b208f8b561f ("[media] siano: register media controller
+ earlier")moves siano_media_device_register before smscore_register_device,
+ and adds corresponding error handling code if smscore_register_device
+ fails. However, it misses the following error handling code of
+ smsusb_init_device.
+
+ Fix this by moving error handling code at the end of smsusb_init_device
+ and adding a goto statement in the following error handling parts.
+
+ Fixes: 4b208f8b561f ("[media] siano: register media controller earlier")
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+
+diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
+index 640737d3b8ae..8a39cac76c58 100644
+--- a/drivers/media/usb/siano/smsusb.c
++++ b/drivers/media/usb/siano/smsusb.c
+@@ -455,12 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
+ rc = smscore_register_device(¶ms, &dev->coredev, 0, mdev);
+ if (rc < 0) {
+ pr_err("smscore_register_device(...) failed, rc %d\n", rc);
+- smsusb_term_device(intf);
+-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+- media_device_unregister(mdev);
+-#endif
+- kfree(mdev);
+- return rc;
++ goto err_unregister_device;
+ }
+
+ smscore_set_board_id(dev->coredev, board_id);
+@@ -477,8 +472,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
+ rc = smsusb_start_streaming(dev);
+ if (rc < 0) {
+ pr_err("smsusb_start_streaming(...) failed\n");
+- smsusb_term_device(intf);
+- return rc;
++ goto err_unregister_device;
+ }
+
+ dev->state = SMSUSB_ACTIVE;
+@@ -486,13 +480,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
+ rc = smscore_start_device(dev->coredev);
+ if (rc < 0) {
+ pr_err("smscore_start_device(...) failed\n");
+- smsusb_term_device(intf);
+- return rc;
++ goto err_unregister_device;
+ }
+
+ pr_debug("device 0x%p created\n", dev);
+
+ return rc;
++
++err_unregister_device:
++ smsusb_term_device(intf);
++#ifdef CONFIG_MEDIA_CONTROLLER_DVB
++ media_device_unregister(mdev);
++#endif
++ kfree(mdev);
++ return rc;
+ }
+
+ static int smsusb_probe(struct usb_interface *intf,commit cd9489623c29aa2f8cc07088168afb6e0d5ef06d
+Author: Shuai Jiang <d202180596@hust.edu.cn>
+Date: Tue Apr 18 21:56:12 2023 +0800
+
+ i2c: qup: Add missing unwind goto in qup_i2c_probe()
+
+ Smatch Warns:
+ drivers/i2c/busses/i2c-qup.c:1784 qup_i2c_probe()
+ warn: missing unwind goto?
+
+ The goto label "fail_runtime" and "fail" will disable qup->pclk,
+ but here qup->pclk failed to obtain, in order to be consistent,
+ change the direct return to goto label "fail_dma".
+
+ Fixes: 9cedf3b2f099 ("i2c: qup: Add bam dma capabilities")
+ Signed-off-by: Shuai Jiang <d202180596@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
+ Signed-off-by: Wolfram Sang <wsa@kernel.org>
+ Cc: <stable@vger.kernel.org> # v4.6+
+
+diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
+index 2e153f2f71b6..78682388e02e 100644
+--- a/drivers/i2c/busses/i2c-qup.c
++++ b/drivers/i2c/busses/i2c-qup.c
+@@ -1752,16 +1752,21 @@ static int qup_i2c_probe(struct platform_device *pdev)
+ if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {
+ dev_err(qup->dev, "clock frequency not supported %d\n",
+ clk_freq);
+- return -EINVAL;
++ ret = -EINVAL;
++ goto fail_dma;
+ }
+
+ qup->base = devm_platform_ioremap_resource(pdev, 0);
+- if (IS_ERR(qup->base))
+- return PTR_ERR(qup->base);
++ if (IS_ERR(qup->base)) {
++ ret = PTR_ERR(qup->base);
++ goto fail_dma;
++ }
+
+ qup->irq = platform_get_irq(pdev, 0);
+- if (qup->irq < 0)
+- return qup->irq;
++ if (qup->irq < 0) {
++ ret = qup->irq;
++ goto fail_dma;
++ }
+
+ if (has_acpi_companion(qup->dev)) {
+ ret = device_property_read_u32(qup->dev,
+@@ -1775,13 +1780,15 @@ static int qup_i2c_probe(struct platform_device *pdev)
+ qup->clk = devm_clk_get(qup->dev, "core");
+ if (IS_ERR(qup->clk)) {
+ dev_err(qup->dev, "Could not get core clock\n");
+- return PTR_ERR(qup->clk);
++ ret = PTR_ERR(qup->clk);
++ goto fail_dma;
+ }
+
+ qup->pclk = devm_clk_get(qup->dev, "iface");
+ if (IS_ERR(qup->pclk)) {
+ dev_err(qup->dev, "Could not get iface clock\n");
+- return PTR_ERR(qup->pclk);
++ ret = PTR_ERR(qup->pclk);
++ goto fail_dma;
+ }
+ qup_i2c_enable_clocks(qup);
+ src_clk_freq = clk_get_rate(qup->clk);commit 9e1a1ee93f6b08aad5ee645073f7c7b115f71e15
+Author: Wang Zhang <silver_code@hust.edu.cn>
+Date: Fri May 26 15:05:33 2023 +0800
+
+ i2c: ocores: use devm_ managed clks
+
+ Smatch complains that:
+ drivers/i2c/busses/i2c-ocores.c:704 ocores_i2c_probe()
+ warn: missing unwind goto?
+
+ If any wrong occurs in ocores_i2c_of_probe, the i2c->clk needs to be
+ released. But the function returns directly without freeing the clock.
+
+ Fix this by updating the code to use devm_clk_get_optional_enabled()
+ instead. Use dev_err_probe() where appropriate as well since we are
+ changing those statements.
+
+ Fixes: f5f35a92e44a ("i2c: ocores: Add irq support for sparc")
+ Signed-off-by: Wang Zhang <silver_code@hust.edu.cn>
+ Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
+ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+ Signed-off-by: Wolfram Sang <wsa@kernel.org>
+
+diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
+index 0742b84a11eb..4ac77e57bbbf 100644
+--- a/drivers/i2c/busses/i2c-ocores.c
++++ b/drivers/i2c/busses/i2c-ocores.c
+@@ -552,28 +552,20 @@ static int ocores_i2c_of_probe(struct platform_device *pdev,
+ &clock_frequency);
+ i2c->bus_clock_khz = 100;
+
+- i2c->clk = devm_clk_get(&pdev->dev, NULL);
+-
+- if (!IS_ERR(i2c->clk)) {
+- int ret = clk_prepare_enable(i2c->clk);
+-
+- if (ret) {
+- dev_err(&pdev->dev,
+- "clk_prepare_enable failed: %d\n", ret);
+- return ret;
+- }
+- i2c->ip_clock_khz = clk_get_rate(i2c->clk) / 1000;
+- if (clock_frequency_present)
+- i2c->bus_clock_khz = clock_frequency / 1000;
+- }
+-
++ i2c->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
++ if (IS_ERR(i2c->clk))
++ return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk),
++ "devm_clk_get_optional_enabled failed\n");
++
++ i2c->ip_clock_khz = clk_get_rate(i2c->clk) / 1000;
++ if (clock_frequency_present)
++ i2c->bus_clock_khz = clock_frequency / 1000;
+ if (i2c->ip_clock_khz == 0) {
+ if (of_property_read_u32(np, "opencores,ip-clock-frequency",
+ &val)) {
+ if (!clock_frequency_present) {
+ dev_err(&pdev->dev,
+ "Missing required parameter 'opencores,ip-clock-frequency'\n");
+- clk_disable_unprepare(i2c->clk);
+ return -ENODEV;
+ }
+ i2c->ip_clock_khz = clock_frequency / 1000;
+@@ -678,8 +670,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
+ default:
+ dev_err(&pdev->dev, "Unsupported I/O width (%d)\n",
+ i2c->reg_io_width);
+- ret = -EINVAL;
+- goto err_clk;
++ return -EINVAL;
+ }
+ }
+
+@@ -710,13 +701,13 @@ static int ocores_i2c_probe(struct platform_device *pdev)
+ pdev->name, i2c);
+ if (ret) {
+ dev_err(&pdev->dev, "Cannot claim IRQ\n");
+- goto err_clk;
++ return ret;
+ }
+ }
+
+ ret = ocores_init(&pdev->dev, i2c);
+ if (ret)
+- goto err_clk;
++ return ret;
+
+ /* hook up driver to tree */
+ platform_set_drvdata(pdev, i2c);
+@@ -728,7 +719,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
+ /* add i2c adapter to i2c tree */
+ ret = i2c_add_adapter(&i2c->adap);
+ if (ret)
+- goto err_clk;
++ return ret;
+
+ /* add in known devices to the bus */
+ if (pdata) {
+@@ -737,10 +728,6 @@ static int ocores_i2c_probe(struct platform_device *pdev)
+ }
+
+ return 0;
+-
+-err_clk:
+- clk_disable_unprepare(i2c->clk);
+- return ret;
+ }
+
+ static void ocores_i2c_remove(struct platform_device *pdev)
+@@ -754,9 +741,6 @@ static void ocores_i2c_remove(struct platform_device *pdev)
+
+ /* remove adapter & data */
+ i2c_del_adapter(&i2c->adap);
+-
+- if (!IS_ERR(i2c->clk))
+- clk_disable_unprepare(i2c->clk);
+ }
+
+ #ifdef CONFIG_PM_SLEEP
+@@ -769,28 +753,22 @@ static int ocores_i2c_suspend(struct device *dev)
+ ctrl &= ~(OCI2C_CTRL_EN | OCI2C_CTRL_IEN);
+ oc_setreg(i2c, OCI2C_CONTROL, ctrl);
+
+- if (!IS_ERR(i2c->clk))
+- clk_disable_unprepare(i2c->clk);
++ clk_disable_unprepare(i2c->clk);
+ return 0;
+ }
+
+ static int ocores_i2c_resume(struct device *dev)
+ {
+ struct ocores_i2c *i2c = dev_get_drvdata(dev);
++ unsigned long rate;
++ int ret;
+
+- if (!IS_ERR(i2c->clk)) {
+- unsigned long rate;
+- int ret = clk_prepare_enable(i2c->clk);
+-
+- if (ret) {
+- dev_err(dev,
+- "clk_prepare_enable failed: %d\n", ret);
+- return ret;
+- }
+- rate = clk_get_rate(i2c->clk) / 1000;
+- if (rate)
+- i2c->ip_clock_khz = rate;
+- }
++ ret = clk_prepare_enable(i2c->clk);
++ if (ret)
++ return dev_err_probe(dev, ret, "clk_prepare_enable failed\n");
++ rate = clk_get_rate(i2c->clk) / 1000;
++ if (rate)
++ i2c->ip_clock_khz = rate;
+ return ocores_init(dev, i2c);
+ }
+ commit 8b5bf64c89c7100c921bd807ba39b2eb003061ab
+Author: Feng Mingxi <m202271825@hust.edu.cn>
+Date: Tue Apr 25 06:56:11 2023 +0000
+
+ clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
+
+ Smatch reports:
+ drivers/clocksource/timer-cadence-ttc.c:529 ttc_timer_probe()
+ warn: 'timer_baseaddr' from of_iomap() not released on lines: 498,508,516.
+
+ timer_baseaddr may have the problem of not being released after use,
+ I replaced it with the devm_of_iomap() function and added the clk_put()
+ function to cleanup the "clk_ce" and "clk_cs".
+
+ Fixes: e932900a3279 ("arm: zynq: Use standard timer binding")
+ Fixes: 70504f311d4b ("clocksource/drivers/cadence_ttc: Convert init function to return error")
+ Signed-off-by: Feng Mingxi <m202271825@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Acked-by: Michal Simek <michal.simek@amd.com>
+ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+ Link: https://lore.kernel.org/r/20230425065611.702917-1-m202271825@hust.edu.cn
+
+diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c
+index 4efd0cf3b602..0d52e28fea4d 100644
+--- a/drivers/clocksource/timer-cadence-ttc.c
++++ b/drivers/clocksource/timer-cadence-ttc.c
+@@ -486,10 +486,10 @@ static int __init ttc_timer_probe(struct platform_device *pdev)
+ * and use it. Note that the event timer uses the interrupt and it's the
+ * 2nd TTC hence the irq_of_parse_and_map(,1)
+ */
+- timer_baseaddr = of_iomap(timer, 0);
+- if (!timer_baseaddr) {
++ timer_baseaddr = devm_of_iomap(&pdev->dev, timer, 0, NULL);
++ if (IS_ERR(timer_baseaddr)) {
+ pr_err("ERROR: invalid timer base address\n");
+- return -ENXIO;
++ return PTR_ERR(timer_baseaddr);
+ }
+
+ irq = irq_of_parse_and_map(timer, 1);
+@@ -513,20 +513,27 @@ static int __init ttc_timer_probe(struct platform_device *pdev)
+ clk_ce = of_clk_get(timer, clksel);
+ if (IS_ERR(clk_ce)) {
+ pr_err("ERROR: timer input clock not found\n");
+- return PTR_ERR(clk_ce);
++ ret = PTR_ERR(clk_ce);
++ goto put_clk_cs;
+ }
+
+ ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);
+ if (ret)
+- return ret;
++ goto put_clk_ce;
+
+ ret = ttc_setup_clockevent(clk_ce, timer_baseaddr + 4, irq);
+ if (ret)
+- return ret;
++ goto put_clk_ce;
+
+ pr_info("%pOFn #0 at %p, irq=%d\n", timer, timer_baseaddr, irq);
+
+ return 0;
++
++put_clk_ce:
++ clk_put(clk_ce);
++put_clk_cs:
++ clk_put(clk_cs);
++ return ret;
+ }
+
+ static const struct of_device_id ttc_timer_of_match[] = {
+ commit 095bb8ba45f28ed15296eb5b7662e03e57d5e34e
+Author: Yi Yingao <m202271736@hust.edu.cn>
+Date: Tue May 9 16:52:36 2023 +0800
+
+ nvmem: sunplus-ocotp: release otp->clk before return
+
+ Smatch reports:
+ drivers/nvmem/sunplus-ocotp.c:205 sp_ocotp_probe()
+ warn: 'otp->clk' from clk_prepare() not released on lines: 196.
+
+ In the function sp_ocotp_probe(struct platform_device *pdev), otp->clk may
+ not be released before return.
+
+ To fix this issue, using function clk_unprepare() to release otp->clk.
+
+ Fixes: 8747ec2e9762 ("nvmem: Add driver for OCOTP in Sunplus SP7021")
+ Signed-off-by: Yi Yingao <m202271736@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Message-ID: <20230509085237.5917-1-m202271736@hust.edu.cn>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/nvmem/sunplus-ocotp.c b/drivers/nvmem/sunplus-ocotp.c
+index 52b928a7a6d5..f85350b17d67 100644
+--- a/drivers/nvmem/sunplus-ocotp.c
++++ b/drivers/nvmem/sunplus-ocotp.c
+@@ -192,9 +192,11 @@ static int sp_ocotp_probe(struct platform_device *pdev)
+ sp_ocotp_nvmem_config.dev = dev;
+
+ nvmem = devm_nvmem_register(dev, &sp_ocotp_nvmem_config);
+- if (IS_ERR(nvmem))
+- return dev_err_probe(&pdev->dev, PTR_ERR(nvmem),
++ if (IS_ERR(nvmem)) {
++ ret = dev_err_probe(&pdev->dev, PTR_ERR(nvmem),
+ "register nvmem device fail\n");
++ goto err;
++ }
+
+ platform_set_drvdata(pdev, nvmem);
+
+@@ -203,6 +205,9 @@ static int sp_ocotp_probe(struct platform_device *pdev)
+ (int)OTP_WORD_SIZE, (int)QAC628_OTP_SIZE);
+
+ return 0;
++err:
++ clk_unprepare(otp->clk);
++ return ret;
+ }
+
+ static const struct of_device_id sp_ocotp_dt_ids[] = {commit 3db7285e044144fd88a356f5b641b9cd4b231a77
+Author: Bosi Zhang <u201911157@hust.edu.cn>
+Date: Sat Apr 22 08:43:31 2023 +0000
+
+ clk: mediatek: fix of_iomap memory leak
+
+ Smatch reports:
+ drivers/clk/mediatek/clk-mtk.c:583 mtk_clk_simple_probe() warn:
+ 'base' from of_iomap() not released on lines: 496.
+
+ This problem was also found in linux-next. In mtk_clk_simple_probe(),
+ base is not released when handling errors
+ if clk_data is not existed, which may cause a leak.
+ So free_base should be added here to release base.
+
+ Fixes: c58cd0e40ffa ("clk: mediatek: Add mtk_clk_simple_probe() to simplify clock providers")
+ Signed-off-by: Bosi Zhang <u201911157@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230422084331.47198-1-u201911157@hust.edu.cn
+ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+
+diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
+index fd2214c3242f..3c50f48e93a7 100644
+--- a/drivers/clk/mediatek/clk-mtk.c
++++ b/drivers/clk/mediatek/clk-mtk.c
+@@ -500,8 +500,10 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,
+ num_clks += mcd->num_mux_clks + mcd->num_divider_clks;
+
+ clk_data = mtk_alloc_clk_data(num_clks);
+- if (!clk_data)
+- return -ENOMEM;
++ if (!clk_data) {
++ r = -ENOMEM;
++ goto free_base;
++ }
+
+ if (mcd->fixed_clks) {
+ r = mtk_clk_register_fixed_clks(mcd->fixed_clks,
+@@ -599,6 +601,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,
+ mcd->num_fixed_clks, clk_data);
+ free_data:
+ mtk_free_clk_data(clk_data);
++free_base:
+ if (mcd->shared_io && base)
+ iounmap(base);
+ return r;commit 878b02d5f3b56cb090dbe2c70c89273be144087f
+Author: Yuxing Liu <lyx2022@hust.edu.cn>
+Date: Wed May 3 07:06:07 2023 +0000
+
+ clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()
+
+ Replace of_iomap() and kzalloc() with devm_of_iomap() and devm_kzalloc()
+ which can automatically release the related memory when the device
+ or driver is removed or unloaded to avoid potential memory leak.
+
+ In this case, iounmap(anatop_base) in line 427,433 are removed
+ as manual release is not required.
+
+ Besides, referring to clk-imx8mq.c, check the return code of
+ of_clk_add_hw_provider, if it returns negtive, print error info
+ and unregister hws, which makes the program more robust.
+
+ Fixes: 9c140d992676 ("clk: imx: Add support for i.MX8MP clock driver")
+ Signed-off-by: Yuxing Liu <lyx2022@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
+ Link: https://lore.kernel.org/r/20230503070607.2462-1-lyx2022@hust.edu.cn
+ Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
+
+diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
+index f26ae8de4cc6..1469249386dd 100644
+--- a/drivers/clk/imx/clk-imx8mp.c
++++ b/drivers/clk/imx/clk-imx8mp.c
+@@ -414,25 +414,22 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
+ struct device *dev = &pdev->dev;
+ struct device_node *np;
+ void __iomem *anatop_base, *ccm_base;
++ int err;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx8mp-anatop");
+- anatop_base = of_iomap(np, 0);
++ anatop_base = devm_of_iomap(dev, np, 0, NULL);
+ of_node_put(np);
+- if (WARN_ON(!anatop_base))
+- return -ENOMEM;
++ if (WARN_ON(IS_ERR(anatop_base)))
++ return PTR_ERR(anatop_base);
+
+ np = dev->of_node;
+ ccm_base = devm_platform_ioremap_resource(pdev, 0);
+- if (WARN_ON(IS_ERR(ccm_base))) {
+- iounmap(anatop_base);
++ if (WARN_ON(IS_ERR(ccm_base)))
+ return PTR_ERR(ccm_base);
+- }
+
+- clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);
+- if (WARN_ON(!clk_hw_data)) {
+- iounmap(anatop_base);
++ clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);
++ if (WARN_ON(!clk_hw_data))
+ return -ENOMEM;
+- }
+
+ clk_hw_data->num = IMX8MP_CLK_END;
+ hws = clk_hw_data->hws;
+@@ -722,7 +719,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
+
+ imx_check_clk_hws(hws, IMX8MP_CLK_END);
+
+- of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
++ err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
++ if (err < 0) {
++ dev_err(dev, "failed to register hws for i.MX8MP\n");
++ imx_unregister_hw_clocks(hws, IMX8MP_CLK_END);
++ return err;
++ }
+
+ imx_register_uart_clocks();
+ commit e02ba11b457647050cb16e7cad16cec3c252fade
+Author: Zhanhao Hu <zero12113@hust.edu.cn>
+Date: Thu Jun 1 03:38:25 2023 +0000
+
+ clk: imx93: fix memory leak and missing unwind goto in imx93_clocks_probe
+
+ In function probe(), it returns directly without unregistered hws
+ when error occurs.
+
+ Fix this by adding 'goto unregister_hws;' on line 295 and
+ line 310.
+
+ Use devm_kzalloc() instead of kzalloc() to automatically
+ free the memory using devm_kfree() when error occurs.
+
+ Replace of_iomap() with devm_of_iomap() to automatically
+ handle the unused ioremap region and delete 'iounmap(anatop_base);'
+ in unregister_hws.
+
+ Fixes: 24defbe194b6 ("clk: imx: add i.MX93 clk")
+ Signed-off-by: Zhanhao Hu <zero12113@hust.edu.cn>
+ Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
+ Link: https://lore.kernel.org/r/20230601033825.336558-1-zero12113@hust.edu.cn
+ Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
+
+diff --git a/drivers/clk/imx/clk-imx93.c b/drivers/clk/imx/clk-imx93.c
+index 07b4a043e449..b6c7c2725906 100644
+--- a/drivers/clk/imx/clk-imx93.c
++++ b/drivers/clk/imx/clk-imx93.c
+@@ -264,7 +264,7 @@ static int imx93_clocks_probe(struct platform_device *pdev)
+ void __iomem *base, *anatop_base;
+ int i, ret;
+
+- clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
++ clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
+ IMX93_CLK_END), GFP_KERNEL);
+ if (!clk_hw_data)
+ return -ENOMEM;
+@@ -288,10 +288,12 @@ static int imx93_clocks_probe(struct platform_device *pdev)
+ "sys_pll_pfd2", 1, 2);
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx93-anatop");
+- anatop_base = of_iomap(np, 0);
++ anatop_base = devm_of_iomap(dev, np, 0, NULL);
+ of_node_put(np);
+- if (WARN_ON(!anatop_base))
+- return -ENOMEM;
++ if (WARN_ON(IS_ERR(anatop_base))) {
++ ret = PTR_ERR(base);
++ goto unregister_hws;
++ }
+
+ clks[IMX93_CLK_ARM_PLL] = imx_clk_fracn_gppll_integer("arm_pll", "osc_24m",
+ anatop_base + 0x1000,
+@@ -304,8 +306,8 @@ static int imx93_clocks_probe(struct platform_device *pdev)
+ np = dev->of_node;
+ base = devm_platform_ioremap_resource(pdev, 0);
+ if (WARN_ON(IS_ERR(base))) {
+- iounmap(anatop_base);
+- return PTR_ERR(base);
++ ret = PTR_ERR(base);
++ goto unregister_hws;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(root_array); i++) {
+@@ -345,7 +347,6 @@ static int imx93_clocks_probe(struct platform_device *pdev)
+
+ unregister_hws:
+ imx_unregister_hw_clocks(clks, IMX93_CLK_END);
+- iounmap(anatop_base);
+
+ return ret;
+ }commit 188d070de9132667956f5aadd98d2bd87d3eac89
+Author: Hao Luo <m202171776@hust.edu.cn>
+Date: Tue Apr 11 09:51:07 2023 +0800
+
+ clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe
+
+ Use devm_of_iomap() instead of of_iomap() to automatically handle
+ the unused ioremap region.
+
+ If any error occurs, regions allocated by kzalloc() will leak,
+ but using devm_kzalloc() instead will automatically free the memory
+ using devm_kfree().
+
+ Fixes: daeb14545514 ("clk: imx: imx8mn: Switch to clk_hw based API")
+ Fixes: 96d6392b54db ("clk: imx: Add support for i.MX8MN clock driver")
+ Signed-off-by: Hao Luo <m202171776@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Peng Fan <peng.fan@nxp.com>
+ Link: https://lore.kernel.org/r/20230411015107.2645-1-m202171776@hust.edu.cn
+ Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
+
+diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
+index 4b23a4648600..4bd1ed11353b 100644
+--- a/drivers/clk/imx/clk-imx8mn.c
++++ b/drivers/clk/imx/clk-imx8mn.c
+@@ -323,7 +323,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
+ void __iomem *base;
+ int ret;
+
+- clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
++ clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
+ IMX8MN_CLK_END), GFP_KERNEL);
+ if (WARN_ON(!clk_hw_data))
+ return -ENOMEM;
+@@ -340,10 +340,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)
+ hws[IMX8MN_CLK_EXT4] = imx_get_clk_hw_by_name(np, "clk_ext4");
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx8mn-anatop");
+- base = of_iomap(np, 0);
++ base = devm_of_iomap(dev, np, 0, NULL);
+ of_node_put(np);
+- if (WARN_ON(!base)) {
+- ret = -ENOMEM;
++ if (WARN_ON(IS_ERR(base))) {
++ ret = PTR_ERR(base);
+ goto unregister_hws;
+ }
+ commit 1b280598ab3bd8a2dc8b96a12530d5b1ee7a8f4a
+Author: Kai Ma <kaima@hust.edu.cn>
+Date: Tue Apr 18 11:34:51 2023 +0000
+
+ clk: imx: clk-imxrt1050: fix memory leak in imxrt1050_clocks_probe
+
+ Use devm_of_iomap() instead of of_iomap() to automatically
+ handle the unused ioremap region. If any error occurs, regions allocated by
+ kzalloc() will leak, but using devm_kzalloc() instead will automatically
+ free the memory using devm_kfree().
+
+ Also, fix error handling of hws by adding unregister_hws label, which
+ unregisters remaining hws when iomap failed.
+
+ Fixes: 7154b046d8f3 ("clk: imx: Add initial support for i.MXRT1050 clock driver")
+ Signed-off-by: Kai Ma <kaima@hust.edu.cn>
+ Reviewed-by: Peng Fan <peng.fan@nxp.com>
+ Acked-by: Jesse Taube <Mr.Bossman075@gmail.com>
+ Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
+ Link: https://lore.kernel.org/r/20230418113451.151312-1-kaima@hust.edu.cn
+ Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
+
+diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c
+index fd5c51fc92c0..08d155feb035 100644
+--- a/drivers/clk/imx/clk-imxrt1050.c
++++ b/drivers/clk/imx/clk-imxrt1050.c
+@@ -42,7 +42,7 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
+ struct device_node *anp;
+ int ret;
+
+- clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,
++ clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws,
+ IMXRT1050_CLK_END), GFP_KERNEL);
+ if (WARN_ON(!clk_hw_data))
+ return -ENOMEM;
+@@ -53,10 +53,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
+ hws[IMXRT1050_CLK_OSC] = imx_get_clk_hw_by_name(np, "osc");
+
+ anp = of_find_compatible_node(NULL, NULL, "fsl,imxrt-anatop");
+- pll_base = of_iomap(anp, 0);
++ pll_base = devm_of_iomap(dev, anp, 0, NULL);
+ of_node_put(anp);
+- if (WARN_ON(!pll_base))
+- return -ENOMEM;
++ if (WARN_ON(IS_ERR(pll_base))) {
++ ret = PTR_ERR(pll_base);
++ goto unregister_hws;
++ }
+
+ /* Anatop clocks */
+ hws[IMXRT1050_CLK_DUMMY] = imx_clk_hw_fixed("dummy", 0UL);
+@@ -104,8 +106,10 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
+
+ /* CCM clocks */
+ ccm_base = devm_platform_ioremap_resource(pdev, 0);
+- if (WARN_ON(IS_ERR(ccm_base)))
+- return PTR_ERR(ccm_base);
++ if (WARN_ON(IS_ERR(ccm_base))) {
++ ret = PTR_ERR(ccm_base);
++ goto unregister_hws;
++ }
+
+ hws[IMXRT1050_CLK_ARM_PODF] = imx_clk_hw_divider("arm_podf", "pll1_arm", ccm_base + 0x10, 0, 3);
+ hws[IMXRT1050_CLK_PRE_PERIPH_SEL] = imx_clk_hw_mux("pre_periph_sel", ccm_base + 0x18, 18, 2,
+@@ -149,8 +153,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)
+ ret = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
+ if (ret < 0) {
+ dev_err(dev, "Failed to register clks for i.MXRT1050.\n");
+- imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END);
++ goto unregister_hws;
+ }
++ return 0;
++
++unregister_hws:
++ imx_unregister_hw_clocks(hws, IMXRT1050_CLK_END);
+ return ret;
+ }
+ static const struct of_device_id imxrt1050_clk_of_match[] = {commit 342161c11403ea00e9febc16baab1d883d589d04
+Author: Li Yang <lidaxian@hust.edu.cn>
+Date: Thu Apr 20 22:08:31 2023 +0800
+
+ usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe()
+
+ Smatch reports:
+ drivers/usb/phy/phy-tahvo.c: tahvo_usb_probe()
+ warn: missing unwind goto?
+
+ After geting irq, if ret < 0, it will return without error handling to
+ free memory.
+ Just add error handling to fix this problem.
+
+ Fixes: 0d45a1373e66 ("usb: phy: tahvo: add IRQ check")
+ Signed-off-by: Li Yang <lidaxian@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230420140832.9110-1-lidaxian@hust.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
+index 47562d49dfc1..5cac31c6029b 100644
+--- a/drivers/usb/phy/phy-tahvo.c
++++ b/drivers/usb/phy/phy-tahvo.c
+@@ -391,7 +391,7 @@ static int tahvo_usb_probe(struct platform_device *pdev)
+
+ tu->irq = ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+- return ret;
++ goto err_remove_phy;
+ ret = request_threaded_irq(tu->irq, NULL, tahvo_usb_vbus_interrupt,
+ IRQF_ONESHOT,
+ "tahvo-vbus", tu);commit c60738de85f40b0b9f5cb23c21f9246e5a47908c
+Author: Junyan Ye <yejunyan@hust.edu.cn>
+Date: Mon May 8 12:36:41 2023 +0800
+
+ PCI: ftpci100: Release the clock resources
+
+ Smatch reported:
+ 1. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
+ 'clk' from clk_prepare_enable() not released on lines: 442,451,462,478,512,517.
+ 2. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
+ 'p->bus_clk' from clk_prepare_enable() not released on lines: 451,462,478,512,517.
+
+ The clock resource is obtained by devm_clk_get(), and then
+ clk_prepare_enable() makes the clock resource ready for use. After that,
+ clk_disable_unprepare() should be called to release the clock resource
+ when it is no longer needed. However, while doing some error handling
+ in faraday_pci_probe(), clk_disable_unprepare() is not called to release
+ clk and p->bus_clk before returning. These return lines are exactly 442,
+ 451, 462, 478, 512, 517.
+
+ Fix this warning by replacing devm_clk_get() with devm_clk_get_enabled(),
+ which is equivalent to devm_clk_get() + clk_prepare_enable(). And with
+ devm_clk_get_enabled(), the clock will automatically be disabled,
+ unprepared and freed when the device is unbound from the bus.
+
+ Link: https://lore.kernel.org/r/20230508043641.23807-1-yejunyan@hust.edu.cn
+ Fixes: b3c433efb8a3 ("PCI: faraday: Fix wrong pointer passed to PTR_ERR()")
+ Fixes: 2eeb02b28579 ("PCI: faraday: Add clock handling")
+ Fixes: 783a862563f7 ("PCI: faraday: Use pci_parse_request_of_pci_ranges()")
+ Fixes: d3c68e0a7e34 ("PCI: faraday: Add Faraday Technology FTPCI100 PCI Host Bridge driver")
+ Fixes: f1e8bd21e39e ("PCI: faraday: Convert IRQ masking to raw PCI config accessors")
+ Signed-off-by: Junyan Ye <yejunyan@hust.edu.cn>
+ Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+
+diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
+index ecd3009df586..6e7981d2ed5e 100644
+--- a/drivers/pci/controller/pci-ftpci100.c
++++ b/drivers/pci/controller/pci-ftpci100.c
+@@ -429,22 +429,12 @@ static int faraday_pci_probe(struct platform_device *pdev)
+ p->dev = dev;
+
+ /* Retrieve and enable optional clocks */
+- clk = devm_clk_get(dev, "PCLK");
++ clk = devm_clk_get_enabled(dev, "PCLK");
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+- ret = clk_prepare_enable(clk);
+- if (ret) {
+- dev_err(dev, "could not prepare PCLK\n");
+- return ret;
+- }
+- p->bus_clk = devm_clk_get(dev, "PCICLK");
++ p->bus_clk = devm_clk_get_enabled(dev, "PCICLK");
+ if (IS_ERR(p->bus_clk))
+ return PTR_ERR(p->bus_clk);
+- ret = clk_prepare_enable(p->bus_clk);
+- if (ret) {
+- dev_err(dev, "could not prepare PCICLK\n");
+- return ret;
+- }
+
+ p->base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(p->base))commit 072210c725c4938682e58236eeeb19a2ddd0b817 +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Thu Mar 16 21:32:36 2023 +0800 + + wifi: ray_cs: add sanity check on local->sram/rmem/amem + + The ray_config uses ray_release as its unified error handling function. + However, it does not know if local->sram/rmem/amem succeeds or not. + + Fix this by adding sanity check on local->sram/rmem/amem in the + ray_relase. + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Signed-off-by: Kalle Valo <kvalo@kernel.org> + Link: https://lore.kernel.org/r/20230316133236.556198-3-dzm91@hust.edu.cn + +diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c +index 93eaf3dba6a9..4b53a9c70e7e 100644 +--- a/drivers/net/wireless/legacy/ray_cs.c ++++ b/drivers/net/wireless/legacy/ray_cs.c +@@ -738,9 +738,12 @@ static void ray_release(struct pcmcia_device *link) + + del_timer_sync(&local->timer); + +- iounmap(local->sram); +- iounmap(local->rmem); +- iounmap(local->amem); ++ if (local->sram) ++ iounmap(local->sram); ++ if (local->rmem) ++ iounmap(local->rmem); ++ if (local->amem) ++ iounmap(local->amem); + pcmcia_disable_device(link); + + dev_dbg(&link->dev, "ray_release ending\n");
commit daef020558bc34e8031263aa7cf9e803d709f93a
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Thu Mar 16 21:32:35 2023 +0800
+
+ wifi: ray_cs: remove one redundant del_timer
+
+ In ray_detach, it and its child function ray_release both call
+ del_timer(_sync) on the same timer.
+
+ Fix this by removing the del_timer_sync in the ray_detach, and revising
+ the del_timer to del_timer_sync.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Kalle Valo <kvalo@kernel.org>
+ Link: https://lore.kernel.org/r/20230316133236.556198-2-dzm91@hust.edu.cn
+
+diff --git a/drivers/net/wireless/legacy/ray_cs.c b/drivers/net/wireless/legacy/ray_cs.c
+index 38782d4c4694..93eaf3dba6a9 100644
+--- a/drivers/net/wireless/legacy/ray_cs.c
++++ b/drivers/net/wireless/legacy/ray_cs.c
+@@ -328,7 +328,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
+ static void ray_detach(struct pcmcia_device *link)
+ {
+ struct net_device *dev;
+- ray_dev_t *local;
+
+ dev_dbg(&link->dev, "ray_detach\n");
+
+@@ -337,9 +336,6 @@ static void ray_detach(struct pcmcia_device *link)
+
+ ray_release(link);
+
+- local = netdev_priv(dev);
+- del_timer_sync(&local->timer);
+-
+ if (link->priv) {
+ unregister_netdev(dev);
+ free_netdev(dev);
+@@ -740,7 +736,7 @@ static void ray_release(struct pcmcia_device *link)
+
+ dev_dbg(&link->dev, "ray_release\n");
+
+- del_timer(&local->timer);
++ del_timer_sync(&local->timer);
+
+ iounmap(local->sram);
+ iounmap(local->rmem);
+ commit 2e2fe5ac695a00ab03cab4db1f4d6be07168ed9d
+Author: Yuchen Yang <u202114568@hust.edu.cn>
+Date: Fri May 5 22:12:55 2023 +0800
+
+ scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
+
+ Smatch complains that:
+
+ tw_probe() warn: missing error code 'retval'
+
+ This patch adds error checking to tw_probe() to handle initialization
+ failure. If tw_reset_sequence() function returns a non-zero value, the
+ function will return -EINVAL to indicate initialization failure.
+
+ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
+ Signed-off-by: Yuchen Yang <u202114568@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230505141259.7730-1-u202114568@hust.edu.cn
+ Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
+index 36c34ced0cc1..f39c9ec2e781 100644
+--- a/drivers/scsi/3w-xxxx.c
++++ b/drivers/scsi/3w-xxxx.c
+@@ -2305,8 +2305,10 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
+ TW_DISABLE_INTERRUPTS(tw_dev);
+
+ /* Initialize the card */
+- if (tw_reset_sequence(tw_dev))
++ if (tw_reset_sequence(tw_dev)) {
++ retval = -EINVAL;
+ goto out_release_mem_region;
++ }
+
+ /* Set host specific parameters */
+ host->max_id = TW_MAX_UNITS;commit ec014683c564fb74fc68e8f5e84691d3b3839d24
+Author: Chao Wang <D202280639@hust.edu.cn>
+Date: Mon Apr 17 03:04:21 2023 +0000
+
+ iommu/rockchip: Fix unwind goto issue
+
+ Smatch complains that
+ drivers/iommu/rockchip-iommu.c:1306 rk_iommu_probe() warn: missing unwind goto?
+
+ The rk_iommu_probe function, after obtaining the irq value through
+ platform_get_irq, directly returns an error if the returned value
+ is negative, without releasing any resources.
+
+ Fix this by adding a new error handling label "err_pm_disable" and
+ use a goto statement to redirect to the error handling process. In
+ order to preserve the original semantics, set err to the value of irq.
+
+ Fixes: 1aa55ca9b14a ("iommu/rockchip: Move irq request past pm_runtime_enable")
+ Signed-off-by: Chao Wang <D202280639@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Heiko Stuebner <heiko@sntech.de>
+ Link: https://lore.kernel.org/r/20230417030421.2777-1-D202280639@hust.edu.cn
+ Signed-off-by: Joerg Roedel <jroedel@suse.de>
+
+diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
+index ea5a3088bb7e..4054030c3237 100644
+--- a/drivers/iommu/rockchip-iommu.c
++++ b/drivers/iommu/rockchip-iommu.c
+@@ -1335,20 +1335,22 @@ static int rk_iommu_probe(struct platform_device *pdev)
+ for (i = 0; i < iommu->num_irq; i++) {
+ int irq = platform_get_irq(pdev, i);
+
+- if (irq < 0)
+- return irq;
++ if (irq < 0) {
++ err = irq;
++ goto err_pm_disable;
++ }
+
+ err = devm_request_irq(iommu->dev, irq, rk_iommu_irq,
+ IRQF_SHARED, dev_name(dev), iommu);
+- if (err) {
+- pm_runtime_disable(dev);
+- goto err_remove_sysfs;
+- }
++ if (err)
++ goto err_pm_disable;
+ }
+
+ dma_set_mask_and_coherent(dev, rk_ops->dma_bit_mask);
+
+ return 0;
++err_pm_disable:
++ pm_runtime_disable(dev);
+ err_remove_sysfs:
+ iommu_device_sysfs_remove(&iommu->iommu);
+ err_put_group:commit 27b2ed5b6d53cd62fc61c3f259ae52f5cac23b66
+Author: Jiakai Luo <jkluo@hust.edu.cn>
+Date: Sat Apr 22 06:34:06 2023 -0700
+
+ iio: adc: mxs-lradc: fix the order of two cleanup operations
+
+ Smatch reports:
+ drivers/iio/adc/mxs-lradc-adc.c:766 mxs_lradc_adc_probe() warn:
+ missing unwind goto?
+
+ the order of three init operation:
+ 1.mxs_lradc_adc_trigger_init
+ 2.iio_triggered_buffer_setup
+ 3.mxs_lradc_adc_hw_init
+
+ thus, the order of three cleanup operation should be:
+ 1.mxs_lradc_adc_hw_stop
+ 2.iio_triggered_buffer_cleanup
+ 3.mxs_lradc_adc_trigger_remove
+
+ we exchange the order of two cleanup operations,
+ introducing the following differences:
+ 1.if mxs_lradc_adc_trigger_init fails, returns directly;
+ 2.if trigger_init succeeds but iio_triggered_buffer_setup fails,
+ goto err_trig and remove the trigger.
+
+ In addition, we also reorder the unwind that goes on in the
+ remove() callback to match the new ordering.
+
+ Fixes: 6dd112b9f85e ("iio: adc: mxs-lradc: Add support for ADC driver")
+ Signed-off-by: Jiakai Luo <jkluo@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230422133407.72908-1-jkluo@hust.edu.cn
+ Cc: <Stable@vger.kernel.org>
+ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+
+diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c
+index bca79a93cbe4..a50f39143d3e 100644
+--- a/drivers/iio/adc/mxs-lradc-adc.c
++++ b/drivers/iio/adc/mxs-lradc-adc.c
+@@ -757,13 +757,13 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
+
+ ret = mxs_lradc_adc_trigger_init(iio);
+ if (ret)
+- goto err_trig;
++ return ret;
+
+ ret = iio_triggered_buffer_setup(iio, &iio_pollfunc_store_time,
+ &mxs_lradc_adc_trigger_handler,
+ &mxs_lradc_adc_buffer_ops);
+ if (ret)
+- return ret;
++ goto err_trig;
+
+ adc->vref_mv = mxs_lradc_adc_vref_mv[lradc->soc];
+
+@@ -801,9 +801,9 @@ static int mxs_lradc_adc_probe(struct platform_device *pdev)
+
+ err_dev:
+ mxs_lradc_adc_hw_stop(adc);
+- mxs_lradc_adc_trigger_remove(iio);
+-err_trig:
+ iio_triggered_buffer_cleanup(iio);
++err_trig:
++ mxs_lradc_adc_trigger_remove(iio);
+ return ret;
+ }
+
+@@ -814,8 +814,8 @@ static int mxs_lradc_adc_remove(struct platform_device *pdev)
+
+ iio_device_unregister(iio);
+ mxs_lradc_adc_hw_stop(adc);
+- mxs_lradc_adc_trigger_remove(iio);
+ iio_triggered_buffer_cleanup(iio);
++ mxs_lradc_adc_trigger_remove(iio);
+
+ return 0;
+ }commit 8ab5fc55d7f65d58a3c3aeadf11bdf60267cd2bd
+Author: Ke Zhang <m202171830@hust.edu.cn>
+Date: Fri Apr 28 11:16:36 2023 +0800
+
+ serial: arc_uart: fix of_iomap leak in `arc_serial_probe`
+
+ Smatch reports:
+
+ drivers/tty/serial/arc_uart.c:631 arc_serial_probe() warn:
+ 'port->membase' from of_iomap() not released on lines: 631.
+
+ In arc_serial_probe(), if uart_add_one_port() fails,
+ port->membase is not released, which would cause a resource leak.
+
+ To fix this, I replace of_iomap with devm_platform_ioremap_resource.
+
+ Fixes: 8dbe1d5e09a7 ("serial/arc: inline the probe helper")
+ Signed-off-by: Ke Zhang <m202171830@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230428031636.44642-1-m202171830@hust.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
+index 59e25f2b6632..4b2512eef577 100644
+--- a/drivers/tty/serial/arc_uart.c
++++ b/drivers/tty/serial/arc_uart.c
+@@ -606,10 +606,11 @@ static int arc_serial_probe(struct platform_device *pdev)
+ }
+ uart->baud = val;
+
+- port->membase = of_iomap(np, 0);
+- if (!port->membase)
++ port->membase = devm_platform_ioremap_resource(pdev, 0);
++ if (IS_ERR(port->membase)) {
+ /* No point of dev_err since UART itself is hosed here */
+- return -ENXIO;
++ return PTR_ERR(port->membase);
++ }
+
+ port->irq = irq_of_parse_and_map(np, 0);
+ commit 5a6bef734247c7a8c19511664ff77634ab86f45b
+Author: Zongjie Li <u202112089@hust.edu.cn>
+Date: Tue May 9 19:27:26 2023 +0800
+
+ fbdev: arcfb: Fix error handling in arcfb_probe()
+
+ Smatch complains that:
+ arcfb_probe() warn: 'irq' from request_irq() not released on lines: 587.
+
+ Fix error handling in the arcfb_probe() function. If IO addresses are
+ not provided or framebuffer registration fails, the code will jump to
+ the err_addr or err_register_fb label to release resources.
+ If IRQ request fails, previously allocated resources will be freed.
+
+ Fixes: 1154ea7dcd8e ("[PATCH] Framebuffer driver for Arc LCD board")
+ Signed-off-by: Zongjie Li <u202112089@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Helge Deller <deller@gmx.de>
+
+diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
+index 45e64016db32..024d0ee4f04f 100644
+--- a/drivers/video/fbdev/arcfb.c
++++ b/drivers/video/fbdev/arcfb.c
+@@ -523,7 +523,7 @@ static int arcfb_probe(struct platform_device *dev)
+
+ info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
+ if (!info)
+- goto err;
++ goto err_fb_alloc;
+
+ info->screen_base = (char __iomem *)videomemory;
+ info->fbops = &arcfb_ops;
+@@ -535,7 +535,7 @@ static int arcfb_probe(struct platform_device *dev)
+
+ if (!dio_addr || !cio_addr || !c2io_addr) {
+ printk(KERN_WARNING "no IO addresses supplied\n");
+- goto err1;
++ goto err_addr;
+ }
+ par->dio_addr = dio_addr;
+ par->cio_addr = cio_addr;
+@@ -551,12 +551,12 @@ static int arcfb_probe(struct platform_device *dev)
+ printk(KERN_INFO
+ "arcfb: Failed req IRQ %d\n", par->irq);
+ retval = -EBUSY;
+- goto err1;
++ goto err_addr;
+ }
+ }
+ retval = register_framebuffer(info);
+ if (retval < 0)
+- goto err1;
++ goto err_register_fb;
+ platform_set_drvdata(dev, info);
+ fb_info(info, "Arc frame buffer device, using %dK of video memory\n",
+ videomemorysize >> 10);
+@@ -580,9 +580,12 @@ static int arcfb_probe(struct platform_device *dev)
+ }
+
+ return 0;
+-err1:
++
++err_register_fb:
++ free_irq(par->irq, info);
++err_addr:
+ framebuffer_release(info);
+-err:
++err_fb_alloc:
+ vfree(videomemory);
+ return retval;
+ }commit 123ee07ba5b7123e0ce0e0f9d64938026c16a2ce
+Author: XuDong Liu <m202071377@hust.edu.cn>
+Date: Sun Apr 30 19:23:46 2023 +0800
+
+ drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks`
+
+ Smatch reports:
+ drivers/gpu/drm/sun4i/sun4i_tcon.c:805 sun4i_tcon_init_clocks() warn:
+ 'tcon->clk' from clk_prepare_enable() not released on lines: 792,801.
+
+ In the function sun4i_tcon_init_clocks(), tcon->clk and tcon->sclk0 are
+ not disabled in the error handling, which affects the release of
+ these variable. Although sun4i_tcon_bind(), which calls
+ sun4i_tcon_init_clocks(), use sun4i_tcon_free_clocks to disable the
+ variables mentioned, but the error handling branch of
+ sun4i_tcon_init_clocks() ignores the required disable process.
+
+ To fix this issue, use the devm_clk_get_enabled to automatically
+ balance enable and disabled calls. As original implementation use
+ sun4i_tcon_free_clocks() to disable clk explicitly, we delete the
+ related calls and error handling that are no longer needed.
+
+ Fixes: 9026e0d122ac ("drm: Add Allwinner A10 Display Engine support")
+ Fixes: b14e945bda8a ("drm/sun4i: tcon: Prepare and enable TCON channel 0 clock at init")
+ Fixes: 8e9240472522 ("drm/sun4i: support TCONs without channel 1")
+ Fixes: 34d698f6e349 ("drm/sun4i: Add has_channel_0 TCON quirk")
+ Signed-off-by: XuDong Liu <m202071377@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+ Link: https://patchwork.freedesktop.org/patch/msgid/20230430112347.4689-1-m202071377@hust.edu.cn
+
+diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
+index b263de7a8237..6a52fb12cbfb 100644
+--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
++++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
+@@ -784,21 +784,19 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)
+ static int sun4i_tcon_init_clocks(struct device *dev,
+ struct sun4i_tcon *tcon)
+ {
+- tcon->clk = devm_clk_get(dev, "ahb");
++ tcon->clk = devm_clk_get_enabled(dev, "ahb");
+ if (IS_ERR(tcon->clk)) {
+ dev_err(dev, "Couldn't get the TCON bus clock\n");
+ return PTR_ERR(tcon->clk);
+ }
+- clk_prepare_enable(tcon->clk);
+
+ if (tcon->quirks->has_channel_0) {
+- tcon->sclk0 = devm_clk_get(dev, "tcon-ch0");
++ tcon->sclk0 = devm_clk_get_enabled(dev, "tcon-ch0");
+ if (IS_ERR(tcon->sclk0)) {
+ dev_err(dev, "Couldn't get the TCON channel 0 clock\n");
+ return PTR_ERR(tcon->sclk0);
+ }
+ }
+- clk_prepare_enable(tcon->sclk0);
+
+ if (tcon->quirks->has_channel_1) {
+ tcon->sclk1 = devm_clk_get(dev, "tcon-ch1");
+@@ -811,12 +809,6 @@ static int sun4i_tcon_init_clocks(struct device *dev,
+ return 0;
+ }
+
+-static void sun4i_tcon_free_clocks(struct sun4i_tcon *tcon)
+-{
+- clk_disable_unprepare(tcon->sclk0);
+- clk_disable_unprepare(tcon->clk);
+-}
+-
+ static int sun4i_tcon_init_irq(struct device *dev,
+ struct sun4i_tcon *tcon)
+ {
+@@ -1229,14 +1221,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
+ ret = sun4i_tcon_init_regmap(dev, tcon);
+ if (ret) {
+ dev_err(dev, "Couldn't init our TCON regmap\n");
+- goto err_free_clocks;
++ goto err_assert_reset;
+ }
+
+ if (tcon->quirks->has_channel_0) {
+ ret = sun4i_dclk_create(dev, tcon);
+ if (ret) {
+ dev_err(dev, "Couldn't create our TCON dot clock\n");
+- goto err_free_clocks;
++ goto err_assert_reset;
+ }
+ }
+
+@@ -1299,8 +1291,6 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
+ err_free_dclk:
+ if (tcon->quirks->has_channel_0)
+ sun4i_dclk_free(tcon);
+-err_free_clocks:
+- sun4i_tcon_free_clocks(tcon);
+ err_assert_reset:
+ reset_control_assert(tcon->lcd_rst);
+ return ret;
+@@ -1314,7 +1304,6 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,
+ list_del(&tcon->list);
+ if (tcon->quirks->has_channel_0)
+ sun4i_dclk_free(tcon);
+- sun4i_tcon_free_clocks(tcon);
+ }
+
+ static const struct component_ops sun4i_tcon_ops = {commit f025312b089474a54e4859f3453771314d9e3d4f
+Author: Jinhong Zhu <jinhongzhu@hust.edu.cn>
+Date: Tue May 2 22:00:21 2023 +0800
+
+ scsi: qedf: Fix NULL dereference in error handling
+
+ Smatch reported:
+
+ drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
+ warn: missing unwind goto?
+
+ At this point in the function, nothing has been allocated so we can return
+ directly. In particular the "qedf->global_queues" have not been allocated
+ so calling qedf_free_global_queues() will lead to a NULL dereference when
+ we check if (!gl[i]) and "gl" is NULL.
+
+ Fixes: 61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.")
+ Signed-off-by: Jinhong Zhu <jinhongzhu@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230502140022.2852-1-jinhongzhu@hust.edu.cn
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
+index 3b64de81ea0d..2a31ddc99dde 100644
+--- a/drivers/scsi/qedf/qedf_main.c
++++ b/drivers/scsi/qedf/qedf_main.c
+@@ -3041,9 +3041,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)
+ * addresses of our queues
+ */
+ if (!qedf->p_cpuq) {
+- status = -EINVAL;
+ QEDF_ERR(&qedf->dbg_ctx, "p_cpuq is NULL.\n");
+- goto mem_alloc_failure;
++ return -EINVAL;
+ }
+
+ qedf->global_queues = kzalloc((sizeof(struct global_queue *)commit f3dc7bb037d813ab7da84f488dd485f0fce66347
+Author: Wang Jikai <wangjikai@hust.edu.cn>
+Date: Fri Apr 21 09:22:00 2023 +0000
+
+ wifi: mt7601u: delete dead code checking debugfs returns
+
+ Smatch reports that:
+ drivers/net/wireless/mediatek/mt7601u/debugfs.c:130
+ mt7601u_init_debugfs() warn: 'dir' is an error pointer or valid".
+
+ Debugfs code is not supposed to need error checking so instead of
+ changing this to if (IS_ERR()) the correct thing is to just delete
+ the dead code.
+
+ Signed-off-by: Wang Jikai <wangjikai@hust.edu.cn>
+ Acked-by: Jakub Kicinski <kuba@kernel.org>
+ Signed-off-by: Kalle Valo <kvalo@kernel.org>
+ Link: https://lore.kernel.org/r/20230421092200.24456-1-wangjikai@hust.edu.cn
+
+diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
+index 230b0e1061a7..dbddf256921b 100644
+--- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
++++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
+@@ -127,8 +127,6 @@ void mt7601u_init_debugfs(struct mt7601u_dev *dev)
+ struct dentry *dir;
+
+ dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
+- if (!dir)
+- return;
+
+ debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
+ debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);commit 0d727e1856ef22dd9337199430258cb64cbbc658
+Author: Ruliang Lin <u202112092@hust.edu.cn>
+Date: Thu May 4 14:50:53 2023 +0800
+
+ ALSA: caiaq: input: Add error handling for unsupported input methods in `snd_usb_caiaq_input_init`
+
+ Smatch complains that:
+ snd_usb_caiaq_input_init() warn: missing error code 'ret'
+
+ This patch adds a new case to handle the situation where the
+ device does not support any input methods in the
+ `snd_usb_caiaq_input_init` function. It returns an `-EINVAL` error code
+ to indicate that no input methods are supported on the device.
+
+ Fixes: 523f1dce3743 ("[ALSA] Add Native Instrument usb audio device support")
+ Signed-off-by: Ruliang Lin <u202112092@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Acked-by: Daniel Mack <daniel@zonque.org>
+ Link: https://lore.kernel.org/r/20230504065054.3309-1-u202112092@hust.edu.cn
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
+index 1e2cf2f08eec..84f26dce7f5d 100644
+--- a/sound/usb/caiaq/input.c
++++ b/sound/usb/caiaq/input.c
+@@ -804,6 +804,7 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev)
+
+ default:
+ /* no input methods supported on this device */
++ ret = -EINVAL;
+ goto exit_free_idev;
+ }
+ commit a3e9a9a5971164933e0d247125897c2e54587c6b
+Author: Kang Chen <void0red@hust.edu.cn>
+Date: Wed Apr 19 10:07:49 2023 +0800
+
+ thermal/drivers/mediatek: Change clk_prepare_enable to devm_clk_get_enabled in mtk_thermal_probe
+
+ Use devm_clk_get_enabled to do automatic resource management.
+ Meanwhile, remove error handling labels in the probe function and
+ the whole remove function.
+
+ Signed-off-by: Kang Chen <void0red@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+ Link: https://lore.kernel.org/r/20230419020749.621257-2-void0red@hust.edu.cn
+
+diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
+index 49bcd5304802..b59fe4307b0a 100644
+--- a/drivers/thermal/mediatek/auxadc_thermal.c
++++ b/drivers/thermal/mediatek/auxadc_thermal.c
+@@ -1206,14 +1206,6 @@ static int mtk_thermal_probe(struct platform_device *pdev)
+
+ mt->conf = of_device_get_match_data(&pdev->dev);
+
+- mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm");
+- if (IS_ERR(mt->clk_peri_therm))
+- return PTR_ERR(mt->clk_peri_therm);
+-
+- mt->clk_auxadc = devm_clk_get(&pdev->dev, "auxadc");
+- if (IS_ERR(mt->clk_auxadc))
+- return PTR_ERR(mt->clk_auxadc);
+-
+ mt->thermal_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+ if (IS_ERR(mt->thermal_base))
+ return PTR_ERR(mt->thermal_base);
+@@ -1272,16 +1264,18 @@ static int mtk_thermal_probe(struct platform_device *pdev)
+ if (ret)
+ return ret;
+
+- ret = clk_prepare_enable(mt->clk_auxadc);
+- if (ret) {
++ mt->clk_auxadc = devm_clk_get_enabled(&pdev->dev, "auxadc");
++ if (IS_ERR(mt->clk_auxadc)) {
++ ret = PTR_ERR(mt->clk_auxadc);
+ dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret);
+ return ret;
+ }
+
+- ret = clk_prepare_enable(mt->clk_peri_therm);
+- if (ret) {
++ mt->clk_peri_therm = devm_clk_get_enabled(&pdev->dev, "therm");
++ if (IS_ERR(mt->clk_peri_therm)) {
++ ret = PTR_ERR(mt->clk_peri_therm);
+ dev_err(&pdev->dev, "Can't enable peri clk: %d\n", ret);
+- goto err_disable_clk_auxadc;
++ return ret;
+ }
+
+ mtk_thermal_turn_on_buffer(mt, apmixed_base);
+@@ -1305,38 +1299,18 @@ static int mtk_thermal_probe(struct platform_device *pdev)
+
+ tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt,
+ &mtk_thermal_ops);
+- if (IS_ERR(tzdev)) {
+- ret = PTR_ERR(tzdev);
+- goto err_disable_clk_peri_therm;
+- }
++ if (IS_ERR(tzdev))
++ return PTR_ERR(tzdev);
+
+ ret = devm_thermal_add_hwmon_sysfs(&pdev->dev, tzdev);
+ if (ret)
+ dev_warn(&pdev->dev, "error in thermal_add_hwmon_sysfs");
+
+ return 0;
+-
+-err_disable_clk_peri_therm:
+- clk_disable_unprepare(mt->clk_peri_therm);
+-err_disable_clk_auxadc:
+- clk_disable_unprepare(mt->clk_auxadc);
+-
+- return ret;
+-}
+-
+-static int mtk_thermal_remove(struct platform_device *pdev)
+-{
+- struct mtk_thermal *mt = platform_get_drvdata(pdev);
+-
+- clk_disable_unprepare(mt->clk_peri_therm);
+- clk_disable_unprepare(mt->clk_auxadc);
+-
+- return 0;
+ }
+
+ static struct platform_driver mtk_thermal_driver = {
+ .probe = mtk_thermal_probe,
+- .remove = mtk_thermal_remove,
+ .driver = {
+ .name = "mtk-thermal",
+ .of_match_table = mtk_thermal_of_match,
+ commit f05c7b7d9ea9477fcc388476c6f4ade8c66d2d26
+Author: Kang Chen <void0red@hust.edu.cn>
+Date: Wed Apr 19 10:07:48 2023 +0800
+
+ thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe
+
+ Smatch reports:
+ 1. mtk_thermal_probe() warn: 'apmixed_base' from of_iomap() not released.
+ 2. mtk_thermal_probe() warn: 'auxadc_base' from of_iomap() not released.
+
+ The original code forgets to release iomap resource when handling errors,
+ fix it by switch to devm_of_iomap.
+
+ Fixes: 89945047b166 ("thermal: mediatek: Add tsensor support for V2 thermal system")
+ Signed-off-by: Kang Chen <void0red@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+ Link: https://lore.kernel.org/r/20230419020749.621257-1-void0red@hust.edu.cn
+
+diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
+index e908c8e9d558..49bcd5304802 100644
+--- a/drivers/thermal/mediatek/auxadc_thermal.c
++++ b/drivers/thermal/mediatek/auxadc_thermal.c
+@@ -1232,7 +1232,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)
+ return -ENODEV;
+ }
+
+- auxadc_base = of_iomap(auxadc, 0);
++ auxadc_base = devm_of_iomap(&pdev->dev, auxadc, 0, NULL);
++ if (IS_ERR(auxadc_base)) {
++ of_node_put(auxadc);
++ return PTR_ERR(auxadc_base);
++ }
++
+ auxadc_phys_base = of_get_phys_base(auxadc);
+
+ of_node_put(auxadc);
+@@ -1248,7 +1253,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)
+ return -ENODEV;
+ }
+
+- apmixed_base = of_iomap(apmixedsys, 0);
++ apmixed_base = devm_of_iomap(&pdev->dev, apmixedsys, 0, NULL);
++ if (IS_ERR(apmixed_base)) {
++ of_node_put(apmixedsys);
++ return PTR_ERR(apmixed_base);
++ }
++
+ apmixed_phys_base = of_get_phys_base(apmixedsys);
+
+ of_node_put(apmixedsys);commit d325c34d9e7e38d371c0a299d415e9b07f66a1fb
+Author: Gencen Gan <gangecen@hust.edu.cn>
+Date: Mon Apr 24 23:28:01 2023 +0800
+
+ net: amd: Fix link leak when verifying config failed
+
+ After failing to verify configuration, it returns directly without
+ releasing link, which may cause memory leak.
+
+ Paolo Abeni thinks that the whole code of this driver is quite
+ "suboptimal" and looks unmainatained since at least ~15y, so he
+ suggests that we could simply remove the whole driver, please
+ take it into consideration.
+
+ Simon Horman suggests that the fix label should be set to
+ "Linux-2.6.12-rc2" considering that the problem has existed
+ since the driver was introduced and the commit above doesn't
+ seem to exist in net/net-next.
+
+ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
+ Signed-off-by: Gan Gecen <gangecen@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
+index 823a329a921f..0dd391c84c13 100644
+--- a/drivers/net/ethernet/amd/nmclan_cs.c
++++ b/drivers/net/ethernet/amd/nmclan_cs.c
+@@ -651,7 +651,7 @@ static int nmclan_config(struct pcmcia_device *link)
+ } else {
+ pr_notice("mace id not found: %x %x should be 0x40 0x?9\n",
+ sig[0], sig[1]);
+- return -ENODEV;
++ goto failed;
+ }
+ }
+ commit e515c330d7e22692d03475740fa45d179281cdf7
+Author: Jianuo Kuang <u202110722@hust.edu.cn>
+Date: Mon Apr 24 10:41:40 2023 +0800
+
+ drivers: nfc: nfcsim: remove return value check of `dev_dir`
+
+ Smatch complains that:
+ nfcsim_debugfs_init_dev() warn: 'dev_dir' is an error pointer or valid
+
+ According to the documentation of the debugfs_create_dir() function,
+ there is no need to check the return value of this function.
+ Just delete the dead code.
+
+ Signed-off-by: Jianuo Kuang <u202110722@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+ Link: https://lore.kernel.org/r/20230424024140.34607-1-u202110722@hust.edu.cn
+ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+
+diff --git a/drivers/nfc/nfcsim.c b/drivers/nfc/nfcsim.c
+index 85bf8d586c70..44eeb17ae48d 100644
+--- a/drivers/nfc/nfcsim.c
++++ b/drivers/nfc/nfcsim.c
+@@ -367,11 +367,6 @@ static void nfcsim_debugfs_init_dev(struct nfcsim *dev)
+ }
+
+ dev_dir = debugfs_create_dir(devname, nfcsim_debugfs_root);
+- if (!dev_dir) {
+- NFCSIM_ERR(dev, "Could not create debugfs entries for nfc%d\n",
+- idx);
+- return;
+- }
+
+ debugfs_create_u8("dropframe", 0664, dev_dir, &dev->dropframe);
+ }commit fb73556386e074e9bee9fa2d253aeaefe4e063e0
+Author: Qinrun Dai <flno@hust.edu.cn>
+Date: Thu Apr 13 13:50:37 2023 +0000
+
+ clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails
+
+ Smatch reports:
+ drivers/clocksource/timer-davinci.c:332 davinci_timer_register()
+ warn: 'base' from ioremap() not released on lines: 274.
+
+ Fix this and other potential memory leak problems
+ by adding a set of corresponding exit lables.
+
+ Fixes: 721154f972aa ("clocksource/drivers/davinci: Add support for clockevents")
+ Signed-off-by: Qinrun Dai <flno@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230413135037.1505799-1-flno@hust.edu.cn
+ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
+
+diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c
+index 9996c0542520..b1c248498be4 100644
+--- a/drivers/clocksource/timer-davinci.c
++++ b/drivers/clocksource/timer-davinci.c
+@@ -257,21 +257,25 @@ int __init davinci_timer_register(struct clk *clk,
+ resource_size(&timer_cfg->reg),
+ "davinci-timer")) {
+ pr_err("Unable to request memory region\n");
+- return -EBUSY;
++ rv = -EBUSY;
++ goto exit_clk_disable;
+ }
+
+ base = ioremap(timer_cfg->reg.start, resource_size(&timer_cfg->reg));
+ if (!base) {
+ pr_err("Unable to map the register range\n");
+- return -ENOMEM;
++ rv = -ENOMEM;
++ goto exit_mem_region;
+ }
+
+ davinci_timer_init(base);
+ tick_rate = clk_get_rate(clk);
+
+ clockevent = kzalloc(sizeof(*clockevent), GFP_KERNEL);
+- if (!clockevent)
+- return -ENOMEM;
++ if (!clockevent) {
++ rv = -ENOMEM;
++ goto exit_iounmap_base;
++ }
+
+ clockevent->dev.name = "tim12";
+ clockevent->dev.features = CLOCK_EVT_FEAT_ONESHOT;
+@@ -296,7 +300,7 @@ int __init davinci_timer_register(struct clk *clk,
+ "clockevent/tim12", clockevent);
+ if (rv) {
+ pr_err("Unable to request the clockevent interrupt\n");
+- return rv;
++ goto exit_free_clockevent;
+ }
+
+ davinci_clocksource.dev.rating = 300;
+@@ -323,13 +327,27 @@ int __init davinci_timer_register(struct clk *clk,
+ rv = clocksource_register_hz(&davinci_clocksource.dev, tick_rate);
+ if (rv) {
+ pr_err("Unable to register clocksource\n");
+- return rv;
++ goto exit_free_irq;
+ }
+
+ sched_clock_register(davinci_timer_read_sched_clock,
+ DAVINCI_TIMER_CLKSRC_BITS, tick_rate);
+
+ return 0;
++
++exit_free_irq:
++ free_irq(timer_cfg->irq[DAVINCI_TIMER_CLOCKEVENT_IRQ].start,
++ clockevent);
++exit_free_clockevent:
++ kfree(clockevent);
++exit_iounmap_base:
++ iounmap(base);
++exit_mem_region:
++ release_mem_region(timer_cfg->reg.start,
++ resource_size(&timer_cfg->reg));
++exit_clk_disable:
++ clk_disable_unprepare(clk);
++ return rv;
+ }
+
+ static int __init of_davinci_timer_register(struct device_node *np)commit d184d60aa301e424cd0cf7de90b40744710a2417
+Author: Zhengkang Huang <zkhuang@hust.edu.cn>
+Date: Wed Apr 19 18:03:03 2023 +0800
+
+ platform/chrome: wilco_ec: remove return value check of debugfs_create_dir()
+
+ Smatch complains that:
+ wilco_ec_debugfs_probe() warn: 'debug_info->dir' is an error
+ pointer or valid
+
+ Debugfs checks are generally not supposed to be checked
+ for errors and it is not necessary here.
+
+ Just delete the dead code.
+
+ Signed-off-by: Zhengkang Huang <zkhuang@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
+ Link: https://lore.kernel.org/r/20230419100303.343379-1-zkhuang@hust.edu.cn
+
+diff --git a/drivers/platform/chrome/wilco_ec/debugfs.c b/drivers/platform/chrome/wilco_ec/debugfs.c
+index a812788a0bdc..7a13f13b16cd 100644
+--- a/drivers/platform/chrome/wilco_ec/debugfs.c
++++ b/drivers/platform/chrome/wilco_ec/debugfs.c
+@@ -251,8 +251,6 @@ static int wilco_ec_debugfs_probe(struct platform_device *pdev)
+ return 0;
+ debug_info->ec = ec;
+ debug_info->dir = debugfs_create_dir("wilco_ec", NULL);
+- if (!debug_info->dir)
+- return 0;
+ debugfs_create_file("raw", 0644, debug_info->dir, NULL, &fops_raw);
+ debugfs_create_file("h1_gpio", 0444, debug_info->dir, ec,
+ &fops_h1_gpio);commit 3c690a0d64f5964977050a91b6bba8de09c13d94 +Author: Lanzhe Li <u202212060@hust.edu.cn> +Date: Sun Apr 9 21:02:29 2023 +0800 + + Bluetooth: fix inconsistent indenting + + Fixed a wrong indentation before "return".This line uses a 7 space + indent instead of a tab. + + Signed-off-by: Lanzhe Li <u202212060@hust.edu.cn> + Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> + +diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c +index b7f682922a16..ec0df2f9188e 100644 +--- a/net/bluetooth/hci_debugfs.c ++++ b/net/bluetooth/hci_debugfs.c +@@ -189,7 +189,7 @@ static int uuids_show(struct seq_file *f, void *p) + } + hci_dev_unlock(hdev); + +- return 0; ++ return 0; + } + + DEFINE_SHOW_ATTRIBUTE(uuids);
commit b148b9abc8444c9e0579a6bbe47b2da6adf5a150
+Author: Wang Zhang <silver_code@hust.edu.cn>
+Date: Fri Apr 21 23:10:09 2023 +0800
+
+ net: ethernet: mediatek: remove return value check of `mtk_wed_hw_add_debugfs`
+
+ Smatch complains that:
+ mtk_wed_hw_add_debugfs() warn: 'dir' is an error pointer or valid
+
+ Debugfs checks are generally not supposed to be checked
+ for errors and it is not necessary here.
+
+ fix it by just deleting the dead code.
+
+ Signed-off-by: Wang Zhang <silver_code@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
+index 56f663439721..b244c02c5b51 100644
+--- a/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
++++ b/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c
+@@ -252,8 +252,6 @@ void mtk_wed_hw_add_debugfs(struct mtk_wed_hw *hw)
+
+ snprintf(hw->dirname, sizeof(hw->dirname), "wed%d", hw->index);
+ dir = debugfs_create_dir(hw->dirname, NULL);
+- if (!dir)
+- return;
+
+ hw->debugfs_dir = dir;
+ debugfs_create_u32("regidx", 0600, dir, &hw->debugfs_reg);commit eb74bfcfa99415f1a65ce021b8ac2256b7ed50bc
+Author: Yingsha Xu <ysxu@hust.edu.cn>
+Date: Wed Apr 19 18:45:47 2023 +0800
+
+ wifi: mac80211: remove return value check of debugfs_create_dir()
+
+ Smatch complains that:
+ debugfs_hw_add() warn: 'statsd' is an error pointer or valid
+
+ Debugfs checks are generally not supposed to be checked for errors
+ and it is not necessary here.
+
+ Just delete the dead code.
+
+ Signed-off-by: Yingsha Xu <ysxu@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230419104548.30124-1-ysxu@hust.edu.cn
+ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+
+diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
+index dfb9f55e2685..207f772bd8ce 100644
+--- a/net/mac80211/debugfs.c
++++ b/net/mac80211/debugfs.c
+@@ -673,10 +673,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
+
+ statsd = debugfs_create_dir("statistics", phyd);
+
+- /* if the dir failed, don't put all the other things into the root! */
+- if (!statsd)
+- return;
+-
+ #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+ DEBUGFS_STATS_ADD(dot11TransmittedFragmentCount);
+ DEBUGFS_STATS_ADD(dot11MulticastTransmittedFrameCount);commit d6f712f53b79f5017cdcefafb7a5aea9ec52da5d
+Author: Yinhao Hu <dddddd@hust.edu.cn>
+Date: Wed Apr 12 13:58:52 2023 +0800
+
+ usb: chipidea: fix missing goto in `ci_hdrc_probe`
+
+ From the comment of ci_usb_phy_init, it returns an error code if
+ usb_phy_init has failed, and it should do some clean up, not just
+ return directly.
+
+ Fix this by goto the error handling.
+
+ Fixes: 74475ede784d ("usb: chipidea: move PHY operation to core")
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Acked-by: Peter Chen <peter.chen@kernel.org>
+ Signed-off-by: Yinhao Hu <dddddd@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230412055852.971991-1-dddddd@hust.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
+index d1d252c87e4f..798cb077867a 100644
+--- a/drivers/usb/chipidea/core.c
++++ b/drivers/usb/chipidea/core.c
+@@ -1108,7 +1108,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
+ ret = ci_usb_phy_init(ci);
+ if (ret) {
+ dev_err(dev, "unable to init phy: %d\n", ret);
+- return ret;
++ goto ulpi_exit;
+ }
+
+ ci->hw_bank.phys = res->start;commit 359f5b0d4e26b7a7bcc574d6148b31a17cefe47d
+Author: Li Lanzhe <u202212060@hust.edu.cn>
+Date: Wed Apr 19 07:50:29 2023 -0400
+
+ spi: spi-rockchip: Fix missing unwind goto in rockchip_sfc_probe()
+
+ If devm_request_irq() fails, then we are directly return 'ret' without
+ clk_disable_unprepare(sfc->clk) and clk_disable_unprepare(sfc->hclk).
+
+ Fix this by changing direct return to a goto 'err_irq'.
+
+ Fixes: 0b89fc0a367e ("spi: rockchip-sfc: add rockchip serial flash controller")
+ Signed-off-by: Li Lanzhe <u202212060@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230419115030.6029-1-u202212060@hust.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
+index bd87d3c92dd3..69347b6bf60c 100644
+--- a/drivers/spi/spi-rockchip-sfc.c
++++ b/drivers/spi/spi-rockchip-sfc.c
+@@ -632,7 +632,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
+ if (ret) {
+ dev_err(dev, "Failed to request irq\n");
+
+- return ret;
++ goto err_irq;
+ }
+
+ ret = rockchip_sfc_init(sfc);
+ commit 1c34890273a020d61d6127ade3f68ed1cb21c16a
+Author: Liliang Ye <yll@hust.edu.cn>
+Date: Mon Apr 3 23:26:47 2023 +0800
+
+ ASoC: fsl_mqs: move of_node_put() to the correct location
+
+ of_node_put() should have been done directly after
+ mqs_priv->regmap = syscon_node_to_regmap(gpr_np);
+ otherwise it creates a reference leak on the success path.
+
+ To fix this, of_node_put() is moved to the correct location, and change
+ all the gotos to direct returns.
+
+ Fixes: a9d273671440 ("ASoC: fsl_mqs: Fix error handling in probe")
+ Signed-off-by: Liliang Ye <yll@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Link: https://lore.kernel.org/r/20230403152647.17638-1-yll@hust.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/sound/soc/fsl/fsl_mqs.c b/sound/soc/fsl/fsl_mqs.c
+index 3fb3d3e4d09a..49ae7f6267d3 100644
+--- a/sound/soc/fsl/fsl_mqs.c
++++ b/sound/soc/fsl/fsl_mqs.c
+@@ -210,10 +210,10 @@ static int fsl_mqs_probe(struct platform_device *pdev)
+ }
+
+ mqs_priv->regmap = syscon_node_to_regmap(gpr_np);
++ of_node_put(gpr_np);
+ if (IS_ERR(mqs_priv->regmap)) {
+ dev_err(&pdev->dev, "failed to get gpr regmap\n");
+- ret = PTR_ERR(mqs_priv->regmap);
+- goto err_free_gpr_np;
++ return PTR_ERR(mqs_priv->regmap);
+ }
+ } else {
+ regs = devm_platform_ioremap_resource(pdev, 0);
+@@ -242,8 +242,7 @@ static int fsl_mqs_probe(struct platform_device *pdev)
+ if (IS_ERR(mqs_priv->mclk)) {
+ dev_err(&pdev->dev, "failed to get the clock: %ld\n",
+ PTR_ERR(mqs_priv->mclk));
+- ret = PTR_ERR(mqs_priv->mclk);
+- goto err_free_gpr_np;
++ return PTR_ERR(mqs_priv->mclk);
+ }
+
+ dev_set_drvdata(&pdev->dev, mqs_priv);
+@@ -252,13 +251,9 @@ static int fsl_mqs_probe(struct platform_device *pdev)
+ ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_fsl_mqs,
+ &fsl_mqs_dai, 1);
+ if (ret)
+- goto err_free_gpr_np;
+- return 0;
+-
+-err_free_gpr_np:
+- of_node_put(gpr_np);
++ return ret;
+
+- return ret;
++ return 0;
+ }
+
+ static void fsl_mqs_remove(struct platform_device *pdev)commit 5c47cdebbaeb7724df6f9f46917c93e53f791547
+Author: Jiefeng Li <jiefeng_li@hust.edu.cn>
+Date: Wed Apr 12 14:22:34 2023 +0800
+
+ wifi: mt76: mt7921: fix missing unwind goto in `mt7921u_probe`
+
+ `mt7921u_dma_init` can only return zero or negative number according to its
+ definition. When it returns non-zero number, there exists an error and this
+ function should handle this error rather than return directly.
+
+ Fixes: 0d2afe09fad5 ("mt76: mt7921: add mt7921u driver")
+ Signed-off-by: Jiefeng Li <jiefeng_li@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
+ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+index 9b05e4577cdf..1f302c430339 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+@@ -259,7 +259,7 @@ static int mt7921u_probe(struct usb_interface *usb_intf,
+
+ ret = mt7921u_dma_init(dev, false);
+ if (ret)
+- return ret;
++ goto error;
+
+ hw = mt76_hw(dev);
+ /* check hw sg support in order to enable AMSDU */commit c4a413e56d16a2ae84e6d8992f215c4dcc7fac20
+Author: YAN SHI <m202071378@hust.edu.cn>
+Date: Wed Apr 12 11:35:29 2023 +0800
+
+ regulator: stm32-pwr: fix of_iomap leak
+
+ Smatch reports:
+ drivers/regulator/stm32-pwr.c:166 stm32_pwr_regulator_probe() warn:
+ 'base' from of_iomap() not released on lines: 151,166.
+
+ In stm32_pwr_regulator_probe(), base is not released
+ when devm_kzalloc() fails to allocate memory or
+ devm_regulator_register() fails to register a new regulator device,
+ which may cause a leak.
+
+ To fix this issue, replace of_iomap() with
+ devm_platform_ioremap_resource(). devm_platform_ioremap_resource()
+ is a specialized function for platform devices.
+ It allows 'base' to be automatically released whether the probe
+ function succeeds or fails.
+
+ Besides, use IS_ERR(base) instead of !base
+ as the return value of devm_platform_ioremap_resource()
+ can either be a pointer to the remapped memory or
+ an ERR_PTR() encoded error code if the operation fails.
+
+ Fixes: dc62f951a6a8 ("regulator: stm32-pwr: Fix return value check in stm32_pwr_regulator_probe()")
+ Signed-off-by: YAN SHI <m202071378@hust.edu.cn>
+ Reported-by: kernel test robot <lkp@intel.com>
+ Link: https://lore.kernel.org/oe-kbuild-all/202304111750.o2643eJN-lkp@intel.com/
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230412033529.18890-1-m202071378@hust.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c
+index 2803a199826f..68aa9d92953d 100644
+--- a/drivers/regulator/stm32-pwr.c
++++ b/drivers/regulator/stm32-pwr.c
+@@ -129,17 +129,16 @@ static const struct regulator_desc stm32_pwr_desc[] = {
+
+ static int stm32_pwr_regulator_probe(struct platform_device *pdev)
+ {
+- struct device_node *np = pdev->dev.of_node;
+ struct stm32_pwr_reg *priv;
+ void __iomem *base;
+ struct regulator_dev *rdev;
+ struct regulator_config config = { };
+ int i, ret = 0;
+
+- base = of_iomap(np, 0);
+- if (!base) {
++ base = devm_platform_ioremap_resource(pdev, 0);
++ if (IS_ERR(base)) {
+ dev_err(&pdev->dev, "Unable to map IO memory\n");
+- return -ENOMEM;
++ return PTR_ERR(base);
+ }
+
+ config.dev = &pdev->dev;commit d93ee84e3eb5d1afc081e57ca37f1411a01f2c94 +Author: Ying Liu <lyre@hust.edu.cn> +Date: Wed Apr 12 01:09:12 2023 +0800 + + ASoC: tas5720: add missing unwind goto in tas5720_codec_probe + + Smatch complains that missing unwind goto in tas5720_codec_probe. + + When tas5720 has an invalid devtype, it is expected to invoke + regulator_bulk_disable to handle the failure. But the default + option return an error code directly. Fix it by reusing the + probe_fail label. + + Signed-off-by: Ying Liu <lyre@hust.edu.cn> + Link: https://lore.kernel.org/r/20230411170912.1939906-1-lyre@hust.edu.cn + Signed-off-by: Mark Brown <broonie@kernel.org> + +diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c +index de6d01c8fdd3..4d27b60bd804 100644 +--- a/sound/soc/codecs/tas5720.c ++++ b/sound/soc/codecs/tas5720.c +@@ -339,7 +339,8 @@ static int tas5720_codec_probe(struct snd_soc_component *component) + break; + default: + dev_err(component->dev, "unexpected private driver data\n"); +- return -EINVAL; ++ ret = -EINVAL; ++ goto probe_fail; + } + + if (device_id != expected_device_id)
commit 8bfb89f6149ea8e790f58abad1f4a84066d86c91 +Author: Jun Chen <jun_c@hust.edu.cn> +Date: Mon Apr 10 10:37:23 2023 +0800 + + scsi: lpfc: Silence an incorrect device output + + In lpfc_sli4_pci_mem_unset(), case LPFC_SLI_INTF_IF_TYPE_1 does not have a + break statement, resulting in an incorrect device output. + + Fix this by adding a break statement before the default option. + + Signed-off-by: Jun Chen <jun_c@hust.edu.cn> + Link: https://lore.kernel.org/r/20230410023724.3209455-1-jun_c@hust.edu.cn + Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn> + Reviewed-by: Justin Tee <justin.tee@broadcom.com> + Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> + +diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c +index 3b0642dc023b..92e7197087bf 100644 +--- a/drivers/scsi/lpfc/lpfc_init.c ++++ b/drivers/scsi/lpfc/lpfc_init.c +@@ -12107,6 +12107,7 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba) + iounmap(phba->sli4_hba.dpp_regs_memmap_p); + break; + case LPFC_SLI_INTF_IF_TYPE_1: ++ break; + default: + dev_printk(KERN_ERR, &phba->pcidev->dev, + "FATAL - unsupported SLI4 interface type - %d\n",
commit 91a0c0c1413239d0548b5aac4c82f38f6d53a91e
+Author: Shuchang Li <lishuchang@hust.edu.cn>
+Date: Tue Apr 4 15:21:32 2023 +0800
+
+ scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup()
+
+ When if_type equals zero and pci_resource_start(pdev, PCI_64BIT_BAR4)
+ returns false, drbl_regs_memmap_p is not remapped. This passes a NULL
+ pointer to iounmap(), which can trigger a WARN() on certain arches.
+
+ When if_type equals six and pci_resource_start(pdev, PCI_64BIT_BAR4)
+ returns true, drbl_regs_memmap_p may has been remapped and
+ ctrl_regs_memmap_p is not remapped. This is a resource leak and passes a
+ NULL pointer to iounmap().
+
+ To fix these issues, we need to add null checks before iounmap(), and
+ change some goto labels.
+
+ Fixes: 1351e69fc6db ("scsi: lpfc: Add push-to-adapter support to sli4")
+ Signed-off-by: Shuchang Li <lishuchang@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230404072133.1022-1-lishuchang@hust.edu.cn
+ Reviewed-by: Justin Tee <justin.tee@broadcom.com>
+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+
+diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
+index a9e36c73cfc5..3b0642dc023b 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -12024,7 +12024,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)
+ goto out_iounmap_all;
+ } else {
+ error = -ENOMEM;
+- goto out_iounmap_all;
++ goto out_iounmap_ctrl;
+ }
+ }
+
+@@ -12042,7 +12042,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)
+ dev_err(&pdev->dev,
+ "ioremap failed for SLI4 HBA dpp registers.\n");
+ error = -ENOMEM;
+- goto out_iounmap_ctrl;
++ goto out_iounmap_all;
+ }
+ phba->pci_bar4_memmap_p = phba->sli4_hba.dpp_regs_memmap_p;
+ }
+@@ -12067,9 +12067,11 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)
+ return 0;
+
+ out_iounmap_all:
+- iounmap(phba->sli4_hba.drbl_regs_memmap_p);
++ if (phba->sli4_hba.drbl_regs_memmap_p)
++ iounmap(phba->sli4_hba.drbl_regs_memmap_p);
+ out_iounmap_ctrl:
+- iounmap(phba->sli4_hba.ctrl_regs_memmap_p);
++ if (phba->sli4_hba.ctrl_regs_memmap_p)
++ iounmap(phba->sli4_hba.ctrl_regs_memmap_p);
+ out_iounmap_conf:
+ iounmap(phba->sli4_hba.conf_regs_memmap_p);
+ commit fb4a624f88f658c7b7ae124452bd42eaa8ac7168
+Author: Xu Biang <xubiang@hust.edu.cn>
+Date: Thu Apr 6 06:28:01 2023 -0700
+
+ ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex()
+
+ Smatch Warns:
+ sound/firewire/tascam/tascam-stream.c:493 snd_tscm_stream_start_duplex()
+ warn: missing unwind goto?
+
+ The direct return will cause the stream list of "&tscm->domain" unemptied
+ and the session in "tscm" unfinished if amdtp_domain_start() returns with
+ an error.
+
+ Fix this by changing the direct return to a goto which will empty the
+ stream list of "&tscm->domain" and finish the session in "tscm".
+
+ The snd_tscm_stream_start_duplex() function is called in the prepare
+ callback of PCM. According to "ALSA Kernel API Documentation", the prepare
+ callback of PCM will be called many times at each setup. So, if the
+ "&d->streams" list is not emptied, when the prepare callback is called
+ next time, snd_tscm_stream_start_duplex() will receive -EBUSY from
+ amdtp_domain_add_stream() that tries to add an existing stream to the
+ domain. The error handling code after the "error" label will be executed
+ in this case, and the "&d->streams" list will be emptied. So not emptying
+ the "&d->streams" list will not cause an issue. But it is more efficient
+ and readable to empty it on the first error by changing the direct return
+ to a goto statement.
+
+ The session in "tscm" has been begun before amdtp_domain_start(), so it
+ needs to be finished when amdtp_domain_start() fails.
+
+ Fixes: c281d46a51e3 ("ALSA: firewire-tascam: support AMDTP domain")
+ Signed-off-by: Xu Biang <xubiang@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+ Cc: <stable@vger.kernel.org>
+ Link: https://lore.kernel.org/r/20230406132801.105108-1-xubiang@hust.edu.cn
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c
+index 53e094cc411f..dfe783d01d7d 100644
+--- a/sound/firewire/tascam/tascam-stream.c
++++ b/sound/firewire/tascam/tascam-stream.c
+@@ -490,7 +490,7 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate)
+ // packet is important for media clock recovery.
+ err = amdtp_domain_start(&tscm->domain, tx_init_skip_cycles, true, true);
+ if (err < 0)
+- return err;
++ goto error;
+
+ if (!amdtp_domain_wait_ready(&tscm->domain, READY_TIMEOUT_MS)) {
+ err = -ETIMEDOUT;commit 194f8692302cbf31d8072f3fc2710fb04720d8a0
+Author: Zihao Wang <u202012060@hust.edu.cn>
+Date: Tue Apr 4 16:46:22 2023 +0800
+
+ ASoC: tegra20_ac97: Add missing unwind goto in tegra20_ac97_platform_probe()
+
+ Smatch Warns:
+ sound/soc/tegra/tegra20_ac97.c:321 tegra20_ac97_platform_probe()
+ warn: missing unwind goto?
+
+ The goto will set the "soc_ac97_ops" and "soc_ac97_bus" operations to
+ NULL. But they are already NULL at this point so it is a no-op.
+ However, just for consistency, change the direct return to a goto. No
+ functional change.
+
+ Signed-off-by: Zihao Wang <u202012060@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Link: https://lore.kernel.org/r/20230404084622.1202-1-u202012060@hust.edu.cn
+ Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
+index fea6955f7f43..c498145e76e0 100644
+--- a/sound/soc/tegra/tegra20_ac97.c
++++ b/sound/soc/tegra/tegra20_ac97.c
+@@ -318,7 +318,8 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
+ ac97->reset = devm_reset_control_get_exclusive(&pdev->dev, "ac97");
+ if (IS_ERR(ac97->reset)) {
+ dev_err(&pdev->dev, "Can't retrieve ac97 reset\n");
+- return PTR_ERR(ac97->reset);
++ ret = PTR_ERR(ac97->reset);
++ goto err;
+ }
+
+ ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL);commit fc187a46a8e682f0f1167b230792b88de01ceaa0
+Author: Li Yang <lidaxian@hust.edu.cn>
+Date: Fri Mar 31 17:55:44 2023 +0800
+
+ soc: renesas: renesas-soc: Release 'chipid' from ioremap()
+
+ Smatch reports:
+
+ drivers/soc/renesas/renesas-soc.c:536 renesas_soc_init() warn:
+ 'chipid' from ioremap() not released on lines: 475.
+
+ If soc_dev_atrr allocation is failed, function renesas_soc_init()
+ will return without releasing 'chipid' from ioremap().
+
+ Fix this by adding function iounmap().
+
+ Fixes: cb5508e47e60 ("soc: renesas: Add support for reading product revision for RZ/G2L family")
+ Signed-off-by: Li Yang <lidaxian@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+ Link: https://lore.kernel.org/r/20230331095545.31823-1-lidaxian@hust.edu.cn
+ Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+
+diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
+index 4ba893e45427..42af7c09f743 100644
+--- a/drivers/soc/renesas/renesas-soc.c
++++ b/drivers/soc/renesas/renesas-soc.c
+@@ -469,8 +469,11 @@ static int __init renesas_soc_init(void)
+ }
+
+ soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+- if (!soc_dev_attr)
++ if (!soc_dev_attr) {
++ if (chipid)
++ iounmap(chipid);
+ return -ENOMEM;
++ }
+
+ np = of_find_node_by_path("/");
+ of_property_read_string(np, "model", &soc_dev_attr->machine);commit c3fbced9af885a6f217fd95509a613d6590916ce
+Author: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
+Date: Mon Mar 27 19:54:22 2023 +0800
+
+ soc: bcm: brcmstb: biuctrl: fix of_iomap leak
+
+ Smatch reports:
+
+ drivers/soc/bcm/brcmstb/biuctrl.c:291 setup_hifcpubiuctrl_regs() warn:
+ 'cpubiuctrl_base' from of_iomap() not released on lines: 291.
+
+ This is because in setup_hifcpubiuctrl_regs(),
+ cpubiuctrl_base is not released when handle error, which may cause a leak.
+ To fix this, iounmap is added when handle error.
+
+ Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
+ Signed-off-by: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230327115422.1536615-1-lizhaoyang04@hust.edu.cn
+ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+
+diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c
+index e1d7b4543248..364ddbe365c2 100644
+--- a/drivers/soc/bcm/brcmstb/biuctrl.c
++++ b/drivers/soc/bcm/brcmstb/biuctrl.c
+@@ -288,6 +288,10 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
+ if (BRCM_ID(family_id) == 0x7260 && BRCM_REV(family_id) == 0)
+ cpubiuctrl_regs = b53_cpubiuctrl_no_wb_regs;
+ out:
++ if (ret && cpubiuctrl_base) {
++ iounmap(cpubiuctrl_base);
++ cpubiuctrl_base = NULL;
++ }
+ return ret;
+ }
+
+ commit db2c2b161d4a8f4a81e6f643848b1531517a67a5
+Author: Mingxuan Xiang <mx_xiang@hust.edu.cn>
+Date: Fri Mar 24 14:09:34 2023 +0800
+
+ usb: dwc3: host: remove dead code in dwc3_host_get_irq()
+
+ According to the description of platform_get_irq()
+ * Return: non-zero IRQ number on success,
+ negative error number on failure.
+ and the code, platform_get_irq() will return -EINVAL
+ instead of IRQ0.
+
+ So platform_get_irq() no longer returns 0, there is no
+ need to check whether the return value is 0.
+
+ Found by Smatch:
+ drivers/usb/dwc3/host.c:60 dwc3_host_get_irq()
+ warn: platform_get_irq() does not return zero
+
+ Signed-off-by: Mingxuan Xiang <mx_xiang@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
+ Link: https://lore.kernel.org/r/20230324060934.1686859-1-mx_xiang@hust.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
+index f6f13e7f1ba1..61f57fe5bb78 100644
+--- a/drivers/usb/dwc3/host.c
++++ b/drivers/usb/dwc3/host.c
+@@ -52,13 +52,8 @@ static int dwc3_host_get_irq(struct dwc3 *dwc)
+ goto out;
+
+ irq = platform_get_irq(dwc3_pdev, 0);
+- if (irq > 0) {
++ if (irq > 0)
+ dwc3_host_fill_xhci_irq_res(dwc, irq, NULL);
+- goto out;
+- }
+-
+- if (!irq)
+- irq = -EINVAL;
+
+ out:
+ return irq;commit f33642224e38d7e0d59336e10e7b4e370b1c4506
+Author: SongJingyi <u201912584@hust.edu.cn>
+Date: Fri Mar 24 11:14:06 2023 +0800
+
+ ptp_qoriq: fix memory leak in probe()
+
+ Smatch complains that:
+ drivers/ptp/ptp_qoriq.c ptp_qoriq_probe()
+ warn: 'base' from ioremap() not released.
+
+ Fix this by revising the parameter from 'ptp_qoriq->base' to 'base'.
+ This is only a bug if ptp_qoriq_init() returns on the
+ first -ENODEV error path.
+ For other error paths ptp_qoriq->base and base are the same.
+ And this change makes the code more readable.
+
+ Fixes: 7f4399ba405b ("ptp_qoriq: fix NULL access if ptp dt node missing")
+ Signed-off-by: SongJingyi <u201912584@hust.edu.cn>
+ Reviewed-by: Dan Carpenter <error27@gmail.com>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230324031406.1895159-1-u201912584@hust.edu.cn
+ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+
+diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c
+index 61530167efe4..350154e4c2b5 100644
+--- a/drivers/ptp/ptp_qoriq.c
++++ b/drivers/ptp/ptp_qoriq.c
+@@ -637,7 +637,7 @@ static int ptp_qoriq_probe(struct platform_device *dev)
+ return 0;
+
+ no_clock:
+- iounmap(ptp_qoriq->base);
++ iounmap(base);
+ no_ioremap:
+ release_resource(ptp_qoriq->rsrc);
+ no_resource:commit 813cc94c7847ae4a17e9f744fb4dbdf7df6bd732
+Author: Tianyi Jing <jingfelix@hust.edu.cn>
+Date: Sat Mar 18 22:38:51 2023 +0800
+
+ hwmon: (xgene) Fix ioremap and memremap leak
+
+ Smatch reports:
+
+ drivers/hwmon/xgene-hwmon.c:757 xgene_hwmon_probe() warn:
+ 'ctx->pcc_comm_addr' from ioremap() not released on line: 757.
+
+ This is because in drivers/hwmon/xgene-hwmon.c:701 xgene_hwmon_probe(),
+ ioremap and memremap is not released, which may cause a leak.
+
+ To fix this, ioremap and memremap is modified to devm_ioremap and
+ devm_memremap.
+
+ Signed-off-by: Tianyi Jing <jingfelix@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230318143851.2191625-1-jingfelix@hust.edu.cn
+ [groeck: Fixed formatting and subject]
+ Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+
+diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c
+index d1abea49f01b..78d9f52e2a71 100644
+--- a/drivers/hwmon/xgene-hwmon.c
++++ b/drivers/hwmon/xgene-hwmon.c
+@@ -698,14 +698,14 @@ static int xgene_hwmon_probe(struct platform_device *pdev)
+ ctx->comm_base_addr = pcc_chan->shmem_base_addr;
+ if (ctx->comm_base_addr) {
+ if (version == XGENE_HWMON_V2)
+- ctx->pcc_comm_addr = (void __force *)ioremap(
+- ctx->comm_base_addr,
+- pcc_chan->shmem_size);
++ ctx->pcc_comm_addr = (void __force *)devm_ioremap(&pdev->dev,
++ ctx->comm_base_addr,
++ pcc_chan->shmem_size);
+ else
+- ctx->pcc_comm_addr = memremap(
+- ctx->comm_base_addr,
+- pcc_chan->shmem_size,
+- MEMREMAP_WB);
++ ctx->pcc_comm_addr = devm_memremap(&pdev->dev,
++ ctx->comm_base_addr,
++ pcc_chan->shmem_size,
++ MEMREMAP_WB);
+ } else {
+ dev_err(&pdev->dev, "Failed to get PCC comm region\n");
+ rc = -ENODEV;commit 8d13d50b157655247cdb3a69aca7836b58ff8735 +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Thu Mar 9 12:01:06 2023 +0800 + + platform/x86/intel: tpmi: Revise the comment of intel_vsec_add_aux + + intel_vsec_add_aux() is resource managed including res and + feature_vsec_dev memory. + + Fix this by revising the comment of intel_vsec_add_aux since res variable + will also be freed in the intel_vsec_add_aux. + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Link: https://lore.kernel.org/r/20230309040107.534716-3-dzm91@hust.edu.cn + Reviewed-by: Hans de Goede <hdegoede@redhat.com> + Signed-off-by: Hans de Goede <hdegoede@redhat.com> + +diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c +index a8733c43e4ab..a5227951decc 100644 +--- a/drivers/platform/x86/intel/tpmi.c ++++ b/drivers/platform/x86/intel/tpmi.c +@@ -239,8 +239,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info, + /* + * intel_vsec_add_aux() is resource managed, no explicit + * delete is required on error or on module unload. +- * feature_vsec_dev memory is also freed as part of device +- * delete. ++ * feature_vsec_dev and res memory are also freed as part of ++ * device deletion. + */ + return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev, + feature_vsec_dev, feature_id_name);
commit 4d5a2a7d2c97dbd658533eea5f79dab1ad5dc0ee
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Thu Mar 9 12:01:05 2023 +0800
+
+ platform/x86/intel: tpmi: Fix double free in tpmi_create_device()
+
+ The previous commit 6a192c0cbf38 ("platform/x86/intel/tpmi: Fix
+ double free reported by Smatch") incorrectly handle the deallocation of
+ res variable. As shown in the comment, intel_vsec_add_aux handles all
+ the deallocation of res and feature_vsec_dev. Therefore, kfree(res) can
+ still cause double free if intel_vsec_add_aux returns error.
+
+ Fix this by adjusting the error handling part in tpmi_create_device,
+ following the function intel_vsec_add_dev.
+
+ Fixes: 6a192c0cbf38 ("platform/x86/intel/tpmi: Fix double free reported by Smatch")
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230309040107.534716-2-dzm91@hust.edu.cn
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c
+index c999732b0f1e..a8733c43e4ab 100644
+--- a/drivers/platform/x86/intel/tpmi.c
++++ b/drivers/platform/x86/intel/tpmi.c
+@@ -203,7 +203,7 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
+ struct intel_vsec_device *feature_vsec_dev;
+ struct resource *res, *tmp;
+ const char *name;
+- int ret, i;
++ int i;
+
+ name = intel_tpmi_name(pfs->pfs_header.tpmi_id);
+ if (!name)
+@@ -215,8 +215,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
+
+ feature_vsec_dev = kzalloc(sizeof(*feature_vsec_dev), GFP_KERNEL);
+ if (!feature_vsec_dev) {
+- ret = -ENOMEM;
+- goto free_res;
++ kfree(res);
++ return -ENOMEM;
+ }
+
+ snprintf(feature_id_name, sizeof(feature_id_name), "tpmi-%s", name);
+@@ -242,17 +242,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info,
+ * feature_vsec_dev memory is also freed as part of device
+ * delete.
+ */
+- ret = intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev,
+- feature_vsec_dev, feature_id_name);
+- if (ret)
+- goto free_res;
+-
+- return 0;
+-
+-free_res:
+- kfree(res);
+-
+- return ret;
++ return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev,
++ feature_vsec_dev, feature_id_name);
+ }
+
+ static int tpmi_create_devices(struct intel_tpmi_info *tpmi_info)commit da0ba0ccce54059d6c6b788a75099bfce95126da
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Thu Mar 9 12:01:07 2023 +0800
+
+ platform/x86/intel: vsec: Fix a memory leak in intel_vsec_add_aux
+
+ The first error handling code in intel_vsec_add_aux misses the
+ deallocation of intel_vsec_dev->resource.
+
+ Fix this by adding kfree(intel_vsec_dev->resource) in the error handling
+ code.
+
+ Reviewed-by: David E. Box <david.e.box@linux.intel.com>
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/r/20230309040107.534716-4-dzm91@hust.edu.cn
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
+index 13decf36c6de..2311c16cb975 100644
+--- a/drivers/platform/x86/intel/vsec.c
++++ b/drivers/platform/x86/intel/vsec.c
+@@ -154,6 +154,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
+ ret = ida_alloc(intel_vsec_dev->ida, GFP_KERNEL);
+ mutex_unlock(&vsec_ida_lock);
+ if (ret < 0) {
++ kfree(intel_vsec_dev->resource);
+ kfree(intel_vsec_dev);
+ return ret;
+ }commit fb37fdd02856e45e78209d32522029c9f77fe7b7
+Author: Cheng Ziqiu <chengziqiu@hust.edu.cn>
+Date: Tue Mar 14 15:01:30 2023 +0800
+
+ iio: adc: at91-sama5d2_adc: remove dead code in at91_adc_probe()
+
+ From the comment of platform_get_irq(), it only returns non-zero IRQ
+ number and negative error number, other than zero.
+
+ Fix this by removing the if condition.
+
+ Signed-off-by: Cheng Ziqiu <chengziqiu@hust.edu.cn>
+ Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
+ Link: https://lore.kernel.org/r/20230314070130.60581-1-chengziqiu@hust.edu.cn
+ Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+
+diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
+index b5d0c9ee284c..30554026a7fe 100644
+--- a/drivers/iio/adc/at91-sama5d2_adc.c
++++ b/drivers/iio/adc/at91-sama5d2_adc.c
+@@ -2400,12 +2400,8 @@ static int at91_adc_probe(struct platform_device *pdev)
+ st->dma_st.phys_addr = res->start;
+
+ st->irq = platform_get_irq(pdev, 0);
+- if (st->irq <= 0) {
+- if (!st->irq)
+- st->irq = -ENXIO;
+-
++ if (st->irq < 0)
+ return st->irq;
+- }
+
+ st->per_clk = devm_clk_get(&pdev->dev, "adc_clk");
+ if (IS_ERR(st->per_clk))commit 984cfd55e0c99e80b2e5b1dc6b2bf98608af7ff9 +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Wed Mar 8 16:32:31 2023 +0800 + + net: ieee802154: remove an unnecessary null pointer check + + llsec_parse_seclevel has the null pointer check at its begining. Compared + with nl802154_add_llsec_seclevel, nl802154_del_llsec_seclevel has a + redundant null pointer check of info->attrs[NL802154_ATTR_SEC_LEVEL] + before llsec_parse_seclevel. + + Fix this issue by removing the null pointer check in + nl802154_del_llsec_seclevel. + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Link: https://lore.kernel.org/r/20230308083231.460015-1-dzm91@hust.edu.cn + Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> + +diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c +index d8f4379d4fa6..832e3c50816c 100644 +--- a/net/ieee802154/nl802154.c ++++ b/net/ieee802154/nl802154.c +@@ -2488,8 +2488,7 @@ static int nl802154_del_llsec_seclevel(struct sk_buff *skb, + if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR) + return -EOPNOTSUPP; + +- if (!info->attrs[NL802154_ATTR_SEC_LEVEL] || +- llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL], ++ if (llsec_parse_seclevel(info->attrs[NL802154_ATTR_SEC_LEVEL], + &sl) < 0) + return -EINVAL; +
commit cbffe6b3b2bdf6064135f715242feb2f9094190f
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Mon Mar 6 10:45:23 2023 +0800
+
+ i2c: davinci: remove dead code in probe
+
+ From the comment of platform_get_irq, it only returns non-zero IRQ
+ number and negative error number, other than zero.
+
+ Fix this by removing the if condition.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+ Signed-off-by: Wolfram Sang <wsa@kernel.org>
+
+diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
+index c836cf884185..9750310f2c96 100644
+--- a/drivers/i2c/busses/i2c-davinci.c
++++ b/drivers/i2c/busses/i2c-davinci.c
+@@ -764,11 +764,8 @@ static int davinci_i2c_probe(struct platform_device *pdev)
+ int r, irq;
+
+ irq = platform_get_irq(pdev, 0);
+- if (irq <= 0) {
+- if (!irq)
+- irq = -ENXIO;
++ if (irq < 0)
+ return dev_err_probe(&pdev->dev, irq, "can't get irq resource\n");
+- }
+
+ dev = devm_kzalloc(&pdev->dev, sizeof(struct davinci_i2c_dev),
+ GFP_KERNEL);commit 4fa1387261e725a418066f8f46ea87a6ba0e5be1 +Author: Yalong Zou <yalongz@hust.edu.cn> +Date: Thu Mar 9 23:08:15 2023 +0800 + + usb: remove dead code in dwc3_gadget_get_irq + + platform_get_irq() only return non-zero irq number on success, or + negative error number on failure. + + There is no need to check the return value of platform_get_irq() + to determine the return value of dwc3_gadget_get_irq(), removing + them to solve this problem. + + Signed-off-by: Yalong Zou <yalongz@hust.edu.cn> + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Link: https://lore.kernel.org/r/20230309150815.1884260-1-yalongz@hust.edu.cn + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c +index 07989c645a94..a1ebb30c15fa 100644 +--- a/drivers/usb/dwc3/gadget.c ++++ b/drivers/usb/dwc3/gadget.c +@@ -4402,11 +4402,6 @@ static int dwc3_gadget_get_irq(struct dwc3 *dwc) + goto out; + + irq = platform_get_irq(dwc3_pdev, 0); +- if (irq > 0) +- goto out; +- +- if (!irq) +- irq = -EINVAL; + + out: + return irq;+
commit 48181d285623198c33bb9698992502687b258efa +Author: Dongliang Mu <dzm91@hust.edu.cn> +Date: Thu Mar 9 10:16:36 2023 +0800 + + wifi: rtw88: fix memory leak in rtw_usb_probe() + + drivers/net/wireless/realtek/rtw88/usb.c:876 rtw_usb_probe() + warn: 'hw' from ieee80211_alloc_hw() not released on lines: 811 + + Fix this by modifying return to a goto statement. + + Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn> + Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> + Signed-off-by: Kalle Valo <kvalo@kernel.org> + Link: https://lore.kernel.org/r/20230309021636.528601-1-dzm91@hust.edu.cn + +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 2a8336b1847a..68e1b782d199 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -808,7 +808,7 @@ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) + + ret = rtw_usb_alloc_rx_bufs(rtwusb); + if (ret) +- return ret; ++ goto err_release_hw; + + ret = rtw_core_init(rtwdev); + if (ret)
commit cd53860edd5e66f2faaf1bfbaef81d4be9109c82
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Fri Nov 18 22:14:06 2022 +0800
+
+ fbdev: da8xx-fb: add missing regulator_disable() in fb_probe
+
+ The error handling code in fb_probe misses regulator_disable if
+ regulator_enable is called successfully. The previous commit only
+ adds regulator_disable in the .remove(), forgetting the error
+ handling code in the .probe.
+
+ Fix this by adding a new error label to call regulator_disable.
+
+ Fixes: 611097d5daea("fbdev: da8xx: add support for a regulator")
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Helge Deller <deller@gmx.de>
+
+diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
+index 11922b009ed7..cd07e401b326 100644
+--- a/drivers/video/fbdev/da8xx-fb.c
++++ b/drivers/video/fbdev/da8xx-fb.c
+@@ -1431,7 +1431,7 @@ static int fb_probe(struct platform_device *device)
+ dev_err(&device->dev,
+ "GLCD: kmalloc for frame buffer failed\n");
+ ret = -EINVAL;
+- goto err_release_fb;
++ goto err_disable_reg;
+ }
+
+ da8xx_fb_info->screen_base = (char __iomem *) par->vram_virt;
+@@ -1475,7 +1475,7 @@ static int fb_probe(struct platform_device *device)
+
+ ret = fb_alloc_cmap(&da8xx_fb_info->cmap, PALETTE_SIZE, 0);
+ if (ret)
+- goto err_release_fb;
++ goto err_disable_reg;
+ da8xx_fb_info->cmap.len = par->palette_sz;
+
+ /* initialize var_screeninfo */
+@@ -1529,6 +1529,9 @@ static int fb_probe(struct platform_device *device)
+ err_dealloc_cmap:
+ fb_dealloc_cmap(&da8xx_fb_info->cmap);
+
++err_disable_reg:
++ if (par->lcd_supply)
++ regulator_disable(par->lcd_supply);
+ err_release_fb:
+ framebuffer_release(da8xx_fb_info);
+ commit b76449ee75e21acfe9fa4c653d8598f191ed7d68
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Fri Nov 11 13:49:49 2022 +0800
+
+ fbdev: smscufx: fix error handling code in ufx_usb_probe
+
+ The current error handling code in ufx_usb_probe have many unmatching
+ issues, e.g., missing ufx_free_usb_list, destroy_modedb label should
+ only include framebuffer_release, fb_dealloc_cmap only matches
+ fb_alloc_cmap.
+
+ My local syzkaller reports a memory leak bug:
+
+ memory leak in ufx_usb_probe
+
+ BUG: memory leak
+ unreferenced object 0xffff88802f879580 (size 128):
+ comm "kworker/0:7", pid 17416, jiffies 4295067474 (age 46.710s)
+ hex dump (first 32 bytes):
+ 80 21 7c 2e 80 88 ff ff 18 d0 d0 0c 80 88 ff ff .!|.............
+ 00 d0 d0 0c 80 88 ff ff e0 ff ff ff 0f 00 00 00 ................
+ backtrace:
+ [<ffffffff814c99a0>] kmalloc_trace+0x20/0x90 mm/slab_common.c:1045
+ [<ffffffff824d219c>] kmalloc include/linux/slab.h:553 [inline]
+ [<ffffffff824d219c>] kzalloc include/linux/slab.h:689 [inline]
+ [<ffffffff824d219c>] ufx_alloc_urb_list drivers/video/fbdev/smscufx.c:1873 [inline]
+ [<ffffffff824d219c>] ufx_usb_probe+0x11c/0x15a0 drivers/video/fbdev/smscufx.c:1655
+ [<ffffffff82d17927>] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396
+ [<ffffffff82712f0d>] call_driver_probe drivers/base/dd.c:560 [inline]
+ [<ffffffff82712f0d>] really_probe+0x12d/0x390 drivers/base/dd.c:639
+ [<ffffffff8271322f>] __driver_probe_device+0xbf/0x140 drivers/base/dd.c:778
+ [<ffffffff827132da>] driver_probe_device+0x2a/0x120 drivers/base/dd.c:808
+ [<ffffffff82713c27>] __device_attach_driver+0xf7/0x150 drivers/base/dd.c:936
+ [<ffffffff82710137>] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427
+ [<ffffffff827136b5>] __device_attach+0x105/0x2d0 drivers/base/dd.c:1008
+ [<ffffffff82711d36>] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487
+ [<ffffffff8270e242>] device_add+0x642/0xdc0 drivers/base/core.c:3517
+ [<ffffffff82d14d5f>] usb_set_configuration+0x8ef/0xb80 drivers/usb/core/message.c:2170
+ [<ffffffff82d2576c>] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238
+ [<ffffffff82d16ffc>] usb_probe_device+0x5c/0x140 drivers/usb/core/driver.c:293
+ [<ffffffff82712f0d>] call_driver_probe drivers/base/dd.c:560 [inline]
+ [<ffffffff82712f0d>] really_probe+0x12d/0x390 drivers/base/dd.c:639
+ [<ffffffff8271322f>] __driver_probe_device+0xbf/0x140 drivers/base/dd.c:778
+
+ Fix this bug by rewriting the error handling code in ufx_usb_probe.
+
+ Reported-by: syzkaller <syzkaller@googlegroups.com>
+ Tested-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Signed-off-by: Helge Deller <deller@gmx.de>
+
+diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
+index 9343b7a4ac89..2ad6e98ce10d 100644
+--- a/drivers/video/fbdev/smscufx.c
++++ b/drivers/video/fbdev/smscufx.c
+@@ -1622,7 +1622,7 @@ static int ufx_usb_probe(struct usb_interface *interface,
+ struct usb_device *usbdev;
+ struct ufx_data *dev;
+ struct fb_info *info;
+- int retval;
++ int retval = -ENOMEM;
+ u32 id_rev, fpga_rev;
+
+ /* usb initialization */
+@@ -1654,15 +1654,17 @@ static int ufx_usb_probe(struct usb_interface *interface,
+
+ if (!ufx_alloc_urb_list(dev, WRITES_IN_FLIGHT, MAX_TRANSFER)) {
+ dev_err(dev->gdev, "ufx_alloc_urb_list failed\n");
+- goto e_nomem;
++ goto put_ref;
+ }
+
+ /* We don't register a new USB class. Our client interface is fbdev */
+
+ /* allocates framebuffer driver structure, not framebuffer memory */
+ info = framebuffer_alloc(0, &usbdev->dev);
+- if (!info)
+- goto e_nomem;
++ if (!info) {
++ dev_err(dev->gdev, "framebuffer_alloc failed\n");
++ goto free_urb_list;
++ }
+
+ dev->info = info;
+ info->par = dev;
+@@ -1705,22 +1707,34 @@ static int ufx_usb_probe(struct usb_interface *interface,
+ check_warn_goto_error(retval, "unable to find common mode for display and adapter");
+
+ retval = ufx_reg_set_bits(dev, 0x4000, 0x00000001);
+- check_warn_goto_error(retval, "error %d enabling graphics engine", retval);
++ if (retval < 0) {
++ dev_err(dev->gdev, "error %d enabling graphics engine", retval);
++ goto setup_modes;
++ }
+
+ /* ready to begin using device */
+ atomic_set(&dev->usb_active, 1);
+
+ dev_dbg(dev->gdev, "checking var");
+ retval = ufx_ops_check_var(&info->var, info);
+- check_warn_goto_error(retval, "error %d ufx_ops_check_var", retval);
++ if (retval < 0) {
++ dev_err(dev->gdev, "error %d ufx_ops_check_var", retval);
++ goto reset_active;
++ }
+
+ dev_dbg(dev->gdev, "setting par");
+ retval = ufx_ops_set_par(info);
+- check_warn_goto_error(retval, "error %d ufx_ops_set_par", retval);
++ if (retval < 0) {
++ dev_err(dev->gdev, "error %d ufx_ops_set_par", retval);
++ goto reset_active;
++ }
+
+ dev_dbg(dev->gdev, "registering framebuffer");
+ retval = register_framebuffer(info);
+- check_warn_goto_error(retval, "error %d register_framebuffer", retval);
++ if (retval < 0) {
++ dev_err(dev->gdev, "error %d register_framebuffer", retval);
++ goto reset_active;
++ }
+
+ dev_info(dev->gdev, "SMSC UDX USB device /dev/fb%d attached. %dx%d resolution."
+ " Using %dK framebuffer memory\n", info->node,
+@@ -1728,21 +1742,23 @@ static int ufx_usb_probe(struct usb_interface *interface,
+
+ return 0;
+
+-error:
+- fb_dealloc_cmap(&info->cmap);
+-destroy_modedb:
++reset_active:
++ atomic_set(&dev->usb_active, 0);
++setup_modes:
+ fb_destroy_modedb(info->monspecs.modedb);
+ vfree(info->screen_base);
+ fb_destroy_modelist(&info->modelist);
++error:
++ fb_dealloc_cmap(&info->cmap);
++destroy_modedb:
+ framebuffer_release(info);
++free_urb_list:
++ if (dev->urbs.count > 0)
++ ufx_free_urb_list(dev);
+ put_ref:
+ kref_put(&dev->kref, ufx_free); /* ref for framebuffer */
+ kref_put(&dev->kref, ufx_free); /* last ref from kref_init */
+ return retval;
+-
+-e_nomem:
+- retval = -ENOMEM;
+- goto put_ref;
+ }
+
+ static void ufx_usb_disconnect(struct usb_interface *interface)commit aa9832e4501264a43db671bba09fe4d8bc39fcff
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Mon Oct 24 19:00:30 2022 +0800
+
+ can: ucan: ucan_disconnect(): change unregister_netdev() to unregister_candev()
+
+ From API pairing, change unregister_netdev() to unregister_candev()
+ since the registration function is register_candev(). Actually, they
+ are the same.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/all/20221024110033.727542-1-dzm91@hust.edu.cn
+ [mkl: adjust subject + commit message]
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c
+index b53e709943bc..a1734f1c0148 100644
+--- a/drivers/net/can/usb/ucan.c
++++ b/drivers/net/can/usb/ucan.c
+@@ -1582,7 +1582,7 @@ static void ucan_disconnect(struct usb_interface *intf)
+ usb_set_intfdata(intf, NULL);
+
+ if (up) {
+- unregister_netdev(up->netdev);
++ unregister_candev(up->netdev);
+ free_candev(up->netdev);
+ }
+ }commit b1a09b63684cea56774786ca14c13b7041ffee63
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Mon Oct 24 17:02:52 2022 +0800
+
+ can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path
+
+ In mcp251x_can_probe(), if mcp251x_gpio_setup() fails, it forgets to
+ unregister the CAN device.
+
+ Fix this by unregistering can device in mcp251x_can_probe().
+
+ Fixes: 2d52dabbef60 ("can: mcp251x: add GPIO support")
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/all/20221024090256.717236-1-dzm91@hust.edu.cn
+ [mkl: adjust label]
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
+index c320de474f40..24883a65ca66 100644
+--- a/drivers/net/can/spi/mcp251x.c
++++ b/drivers/net/can/spi/mcp251x.c
+@@ -1415,11 +1415,14 @@ static int mcp251x_can_probe(struct spi_device *spi)
+
+ ret = mcp251x_gpio_setup(priv);
+ if (ret)
+- goto error_probe;
++ goto out_unregister_candev;
+
+ netdev_info(net, "MCP%x successfully initialized.\n", priv->model);
+ return 0;
+
++out_unregister_candev:
++ unregister_candev(net);
++
+ error_probe:
+ destroy_workqueue(priv->wq);
+ priv->wq = NULL;commit 3e5b3418827cefb5e1cc658806f02965791b8f07
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Mon Oct 24 19:48:07 2022 +0800
+
+ can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
+
+ The commit 1149108e2fbf ("can: mscan: improve clock API use") only
+ adds put_clock() in mpc5xxx_can_remove() function, forgetting to add
+ put_clock() in the error handling code.
+
+ Fix this bug by adding put_clock() in the error handling code.
+
+ Fixes: 1149108e2fbf ("can: mscan: improve clock API use")
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Link: https://lore.kernel.org/all/20221024133828.35881-1-mkl@pengutronix.de
+ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+
+diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
+index c469b2f3e57d..b0ed798ae70f 100644
+--- a/drivers/net/can/mscan/mpc5xxx_can.c
++++ b/drivers/net/can/mscan/mpc5xxx_can.c
+@@ -322,14 +322,14 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
+ &mscan_clksrc);
+ if (!priv->can.clock.freq) {
+ dev_err(&ofdev->dev, "couldn't get MSCAN clock properties\n");
+- goto exit_free_mscan;
++ goto exit_put_clock;
+ }
+
+ err = register_mscandev(dev, mscan_clksrc);
+ if (err) {
+ dev_err(&ofdev->dev, "registering %s failed (err=%d)\n",
+ DRV_NAME, err);
+- goto exit_free_mscan;
++ goto exit_put_clock;
+ }
+
+ dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",
+@@ -337,7 +337,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)
+
+ return 0;
+
+-exit_free_mscan:
++exit_put_clock:
++ if (data->put_clock)
++ data->put_clock(ofdev);
+ free_candev(dev);
+ exit_dispose_irq:
+ irq_dispose_mapping(irq);commit 90732f1769165dcf0778d723ad188f6441a930f5
+Author: Dongliang Mu <dzm91@hust.edu.cn>
+Date: Sun Oct 9 15:23:05 2022 +0800
+
+ usb: cdns3: adjust the partial logic of cdnsp_pci_remove
+
+ In cdnsp_pci_remove, if pci_is_enabled returns true, it will
+ call cdns_remove; else it will call kfree. Then both control flow
+ goes to pci_dev_put.
+
+ Adjust this logic by modifying it to an if else.
+
+ Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
+ Acked-by: Pawel Laszczak <pawell@cadence.com>
+ Link: https://lore.kernel.org/r/20221009072305.1593707-1-dzm91@hust.edu.cn
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
+index fe8a114c586c..efd54ed918b9 100644
+--- a/drivers/usb/cdns3/cdnsp-pci.c
++++ b/drivers/usb/cdns3/cdnsp-pci.c
+@@ -192,14 +192,12 @@ static void cdnsp_pci_remove(struct pci_dev *pdev)
+ if (pci_dev_run_wake(pdev))
+ pm_runtime_get_noresume(&pdev->dev);
+
+- if (!pci_is_enabled(func)) {
++ if (pci_is_enabled(func)) {
++ cdns_remove(cdnsp);
++ } else {
+ kfree(cdnsp);
+- goto pci_put;
+ }
+
+- cdns_remove(cdnsp);
+-
+-pci_put:
+ pci_dev_put(func);
+ }
+
+ commit e30b9d6c641dbd9687a5605b2151a2a83d2e8770
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Nov 24 04:34:42 2007 -0300
+
+ V4L/DVB (12821): tm6000: update USB request names and clean up i2c routine
+
+ Update the descriptions of the USB request types so that they match what
+ we now know they do.
+
+ Rework the i2c_xfer function so that it is more explicit what sort of I2C
+ transfers it is that the tm6000 can't perform.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
+index 8569cfca8f82..12e2c98e5433 100644
+--- a/drivers/staging/tm6000/tm6000-i2c.c
++++ b/drivers/staging/tm6000/tm6000-i2c.c
+@@ -73,7 +73,7 @@ static int tm6000_i2c_scan(struct i2c_adapter *i2c_adap, int addr)
+ /* This sends addr + 1 byte with 0 */
+ rc = tm6000_read_write_usb (dev,
+ USB_DIR_IN | USB_TYPE_VENDOR,
+- REQ_16_SET_GET_I2CSEQ,
++ REQ_16_SET_GET_I2C_WR1_RDN,
+ addr, 0,
+ buf, 0);
+ msleep(10);
+@@ -94,82 +94,61 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ {
+ struct tm6000_core *dev = i2c_adap->algo_data;
+ int addr, rc, i, byte;
+- int prev_reg = -1;
+
+ if (num <= 0)
+ return 0;
+ for (i = 0; i < num; i++) {
+- addr = (msgs[i].addr << 1) &0xff;
++ addr = (msgs[i].addr << 1) & 0xff;
+ i2c_dprintk(2,"%s %s addr=0x%x len=%d:",
+ (msgs[i].flags & I2C_M_RD) ? "read" : "write",
+ i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
+ if (!msgs[i].len) {
+ /* Do I2C scan */
+- rc=tm6000_i2c_scan(i2c_adap, addr);
++ rc = tm6000_i2c_scan(i2c_adap, addr);
+ } else if (msgs[i].flags & I2C_M_RD) {
+- /* Read bytes */
+- /* I2C is assumed to have always a subaddr at the first byte of the
+- message bus. Also, the first i2c value of the answer is returned
+- out of message data.
+- */
+- /* SMBus Read Byte command */
+- if (prev_reg < 0)
+- printk("XXX read from unknown prev_reg\n");
+- rc = tm6000_read_write_usb (dev,
+- USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+- REQ_16_SET_GET_I2CSEQ,
+- addr | (prev_reg << 8), 0,
+- msgs[i].buf, msgs[i].len);
+- if (prev_reg >= 0)
+- prev_reg += msgs[i].len;
+- if (i2c_debug>=2) {
+- for (byte = 0; byte < msgs[i].len; byte++) {
++ /* read request without preceding register selection */
++ /*
++ * The TM6000 only supports a read transaction
++ * immediately after a 1 or 2 byte write to select
++ * a register. We cannot fulfil this request.
++ */
++ i2c_dprintk(2, " read without preceding write not"
++ " supported");
++ rc = -EOPNOTSUPP;
++ goto err;
++ } else if (i + 1 < num && msgs[i].len <= 2 &&
++ (msgs[i + 1].flags & I2C_M_RD) &&
++ msgs[i].addr == msgs[i + 1].addr) {
++ /* 1 or 2 byte write followed by a read */
++ if (i2c_debug >= 2)
++ for (byte = 0; byte < msgs[i].len; byte++)
+ printk(" %02x", msgs[i].buf[byte]);
+- }
+- }
+- } else if (i+1 < num && msgs[i].len == 2 &&
+- (msgs[i+1].flags & I2C_M_RD) &&
+- msgs[i].addr == msgs[i+1].addr) {
+- i2c_dprintk(2, "msg %d: write 2, read %d", i,
+- msgs[i+1].len);
+- /* Write 2 Read N command */
++ i2c_dprintk(2, "; joined to read %s len=%d:",
++ i == num - 2 ? "stop" : "nonstop",
++ msgs[i + 1].len);
+ rc = tm6000_read_write_usb (dev,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+- REQ_14_SET_GET_EEPROM_PAGE, /* XXX wrong name */
+- addr | msgs[i].buf[0] << 8, msgs[i].buf[1],
+- msgs[i+1].buf, msgs[i+1].len);
++ msgs[i].len == 1 ? REQ_16_SET_GET_I2C_WR1_RDN
++ : REQ_14_SET_GET_I2C_WR2_RDN,
++ addr | msgs[i].buf[0] << 8,
++ msgs[i].len == 1 ? 0 : msgs[i].buf[1],
++ msgs[i + 1].buf, msgs[i + 1].len);
+ i++;
+- if (i2c_debug>=2) {
+- for (byte = 0; byte < msgs[i].len; byte++) {
++ if (i2c_debug >= 2)
++ for (byte = 0; byte < msgs[i].len; byte++)
+ printk(" %02x", msgs[i].buf[byte]);
+- }
+- }
+- prev_reg = -1;
+ } else {
+ /* write bytes */
+- if (i2c_debug>=2) {
++ if (i2c_debug >= 2)
+ for (byte = 0; byte < msgs[i].len; byte++)
+ printk(" %02x", msgs[i].buf[byte]);
+- }
+-
+- /* SMBus Write Byte command followed by a read command */
+- if(msgs[i].len == 1 && i+1 < num && msgs[i+1].flags & I2C_M_RD
+- && msgs[i+1].addr == msgs[i].addr) {
+- prev_reg = msgs[i].buf[0];
+- if (i2c_debug >= 2)
+- printk("\n");
+- continue;
+- }
+-
+- rc = tm6000_read_write_usb (dev,
++ rc = tm6000_read_write_usb(dev,
+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+- REQ_16_SET_GET_I2CSEQ,
+- addr|(*msgs[i].buf)<<8, 0,
+- msgs[i].buf+1, msgs[i].len-1);
+-
+- prev_reg = -1;
++ REQ_16_SET_GET_I2C_WR1_RDN,
++ addr | msgs[i].buf[0] << 8, 0,
++ msgs[i].buf + 1, msgs[i].len - 1);
+ }
+- if (i2c_debug>=2)
++ if (i2c_debug >= 2)
+ printk("\n");
+ if (rc < 0)
+ goto err;
+@@ -181,7 +160,6 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ return rc;
+ }
+
+-
+ static int tm6000_i2c_eeprom(struct tm6000_core *dev,
+ unsigned char *eedata, int len)
+ {
+@@ -196,7 +174,7 @@ static int tm6000_i2c_eeprom(struct tm6000_core *dev,
+ *p = i;
+ rc = tm6000_read_write_usb (dev,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+- REQ_16_SET_GET_I2CSEQ, 0xa0 | i<<8, 0, p, 1);
++ REQ_16_SET_GET_I2C_WR1_RDN, 0xa0 | i<<8, 0, p, 1);
+ if (rc < 1) {
+ if (p == eedata)
+ goto noeeprom;
+@@ -273,7 +251,7 @@ static void dec_use(struct i2c_adapter *adap)
+ #define mass_write(addr, reg, data...) \
+ { const static u8 _val[] = data; \
+ rc=tm6000_read_write_usb(dev,USB_DIR_OUT | USB_TYPE_VENDOR, \
+- REQ_16_SET_GET_I2CSEQ,(reg<<8)+addr, 0x00, (u8 *) _val, \
++ REQ_16_SET_GET_I2C_WR1_RDN,(reg<<8)+addr, 0x00, (u8 *) _val, \
+ ARRAY_SIZE(_val)); \
+ if (rc<0) { \
+ printk(KERN_ERR "Error on line %d: %d\n",__LINE__,rc); \
+diff --git a/drivers/staging/tm6000/tm6000-regs.h b/drivers/staging/tm6000/tm6000-regs.h
+index 414852e69fce..9b6456e18426 100644
+--- a/drivers/staging/tm6000/tm6000-regs.h
++++ b/drivers/staging/tm6000/tm6000-regs.h
+@@ -38,11 +38,11 @@
+ #define REQ_11_SET_EEPROM_ADDR 11
+ #define REQ_12_SET_GET_EEPROMBYTE 12
+ #define REQ_13_GET_EEPROM_SEQREAD 13
+-#define REQ_14_SET_GET_EEPROM_PAGE 14
++#define REQ_14_SET_GET_I2C_WR2_RDN 14
+ #define REQ_15_SET_GET_I2CBYTE 15
+ /* Write: Subaddr, Slave Addr, value, 0 */
+ /* Read : Subaddr, Slave Addr, value, 1 */
+-#define REQ_16_SET_GET_I2CSEQ 16
++#define REQ_16_SET_GET_I2C_WR1_RDN 16
+ /* Subaddr, Slave Addr, 0, length */
+ #define REQ_17_SET_GET_I2CFP 17
+ /* Write: Slave Addr, register, value */commit cf9e1509c278c3d5005f222539813933e4dc345c
+Author: Christopher Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Fri Nov 23 13:18:56 2007 -0300
+
+ V4L/DVB (12820): tm6000: fix i2c readings
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
+index c0327d724eb2..8569cfca8f82 100644
+--- a/drivers/staging/tm6000/tm6000-i2c.c
++++ b/drivers/staging/tm6000/tm6000-i2c.c
+@@ -94,7 +94,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ {
+ struct tm6000_core *dev = i2c_adap->algo_data;
+ int addr, rc, i, byte;
+- u8 prev_reg = 0;
++ int prev_reg = -1;
+
+ if (num <= 0)
+ return 0;
+@@ -113,16 +113,38 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ out of message data.
+ */
+ /* SMBus Read Byte command */
++ if (prev_reg < 0)
++ printk("XXX read from unknown prev_reg\n");
+ rc = tm6000_read_write_usb (dev,
+ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+ REQ_16_SET_GET_I2CSEQ,
+ addr | (prev_reg << 8), 0,
+ msgs[i].buf, msgs[i].len);
++ if (prev_reg >= 0)
++ prev_reg += msgs[i].len;
+ if (i2c_debug>=2) {
+ for (byte = 0; byte < msgs[i].len; byte++) {
+ printk(" %02x", msgs[i].buf[byte]);
+ }
+ }
++ } else if (i+1 < num && msgs[i].len == 2 &&
++ (msgs[i+1].flags & I2C_M_RD) &&
++ msgs[i].addr == msgs[i+1].addr) {
++ i2c_dprintk(2, "msg %d: write 2, read %d", i,
++ msgs[i+1].len);
++ /* Write 2 Read N command */
++ rc = tm6000_read_write_usb (dev,
++ USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
++ REQ_14_SET_GET_EEPROM_PAGE, /* XXX wrong name */
++ addr | msgs[i].buf[0] << 8, msgs[i].buf[1],
++ msgs[i+1].buf, msgs[i+1].len);
++ i++;
++ if (i2c_debug>=2) {
++ for (byte = 0; byte < msgs[i].len; byte++) {
++ printk(" %02x", msgs[i].buf[byte]);
++ }
++ }
++ prev_reg = -1;
+ } else {
+ /* write bytes */
+ if (i2c_debug>=2) {
+@@ -134,6 +156,8 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ if(msgs[i].len == 1 && i+1 < num && msgs[i+1].flags & I2C_M_RD
+ && msgs[i+1].addr == msgs[i].addr) {
+ prev_reg = msgs[i].buf[0];
++ if (i2c_debug >= 2)
++ printk("\n");
+ continue;
+ }
+
+@@ -143,12 +167,7 @@ static int tm6000_i2c_xfer(struct i2c_adapter *i2c_adap,
+ addr|(*msgs[i].buf)<<8, 0,
+ msgs[i].buf+1, msgs[i].len-1);
+
+- if(msgs[i].len >= 1) {
+- prev_reg = msgs[i].buf[0];
+- }
+- else {
+- prev_reg = 0;
+- }
++ prev_reg = -1;
+ }
+ if (i2c_debug>=2)
+ printk("\n");commit d4dc673da9a94716ca2410306c1b36b5faf6c4cc
+Author: Christopher Pascoe <linuxdvb@itee.uq.edu.au>
+Date: Mon Apr 27 11:27:04 2009 -0300
+
+ V4L/DVB (11626): cx23885: Two fixes for DViCO FusionHDTV DVB-T Dual Express
+
+ Two fixes for DViCO FusionHDTV DVB-T Dual Express:
+
+ * Reset correct tuner when reinitializing xc3028.
+ * Disable the I2C gate control to avoid locking up the I2C bus.
+
+ Tested-by: John Knops <jknops@australiaonline.net.au>
+ Reviewed-by: Steven Toth <stoth@linuxtv.org>
+ Signed-off-by: Christopher Pascoe <linuxdvb@itee.uq.edu.au>
+ Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
+index a3c0565be1a9..6d6293f7d428 100644
+--- a/drivers/media/video/cx23885/cx23885-cards.c
++++ b/drivers/media/video/cx23885/cx23885-cards.c
+@@ -441,9 +441,9 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
+ case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
+ /* Two identical tuners on two different i2c buses,
+ * we need to reset the correct gpio. */
+- if (port->nr == 0)
++ if (port->nr == 1)
+ bitmask = 0x01;
+- else if (port->nr == 1)
++ else if (port->nr == 2)
+ bitmask = 0x04;
+ break;
+ }
+diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
+index f48454ab3900..0c49a98213c4 100644
+--- a/drivers/media/video/cx23885/cx23885-dvb.c
++++ b/drivers/media/video/cx23885/cx23885-dvb.c
+@@ -314,6 +314,7 @@ static struct zl10353_config dvico_fusionhdtv_xc3028 = {
+ .demod_address = 0x0f,
+ .if2 = 45600,
+ .no_tuner = 1,
++ .disable_i2c_gate_ctrl = 1,
+ };
+
+ static struct stv0900_config netup_stv0900_config = {commit ade0815c16734e8c25dbac9faf5b5d63bcccd533
+Author: Douglas Kosovic <douglask@itee.uq.edu.au>
+Date: Thu Jan 22 23:07:26 2009 -0300
+
+ V4L/DVB (10299): bttv: Add support for IVCE-8784 support for V4L2 bttv driver
+
+ It's a quad Bt878 PCI-e x1 capture board that's basically the same as the
+ IVC-200 (quad Bt878 PCI) capture board that's currently supported in
+ the V4L2 bttv driver.
+
+ Manufacturer's web page for IVCE-8784 with photo and info:
+ http://www.iei.com.tw/en/product_IPC.asp?model=IVCE-8784
+
+ Signed-off-by: Douglas Kosovic <douglask@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
+index 0d93fa1ac25e..4dfe62641374 100644
+--- a/Documentation/video4linux/CARDLIST.bttv
++++ b/Documentation/video4linux/CARDLIST.bttv
+@@ -154,3 +154,4 @@
+ 153 -> PHYTEC VD-012 (bt878)
+ 154 -> PHYTEC VD-012-X1 (bt878)
+ 155 -> PHYTEC VD-012-X2 (bt878)
++156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050]
+diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
+index d24dcc025e37..9dfd8c70e4fb 100644
+--- a/drivers/media/video/bt8xx/bttv-cards.c
++++ b/drivers/media/video/bt8xx/bttv-cards.c
+@@ -246,6 +246,10 @@ static struct CARD {
+ { 0xa182ff0d, BTTV_BOARD_IVC120, "IVC-120G" },
+ { 0xa182ff0e, BTTV_BOARD_IVC120, "IVC-120G" },
+ { 0xa182ff0f, BTTV_BOARD_IVC120, "IVC-120G" },
++ { 0xf0500000, BTTV_BOARD_IVCE8784, "IVCE-8784" },
++ { 0xf0500001, BTTV_BOARD_IVCE8784, "IVCE-8784" },
++ { 0xf0500002, BTTV_BOARD_IVCE8784, "IVCE-8784" },
++ { 0xf0500003, BTTV_BOARD_IVCE8784, "IVCE-8784" },
+
+ { 0x41424344, BTTV_BOARD_GRANDTEC, "GrandTec Multi Capture" },
+ { 0x01020304, BTTV_BOARD_XGUARD, "Grandtec Grand X-Guard" },
+@@ -2162,6 +2166,19 @@ struct tvcard bttv_tvcards[] = {
+ .muxsel = { 2 },
+ .pll = PLL_28,
+ },
++ [BTTV_BOARD_IVCE8784] = {
++ .name = "IVCE-8784",
++ .video_inputs = 1,
++ .audio_inputs = 0,
++ .tuner = UNSET,
++ .tuner_type = UNSET,
++ .tuner_addr = ADDR_UNSET,
++ .radio_addr = ADDR_UNSET,
++ .svhs = UNSET,
++ .gpiomask = 0xdf,
++ .muxsel = { 2 },
++ .pll = PLL_28,
++ },
+ [BTTV_BOARD_XGUARD] = {
+ .name = "Grand X-Guard / Trust 814PCI",
+ .video_inputs = 16,
+diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
+index 529bf6cf634d..a7bcad171823 100644
+--- a/drivers/media/video/bt8xx/bttv.h
++++ b/drivers/media/video/bt8xx/bttv.h
+@@ -180,6 +180,7 @@
+ #define BTTV_BOARD_VD012 0x99
+ #define BTTV_BOARD_VD012_X1 0x9a
+ #define BTTV_BOARD_VD012_X2 0x9b
++#define BTTV_BOARD_IVCE8784 0x9c
+
+
+ /* more card-specific defines */commit 8765561fc88131bbc9a6246010c15b63595ec35e
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Apr 22 14:45:15 2008 -0300
+
+ V4L/DVB (7259): FusionHDTV DVB-T Pro tuning problem fixes
+
+ It seems that on this board, the demodulator provides the pullup on the I2C
+ bus, which means that calling i2c_gate_ctrl crashes the bus. Turn this off
+ and the xc3028 can talk OK. Also fix some GPIO related settings that
+ became more clear through working on this.
+
+ Some changes made by Mauro Chehab to allow merging it with some
+ other xc3028 patches.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index 1dc70f27f7f9..1fe6b9da9815 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -2038,11 +2038,9 @@ static int cx88_dvico_xc2028_callback(void *ptr, int command, int arg)
+
+ switch (command) {
+ case XC2028_TUNER_RESET:
+- cx_set(MO_GP0_IO, 0x0200);
+- cx_clear(MO_GP0_IO, 0x02);
+- mdelay(100);
+- cx_set(MO_GP0_IO, 0x02);
+- mdelay(100);
++ cx_write(MO_GP0_IO, 0x101000);
++ mdelay(5);
++ cx_set(MO_GP0_IO, 0x101010);
+ break;
+ default:
+ return -EINVAL;
+@@ -2302,6 +2300,13 @@ static void cx88_card_setup(struct cx88_core *core)
+ cx_write(MO_GP0_IO, 0x000007f8);
+ cx_write(MO_GP1_IO, 0x00000001);
+ break;
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
++ /* GPIO0:0 is hooked to demod reset */
++ /* GPIO0:4 is hooked to xc3028 reset */
++ cx_write(MO_GP0_IO, 0x00111100);
++ msleep(1);
++ cx_write(MO_GP0_IO, 0x00111111);
++ break;
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
+ /* GPIO0:6 is hooked to FX2 reset pin */
+ cx_set(MO_GP0_IO, 0x00004040);
+@@ -2312,7 +2317,6 @@ static void cx88_card_setup(struct cx88_core *core)
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
+- case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
+ /* GPIO0:0 is hooked to mt352 reset pin */
+ cx_set(MO_GP0_IO, 0x00000101);
+ cx_clear(MO_GP0_IO, 0x00000001);
+diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
+index 591037d8d14f..ae2a0f5f0806 100644
+--- a/drivers/media/video/cx88/cx88-dvb.c
++++ b/drivers/media/video/cx88/cx88-dvb.c
+@@ -588,6 +588,14 @@ static int dvb_register(struct cx8802_dev *dev)
+ dev->dvb.frontend = dvb_attach(mt352_attach,
+ &dvico_fusionhdtv_mt352_xc3028,
+ &dev->core->i2c_adap);
++ /*
++ * On this board, the demod provides the I2C bus pullup.
++ * We must not permit gate_ctrl to be performed, or
++ * the xc3028 cannot communicate on the bus.
++ */
++ if (dev->dvb.frontend)
++ dev->dvb.frontend->ops.i2c_gate_ctrl = NULL;
++
+ attach_xc3028 = 1;
+ break;
+ case CX88_BOARD_PCHDTV_HD3000:commit b3fb91d20ca111316854a166ff88b0c8c0f2388b
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Apr 22 14:45:15 2008 -0300
+
+ V4L/DVB (7258): Support DVB-T tuning on the DViCO FusionHDTV DVB-T Pro
+
+ Add support for tuning DVB-T channels on DViCO's FusionHDTV DVB-T Pro board.
+
+ The IR remote and analog tuner are not supported at this time.
+
+ Some changes made by Mauro Chehab to allow merging it with some other xc3028
+ patches.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
+index c92795b6e697..423da1543815 100644
+--- a/Documentation/video4linux/CARDLIST.cx88
++++ b/Documentation/video4linux/CARDLIST.cx88
+@@ -62,3 +62,4 @@
+ 61 -> Winfast TV2000 XP Global [107d:6f18]
+ 62 -> PowerColor Real Angel 330 [14f1:ea3d]
+ 63 -> Geniatech X8000-MT DVBT [14f1:8852]
++ 64 -> DViCO FusionHDTV DVB-T PRO [18ac:db30]
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index d07286fa21f5..1dc70f27f7f9 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -1543,7 +1543,24 @@ static const struct cx88_board cx88_boards[] = {
+ .gpio3 = 0x00000000,
+ },
+ .mpeg = CX88_MPEG_DVB,
+- }
++ },
++ [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO] = {
++ .name = "DViCO FusionHDTV DVB-T PRO",
++ .tuner_type = TUNER_ABSENT, /* XXX: Has XC3028 */
++ .radio_type = UNSET,
++ .tuner_addr = ADDR_UNSET,
++ .radio_addr = ADDR_UNSET,
++ .input = { {
++ .type = CX88_VMUX_COMPOSITE1,
++ .vmux = 1,
++ .gpio0 = 0x000067df,
++ }, {
++ .type = CX88_VMUX_SVIDEO,
++ .vmux = 2,
++ .gpio0 = 0x000067df,
++ } },
++ .mpeg = CX88_MPEG_DVB,
++ },
+ };
+
+ /* ------------------------------------------------------------------ */
+@@ -1748,7 +1765,11 @@ static const struct cx88_subid cx88_subids[] = {
+ .subdevice = 0xdb11,
+ .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
+ /* Re-branded DViCO: UltraView DVB-T Plus */
+- },{
++ }, {
++ .subvendor = 0x18ac,
++ .subdevice = 0xdb30,
++ .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO,
++ }, {
+ .subvendor = 0x17de,
+ .subdevice = 0x0840,
+ .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT,
+@@ -2009,6 +2030,28 @@ static void gdi_eeprom(struct cx88_core *core, u8 *eeprom_data)
+ CX88_RADIO : 0;
+ }
+
++/* ------------------------------------------------------------------- */
++/* some Divco specific stuff */
++static int cx88_dvico_xc2028_callback(void *ptr, int command, int arg)
++{
++ struct cx88_core *core = ptr;
++
++ switch (command) {
++ case XC2028_TUNER_RESET:
++ cx_set(MO_GP0_IO, 0x0200);
++ cx_clear(MO_GP0_IO, 0x02);
++ mdelay(100);
++ cx_set(MO_GP0_IO, 0x02);
++ mdelay(100);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ return 0;
++}
++
++
+ /* ----------------------------------------------------------------------- */
+ /* some Geniatech specific stuff */
+
+@@ -2098,6 +2141,8 @@ static int cx88_xc2028_tuner_callback(void *priv, int command, int arg)
+ case CX88_BOARD_POWERCOLOR_REAL_ANGEL:
+ case CX88_BOARD_GENIATECH_X8000_MT:
+ return cx88_xc3028_geniatech_tuner_callback(priv, command, arg);
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
++ return cx88_dvico_xc2028_callback(priv, command, arg);
+ }
+
+ switch (command) {
+@@ -2267,6 +2312,7 @@ static void cx88_card_setup(struct cx88_core *core)
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
+ /* GPIO0:0 is hooked to mt352 reset pin */
+ cx_set(MO_GP0_IO, 0x00000101);
+ cx_clear(MO_GP0_IO, 0x00000001);
+@@ -2338,9 +2384,18 @@ static void cx88_card_setup(struct cx88_core *core)
+
+ ctl.fname = XC2028_DEFAULT_FIRMWARE;
+ ctl.max_len = 64;
+- /* FIXME: Those should be device-dependent */
+- ctl.demod = XC3028_FE_OREN538;
+- ctl.mts = 1;
++
++ switch (core->boardnr) {
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
++ ctl.scode_table = XC3028_FE_ZARLINK456;
++ break;
++ case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
++ ctl.demod = XC3028_FE_OREN538;
++ break;
++ default:
++ ctl.demod = XC3028_FE_OREN538;
++ ctl.mts = 1;
++ }
+
+ xc2028_cfg.tuner = TUNER_XC2028;
+ xc2028_cfg.priv = &ctl;
+diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
+index c786d951a04b..591037d8d14f 100644
+--- a/drivers/media/video/cx88/cx88-dvb.c
++++ b/drivers/media/video/cx88/cx88-dvb.c
+@@ -237,6 +237,19 @@ static struct zl10353_config dvico_fusionhdtv_hybrid = {
+ .no_tuner = 1,
+ };
+
++static struct zl10353_config dvico_fusionhdtv_xc3028 = {
++ .demod_address = 0x0f,
++ .if2 = 45600,
++ .no_tuner = 1,
++};
++
++static struct mt352_config dvico_fusionhdtv_mt352_xc3028 = {
++ .demod_address = 0x0f,
++ .if2 = 4560,
++ .no_tuner = 1,
++ .demod_init = dvico_fusionhdtv_demod_init,
++};
++
+ static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
+ .demod_address = 0x0f,
+ };
+@@ -567,6 +580,16 @@ static int dvb_register(struct cx8802_dev *dev)
+ DVB_PLL_THOMSON_FE6600);
+ }
+ break;
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO:
++ dev->dvb.frontend = dvb_attach(zl10353_attach,
++ &dvico_fusionhdtv_xc3028,
++ &dev->core->i2c_adap);
++ if (dev->dvb.frontend == NULL)
++ dev->dvb.frontend = dvb_attach(mt352_attach,
++ &dvico_fusionhdtv_mt352_xc3028,
++ &dev->core->i2c_adap);
++ attach_xc3028 = 1;
++ break;
+ case CX88_BOARD_PCHDTV_HD3000:
+ dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
+ &dev->core->i2c_adap);
+diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
+index 5145bf2f5557..9df3f198a4df 100644
+--- a/drivers/media/video/cx88/cx88.h
++++ b/drivers/media/video/cx88/cx88.h
+@@ -216,6 +216,7 @@ extern struct sram_channel cx88_sram_channels[];
+ #define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL 61
+ #define CX88_BOARD_POWERCOLOR_REAL_ANGEL 62
+ #define CX88_BOARD_GENIATECH_X8000_MT 63
++#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PRO 64
+
+ enum cx88_itype {
+ CX88_VMUX_COMPOSITE1 = 1,commit 0aaa22e554c0934625faf79deea42bfecbdbc23d
+Author: Douglas Kosovic <douglask@itee.uq.edu.au>
+Date: Tue Jan 29 15:02:50 2008 +0100
+
+ [ALSA] hda-codec - Add Dell T3400 support
+
+ Added the support for Dell T3400 with AD1984 codec chip.
+ ALSA bug#3699:
+ https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3699
+
+ Signed-off-by: Douglas Kosovic <douglask@itee.uq.edu.au>
+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
+ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+
+diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
+index 73f5012326ba..e985cf5e0410 100644
+--- a/Documentation/sound/alsa/ALSA-Configuration.txt
++++ b/Documentation/sound/alsa/ALSA-Configuration.txt
+@@ -926,6 +926,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
+ AD1984
+ basic default configuration
+ thinkpad Lenovo Thinkpad T61/X61
++ dell Dell T3400
+
+ AD1986A
+ 6stack 6-jack, separate surrounds (default)
+diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
+index 845e949a7f63..19f08846d6fc 100644
+--- a/sound/pci/hda/patch_analog.c
++++ b/sound/pci/hda/patch_analog.c
+@@ -3141,6 +3141,20 @@ static struct hda_input_mux ad1984_thinkpad_capture_source = {
+ },
+ };
+
++
++/*
++ * Dell Precision T3400
++ */
++static struct hda_input_mux ad1984_dell_desktop_capture_source = {
++ .num_items = 3,
++ .items = {
++ { "Front Mic", 0x0 },
++ { "Line-In", 0x1 },
++ { "Mix", 0x3 },
++ },
++};
++
++
+ static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = {
+ HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
+ /* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */
+@@ -3200,6 +3214,44 @@ static struct hda_verb ad1984_thinkpad_init_verbs[] = {
+ { } /* end */
+ };
+
++/*
++ * Dell Precision T3400
++ */
++static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = {
++ HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT),
++ HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT),
++ HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT),
++ HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT),
++ HDA_CODEC_VOLUME("Line-In Playback Volume", 0x20, 0x01, HDA_INPUT),
++ HDA_CODEC_MUTE("Line-In Playback Switch", 0x20, 0x01, HDA_INPUT),
++ /*
++ HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x20, 0x03, HDA_INPUT),
++ HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x20, 0x03, HDA_INPUT),
++ */
++ HDA_CODEC_VOLUME("Line-In Boost", 0x15, 0x0, HDA_INPUT),
++ HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT),
++ HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT),
++ HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT),
++ HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT),
++ {
++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
++ /* The multiple "Capture Source" controls confuse alsamixer
++ * So call somewhat different..
++ */
++ /* .name = "Capture Source", */
++ .name = "Input Source",
++ .count = 2,
++ .info = ad198x_mux_enum_info,
++ .get = ad198x_mux_enum_get,
++ .put = ad198x_mux_enum_put,
++ },
++ { } /* end */
++};
++
+ /* Digial MIC ADC NID 0x05 + 0x06 */
+ static int ad1984_pcm_dmic_prepare(struct hda_pcm_stream *hinfo,
+ struct hda_codec *codec,
+@@ -3253,17 +3305,20 @@ static int ad1984_build_pcms(struct hda_codec *codec)
+ enum {
+ AD1984_BASIC,
+ AD1984_THINKPAD,
++ AD1984_DELL_DESKTOP,
+ AD1984_MODELS
+ };
+
+ static const char *ad1984_models[AD1984_MODELS] = {
+ [AD1984_BASIC] = "basic",
+ [AD1984_THINKPAD] = "thinkpad",
++ [AD1984_DELL_DESKTOP] = "dell_desktop",
+ };
+
+ static struct snd_pci_quirk ad1984_cfg_tbl[] = {
+ /* Lenovo Thinkpad T61/X61 */
+ SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1984_THINKPAD),
++ SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
+ {}
+ };
+
+@@ -3290,6 +3345,11 @@ static int patch_ad1984(struct hda_codec *codec)
+ spec->mixers[0] = ad1984_thinkpad_mixers;
+ spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs;
+ break;
++ case AD1984_DELL_DESKTOP:
++ spec->multiout.dig_out_nid = 0;
++ spec->input_mux = &ad1984_dell_desktop_capture_source;
++ spec->mixers[0] = ad1984_dell_desktop_mixers;
++ break;
+ }
+ return 0;
+ }commit ef207feddf826f099562b239543c447e68991b84
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 09:30:55 2007 -0300
+
+ V4L/DVB (6897): xc2028: ignore HAS_IF during specific S-Code type searches
+
+ If we are selecting the S-Code firmware to load by name, then we must mask
+ off the HAS_IF bit during the search.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index ddd94f1d6a6f..1817bf67dad1 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -395,6 +395,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+ int i, best_i = -1, best_nr_matches = 0;
++ unsigned int ign_firm_type_mask = 0;
+
+ tuner_dbg("%s called, want type=", __FUNCTION__);
+ if (debug) {
+@@ -412,16 +413,18 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+
+ if (type & BASE)
+ type &= BASE_TYPES;
+- else if (type & SCODE)
++ else if (type & SCODE) {
+ type &= SCODE_TYPES;
+- else if (type & DTV_TYPES)
++ ign_firm_type_mask = HAS_IF;
++ } else if (type & DTV_TYPES)
+ type &= DTV_TYPES;
+ else if (type & STD_SPECIFIC_TYPES)
+ type &= STD_SPECIFIC_TYPES;
+
+ /* Seek for exact match */
+ for (i = 0; i < priv->firm_size; i++) {
+- if ((type == priv->firm[i].type) && (*id == priv->firm[i].id))
++ if ((type == (priv->firm[i].type & ~ign_firm_type_mask)) &&
++ (*id == priv->firm[i].id))
+ goto found;
+ }
+
+@@ -430,7 +433,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ v4l2_std_id match_mask;
+ int nr_matches;
+
+- if (type != priv->firm[i].type)
++ if (type != (priv->firm[i].type & ~ign_firm_type_mask))
+ continue;
+
+ match_mask = *id & priv->firm[i].id;commit 5e3c5967da48b54e5d4ee528b51b565e2f7a3178
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Dec 15 03:31:09 2007 -0300
+
+ V4L/DVB (6857): cx23885: correctly join I2C writes and reads from same address
+
+ When an I2C message specifies a write then a read from the same I2C address,
+ we need to tell the chip to not release the bus between the message parts.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
+index 08e92df33168..20f3fb450f88 100644
+--- a/drivers/media/video/cx23885/cx23885-i2c.c
++++ b/drivers/media/video/cx23885/cx23885-i2c.c
+@@ -37,8 +37,10 @@ static unsigned int i2c_scan = 0;
+ module_param(i2c_scan, int, 0444);
+ MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
+
+-#define dprintk(level,fmt, arg...) if (i2c_debug >= level) \
+- printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg)
++#define dprintk(level, fmt, arg...) do { \
++ if (i2c_debug >= level) \
++ printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg); \
++ } while (0)
+
+ #define I2C_WAIT_DELAY 32
+ #define I2C_WAIT_RETRY 64
+@@ -77,14 +79,18 @@ static int i2c_wait_done(struct i2c_adapter *i2c_adap)
+ }
+
+ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+- const struct i2c_msg *msg, int last)
++ const struct i2c_msg *msg, int joined_rlen)
+ {
+ struct cx23885_i2c *bus = i2c_adap->algo_data;
+ struct cx23885_dev *dev = bus->dev;
+ u32 wdata, addr, ctrl;
+ int retval, cnt;
+
+- dprintk(1, "%s(msg->len=%d, last=%d)\n", __FUNCTION__, msg->len, last);
++ if (joined_rlen)
++ dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __FUNCTION__,
++ msg->len, joined_rlen);
++ else
++ dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+
+ /* Deal with i2c probe functions with zero payload */
+ if (msg->len == 0) {
+@@ -107,6 +113,8 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+
+ if (msg->len > 1)
+ ctrl |= I2C_NOSTOP | I2C_EXTEND;
++ else if (joined_rlen)
++ ctrl |= I2C_NOSTOP;
+
+ cx_write(bus->reg_addr, addr);
+ cx_write(bus->reg_wdata, wdata);
+@@ -130,6 +138,8 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+
+ if (cnt < msg->len - 1)
+ ctrl |= I2C_NOSTOP | I2C_EXTEND;
++ else if (joined_rlen)
++ ctrl |= I2C_NOSTOP;
+
+ cx_write(bus->reg_addr, addr);
+ cx_write(bus->reg_wdata, wdata);
+@@ -151,19 +161,22 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+ eio:
+ retval = -EIO;
+ err:
+- printk(" ERR: %d\n", retval);
++ if (i2c_debug)
++ printk(" ERR: %d\n", retval);
+ return retval;
+ }
+
+ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
+- const struct i2c_msg *msg, int last)
++ const struct i2c_msg *msg, int joined)
+ {
+ struct cx23885_i2c *bus = i2c_adap->algo_data;
+ struct cx23885_dev *dev = bus->dev;
+ u32 ctrl, cnt;
+ int retval;
+
+- dprintk(1, "%s(msg->len=%d, last=%d)\n", __FUNCTION__, msg->len, last);
++
++ if (i2c_debug && !joined)
++ dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
+
+ /* Deal with i2c probe functions with zero payload */
+ if (msg->len == 0) {
+@@ -179,8 +192,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
+ return 0;
+ }
+
+- if (i2c_debug)
+- printk(" <R %02x", (msg->addr << 1) + 1);
++ if (i2c_debug) {
++ if (joined)
++ printk(" R");
++ else
++ printk(" <R %02x", (msg->addr << 1) + 1);
++ }
+
+ for(cnt = 0; cnt < msg->len; cnt++) {
+
+@@ -209,7 +226,8 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
+ eio:
+ retval = -EIO;
+ err:
+- printk(" ERR: %d\n", retval);
++ if (i2c_debug)
++ printk(" ERR: %d\n", retval);
+ return retval;
+ }
+
+@@ -227,15 +245,22 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap,
+ __FUNCTION__, num, msgs[i].addr, msgs[i].len);
+ if (msgs[i].flags & I2C_M_RD) {
+ /* read */
+- retval = i2c_readbytes(i2c_adap, &msgs[i], i+1 == num);
++ retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
++ } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) &&
++ msgs[i].addr == msgs[i + 1].addr) {
++ /* write then read from same address */
++ retval = i2c_sendbytes(i2c_adap, &msgs[i],
++ msgs[i + 1].len);
+ if (retval < 0)
+ goto err;
++ i++;
++ retval = i2c_readbytes(i2c_adap, &msgs[i], 1);
+ } else {
+ /* write */
+- retval = i2c_sendbytes(i2c_adap, &msgs[i], i+1 == num);
+- if (retval < 0)
+- goto err;
++ retval = i2c_sendbytes(i2c_adap, &msgs[i], 0);
+ }
++ if (retval < 0)
++ goto err;
+ }
+ return num;
+ commit bc514710889ebb975be9e84ca9c04f698225b656
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Dec 15 03:24:00 2007 -0300
+
+ V4L/DVB (6856): zl10353: improve tuning parameters and update register map
+
+ Some more I2C traces and a experimentation with register values on
+ both the ZL10353 and MT352 mean that I can now guess at what more
+ of the ZL10353 registers do.
+
+ Guess at the registers' names (based on the equivalent names in MT352)
+ and update set_parameters/get_parameters with the new knowledge.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index e874ec8df60c..276e3b631dc2 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -36,6 +36,8 @@ struct zl10353_state {
+ struct dvb_frontend frontend;
+
+ struct zl10353_config config;
++
++ enum fe_bandwidth bandwidth;
+ };
+
+ static int debug;
+@@ -195,27 +197,156 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+ u16 nominal_rate, input_freq;
+- u8 pllbuf[6] = { 0x67 };
++ u8 pllbuf[6] = { 0x67 }, acq_ctl = 0;
++ u16 tps = 0;
++ struct dvb_ofdm_parameters *op = ¶m->u.ofdm;
+
+- /* These settings set "auto-everything" and start the FSM. */
+- zl10353_single_write(fe, 0x55, 0x80);
++ zl10353_single_write(fe, RESET, 0x80);
+ udelay(200);
+ zl10353_single_write(fe, 0xEA, 0x01);
+ udelay(200);
+ zl10353_single_write(fe, 0xEA, 0x00);
+
+- zl10353_single_write(fe, 0x56, 0x28);
+- zl10353_single_write(fe, 0x89, 0x20);
+- zl10353_single_write(fe, 0x5E, 0x00);
++ zl10353_single_write(fe, AGC_TARGET, 0x28);
++
++ if (op->transmission_mode != TRANSMISSION_MODE_AUTO)
++ acq_ctl |= (1 << 0);
++ if (op->guard_interval != GUARD_INTERVAL_AUTO)
++ acq_ctl |= (1 << 1);
++ zl10353_single_write(fe, ACQ_CTL, acq_ctl);
+
+- zl10353_calc_nominal_rate(fe, param->u.ofdm.bandwidth, &nominal_rate);
++ switch (op->bandwidth) {
++ case BANDWIDTH_6_MHZ:
++ /* These are extrapolated from the 7 and 8MHz values */
++ zl10353_single_write(fe, MCLK_RATIO, 0x97);
++ zl10353_single_write(fe, 0x64, 0x34);
++ break;
++ case BANDWIDTH_7_MHZ:
++ zl10353_single_write(fe, MCLK_RATIO, 0x86);
++ zl10353_single_write(fe, 0x64, 0x35);
++ break;
++ case BANDWIDTH_8_MHZ:
++ default:
++ zl10353_single_write(fe, MCLK_RATIO, 0x75);
++ zl10353_single_write(fe, 0x64, 0x36);
++ }
++
++ zl10353_calc_nominal_rate(fe, op->bandwidth, &nominal_rate);
+ zl10353_single_write(fe, TRL_NOMINAL_RATE_1, msb(nominal_rate));
+ zl10353_single_write(fe, TRL_NOMINAL_RATE_0, lsb(nominal_rate));
++ state->bandwidth = op->bandwidth;
+
+ zl10353_calc_input_freq(fe, &input_freq);
+ zl10353_single_write(fe, INPUT_FREQ_1, msb(input_freq));
+ zl10353_single_write(fe, INPUT_FREQ_0, lsb(input_freq));
+
++ /* Hint at TPS settings */
++ switch (op->code_rate_HP) {
++ case FEC_2_3:
++ tps |= (1 << 7);
++ break;
++ case FEC_3_4:
++ tps |= (2 << 7);
++ break;
++ case FEC_5_6:
++ tps |= (3 << 7);
++ break;
++ case FEC_7_8:
++ tps |= (4 << 7);
++ break;
++ case FEC_1_2:
++ case FEC_AUTO:
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ switch (op->code_rate_LP) {
++ case FEC_2_3:
++ tps |= (1 << 4);
++ break;
++ case FEC_3_4:
++ tps |= (2 << 4);
++ break;
++ case FEC_5_6:
++ tps |= (3 << 4);
++ break;
++ case FEC_7_8:
++ tps |= (4 << 4);
++ break;
++ case FEC_1_2:
++ case FEC_AUTO:
++ break;
++ case FEC_NONE:
++ if (op->hierarchy_information == HIERARCHY_AUTO ||
++ op->hierarchy_information == HIERARCHY_NONE)
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ switch (op->constellation) {
++ case QPSK:
++ break;
++ case QAM_AUTO:
++ case QAM_16:
++ tps |= (1 << 13);
++ break;
++ case QAM_64:
++ tps |= (2 << 13);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ switch (op->transmission_mode) {
++ case TRANSMISSION_MODE_2K:
++ case TRANSMISSION_MODE_AUTO:
++ break;
++ case TRANSMISSION_MODE_8K:
++ tps |= (1 << 0);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ switch (op->guard_interval) {
++ case GUARD_INTERVAL_1_32:
++ case GUARD_INTERVAL_AUTO:
++ break;
++ case GUARD_INTERVAL_1_16:
++ tps |= (1 << 2);
++ break;
++ case GUARD_INTERVAL_1_8:
++ tps |= (2 << 2);
++ break;
++ case GUARD_INTERVAL_1_4:
++ tps |= (3 << 2);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ switch (op->hierarchy_information) {
++ case HIERARCHY_AUTO:
++ case HIERARCHY_NONE:
++ break;
++ case HIERARCHY_1:
++ tps |= (1 << 10);
++ break;
++ case HIERARCHY_2:
++ tps |= (2 << 10);
++ break;
++ case HIERARCHY_4:
++ tps |= (3 << 10);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ zl10353_single_write(fe, TPS_GIVEN_1, msb(tps));
++ zl10353_single_write(fe, TPS_GIVEN_0, lsb(tps));
++
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
+
+@@ -244,12 +375,97 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
+ else
+ zl10353_single_write(fe, TUNER_GO, 0x01);
+
+- udelay(250);
+- zl10353_single_write(fe, 0xE4, 0x00);
+- zl10353_single_write(fe, 0xE5, 0x2A);
+- zl10353_single_write(fe, 0xE9, 0x02);
+- zl10353_single_write(fe, 0xE7, 0x40);
+- zl10353_single_write(fe, 0xE8, 0x10);
++ return 0;
++}
++
++static int zl10353_get_parameters(struct dvb_frontend *fe,
++ struct dvb_frontend_parameters *param)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ struct dvb_ofdm_parameters *op = ¶m->u.ofdm;
++ int s6, s9;
++ u16 tps;
++ static const u8 tps_fec_to_api[8] = {
++ FEC_1_2,
++ FEC_2_3,
++ FEC_3_4,
++ FEC_5_6,
++ FEC_7_8,
++ FEC_AUTO,
++ FEC_AUTO,
++ FEC_AUTO
++ };
++
++ s6 = zl10353_read_register(state, STATUS_6);
++ s9 = zl10353_read_register(state, STATUS_9);
++ if (s6 < 0 || s9 < 0)
++ return -EREMOTEIO;
++ if ((s6 & (1 << 5)) == 0 || (s9 & (1 << 4)) == 0)
++ return -EINVAL; /* no FE or TPS lock */
++
++ tps = zl10353_read_register(state, TPS_RECEIVED_1) << 8 |
++ zl10353_read_register(state, TPS_RECEIVED_0);
++
++ op->code_rate_HP = tps_fec_to_api[(tps >> 7) & 7];
++ op->code_rate_LP = tps_fec_to_api[(tps >> 4) & 7];
++
++ switch ((tps >> 13) & 3) {
++ case 0:
++ op->constellation = QPSK;
++ break;
++ case 1:
++ op->constellation = QAM_16;
++ break;
++ case 2:
++ op->constellation = QAM_64;
++ break;
++ default:
++ op->constellation = QAM_AUTO;
++ break;
++ }
++
++ op->transmission_mode = (tps & 0x01) ? TRANSMISSION_MODE_8K :
++ TRANSMISSION_MODE_2K;
++
++ switch ((tps >> 2) & 3) {
++ case 0:
++ op->guard_interval = GUARD_INTERVAL_1_32;
++ break;
++ case 1:
++ op->guard_interval = GUARD_INTERVAL_1_16;
++ break;
++ case 2:
++ op->guard_interval = GUARD_INTERVAL_1_8;
++ break;
++ case 3:
++ op->guard_interval = GUARD_INTERVAL_1_4;
++ break;
++ default:
++ op->guard_interval = GUARD_INTERVAL_AUTO;
++ break;
++ }
++
++ switch ((tps >> 10) & 7) {
++ case 0:
++ op->hierarchy_information = HIERARCHY_NONE;
++ break;
++ case 1:
++ op->hierarchy_information = HIERARCHY_1;
++ break;
++ case 2:
++ op->hierarchy_information = HIERARCHY_2;
++ break;
++ case 3:
++ op->hierarchy_information = HIERARCHY_4;
++ break;
++ default:
++ op->hierarchy_information = HIERARCHY_AUTO;
++ break;
++ }
++
++ param->frequency = 0;
++ op->bandwidth = state->bandwidth;
++ param->inversion = INVERSION_AUTO;
+
+ return 0;
+ }
+@@ -438,6 +654,7 @@ static struct dvb_frontend_ops zl10353_ops = {
+ .write = zl10353_write,
+
+ .set_frontend = zl10353_set_parameters,
++ .get_frontend = zl10353_get_parameters,
+ .get_tune_settings = zl10353_get_tune_settings,
+
+ .read_status = zl10353_read_status,
+diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
+index fcad9221945e..055ff1f7e349 100644
+--- a/drivers/media/dvb/frontends/zl10353_priv.h
++++ b/drivers/media/dvb/frontends/zl10353_priv.h
+@@ -46,13 +46,28 @@ enum zl10353_reg_addr {
+ RS_ERR_CNT_0 = 0x13,
+ RS_UBC_1 = 0x14,
+ RS_UBC_0 = 0x15,
++ TPS_RECEIVED_1 = 0x1D,
++ TPS_RECEIVED_0 = 0x1E,
++ TPS_CURRENT_1 = 0x1F,
++ TPS_CURRENT_0 = 0x20,
++ RESET = 0x55,
++ AGC_TARGET = 0x56,
++ MCLK_RATIO = 0x5C,
++ ACQ_CTL = 0x5E,
+ TRL_NOMINAL_RATE_1 = 0x65,
+ TRL_NOMINAL_RATE_0 = 0x66,
+ INPUT_FREQ_1 = 0x6C,
+ INPUT_FREQ_0 = 0x6D,
++ TPS_GIVEN_1 = 0x6E,
++ TPS_GIVEN_0 = 0x6F,
+ TUNER_GO = 0x70,
+ FSM_GO = 0x71,
+ CHIP_ID = 0x7F,
++ CHAN_STEP_1 = 0xE4,
++ CHAN_STEP_0 = 0xE5,
++ OFDM_LOCK_TIME = 0xE7,
++ FEC_LOCK_TIME = 0xE8,
++ ACQ_DELAY = 0xE9,
+ };
+
+ #endif /* _ZL10353_PRIV_ */
+ commit 3dfefc50ff45744ffb97ce0bf9c213a3fb6d5d3d
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 10:07:06 2007 -0300
+
+ V4L/DVB (6855): xc2028: select DTV78 firmware if tuning 7MHz VHF / 8MHz UHF
+
+ It seems that the DTV78 firmware is intended for use in locations where
+ VHF channels have 7MHz bandwidth and UHF channels have 8MHz bandwidth.
+ If we switch to DTV78 firmware when we detect this condition, we can
+ avoid firmware reloads when switching between VHF and UHF transponders.
+
+ Place the state for this in the control structure so that card drivers
+ can hint to us to use DTV78 firmware from the first tuning attempt.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 63a6fca1f8cf..0565edd224bc 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -998,20 +998,27 @@ static int xc2028_set_params(struct dvb_frontend *fe,
+ return -EINVAL;
+ }
+
+- /* FIXME:
+- There are two Scodes that will never be selected:
+- DTV78 ZARLINK456, DTV78 DIBCOM52
+- When it should opt for DTV78 instead of DTV7 or DTV8?
+- */
+ switch (bw) {
+ case BANDWIDTH_8_MHZ:
+- type |= DTV8 | F8MHZ;
++ if (p->frequency < 470000000)
++ priv->ctrl.vhfbw7 = 0;
++ else
++ priv->ctrl.uhfbw8 = 1;
++ type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV8;
++ type |= F8MHZ;
+ break;
+ case BANDWIDTH_7_MHZ:
+- type |= DTV7 | F8MHZ;
++ if (p->frequency < 470000000)
++ priv->ctrl.vhfbw7 = 1;
++ else
++ priv->ctrl.uhfbw8 = 0;
++ type |= (priv->ctrl.vhfbw7 && priv->ctrl.uhfbw8) ? DTV78 : DTV7;
++ type |= F8MHZ;
+ break;
+ case BANDWIDTH_6_MHZ:
+- type |= DTV6 ;
++ type |= DTV6;
++ priv->ctrl.vhfbw7 = 0;
++ priv->ctrl.uhfbw8 = 0;
+ break;
+ default:
+ tuner_err("error: bandwidth not supported.\n");
+diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
+index 1fe8b195960c..7462629b98fd 100644
+--- a/drivers/media/video/tuner-xc2028.h
++++ b/drivers/media/video/tuner-xc2028.h
+@@ -30,6 +30,8 @@ struct xc2028_ctrl {
+ unsigned int mts :1;
+ unsigned int d2633 :1;
+ unsigned int input1:1;
++ unsigned int vhfbw7:1;
++ unsigned int uhfbw8:1;
+ unsigned int demod;
+ };
+ commit 897b842296f1285a6b58e9170f7017022e2e2603
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 09:39:18 2007 -0300
+
+ V4L/DVB (6854): xc2028: be more specific about when applying offset for 7MHz channels
+
+ We have been inserting a mystery 500kHz offset for tuning 7MHz channels,
+ however some experimentation reveals it is only needed under certain
+ conditions with specific firmware combinations. Document these and only
+ apply the offset when we know it is required.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index a6b05dfd6703..63a6fca1f8cf 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -875,7 +875,16 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
+ rc = send_seq(priv, {0x00, 0x00});
+ } else {
+ offset = 2750000;
+- if (priv->cur_fw.type & DTV7)
++ /*
++ * We must adjust the offset by 500kHz in two cases in order
++ * to correctly center the IF output:
++ * 1) When the ZARLINK456 or DIBCOM52 tables were explicitly
++ * selected and a 7MHz channel is tuned;
++ * 2) When tuning a VHF channel with DTV78 firmware.
++ */
++ if (((priv->cur_fw.type & DTV7) &&
++ (priv->cur_fw.scode_table & (ZARLINK456 | DIBCOM52))) ||
++ ((priv->cur_fw.type & DTV78) && freq < 470000000))
+ offset -= 500000;
+ }
+ commit 9ca01e780f8966a7a94f88ef5c54f340e117abea
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 06:54:17 2007 -0300
+
+ V4L/DVB (6853): xc2028: check HAS_IF flag against table
+
+ When searching for the right S-Code table to load, check the HAS_IF flag
+ against the firmware we are checking instead of against the the "type"
+ requested. We already ignore the scode type requested if the caller passed
+ an int_freq; this makes the search by frequency consistent with that behaviour.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 81cc7f607d4e..a6b05dfd6703 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -592,7 +592,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+ } else {
+ for (pos = 0; pos < priv->firm_size; pos++) {
+ if ((priv->firm[pos].int_freq == int_freq) &&
+- (type & HAS_IF))
++ (priv->firm[pos].type & HAS_IF))
+ break;
+ }
+ if (pos == priv->firm_size)
+@@ -601,7 +601,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+
+ p = priv->firm[pos].ptr;
+
+- if (type & HAS_IF) {
++ if (priv->firm[pos].type & HAS_IF) {
+ if (priv->firm[pos].size != 12 * 16 || scode >= 16)
+ return -EINVAL;
+ p += 12 * scode;commit ad35ce9e3e03b1515c8581bababb0e64d05cf1ad
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 06:36:42 2007 -0300
+
+ V4L/DVB (6852): xc2028: s-code offset should not modify internal control structure
+
+ Don't modify the control structure that was provided at attach when applying
+ an offset to the S-Code, otherwise it will be incorrect on subsequent tunes.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 416c717eb78e..81cc7f607d4e 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -956,6 +956,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
+ struct xc2028_data *priv = fe->tuner_priv;
+ unsigned int type=0;
+ fe_bandwidth_t bw = BANDWIDTH_8_MHZ;
++ u16 demod = 0;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+@@ -1009,10 +1010,10 @@ static int xc2028_set_params(struct dvb_frontend *fe,
+
+ /* All S-code tables need a 200kHz shift */
+ if (priv->ctrl.demod)
+- priv->ctrl.demod += 200;
++ demod = priv->ctrl.demod + 200;
+
+ return generic_set_freq(fe, p->frequency,
+- T_DIGITAL_TV, type, 0, priv->ctrl.demod);
++ T_DIGITAL_TV, type, 0, demod);
+ }
+
+ static int xc2028_sleep(struct dvb_frontend *fe)commit e026268870b5f05a3f74b37816d96ed3b19a9e33
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sun Dec 2 06:30:50 2007 -0300
+
+ V4L/DVB (6851): xc2028: include int_freq in firmware version display
+
+ Add "int_freq" to the debugging output when selecting firmware and the
+ HAS_IF flag when dumping firmware during load.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index fd248a19c259..416c717eb78e 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -144,7 +144,8 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
+ return 0;
+ }
+
+-void dump_firm_type(unsigned int type)
++#define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0)
++void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq)
+ {
+ if (type & BASE)
+ printk("BASE ");
+@@ -206,6 +207,8 @@ void dump_firm_type(unsigned int type)
+ printk("INPUT2 ");
+ if (type & SCODE)
+ printk("SCODE ");
++ if (type & HAS_IF)
++ printk("HAS_IF_%d ", int_freq);
+ }
+
+ static v4l2_std_id parse_audio_std_option(void)
+@@ -350,9 +353,9 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ }
+ tuner_dbg("Reading firmware type ");
+ if (debug) {
+- dump_firm_type(type);
++ dump_firm_type_and_int_freq(type, int_freq);
+ printk("(%x), id %llx, size=%d.\n",
+- type, (unsigned long long)id, size);
++ type, (unsigned long long)id, size);
+ }
+
+ memcpy(priv->firm[n].ptr, p, size);
+@@ -612,7 +615,8 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+ }
+
+ tuner_info("Loading SCODE for type=");
+- dump_firm_type(priv->firm[pos].type);
++ dump_firm_type_and_int_freq(priv->firm[pos].type,
++ priv->firm[pos].int_freq);
+ printk("(%x), id %016llx.\n", priv->firm[pos].type,
+ (unsigned long long)*id);
+
+@@ -670,11 +674,15 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
+ tuner_dbg("checking firmware, user requested type=");
+ if (debug) {
+ dump_firm_type(new_fw.type);
+- printk("(%x), id %016llx, scode_tbl ", new_fw.type,
++ printk("(%x), id %016llx, ", new_fw.type,
+ (unsigned long long)new_fw.std_req);
+- dump_firm_type(priv->ctrl.scode_table);
+- printk("(%x), scode_nr %d\n", priv->ctrl.scode_table,
+- new_fw.scode_nr);
++ if (!int_freq) {
++ printk("scode_tbl ");
++ dump_firm_type(priv->ctrl.scode_table);
++ printk("(%x), ", priv->ctrl.scode_table);
++ } else
++ printk("int_freq %d, ", new_fw.int_freq);
++ printk("scode_nr %d\n", new_fw.scode_nr);
+ }
+
+ /* No need to reload base firmware if it matches */commit a1dcd9de648c8cf21abaeca7f77885665eed4117
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Nov 20 08:17:54 2007 -0300
+
+ V4L/DVB (6656): zl10353: store frequencies in 0.1kHz to eliminate rounding errors
+
+ Whilst reanalysing my formulas I realised it was no longer possible to get the
+ right values for a 36.1667MHz IF due to rounding problems.
+
+ Storing frequencies in units of 0.1kHz makes it possible to calculate these
+ again correctly.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index c44b9799efaa..deeb3871a2aa 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -435,7 +435,7 @@ static struct mt352_config cxusb_mt352_config = {
+
+ static struct zl10353_config cxusb_zl10353_xc3028_config = {
+ .demod_address = 0x0f,
+- .if2 = 4560,
++ .if2 = 45600,
+ .no_tuner = 1,
+ .parallel_ts = 1,
+ };
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index 1736c6ac39cc..091fbcced006 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -123,9 +123,10 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+ enum fe_bandwidth bandwidth,
+ u16 *nominal_rate)
+ {
+- u32 adc_clock = 45056; /* 45.056 MHz */
+- u8 bw;
+ struct zl10353_state *state = fe->demodulator_priv;
++ u32 adc_clock = 450560; /* 45.056 MHz */
++ u64 value;
++ u8 bw;
+
+ if (state->config.adc_clock)
+ adc_clock = state->config.adc_clock;
+@@ -143,7 +144,9 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+ break;
+ }
+
+- *nominal_rate = (bw * (1 << 23) / 7 * 125 + adc_clock / 2) / adc_clock;
++ value = (bw * (u64)10 * (1 << 23) / 7 * 125 + adc_clock / 2);
++ do_div(value, adc_clock);
++ *nominal_rate = value;
+
+ dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
+ __FUNCTION__, bw, adc_clock, *nominal_rate);
+@@ -153,8 +156,8 @@ static void zl10353_calc_input_freq(struct dvb_frontend *fe,
+ u16 *input_freq)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+- u32 adc_clock = 45056; /* 45.056 MHz */
+- int if2 = 36167; /* 36.167 MHz */
++ u32 adc_clock = 450560; /* 45.056 MHz */
++ int if2 = 361667; /* 36.1667 MHz */
+ int ife;
+ u64 value;
+
+@@ -170,7 +173,7 @@ static void zl10353_calc_input_freq(struct dvb_frontend *fe,
+ if (ife > adc_clock / 2)
+ ife = adc_clock - ife;
+ }
+- value = 65536ULL * ife + adc_clock / 2;
++ value = (u64)65536 * ife + adc_clock / 2;
+ do_div(value, adc_clock);
+ *input_freq = -value;
+
+diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
+index 2660cec93f83..fc734c22b5fa 100644
+--- a/drivers/media/dvb/frontends/zl10353.h
++++ b/drivers/media/dvb/frontends/zl10353.h
+@@ -29,9 +29,9 @@ struct zl10353_config
+ /* demodulator's I2C address */
+ u8 demod_address;
+
+- /* frequencies in kHz */
+- int adc_clock; /* default: 45056 */
+- int if2; /* default: 36167 */
++ /* frequencies in units of 0.1kHz */
++ int adc_clock; /* default: 450560 (45.056 MHz) */
++ int if2; /* default: 361667 (36.1667 MHz) */
+
+ /* set if no pll is connected to the secondary i2c bus */
+ int no_tuner;
+@@ -50,6 +50,6 @@ static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *c
+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+ return NULL;
+ }
+-#endif // CONFIG_DVB_ZL10353
++#endif /* CONFIG_DVB_ZL10353 */
+
+ #endif /* ZL10353_H */commit 702a67624e4bc9c7056418b576af928940b7dbb9
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Nov 20 03:34:11 2007 -0300
+
+ V4L/DVB (6655): Add support for MT352-based DViCO FusionHDTV DVB-T NANO devices
+
+ There are at least three variants of the DViCO FusionHDTV DVB-T NANO that
+ share the same USB device ID. The first (ZL10353 w/ firmware in ROM) is
+ already supported; the latter two both require firmware and have either
+ an MT352 or ZL10353 demodulator, and have a different IR receiver from the
+ first.
+
+ This introduces a new identify_state that can tell the difference between a
+ "warm" device which is running the embedded firmware, and a "cold" device
+ that needs us to upload firmware to it before it will work. We patch the
+ uploaded device ID (like we do for other bluebird devices) to make it easy
+ to identify the particular device variant when it reattaches.
+
+ NB: These devices use a different firmware file from previous bluebird
+ devices. You need a new firmware file to make this work.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index f6fa2c22b0bf..c44b9799efaa 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -440,6 +440,13 @@ static struct zl10353_config cxusb_zl10353_xc3028_config = {
+ .parallel_ts = 1,
+ };
+
++static struct mt352_config cxusb_mt352_xc3028_config = {
++ .demod_address = 0x0f,
++ .if2 = 4560,
++ .no_tuner = 1,
++ .demod_init = cxusb_mt352_demod_init,
++};
++
+ /* Callbacks for DVB USB */
+ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
+ {
+@@ -639,30 +646,63 @@ static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
+ &adap->dev->i2c_adap)) != NULL)
+ return 0;
+
++ if ((adap->fe = dvb_attach(mt352_attach,
++ &cxusb_mt352_xc3028_config,
++ &adap->dev->i2c_adap)) != NULL)
++ return 0;
++
+ return -EIO;
+ }
+
++/*
++ * DViCO has shipped two devices with the same USB ID, but only one of them
++ * needs a firmware download. Check the device class details to see if they
++ * have non-default values to decide whether the device is actually cold or
++ * not, and forget a match if it turns out we selected the wrong device.
++ */
++static int bluebird_fx2_identify_state(struct usb_device *udev,
++ struct dvb_usb_device_properties *props,
++ struct dvb_usb_device_description **desc,
++ int *cold)
++{
++ int wascold = *cold;
++
++ *cold = udev->descriptor.bDeviceClass == 0xff &&
++ udev->descriptor.bDeviceSubClass == 0xff &&
++ udev->descriptor.bDeviceProtocol == 0xff;
++
++ if (*cold && !wascold)
++ *desc = NULL;
++
++ return 0;
++}
++
+ /*
+ * DViCO bluebird firmware needs the "warm" product ID to be patched into the
+ * firmware file before download.
+ */
+
+-#define BLUEBIRD_01_ID_OFFSET 6638
++static const int dvico_firmware_id_offsets[] = { 6638, 3204 };
+ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev,
+ const struct firmware *fw)
+ {
+- if (fw->size < BLUEBIRD_01_ID_OFFSET + 4)
+- return -EINVAL;
++ int pos;
++
++ for (pos = 0; pos < ARRAY_SIZE(dvico_firmware_id_offsets); pos++) {
++ int idoff = dvico_firmware_id_offsets[pos];
+
+- if (fw->data[BLUEBIRD_01_ID_OFFSET] == (USB_VID_DVICO & 0xff) &&
+- fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {
++ if (fw->size < idoff + 4)
++ continue;
+
+- fw->data[BLUEBIRD_01_ID_OFFSET + 2] =
+- le16_to_cpu(udev->descriptor.idProduct) + 1;
+- fw->data[BLUEBIRD_01_ID_OFFSET + 3] =
+- le16_to_cpu(udev->descriptor.idProduct) >> 8;
++ if (fw->data[idoff] == (USB_VID_DVICO & 0xff) &&
++ fw->data[idoff + 1] == USB_VID_DVICO >> 8) {
++ fw->data[idoff + 2] =
++ le16_to_cpu(udev->descriptor.idProduct) + 1;
++ fw->data[idoff + 3] =
++ le16_to_cpu(udev->descriptor.idProduct) >> 8;
+
+- return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
++ return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
++ }
+ }
+
+ return -EINVAL;
+@@ -676,6 +716,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;
++static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties;
+
+ static int cxusb_probe(struct usb_interface *intf,
+ const struct usb_device_id *id)
+@@ -686,7 +727,8 @@ static int cxusb_probe(struct usb_interface *intf,
+ dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0 ||
+- dvb_usb_device_init(intf,&cxusb_bluebird_nano2_properties,THIS_MODULE,NULL) == 0) {
++ dvb_usb_device_init(intf,&cxusb_bluebird_nano2_properties,THIS_MODULE,NULL) == 0 ||
++ dvb_usb_device_init(intf,&cxusb_bluebird_nano2_needsfirmware_properties,THIS_MODULE,NULL) == 0) {
+ return 0;
+ }
+
+@@ -709,6 +751,7 @@ static struct usb_device_id cxusb_table [] = {
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2) },
++ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM) },
+ {} /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE (usb, cxusb_table);
+@@ -1018,6 +1061,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
+
+ .usb_ctrl = CYPRESS_FX2,
++ .identify_state = bluebird_fx2_identify_state,
+
+ .size_of_priv = sizeof(struct cxusb_state),
+
+@@ -1061,6 +1105,56 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
+ }
+ };
+
++static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties = {
++ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
++
++ .usb_ctrl = DEVICE_SPECIFIC,
++ .firmware = "dvb-usb-bluebird-02.fw",
++ .download_firmware = bluebird_patch_dvico_firmware_download,
++ .identify_state = bluebird_fx2_identify_state,
++
++ .size_of_priv = sizeof(struct cxusb_state),
++
++ .num_adapters = 1,
++ .adapter = {
++ {
++ .streaming_ctrl = cxusb_streaming_ctrl,
++ .frontend_attach = cxusb_nano2_frontend_attach,
++ .tuner_attach = cxusb_dvico_xc3028_tuner_attach,
++ /* parameter for the MPEG2-data transfer */
++ .stream = {
++ .type = USB_BULK,
++ .count = 5,
++ .endpoint = 0x02,
++ .u = {
++ .bulk = {
++ .buffersize = 8192,
++ }
++ }
++ },
++ },
++ },
++
++ .power_ctrl = cxusb_nano2_power_ctrl,
++
++ .i2c_algo = &cxusb_i2c_algo,
++
++ .generic_bulk_ctrl_endpoint = 0x01,
++
++ .rc_interval = 100,
++ .rc_key_map = dvico_portable_rc_keys,
++ .rc_key_map_size = ARRAY_SIZE(dvico_portable_rc_keys),
++ .rc_query = cxusb_rc_query,
++
++ .num_device_descs = 1,
++ .devices = {
++ { "DViCO FusionHDTV DVB-T NANO2 w/o firmware",
++ { &cxusb_table[14], NULL },
++ { &cxusb_table[15], NULL },
++ },
++ }
++};
++
+ static struct usb_driver cxusb_driver = {
+ .name = "dvb_usb_cxusb",
+ .probe = cxusb_probe,
+diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+index 53496985ddfd..c94d993a6eff 100644
+--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
++++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+@@ -149,6 +149,7 @@
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM 0xdb59
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_4 0xdb78
+ #define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2 0xdb70
++#define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM 0xdb71
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
+ #define USB_PID_MEDION_MD95700 0x0932commit c6e62a3a398d62e8ae366ac1465911db0ac7fc0b
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Nov 20 02:49:41 2007 -0300
+
+ V4L/DVB (6654): mt352: support oversampled IF input
+
+ Rework the input frequency calculation so that it produces the right values
+ when the ADC oversamples the IF input.
+
+ This means MT352 devices can now process a near-zero IF (according to the,
+ specs 4.57MHz is supported with the default crystal).
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
+index 5dd9b731f6f2..7cd190b6f015 100644
+--- a/drivers/media/dvb/frontends/mt352.c
++++ b/drivers/media/dvb/frontends/mt352.c
+@@ -152,7 +152,13 @@ static void mt352_calc_input_freq(struct mt352_state* state,
+ if (state->config.if2)
+ if2 = state->config.if2;
+
+- ife = (2*adc_clock - if2);
++ if (adc_clock >= if2 * 2)
++ ife = if2;
++ else {
++ ife = adc_clock - (if2 % adc_clock);
++ if (ife > adc_clock / 2)
++ ife = adc_clock - ife;
++ }
+ value = -16374 * ife / adc_clock;
+ dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
+ __FUNCTION__, if2, ife, adc_clock, value, value & 0x3fff);commit 5ccaf905015c83a9b28e8496b4504b9b8dc25a80
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Nov 20 01:53:31 2007 -0300
+
+ V4L/DVB (6653): Add support for the DViCO FusionHDTV NANO2 w/ZL10353 and firmware
+
+ Add support for the DViCO FusionHDTV DVB-T NANO with zl10353 demodulator and
+ firmware in ROM on the device.
+
+ Again, this is based on the great work of Mike Krufky with my modifications
+ to use the in-tree XC2028 driver.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index ec8516ac8105..f6fa2c22b0bf 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -98,6 +98,11 @@ static void cxusb_bluebird_gpio_pulse(struct dvb_usb_device *d, u8 pin, int low)
+ cxusb_bluebird_gpio_rw(d, pin, low ? pin : 0);
+ }
+
++static void cxusb_nano2_led(struct dvb_usb_device *d, int onoff)
++{
++ cxusb_bluebird_gpio_rw(d, 0x40, onoff ? 0 : 0x40);
++}
++
+ /* I2C */
+ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ int num)
+@@ -200,6 +205,17 @@ static int cxusb_bluebird_power_ctrl(struct dvb_usb_device *d, int onoff)
+ return 0;
+ }
+
++static int cxusb_nano2_power_ctrl(struct dvb_usb_device *d, int onoff)
++{
++ int rc = 0;
++
++ rc = cxusb_power_ctrl(d, onoff);
++ if (!onoff)
++ cxusb_nano2_led(d, 0);
++
++ return rc;
++}
++
+ static int cxusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+ {
+ u8 buf[2] = { 0x03, 0x00 };
+@@ -606,6 +622,26 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
+ return 0;
+ }
+
++static int cxusb_nano2_frontend_attach(struct dvb_usb_adapter *adap)
++{
++ if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
++ err("set interface failed");
++
++ cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
++
++ /* reset the tuner and demodulator */
++ cxusb_bluebird_gpio_rw(adap->dev, 0x04, 0);
++ cxusb_bluebird_gpio_pulse(adap->dev, 0x01, 1);
++ cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
++
++ if ((adap->fe = dvb_attach(zl10353_attach,
++ &cxusb_zl10353_xc3028_config,
++ &adap->dev->i2c_adap)) != NULL)
++ return 0;
++
++ return -EIO;
++}
++
+ /*
+ * DViCO bluebird firmware needs the "warm" product ID to be patched into the
+ * firmware file before download.
+@@ -639,6 +675,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
++static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;
+
+ static int cxusb_probe(struct usb_interface *intf,
+ const struct usb_device_id *id)
+@@ -648,7 +685,8 @@ static int cxusb_probe(struct usb_interface *intf,
+ dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0 ||
+- dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0) {
++ dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0 ||
++ dvb_usb_device_init(intf,&cxusb_bluebird_nano2_properties,THIS_MODULE,NULL) == 0) {
+ return 0;
+ }
+
+@@ -670,6 +708,7 @@ static struct usb_device_id cxusb_table [] = {
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
++ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2) },
+ {} /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE (usb, cxusb_table);
+@@ -975,6 +1014,53 @@ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
+ }
+ };
+
++static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
++ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
++
++ .usb_ctrl = CYPRESS_FX2,
++
++ .size_of_priv = sizeof(struct cxusb_state),
++
++ .num_adapters = 1,
++ .adapter = {
++ {
++ .streaming_ctrl = cxusb_streaming_ctrl,
++ .frontend_attach = cxusb_nano2_frontend_attach,
++ .tuner_attach = cxusb_dvico_xc3028_tuner_attach,
++ /* parameter for the MPEG2-data transfer */
++ .stream = {
++ .type = USB_BULK,
++ .count = 5,
++ .endpoint = 0x02,
++ .u = {
++ .bulk = {
++ .buffersize = 8192,
++ }
++ }
++ },
++ },
++ },
++
++ .power_ctrl = cxusb_nano2_power_ctrl,
++
++ .i2c_algo = &cxusb_i2c_algo,
++
++ .generic_bulk_ctrl_endpoint = 0x01,
++
++ .rc_interval = 100,
++ .rc_key_map = dvico_portable_rc_keys,
++ .rc_key_map_size = ARRAY_SIZE(dvico_portable_rc_keys),
++ .rc_query = cxusb_bluebird2_rc_query,
++
++ .num_device_descs = 1,
++ .devices = {
++ { "DViCO FusionHDTV DVB-T NANO2",
++ { NULL },
++ { &cxusb_table[14], NULL },
++ },
++ }
++};
++
+ static struct usb_driver cxusb_driver = {
+ .name = "dvb_usb_cxusb",
+ .probe = cxusb_probe,
+diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+index 6f14c853ffea..53496985ddfd 100644
+--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
++++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+@@ -148,6 +148,7 @@
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD 0xdb58
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM 0xdb59
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_4 0xdb78
++#define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2 0xdb70
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
+ #define USB_PID_MEDION_MD95700 0x0932commit 1ad0b796a3fa3d1c1a7d16be7c70b626da2940a9
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 23:43:13 2007 -0300
+
+ V4L/DVB (6652): xc2028: try non-8MHZ init1 firmware
+
+ When loading init1 firmware, there may not be an 8MHz specific version.
+ Load the non-8MHz version if it exists.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 5b646fed340f..429e81be697e 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -706,6 +706,9 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ tuner_dbg("Load init1 firmware, if exists\n");
+
+ rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &std0);
++ if (rc == -ENOENT)
++ rc = load_firmware(fe, (BASE | INIT1 | new_fw.type) & ~F8MHZ,
++ &std0);
+ if (rc < 0 && rc != -ENOENT) {
+ tuner_err("Error %d while loading init1 firmware\n",
+ rc);
+ commit 11a9eff9b66b1cf860faa84084328d798d18834c
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 23:18:36 2007 -0300
+
+ V4L/DVB (6651): xc2028: mask off type correctly when searching for standard-specific types
+
+ When searching for standard-specific analog firmware, only certain
+ type bits are valid, much like for DTV. Mask them off when finding
+ the firmware to load.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028-types.h b/drivers/media/video/tuner-xc2028-types.h
+index 6cee48193c47..c0dc6ec19f09 100644
+--- a/drivers/media/video/tuner-xc2028-types.h
++++ b/drivers/media/video/tuner-xc2028-types.h
+@@ -43,6 +43,8 @@
+ /* There's a FM | BASE firmware + FM specific firmware (std=0) */
+ #define FM (1<<10)
+
++#define STD_SPECIFIC_TYPES (MTS|FM|LCD|NOGD)
++
+ /* Applies only for FM firmware
+ Makes it use RF input 1 (pin #2) instead of input 2 (pin #4)
+ */
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 115738d75f3e..5b646fed340f 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -403,7 +403,9 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ else if (type & SCODE)
+ type &= SCODE_TYPES;
+ else if (type & DTV_TYPES)
+- type = type & DTV_TYPES;
++ type &= DTV_TYPES;
++ else if (type & STD_SPECIFIC_TYPES)
++ type &= STD_SPECIFIC_TYPES;
+
+ /* Seek for exact match */
+ for (i = 0; i < priv->firm_size; i++) {commit 47bd5bc6486a5288aa3002533c24c8e9e564f9ac
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 23:11:37 2007 -0300
+
+ V4L/DVB (6650): xc2028: base firmwares should have std0
+
+ When loading BASE firmware, we must use std = 0.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 8f9ccaee9bb5..115738d75f3e 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -614,6 +614,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ unsigned int type = 0;
+ struct firmware_properties new_fw;
+ u16 version, hwmodel;
++ v4l2_std_id std0;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+@@ -690,7 +691,9 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ if (rc < 0)
+ goto fail;
+
+- rc = load_firmware(fe, BASE | new_fw.type, &new_fw.id);
++ /* BASE firmwares are all std0 */
++ std0 = 0;
++ rc = load_firmware(fe, BASE | new_fw.type, &std0);
+ if (rc < 0) {
+ tuner_err("Error %d while loading base firmware\n",
+ rc);
+@@ -700,7 +703,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ /* Load INIT1, if needed */
+ tuner_dbg("Load init1 firmware, if exists\n");
+
+- rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &new_fw.id);
++ rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &std0);
+ if (rc < 0 && rc != -ENOENT) {
+ tuner_err("Error %d while loading init1 firmware\n",
+ rc);commit aeb012bbf460171b75ba17dc064a543f7256521f
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 21:57:10 2007 -0300
+
+ V4L/DVB (6649): Add support for the DViCO FusionHDTV Dual Digital 4
+
+ Add support for DViCO's Dual Digital 4 with xc3028 tuner, zl10353 DVB-T
+ demodulator and a new-style I2C IR remote control receiver.
+
+ This would not have been possible without the work of and advice from
+ Mike Krufky, who originally got the Dual Digital 4 and second-gen DVB-T
+ NANO devices working with the out-of-tree XC3028 driver.
+
+ I converted it to use the in-tree XC3028 driver (after making it suitable
+ for our use), and added the IR remote control support based on his advice.
+
+ NB: a firmware package is required to use this device.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index 74eeb168f241..ec8516ac8105 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -15,7 +15,7 @@
+ *
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2006 Michael Krufky (mkrufky@linuxtv.org)
+- * Copyright (C) 2006 Chris Pascoe (c.pascoe@itee.uq.edu.au)
++ * Copyright (C) 2006, 2007 Chris Pascoe (c.pascoe@itee.uq.edu.au)
+ *
+ * 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
+@@ -30,6 +30,8 @@
+ #include "mt352.h"
+ #include "mt352_priv.h"
+ #include "zl10353.h"
++#include "tuner-xc2028.h"
++#include "tuner-xc2028-types.h"
+
+ /* debug */
+ static int dvb_usb_cxusb_debug;
+@@ -73,6 +75,29 @@ static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff)
+ st->gpio_write_state[GPIO_TUNER] = onoff;
+ }
+
++static int cxusb_bluebird_gpio_rw(struct dvb_usb_device *d, u8 changemask,
++ u8 newval)
++{
++ u8 o[2], gpio_state;
++ int rc;
++
++ o[0] = 0xff & ~changemask; /* mask of bits to keep */
++ o[1] = newval & changemask; /* new values for bits */
++
++ rc = cxusb_ctrl_msg(d, CMD_BLUEBIRD_GPIO_RW, o, 2, &gpio_state, 1);
++ if (rc < 0 || (gpio_state & changemask) != (newval & changemask))
++ deb_info("bluebird_gpio_write failed.\n");
++
++ return rc < 0 ? rc : gpio_state;
++}
++
++static void cxusb_bluebird_gpio_pulse(struct dvb_usb_device *d, u8 pin, int low)
++{
++ cxusb_bluebird_gpio_rw(d, pin, low ? 0 : pin);
++ msleep(5);
++ cxusb_bluebird_gpio_rw(d, pin, low ? pin : 0);
++}
++
+ /* I2C */
+ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ int num)
+@@ -210,6 +235,34 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+ return 0;
+ }
+
++static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
++ int *state)
++{
++ struct dvb_usb_rc_key *keymap = d->props.rc_key_map;
++ u8 ircode[4];
++ int i;
++ struct i2c_msg msg = { .addr = 0x6b, .flags = I2C_M_RD,
++ .buf = ircode, .len = 4 };
++
++ *event = 0;
++ *state = REMOTE_NO_KEY_PRESSED;
++
++ if (cxusb_i2c_xfer(&d->i2c_adap, &msg, 1) != 1)
++ return 0;
++
++ for (i = 0; i < d->props.rc_key_map_size; i++) {
++ if (keymap[i].custom == ircode[1] &&
++ keymap[i].data == ircode[2]) {
++ *event = keymap[i].event;
++ *state = REMOTE_KEY_PRESSED;
++
++ return 0;
++ }
++ }
++
++ return 0;
++}
++
+ static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {
+ { 0xfe, 0x02, KEY_TV },
+ { 0xfe, 0x0e, KEY_MP3 },
+@@ -364,6 +417,13 @@ static struct mt352_config cxusb_mt352_config = {
+ .demod_init = cxusb_mt352_demod_init,
+ };
+
++static struct zl10353_config cxusb_zl10353_xc3028_config = {
++ .demod_address = 0x0f,
++ .if2 = 4560,
++ .no_tuner = 1,
++ .parallel_ts = 1,
++};
++
+ /* Callbacks for DVB USB */
+ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
+ {
+@@ -399,6 +459,52 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap)
+ return 0;
+ }
+
++static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)
++{
++ struct dvb_usb_device *d = ptr;
++
++ switch (command) {
++ case XC2028_TUNER_RESET:
++ deb_info("%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
++ cxusb_bluebird_gpio_pulse(d, 0x01, 1);
++ break;
++ case XC2028_RESET_CLK:
++ deb_info("%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
++ break;
++ default:
++ deb_info("%s: unknown command %d, arg %d\n", __FUNCTION__,
++ command, arg);
++ return -EINVAL;
++ }
++
++ return 0;
++}
++
++static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
++{
++ struct dvb_frontend *fe;
++ struct xc2028_config cfg = {
++ .i2c_adap = &adap->dev->i2c_adap,
++ .i2c_addr = 0x61,
++ .video_dev = adap->dev,
++ .callback = dvico_bluebird_xc2028_callback,
++ };
++ static struct xc2028_ctrl ctl = {
++ .type = XC2028_FIRM_NORMAL,
++ .fname = "xc3028-dvico-au-01.fw",
++ .max_len = 64,
++ .scode_table = ZARLINK456,
++ };
++
++ fe = dvb_attach(xc2028_attach, adap->fe, &cfg);
++ if (fe == NULL || fe->ops.tuner_ops.set_config == NULL)
++ return -EIO;
++
++ fe->ops.tuner_ops.set_config(fe, &ctl);
++
++ return 0;
++}
++
+ static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
+ {
+ u8 b;
+@@ -460,6 +566,46 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_adapter *adap)
+ return -EIO;
+ }
+
++static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
++{
++ u8 ircode[4];
++ int i;
++ struct i2c_msg msg = { .addr = 0x6b, .flags = I2C_M_RD,
++ .buf = ircode, .len = 4 };
++
++ if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
++ err("set interface failed");
++
++ cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
++
++ /* reset the tuner and demodulator */
++ cxusb_bluebird_gpio_rw(adap->dev, 0x04, 0);
++ cxusb_bluebird_gpio_pulse(adap->dev, 0x01, 1);
++ cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);
++
++ if ((adap->fe = dvb_attach(zl10353_attach,
++ &cxusb_zl10353_xc3028_config,
++ &adap->dev->i2c_adap)) == NULL)
++ return -EIO;
++
++ /* try to determine if there is no IR decoder on the I2C bus */
++ for (i = 0; adap->dev->props.rc_key_map != NULL && i < 5; i++) {
++ msleep(20);
++ if (cxusb_i2c_xfer(&adap->dev->i2c_adap, &msg, 1) != 1)
++ goto no_IR;
++ if (ircode[0] == 0 && ircode[1] == 0)
++ continue;
++ if (ircode[2] + ircode[3] != 0xff) {
++no_IR:
++ adap->dev->props.rc_key_map = NULL;
++ info("No IR receiver detected on this device.");
++ break;
++ }
++ }
++
++ return 0;
++}
++
+ /*
+ * DViCO bluebird firmware needs the "warm" product ID to be patched into the
+ * firmware file before download.
+@@ -492,6 +638,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgh064f_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
+ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
++static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
+
+ static int cxusb_probe(struct usb_interface *intf,
+ const struct usb_device_id *id)
+@@ -500,7 +647,8 @@ static int cxusb_probe(struct usb_interface *intf,
+ dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0 ||
+ dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
+- dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0) {
++ dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0 ||
++ dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0) {
+ return 0;
+ }
+
+@@ -521,6 +669,7 @@ static struct usb_device_id cxusb_table [] = {
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
++ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
+ {} /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE (usb, cxusb_table);
+@@ -779,6 +928,53 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = {
+ }
+ };
+
++static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
++ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
++
++ .usb_ctrl = CYPRESS_FX2,
++
++ .size_of_priv = sizeof(struct cxusb_state),
++
++ .num_adapters = 1,
++ .adapter = {
++ {
++ .streaming_ctrl = cxusb_streaming_ctrl,
++ .frontend_attach = cxusb_dualdig4_frontend_attach,
++ .tuner_attach = cxusb_dvico_xc3028_tuner_attach,
++ /* parameter for the MPEG2-data transfer */
++ .stream = {
++ .type = USB_BULK,
++ .count = 5,
++ .endpoint = 0x02,
++ .u = {
++ .bulk = {
++ .buffersize = 8192,
++ }
++ }
++ },
++ },
++ },
++
++ .power_ctrl = cxusb_power_ctrl,
++
++ .i2c_algo = &cxusb_i2c_algo,
++
++ .generic_bulk_ctrl_endpoint = 0x01,
++
++ .rc_interval = 100,
++ .rc_key_map = dvico_mce_rc_keys,
++ .rc_key_map_size = ARRAY_SIZE(dvico_mce_rc_keys),
++ .rc_query = cxusb_bluebird2_rc_query,
++
++ .num_device_descs = 1,
++ .devices = {
++ { "DViCO FusionHDTV DVB-T Dual Digital 4",
++ { NULL },
++ { &cxusb_table[13], NULL },
++ },
++ }
++};
++
+ static struct usb_driver cxusb_driver = {
+ .name = "dvb_usb_cxusb",
+ .probe = cxusb_probe,
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.h b/drivers/media/dvb/dvb-usb/cxusb.h
+index 79ca7abb89a5..4768a2c35517 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.h
++++ b/drivers/media/dvb/dvb-usb/cxusb.h
+@@ -5,6 +5,8 @@
+ #include "dvb-usb.h"
+
+ /* usb commands - some of it are guesses, don't have a reference yet */
++#define CMD_BLUEBIRD_GPIO_RW 0x05
++
+ #define CMD_I2C_WRITE 0x08
+ #define CMD_I2C_READ 0x09
+
+diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+index d6d96308cbaa..6f14c853ffea 100644
+--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
++++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+@@ -147,6 +147,7 @@
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM 0xdb51
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD 0xdb58
+ #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM 0xdb59
++#define USB_PID_DVICO_BLUEBIRD_DUAL_4 0xdb78
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54
+ #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
+ #define USB_PID_MEDION_MD95700 0x0932commit 45819c381fc4fb342dc091f30eef4b56193e34d5
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 11:41:20 2007 -0300
+
+ V4L/DVB (6648): xc2028: add sleep hook
+
+ Add sleep method to enable putting the tuner into standby mode.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index cc6fa2fa859b..8f9ccaee9bb5 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -929,6 +929,28 @@ static int xc2028_set_params(struct dvb_frontend *fe,
+
+ }
+
++static int xc2028_sleep(struct dvb_frontend *fe)
++{
++ struct xc2028_data *priv = fe->tuner_priv;
++ int rc = 0;
++
++ tuner_dbg("%s called\n", __FUNCTION__);
++
++ mutex_lock(&priv->lock);
++
++ if (priv->firm_version < 0x0202)
++ rc = send_seq(priv, {0x00, 0x08, 0x00, 0x00});
++ else
++ rc = send_seq(priv, {0x80, 0x08, 0x00, 0x00});
++
++ priv->cur_fw.type = 0; /* need firmware reload */
++
++ mutex_unlock(&priv->lock);
++
++ return rc;
++}
++
++
+ static int xc2028_dvb_release(struct dvb_frontend *fe)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+@@ -1009,6 +1031,7 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
+ .get_frequency = xc2028_get_frequency,
+ .get_rf_strength = xc2028_signal,
+ .set_params = xc2028_set_params,
++ .sleep = xc2028_sleep,
+
+ };
+ commit 8bf799a6217f6336fb95f37bf1b130003404bd7b
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 11:35:45 2007 -0300
+
+ V4L/DVB (6647): xc2028: retry firmware load if tuner does not respond
+
+ In practice, the tuner occasionally fails to respond correctly after a
+ firmware load. Retry the firmware load if the firmware/hardware version
+ we read back from the tuner after programming does not match what we
+ expect.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 8140d8ad0792..cc6fa2fa859b 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -75,6 +75,9 @@ struct xc2028_data {
+ int firm_size;
+ __u16 firm_version;
+
++ __u16 hwmodel;
++ __u16 hwvers;
++
+ struct xc2028_ctrl ctrl;
+
+ struct firmware_properties cur_fw;
+@@ -607,7 +610,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ v4l2_std_id std, fe_bandwidth_t bandwidth)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+- int rc = 0;
++ int rc = 0, is_retry = 0;
+ unsigned int type = 0;
+ struct firmware_properties new_fw;
+ u16 version, hwmodel;
+@@ -654,6 +657,7 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ };
+ }
+
++retry:
+ new_fw.type = type;
+ new_fw.id = std;
+ new_fw.std_req = std;
+@@ -739,14 +743,34 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ &new_fw.id, new_fw.scode_nr);
+
+ check_device:
+- xc2028_get_reg(priv, 0x0004, &version);
+- xc2028_get_reg(priv, 0x0008, &hwmodel);
++ if (xc2028_get_reg(priv, 0x0004, &version) < 0 ||
++ xc2028_get_reg(priv, 0x0008, &hwmodel) < 0) {
++ tuner_err("Unable to read tuner registers.\n");
++ goto fail;
++ }
+
+ tuner_info("Device is Xceive %d version %d.%d, "
+ "firmware version %d.%d\n",
+ hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8,
+ (version & 0xf0) >> 4, version & 0xf);
+
++ /* Check firmware version against what we downloaded. */
++ if (priv->firm_version != ((version & 0xf0) << 4 | (version & 0x0f))) {
++ tuner_err("Incorrect readback of firmware version.\n");
++ goto fail;
++ }
++
++ /* Check that the tuner hardware model remains consistent over time. */
++ if (priv->hwmodel == 0 && (hwmodel == 2028 || hwmodel == 3028)) {
++ priv->hwmodel = hwmodel;
++ priv->hwvers = version & 0xff00;
++ } else if (priv->hwmodel == 0 || priv->hwmodel != hwmodel ||
++ priv->hwvers != (version & 0xff00)) {
++ tuner_err("Read invalid device hardware information - tuner "
++ "hung?\n");
++ goto fail;
++ }
++
+ memcpy(&priv->cur_fw, &new_fw, sizeof(priv->cur_fw));
+
+ /*
+@@ -761,6 +785,13 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+
+ fail:
+ memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
++ if (!is_retry) {
++ msleep(50);
++ is_retry = 1;
++ tuner_dbg("Retrying firmware load\n");
++ goto retry;
++ }
++
+ if (rc == -ENOENT)
+ rc = -EINVAL;
+ return rc;commit e0f0b37a3e624440b1b0e8a5978b367895226e75
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 11:22:03 2007 -0300
+
+ V4L/DVB (6646): xc2028: rework firmware (re)loading process
+
+ Define a list of valid "firmware types" for each combination of BASE,
+ DTV and SCODEs. By masking the appropriate firmware bits off we can
+ just use one "type" for the firmware searching and also flag when we
+ are looking for a BASE, DTV or SCODE type firmware. This makes it
+ much easier to track if we need to change device modes or flash an
+ individual firmware part.
+
+ Add a structure to remember what firmware properties we have. This
+ contains the currently loaded/wanted base firmware (type), video std
+ (id), video std requested (std_req), scode file and number in use.
+
+ Incorporate said structure into the tuner private data.
+
+ When checking whether the current firmware needs to be reloaded, first
+ figure out exactly what "type" of firmware we want (base, std and
+ scode), and then proceed to load the appropriate matching base,
+ std-specific and scode records iff there are any changes required.
+ This removes guesswork from the process because we no longer need to
+ individually code a check for every tuning parameter's interactions.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028-types.h b/drivers/media/video/tuner-xc2028-types.h
+index a9e2e0562d99..6cee48193c47 100644
+--- a/drivers/media/video/tuner-xc2028-types.h
++++ b/drivers/media/video/tuner-xc2028-types.h
+@@ -8,6 +8,7 @@
+
+ /* BASE firmware should be loaded before any other firmware */
+ #define BASE (1<<0)
++#define BASE_TYPES (BASE|F8MHZ|MTS|FM|INPUT1|INPUT2|INIT1)
+
+ /* F8MHZ marks BASE firmwares for 8 MHz Bandwidth */
+ #define F8MHZ (1<<1)
+@@ -37,6 +38,8 @@
+ #define DTV78 (1<<8)
+ #define DTV8 (1<<9)
+
++#define DTV_TYPES (D2620|D2633|DTV6|QAM|DTV7|DTV78|DTV8|ATSC)
++
+ /* There's a FM | BASE firmware + FM specific firmware (std=0) */
+ #define FM (1<<10)
+
+@@ -60,6 +63,7 @@
+ /* Old firmwares were broken into init0 and init1 */
+ #define INIT1 (1<<14)
+
++/* SCODE firmware selects particular behaviours */
+ #define MONO (1 << 15)
+ #define ATSC (1 << 16)
+ #define IF (1 << 17)
+@@ -76,6 +80,10 @@
+ #define INPUT2 (1 << 28)
+ #define SCODE (1 << 29)
+
++#define SCODE_TYPES (MTS|DTV6|QAM|DTV7|DTV78|DTV8|LCD|NOGD|MONO|ATSC|IF| \
++ LG60|ATI638|OREN538|OREN36|TOYOTA388|TOYOTA794| \
++ DIBCOM52|ZARLINK456|CHINA|F6MHZ|SCODE)
++
+ /* Newer types to be moved to videodev2.h */
+
+ #define V4L2_STD_SECAM_K3 (0x04000000)
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index a5efd5f6e57c..8140d8ad0792 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -54,6 +54,14 @@ struct firmware_description {
+ unsigned int size;
+ };
+
++struct firmware_properties {
++ unsigned int type;
++ v4l2_std_id id;
++ v4l2_std_id std_req;
++ unsigned int scode_table;
++ int scode_nr;
++};
++
+ struct xc2028_data {
+ struct list_head xc2028_list;
+ struct tuner_i2c_props i2c_props;
+@@ -69,14 +77,7 @@ struct xc2028_data {
+
+ struct xc2028_ctrl ctrl;
+
+- v4l2_std_id firm_type; /* video stds supported
+- by current firmware */
+- fe_bandwidth_t bandwidth; /* Firmware bandwidth:
+- 6M, 7M or 8M */
+- int need_load_generic; /* The generic firmware
+- were loaded? */
+- enum tuner_mode mode;
+- struct i2c_client *i2c_client;
++ struct firmware_properties cur_fw;
+
+ struct mutex lock;
+ };
+@@ -234,7 +235,8 @@ static void free_firmware(struct xc2028_data *priv)
+
+ priv->firm = NULL;
+ priv->firm_size = 0;
+- priv->need_load_generic = 1;
++
++ memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
+ }
+
+ static int load_all_firmwares(struct dvb_frontend *fe)
+@@ -393,6 +395,13 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ if (((type & ~SCODE) == 0) && (*id == 0))
+ *id = V4L2_STD_PAL;
+
++ if (type & BASE)
++ type &= BASE_TYPES;
++ else if (type & SCODE)
++ type &= SCODE_TYPES;
++ else if (type & DTV_TYPES)
++ type = type & DTV_TYPES;
++
+ /* Seek for exact match */
+ for (i = 0; i < priv->firm_size; i++) {
+ if ((type == priv->firm[i].type) && (*id == priv->firm[i].id))
+@@ -598,11 +607,10 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ v4l2_std_id std, fe_bandwidth_t bandwidth)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+- int rc;
++ int rc = 0;
++ unsigned int type = 0;
++ struct firmware_properties new_fw;
+ u16 version, hwmodel;
+- v4l2_std_id std0 = 0;
+- unsigned int type0 = 0, type = 0;
+- int change_digital_bandwidth;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+@@ -617,61 +625,19 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ return rc;
+ }
+
+- tuner_dbg("I am in mode %u and I should switch to mode %i\n",
+- priv->mode, new_mode);
+-
+- /* first of all, determine whether we have switched the mode */
+- if (new_mode != priv->mode) {
+- priv->mode = new_mode;
+- priv->need_load_generic = 1;
+- }
+-
+- change_digital_bandwidth = (priv->mode == T_DIGITAL_TV
+- && bandwidth != priv->bandwidth) ? 1 : 0;
+- tuner_dbg("old bandwidth %u, new bandwidth %u\n", priv->bandwidth,
+- bandwidth);
+-
+- if (priv->need_load_generic) {
+- /* Reset is needed before loading firmware */
+- rc = priv->tuner_callback(priv->video_dev,
+- XC2028_TUNER_RESET, 0);
+- if (rc < 0)
+- return rc;
+-
+- type0 = BASE;
+-
+- if (priv->ctrl.type == XC2028_FIRM_MTS)
+- type0 |= MTS;
+-
+- if (bandwidth == BANDWIDTH_7_MHZ ||
+- bandwidth == BANDWIDTH_8_MHZ)
+- type0 |= F8MHZ;
+-
+- /* FIXME: How to load FM and FM|INPUT1 firmwares? */
+-
+- rc = load_firmware(fe, type0, &std0);
+- if (rc < 0) {
+- tuner_err("Error %d while loading generic firmware\n",
+- rc);
+- return rc;
+- }
+-
+- priv->need_load_generic = 0;
+- priv->firm_type = 0;
+- if (priv->mode == T_DIGITAL_TV)
+- change_digital_bandwidth = 1;
+- }
++ if (priv->ctrl.type == XC2028_FIRM_MTS)
++ type |= MTS;
++ if (bandwidth == BANDWIDTH_7_MHZ || bandwidth == BANDWIDTH_8_MHZ)
++ type |= F8MHZ;
+
+- tuner_dbg("I should change bandwidth %u\n", change_digital_bandwidth);
++ /* FIXME: How to load FM and FM|INPUT1 firmwares? */
+
+- if (change_digital_bandwidth) {
++ if (new_mode == T_DIGITAL_TV) {
+ if (priv->ctrl.d2633)
+ type |= D2633;
+ else
+ type |= D2620;
+
+- /* FIXME: When should select a DTV78 firmware?
+- */
+ switch (bandwidth) {
+ case BANDWIDTH_8_MHZ:
+ type |= DTV8;
+@@ -683,49 +649,96 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ /* FIXME: Should allow select also ATSC */
+ type |= DTV6 | QAM;
+ break;
+-
+ default:
+ tuner_err("error: bandwidth not supported.\n");
+ };
+- priv->bandwidth = bandwidth;
+ }
+
+- if (!change_digital_bandwidth && priv->mode == T_DIGITAL_TV)
+- return 0;
++ new_fw.type = type;
++ new_fw.id = std;
++ new_fw.std_req = std;
++ new_fw.scode_table = SCODE | priv->ctrl.scode_table;
++ new_fw.scode_nr = 0;
++
++ tuner_dbg("checking firmware, user requested type=");
++ if (debug) {
++ dump_firm_type(new_fw.type);
++ printk("(%x), id %016llx, scode_tbl ", new_fw.type,
++ (unsigned long long)new_fw.std_req);
++ dump_firm_type(priv->ctrl.scode_table);
++ printk("(%x), scode_nr %d\n", priv->ctrl.scode_table,
++ new_fw.scode_nr);
++ }
++
++ /* No need to reload base firmware if it matches */
++ if (((BASE | new_fw.type) & BASE_TYPES) ==
++ (priv->cur_fw.type & BASE_TYPES)) {
++ tuner_dbg("BASE firmware not changed.\n");
++ goto skip_base;
++ }
++
++ /* Updating BASE - forget about all currently loaded firmware */
++ memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
++
++ /* Reset is needed before loading firmware */
++ rc = priv->tuner_callback(priv->video_dev,
++ XC2028_TUNER_RESET, 0);
++ if (rc < 0)
++ goto fail;
++
++ rc = load_firmware(fe, BASE | new_fw.type, &new_fw.id);
++ if (rc < 0) {
++ tuner_err("Error %d while loading base firmware\n",
++ rc);
++ goto fail;
++ }
+
+ /* Load INIT1, if needed */
+ tuner_dbg("Load init1 firmware, if exists\n");
+- type0 = BASE | INIT1;
+- if (priv->ctrl.type == XC2028_FIRM_MTS)
+- type0 |= MTS;
+
+- /* FIXME: Should handle errors - if INIT1 found */
+- rc = load_firmware(fe, type0, &std0);
++ rc = load_firmware(fe, BASE | INIT1 | new_fw.type, &new_fw.id);
++ if (rc < 0 && rc != -ENOENT) {
++ tuner_err("Error %d while loading init1 firmware\n",
++ rc);
++ goto fail;
++ }
+
+- /* FIXME: Should add support for FM radio
++skip_base:
++ /*
++ * No need to reload standard specific firmware if base firmware
++ * was not reloaded and requested video standards have not changed.
+ */
+-
+- if (priv->ctrl.type == XC2028_FIRM_MTS)
+- type |= MTS;
+-
+- if (priv->firm_type & std) {
++ if (priv->cur_fw.type == (BASE | new_fw.type) &&
++ priv->cur_fw.std_req == std) {
+ tuner_dbg("Std-specific firmware already loaded.\n");
+- return 0;
++ goto skip_std_specific;
+ }
+
++ /* Reloading std-specific firmware forces a SCODE update */
++ priv->cur_fw.scode_table = 0;
++
+ /* Add audio hack to std mask */
+- std |= parse_audio_std_option();
++ if (new_mode == T_ANALOG_TV)
++ new_fw.id |= parse_audio_std_option();
+
+- rc = load_firmware(fe, type, &std);
++ rc = load_firmware(fe, new_fw.type, &new_fw.id);
+ if (rc < 0)
+- return rc;
++ goto fail;
++
++skip_std_specific:
++ if (priv->cur_fw.scode_table == new_fw.scode_table &&
++ priv->cur_fw.scode_nr == new_fw.scode_nr) {
++ tuner_dbg("SCODE firmware already loaded.\n");
++ goto check_device;
++ }
+
+ /* Load SCODE firmware, if exists */
+- tuner_dbg("Trying to load scode 0\n");
+- type |= SCODE;
++ tuner_dbg("Trying to load scode %d\n", new_fw.scode_nr);
+
+- rc = load_scode(fe, type, &std, 0);
++ rc = load_scode(fe, new_fw.type | new_fw.scode_table,
++ &new_fw.id, new_fw.scode_nr);
+
++check_device:
+ xc2028_get_reg(priv, 0x0004, &version);
+ xc2028_get_reg(priv, 0x0008, &hwmodel);
+
+@@ -734,9 +747,23 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8,
+ (version & 0xf0) >> 4, version & 0xf);
+
+- priv->firm_type = std;
++ memcpy(&priv->cur_fw, &new_fw, sizeof(priv->cur_fw));
++
++ /*
++ * By setting BASE in cur_fw.type only after successfully loading all
++ * firmwares, we can:
++ * 1. Identify that BASE firmware with type=0 has been loaded;
++ * 2. Tell whether BASE firmware was just changed the next time through.
++ */
++ priv->cur_fw.type |= BASE;
+
+ return 0;
++
++fail:
++ memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
++ if (rc == -ENOENT)
++ rc = -EINVAL;
++ return rc;
+ }
+
+ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
+@@ -785,16 +812,10 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ mutex_lock(&priv->lock);
+
+ /* HACK: It seems that specific firmware need to be reloaded
+- when freq is changed */
+-
+- priv->firm_type = 0;
+-
+- /* Reset GPIO 1 */
+- rc = priv->tuner_callback(priv->video_dev, XC2028_TUNER_RESET, 0);
+- if (rc < 0)
+- goto ret;
++ when watching analog TV and freq is changed */
++ if (new_mode != T_DIGITAL_TV)
++ priv->cur_fw.type = 0;
+
+- msleep(10);
+ tuner_dbg("should set frequency %d kHz\n", freq / 1000);
+
+ if (check_firmware(fe, new_mode, std, bandwidth) < 0)
+@@ -802,7 +823,7 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+
+ if (new_mode == T_DIGITAL_TV) {
+ offset = 2750000;
+- if (priv->bandwidth == BANDWIDTH_7_MHZ)
++ if (priv->cur_fw.type & DTV7)
+ offset -= 500000;
+ }
+
+@@ -994,9 +1015,6 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+ return NULL;
+ }
+
+- priv->bandwidth = BANDWIDTH_6_MHZ;
+- priv->need_load_generic = 1;
+- priv->mode = T_UNINITIALIZED;
+ priv->i2c_props.addr = cfg->i2c_addr;
+ priv->i2c_props.adap = cfg->i2c_adap;
+ priv->video_dev = video_dev;
+diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
+index 4edc4b735c84..16259b14ce90 100644
+--- a/drivers/media/video/tuner-xc2028.h
++++ b/drivers/media/video/tuner-xc2028.h
+@@ -21,6 +21,7 @@ struct xc2028_ctrl {
+ char *fname;
+ int max_len;
+ int d2633:1;
++ unsigned int scode_table;
+ };
+
+ struct xc2028_config {commit 59a636e50f339f91880b3a1e395829c43cc6541a
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 10:23:17 2007 -0300
+
+ V4L/DVB (6645): xc2028: allow selection of D2633 firmware
+
+ Add a bit to select D2633 DTV firmware to struct xc2028_ctrl, so that it can
+ be enabled via .set_config.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index fbaab68fd05c..a5efd5f6e57c 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -665,9 +665,10 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ tuner_dbg("I should change bandwidth %u\n", change_digital_bandwidth);
+
+ if (change_digital_bandwidth) {
+-
+- /*FIXME: Should allow selecting between D2620 and D2633 */
+- type |= D2620;
++ if (priv->ctrl.d2633)
++ type |= D2633;
++ else
++ type |= D2620;
+
+ /* FIXME: When should select a DTV78 firmware?
+ */
+diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
+index a20eeb4935d0..4edc4b735c84 100644
+--- a/drivers/media/video/tuner-xc2028.h
++++ b/drivers/media/video/tuner-xc2028.h
+@@ -20,6 +20,7 @@ struct xc2028_ctrl {
+ enum xc2028_firm_type type;
+ char *fname;
+ int max_len;
++ int d2633:1;
+ };
+
+ struct xc2028_config {commit d7b22c5cfef28d21051331622f9595993a083cc4
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 10:12:45 2007 -0300
+
+ V4L/DVB (6644): xc2028: use correct offset into scode firmware
+
+ When validating and loading SCODE firmware we need to take into account the
+ two-byte size header before each entry.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 3edf5be47197..fbaab68fd05c 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -565,9 +565,17 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+
+ p = priv->firm[pos].ptr;
+
+- if ((priv->firm[pos].size != 12 * 16) || (scode >= 16))
++ /* 16 SCODE entries per file; each SCODE entry is 12 bytes and
++ * has a 2-byte size header in the firmware format. */
++ if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||
++ le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)
+ return -EINVAL;
+
++ tuner_info("Loading SCODE for type=");
++ dump_firm_type(priv->firm[pos].type);
++ printk("(%x), id %016llx.\n", priv->firm[pos].type,
++ (unsigned long long)*id);
++
+ if (priv->firm_version < 0x0202)
+ rc = send_seq(priv, {0x20, 0x00, 0x00, 0x00});
+ else
+@@ -575,7 +583,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+ if (rc < 0)
+ return -EIO;
+
+- rc = i2c_send(priv, p + 12 * scode, 12);
++ rc = i2c_send(priv, p + 14 * scode + 2, 12);
+ if (rc < 0)
+ return -EIO;
+ commit b1535293dc816f01b0934718c370f9533c7d635e
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 10:04:06 2007 -0300
+
+ V4L/DVB (6643): xc2028: use best match instead of first partial match during firmware selection
+
+ Rather than picking the first video standard firmware that supports any of
+ the standards that the user has requested, try to select one that supports
+ as many of them as possible. This improves the likelihood that the firmware
+ we select will support the user's desired TV standard.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index e19449603d73..3edf5be47197 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -377,9 +377,13 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ v4l2_std_id *id)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+- int i;
++ int i, best_i = -1, best_nr_matches = 0;
+
+- tuner_dbg("%s called\n", __FUNCTION__);
++ tuner_dbg("%s called, want type=", __FUNCTION__);
++ if (debug) {
++ dump_firm_type(type);
++ printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
++ }
+
+ if (!priv->firm) {
+ tuner_err("Error! firmware not loaded\n");
+@@ -397,20 +401,45 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+
+ /* Seek for generic video standard match */
+ for (i = 0; i < priv->firm_size; i++) {
+- if ((type == priv->firm[i].type) && (*id & priv->firm[i].id))
+- goto found;
++ v4l2_std_id match_mask;
++ int nr_matches;
++
++ if (type != priv->firm[i].type)
++ continue;
++
++ match_mask = *id & priv->firm[i].id;
++ if (!match_mask)
++ continue;
++
++ if ((*id & match_mask) == *id)
++ goto found; /* Supports all the requested standards */
++
++ nr_matches = hweight64(match_mask);
++ if (nr_matches > best_nr_matches) {
++ best_nr_matches = nr_matches;
++ best_i = i;
++ }
++ }
++
++ if (best_nr_matches > 0) {
++ tuner_dbg("Selecting best matching firmware (%d bits) for "
++ "type=", best_nr_matches);
++ dump_firm_type(type);
++ printk("(%x), id %016llx:\n", type, (unsigned long long)*id);
++ i = best_i;
++ goto found;
+ }
+
+ /*FIXME: Would make sense to seek for type "hint" match ? */
+
+- i = -EINVAL;
++ i = -ENOENT;
+ goto ret;
+
+ found:
+ *id = priv->firm[i].id;
+
+ ret:
+- tuner_dbg("%s firmware for type=", (i < 0)? "Can't find": "Found");
++ tuner_dbg("%s firmware for type=", (i < 0) ? "Can't find" : "Found");
+ if (debug) {
+ dump_firm_type(type);
+ printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
+@@ -432,8 +461,9 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+ return pos;
+
+ tuner_info("Loading firmware for type=");
+- dump_firm_type(type);
+- printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
++ dump_firm_type(priv->firm[pos].type);
++ printk("(%x), id %016llx.\n", priv->firm[pos].type,
++ (unsigned long long)*id);
+
+ p = priv->firm[pos].ptr;
+ endp = p + priv->firm[pos].size;commit 0a196b6fa9b42a2bb49733b37565aaaa97ffb07f
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 09:29:59 2007 -0300
+
+ V4L/DVB (6642): xc2028: don't duplicate max_len in priv
+
+ There is no need to duplicate the max_len field from the ctrl structure
+ in the private data. If we use it directly from priv->ctrl, we can memcpy
+ the structure (apart from strings) to reduce maintenance as it grows.
+
+ Enforce a minimum max_len length of 8 data bytes (+ 1 address byte) as seems
+ to be required by the tuner.
+
+ Also, use kstrdup instead of open coding the string duplication.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index c921d6009a8b..e19449603d73 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -75,9 +75,6 @@ struct xc2028_data {
+ 6M, 7M or 8M */
+ int need_load_generic; /* The generic firmware
+ were loaded? */
+-
+- int max_len; /* Max firmware chunk */
+-
+ enum tuner_mode mode;
+ struct i2c_client *i2c_client;
+
+@@ -426,7 +423,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+ int pos, rc;
+- unsigned char *p, *endp, buf[priv->max_len];
++ unsigned char *p, *endp, buf[priv->ctrl.max_len];
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+@@ -505,8 +502,8 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+
+ /* Sends message chunks */
+ while (size > 0) {
+- int len = (size < priv->max_len - 1) ?
+- size : priv->max_len - 1;
++ int len = (size < priv->ctrl.max_len - 1) ?
++ size : priv->ctrl.max_len - 1;
+
+ memcpy(buf + 1, p, len);
+
+@@ -881,32 +878,30 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+ struct xc2028_ctrl *p = priv_cfg;
++ int rc = 0;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+ mutex_lock(&priv->lock);
+
+- priv->ctrl.type = p->type;
+-
+- if (p->fname) {
+- kfree(priv->ctrl.fname);
++ kfree(priv->ctrl.fname);
++ free_firmware(priv);
+
+- priv->ctrl.fname = kmalloc(strlen(p->fname) + 1, GFP_KERNEL);
+- if (priv->ctrl.fname == NULL) {
+- mutex_unlock(&priv->lock);
+- return -ENOMEM;
+- }
++ memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
++ priv->ctrl.fname = NULL;
+
+- free_firmware(priv);
+- strcpy(priv->ctrl.fname, p->fname);
++ if (p->fname) {
++ priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);
++ if (priv->ctrl.fname == NULL)
++ rc = -ENOMEM;
+ }
+
+- if (p->max_len > 0)
+- priv->max_len = p->max_len;
++ if (priv->ctrl.max_len < 9)
++ priv->ctrl.max_len = 13;
+
+ mutex_unlock(&priv->lock);
+
+- return 0;
++ return rc;
+ }
+
+ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = {
+@@ -967,7 +962,7 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+ priv->i2c_props.adap = cfg->i2c_adap;
+ priv->video_dev = video_dev;
+ priv->tuner_callback = cfg->callback;
+- priv->max_len = 13;
++ priv->ctrl.max_len = 13;
+
+ mutex_init(&priv->lock);
+
+ commit a44f1c43dfa98e2eb763968890157bfaf9001add
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 06:35:26 2007 -0300
+
+ V4L/DVB (6641): xc2028: correct tuner offset for 7MHz DTV
+
+ 7MHz bandwidth DVB-T needs an adjusted offset at the PLL to ensure the IF
+ output is correctly centered.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index adef80e627b8..c921d6009a8b 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -764,8 +764,11 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ if (check_firmware(fe, new_mode, std, bandwidth) < 0)
+ goto ret;
+
+- if (new_mode == T_DIGITAL_TV)
++ if (new_mode == T_DIGITAL_TV) {
+ offset = 2750000;
++ if (priv->bandwidth == BANDWIDTH_7_MHZ)
++ offset -= 500000;
++ }
+
+ div = (freq - offset + DIV / 2) / DIV;
+ commit ddf1c5f1d78c1ce30a7e6b2447670fc0e103bb62
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 06:33:16 2007 -0300
+
+ V4L/DVB (6640): xc2028: correctly select 8MHz firmware
+
+ We were using priv->bandwidth to select the base firmware to load, not the
+ requested bandwidth value, oops. Also, 7MHz Digital TV needs 8MHz base
+ firmware loaded.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index e85992f970f7..adef80e627b8 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -608,7 +608,8 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ if (priv->ctrl.type == XC2028_FIRM_MTS)
+ type0 |= MTS;
+
+- if (priv->bandwidth == 8)
++ if (bandwidth == BANDWIDTH_7_MHZ ||
++ bandwidth == BANDWIDTH_8_MHZ)
+ type0 |= F8MHZ;
+
+ /* FIXME: How to load FM and FM|INPUT1 firmwares? */
+@@ -814,7 +815,8 @@ static int xc2028_set_tv_freq(struct dvb_frontend *fe,
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+ return generic_set_tv_freq(fe, 62500l * p->frequency, T_ANALOG_TV,
+- p->std, BANDWIDTH_8_MHZ /* NOT USED */);
++ p->std, BANDWIDTH_8_MHZ);
++ /* XXX Are some analog standards 6MHz? */
+ }
+
+ static int xc2028_set_params(struct dvb_frontend *fe,commit 2ce4b3aa7c3c199466ae9f5ed32ea177912c8c3a
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 06:20:17 2007 -0300
+
+ V4L/DVB (6639): xc2028: correct divisor length
+
+ The frequency divisor should only be four bytes long. Also, display the
+ frequency and divisor correctly in the debug output.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 7c86971a8d64..e85992f970f7 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -740,7 +740,7 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+ int rc = -EINVAL;
+- unsigned char buf[5];
++ unsigned char buf[4];
+ u32 div, offset = 0;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+@@ -758,7 +758,7 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ goto ret;
+
+ msleep(10);
+- tuner_dbg("should set frequency %d kHz)\n", freq / 1000);
++ tuner_dbg("should set frequency %d kHz\n", freq / 1000);
+
+ if (check_firmware(fe, new_mode, std, bandwidth) < 0)
+ goto ret;
+@@ -769,7 +769,6 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ div = (freq - offset + DIV / 2) / DIV;
+
+ /* CMD= Set frequency */
+-
+ if (priv->firm_version < 0x0202)
+ rc = send_seq(priv, {0x00, 0x02, 0x00, 0x00});
+ else
+@@ -787,7 +786,6 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ buf[1] = 0xff & (div >> 16);
+ buf[2] = 0xff & (div >> 8);
+ buf[3] = 0xff & (div);
+- buf[4] = 0;
+
+ rc = i2c_send(priv, buf, sizeof(buf));
+ if (rc < 0)
+@@ -796,9 +794,9 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+
+ priv->frequency = freq;
+
+- tuner_dbg("divider= %02x %02x %02x %02x (freq=%d.%02d)\n",
+- buf[1], buf[2], buf[3], buf[4],
+- freq / 1000000, (freq % 1000000) / 10000);
++ tuner_dbg("divisor= %02x %02x %02x %02x (freq=%d.%03d)\n",
++ buf[0], buf[1], buf[2], buf[3],
++ freq / 1000000, (freq % 1000000) / 1000);
+
+ rc = 0;
+ commit 06fd82dc7bdc6045bf8d6c1438d2a33ffb1cf337
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 06:06:08 2007 -0300
+
+ V4L/DVB (6638): xc2028: firmware loading cleanup
+
+ Hold the private lock over set_config and set priv->firm_size to 0 after a
+ failed firmware load to prevent firmware accidentally being freed on us.
+
+ Clean up the firmware load/error messages somewhat and rename priv->version
+ to priv->firm_version to make it clear which "version" it is.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 7e558decad84..7c86971a8d64 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -65,8 +65,7 @@ struct xc2028_data {
+
+ struct firmware_description *firm;
+ int firm_size;
+-
+- __u16 version;
++ __u16 firm_version;
+
+ struct xc2028_ctrl ctrl;
+
+@@ -237,6 +236,7 @@ static void free_firmware(struct xc2028_data *priv)
+ kfree(priv->firm);
+
+ priv->firm = NULL;
++ priv->firm_size = 0;
+ priv->need_load_generic = 1;
+ }
+
+@@ -251,7 +251,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+- tuner_info("Reading firmware %s\n", priv->ctrl.fname);
++ tuner_dbg("Reading firmware %s\n", priv->ctrl.fname);
+ rc = request_firmware(&fw, priv->ctrl.fname,
+ &priv->i2c_props.adap->dev);
+ if (rc < 0) {
+@@ -267,40 +267,34 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ p = fw->data;
+ endp = p + fw->size;
+
+- if (fw->size < sizeof(name) - 1 + 2) {
+- tuner_err("Error: firmware size is zero!\n");
+- rc = -EINVAL;
+- goto done;
++ if (fw->size < sizeof(name) - 1 + 2 + 2) {
++ tuner_err("Error: firmware file %s has invalid size!\n",
++ priv->ctrl.fname);
++ goto corrupt;
+ }
+
+ memcpy(name, p, sizeof(name) - 1);
+ name[sizeof(name) - 1] = 0;
+ p += sizeof(name) - 1;
+
+- priv->version = le16_to_cpu(*(__u16 *) p);
++ priv->firm_version = le16_to_cpu(*(__u16 *) p);
+ p += 2;
+
+- tuner_info("Firmware: %s, ver %d.%d\n", name,
+- priv->version >> 8, priv->version & 0xff);
+-
+- if (p + 2 > endp)
+- goto corrupt;
+-
+ n_array = le16_to_cpu(*(__u16 *) p);
+ p += 2;
+
+- tuner_info("There are %d firmwares at %s\n",
+- n_array, priv->ctrl.fname);
++ tuner_info("Loading %d firmware images from %s, type: %s, ver %d.%d\n",
++ n_array, priv->ctrl.fname, name,
++ priv->firm_version >> 8, priv->firm_version & 0xff);
+
+ priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL);
+-
+- if (!fw) {
+- tuner_err("Not enough memory for reading firmware.\n");
++ if (priv->firm == NULL) {
++ tuner_err("Not enough memory to load firmware file.\n");
+ rc = -ENOMEM;
+- goto done;
++ goto err;
+ }
+-
+ priv->firm_size = n_array;
++
+ n = -1;
+ while (p < endp) {
+ __u32 type, size;
+@@ -308,7 +302,8 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+
+ n++;
+ if (n >= n_array) {
+- tuner_err("Too much firmwares at the file\n");
++ tuner_err("More firmware images in file than "
++ "were expected!\n");
+ goto corrupt;
+ }
+
+@@ -338,15 +333,17 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ }
+
+ priv->firm[n].ptr = kzalloc(size, GFP_KERNEL);
+- if (!priv->firm[n].ptr) {
+- tuner_err("Not enough memory.\n");
++ if (priv->firm[n].ptr == NULL) {
++ tuner_err("Not enough memory to load firmware file.\n");
+ rc = -ENOMEM;
+ goto err;
+ }
+- tuner_info("Reading firmware type ");
+- dump_firm_type(type);
+- printk("(%x), id %llx, size=%d.\n",
+- type, (unsigned long long)id, size);
++ tuner_dbg("Reading firmware type ");
++ if (debug) {
++ dump_firm_type(type);
++ printk("(%x), id %llx, size=%d.\n",
++ type, (unsigned long long)id, size);
++ }
+
+ memcpy(priv->firm[n].ptr, p, size);
+ priv->firm[n].type = type;
+@@ -368,13 +365,13 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ tuner_err("Error: firmware file is corrupted!\n");
+
+ err:
+- tuner_info("Releasing loaded firmware file.\n");
+-
++ tuner_info("Releasing partially loaded firmware file.\n");
+ free_firmware(priv);
+
+ done:
+ release_firmware(fw);
+- tuner_dbg("Firmware files loaded.\n");
++ if (rc == 0)
++ tuner_dbg("Firmware files loaded.\n");
+
+ return rc;
+ }
+@@ -442,11 +439,6 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+ printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
+
+ p = priv->firm[pos].ptr;
+-
+- if (!p) {
+- tuner_err("Firmware pointer were freed!");
+- return -EINVAL;
+- }
+ endp = p + priv->firm[pos].size;
+
+ while (p < endp) {
+@@ -546,15 +538,10 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+
+ p = priv->firm[pos].ptr;
+
+- if (!p) {
+- tuner_err("Firmware pointer were freed!");
+- return -EINVAL;
+- }
+-
+ if ((priv->firm[pos].size != 12 * 16) || (scode >= 16))
+ return -EINVAL;
+
+- if (priv->version < 0x0202)
++ if (priv->firm_version < 0x0202)
+ rc = send_seq(priv, {0x20, 0x00, 0x00, 0x00});
+ else
+ rc = send_seq(priv, {0xa0, 0x00, 0x00, 0x00});
+@@ -783,7 +770,7 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+
+ /* CMD= Set frequency */
+
+- if (priv->version < 0x0202)
++ if (priv->firm_version < 0x0202)
+ rc = send_seq(priv, {0x00, 0x02, 0x00, 0x00});
+ else
+ rc = send_seq(priv, {0x80, 0x02, 0x00, 0x00});
+@@ -868,6 +855,7 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
+
+ free_firmware(priv);
+ kfree(priv);
++ fe->tuner_priv = NULL;
+ }
+
+ mutex_unlock(&xc2028_list_mutex);
+@@ -893,14 +881,18 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
++ mutex_lock(&priv->lock);
++
+ priv->ctrl.type = p->type;
+
+ if (p->fname) {
+ kfree(priv->ctrl.fname);
+
+ priv->ctrl.fname = kmalloc(strlen(p->fname) + 1, GFP_KERNEL);
+- if (!priv->ctrl.fname)
++ if (priv->ctrl.fname == NULL) {
++ mutex_unlock(&priv->lock);
+ return -ENOMEM;
++ }
+
+ free_firmware(priv);
+ strcpy(priv->ctrl.fname, p->fname);
+@@ -909,6 +901,8 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
+ if (p->max_len > 0)
+ priv->max_len = p->max_len;
+
++ mutex_unlock(&priv->lock);
++
+ return 0;
+ }
+ commit b32f9fb962d593e3c5a61092a79434714f405ef5
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:53:50 2007 -0300
+
+ V4L/DVB (6637): xc2028: add missing break
+
+ Add break to stop us from following the default failure path even upon success.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index ac7f3e1d32f4..7e558decad84 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -485,6 +485,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+ (*p) & 0x7f);
+ return -EINVAL;
+ }
++ break;
+ default:
+ tuner_info("Invalid RESET code %d\n",
+ size & 0x7f);commit aa501be989f5df58c4732d5eb1989e5ca6479d90
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:45:38 2007 -0300
+
+ V4L/DVB (6636): xc2028: protect device list
+
+ Protect refcount changes and modifications to xc2028_list with a mutex.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index a01231a0410d..ac7f3e1d32f4 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -44,6 +44,8 @@ MODULE_PARM_DESC(audio_std,
+ "NICAM/B\n");
+
+ static LIST_HEAD(xc2028_list);
++static DEFINE_MUTEX(xc2028_list_mutex);
++
+ /* struct for storing firmware table */
+ struct firmware_description {
+ unsigned int type;
+@@ -854,6 +856,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
++ mutex_lock(&xc2028_list_mutex);
++
+ priv->count--;
+
+ if (!priv->count) {
+@@ -865,6 +869,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
+ kfree(priv);
+ }
+
++ mutex_unlock(&xc2028_list_mutex);
++
+ return 0;
+ }
+
+@@ -940,6 +946,8 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+
+ video_dev = cfg->video_dev;
+
++ mutex_lock(&xc2028_list_mutex);
++
+ list_for_each_entry(priv, &xc2028_list, xc2028_list) {
+ if (priv->video_dev == cfg->video_dev) {
+ video_dev = NULL;
+@@ -949,8 +957,10 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+
+ if (video_dev) {
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+- if (priv == NULL)
++ if (priv == NULL) {
++ mutex_unlock(&xc2028_list_mutex);
+ return NULL;
++ }
+
+ priv->bandwidth = BANDWIDTH_6_MHZ;
+ priv->need_load_generic = 1;
+@@ -974,6 +984,8 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+
+ tuner_info("type set to %s\n", "XCeive xc2028/xc3028 tuner");
+
++ mutex_unlock(&xc2028_list_mutex);
++
+ return fe;
+ }
+ commit 91240dd92474d4124f80b00e6200052b275a99a1
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:38:53 2007 -0300
+
+ V4L/DVB (6635): xc2028: v4l2_std_id needs to be long long to display completely
+
+ Cast v4l2_std_id variables to unsigned long long so they will printk properly.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index c208f1f5e72c..a01231a0410d 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -330,7 +330,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ dump_firm_type(type);
+ printk("(%x), id %llx is corrupted "
+ "(size=%d, expected %d)\n",
+- type, id,
++ type, (unsigned long long)id,
+ (unsigned)(endp - p), size);
+ goto corrupt;
+ }
+@@ -343,8 +343,8 @@ static int load_all_firmwares(struct dvb_frontend *fe)
+ }
+ tuner_info("Reading firmware type ");
+ dump_firm_type(type);
+- printk("(%x), id %lx, size=%d.\n",
+- type, (unsigned long)id, size);
++ printk("(%x), id %llx, size=%d.\n",
++ type, (unsigned long long)id, size);
+
+ memcpy(priv->firm[n].ptr, p, size);
+ priv->firm[n].type = type;
+@@ -417,7 +417,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
+ tuner_dbg("%s firmware for type=", (i < 0)? "Can't find": "Found");
+ if (debug) {
+ dump_firm_type(type);
+- printk("(%x), id %08lx.\n", type, (unsigned long)*id);
++ printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
+ }
+ return i;
+ }
+@@ -437,7 +437,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+
+ tuner_info("Loading firmware for type=");
+ dump_firm_type(type);
+- printk("(%x), id %08lx.\n", type, (unsigned long)*id);
++ printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
+
+ p = priv->firm[pos].ptr;
+ commit 3157ecef3bce47df74427d6656fa8592bfe8d2d7
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:34:29 2007 -0300
+
+ V4L/DVB (6634): xc2028: error messages missing whitespace
+
+ Fix some missing spaces in errors that may be emitted during attach failure.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index a49a4e886897..c208f1f5e72c 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -928,13 +928,13 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
+ void *video_dev;
+
+ if (debug)
+- printk(KERN_DEBUG PREFIX "Xcv2028/3028 init called!\n");
++ printk(KERN_DEBUG PREFIX ": Xcv2028/3028 init called!\n");
+
+ if (NULL == cfg->video_dev)
+ return NULL;
+
+ if (!fe) {
+- printk(KERN_ERR PREFIX "No frontend!\n");
++ printk(KERN_ERR PREFIX ": No frontend!\n");
+ return NULL;
+ }
+ commit 7d58d1117ec02f5fe22ddd03ca08fe2a8c777ea2
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:31:58 2007 -0300
+
+ V4L/DVB (6633): xc2028: make register reads atomic
+
+ Issuing register reads as a separate address write and data read transactions
+ means that other I2C activity could occur in between and state could get out
+ of sync. Issue both the write and read in a single transaction so that the
+ i2c layer can prevent other users accessing the bus until we are complete.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-i2c.h b/drivers/media/video/tuner-i2c.h
+index b5ac189ba40f..d7cf72c3fd71 100644
+--- a/drivers/media/video/tuner-i2c.h
++++ b/drivers/media/video/tuner-i2c.h
+@@ -46,6 +46,19 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf,
+ return (ret == 1) ? len : ret;
+ }
+
++static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props,
++ char *obuf, int olen,
++ char *ibuf, int ilen)
++{
++ struct i2c_msg msg[2] = { { .addr = props->addr, .flags = 0,
++ .buf = obuf, .len = olen },
++ { .addr = props->addr, .flags = I2C_M_RD,
++ .buf = ibuf, .len = ilen } };
++ int ret = i2c_transfer(props->adap, msg, 2);
++
++ return (ret == 2) ? ilen : ret;
++}
++
+ #ifndef __TUNER_DRIVER_H__
+ #define tuner_warn(fmt, arg...) do { \
+ printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 166fede7d0e3..a49a4e886897 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -101,6 +101,16 @@ struct xc2028_data {
+ _rc; \
+ })
+
++#define i2c_send_recv(priv, obuf, osize, ibuf, isize) ({ \
++ int _rc; \
++ _rc = tuner_i2c_xfer_send_recv(&priv->i2c_props, obuf, osize, \
++ ibuf, isize); \
++ if (isize != _rc) \
++ tuner_err("i2c input error: rc = %d (should be %d)\n", \
++ _rc, (int)isize); \
++ _rc; \
++})
++
+ #define send_seq(priv, data...) ({ \
+ static u8 _val[] = data; \
+ int _rc; \
+@@ -113,25 +123,21 @@ struct xc2028_data {
+ _rc; \
+ })
+
+-static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg)
++static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
+ {
+- int rc;
+ unsigned char buf[2];
++ unsigned char ibuf[2];
+
+- tuner_dbg("%s called\n", __FUNCTION__);
++ tuner_dbg("%s %04x called\n", __FUNCTION__, reg);
+
+- buf[0] = reg>>8;
++ buf[0] = reg >> 8;
+ buf[1] = (unsigned char) reg;
+
+- rc = i2c_send(priv, buf, 2);
+- if (rc < 0)
+- return rc;
+-
+- rc = i2c_rcv(priv, buf, 2);
+- if (rc < 0)
+- return rc;
++ if (i2c_send_recv(priv, buf, 2, ibuf, 2) != 2)
++ return -EIO;
+
+- return (buf[1]) | (buf[0] << 8);
++ *val = (ibuf[1]) | (ibuf[0] << 8);
++ return 0;
+ }
+
+ void dump_firm_type(unsigned int type)
+@@ -567,7 +573,8 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ v4l2_std_id std, fe_bandwidth_t bandwidth)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+- int rc, version, hwmodel;
++ int rc;
++ u16 version, hwmodel;
+ v4l2_std_id std0 = 0;
+ unsigned int type0 = 0, type = 0;
+ int change_digital_bandwidth;
+@@ -692,8 +699,8 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+
+ rc = load_scode(fe, type, &std, 0);
+
+- version = xc2028_get_reg(priv, 0x0004);
+- hwmodel = xc2028_get_reg(priv, 0x0008);
++ xc2028_get_reg(priv, 0x0004, &version);
++ xc2028_get_reg(priv, 0x0008, &hwmodel);
+
+ tuner_info("Device is Xceive %d version %d.%d, "
+ "firmware version %d.%d\n",
+@@ -708,33 +715,31 @@ static int check_firmware(struct dvb_frontend *fe, enum tuner_mode new_mode,
+ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
+ {
+ struct xc2028_data *priv = fe->tuner_priv;
+- int frq_lock, signal = 0;
++ u16 frq_lock, signal = 0;
++ int rc;
+
+ tuner_dbg("%s called\n", __FUNCTION__);
+
+ mutex_lock(&priv->lock);
+
+- *strength = 0;
+-
+ /* Sync Lock Indicator */
+- frq_lock = xc2028_get_reg(priv, 0x0002);
+- if (frq_lock <= 0)
++ rc = xc2028_get_reg(priv, 0x0002, &frq_lock);
++ if (rc < 0 || frq_lock == 0)
+ goto ret;
+
+ /* Frequency is locked. Return signal quality */
+
+ /* Get SNR of the video signal */
+- signal = xc2028_get_reg(priv, 0x0040);
+-
+- if (signal <= 0)
+- signal = frq_lock;
++ rc = xc2028_get_reg(priv, 0x0040, &signal);
++ if (rc < 0)
++ signal = -frq_lock;
+
+ ret:
+ mutex_unlock(&priv->lock);
+
+ *strength = signal;
+
+- return 0;
++ return rc;
+ }
+
+ #define DIV 15625commit e155d908f72cc429b538c101ee8ffcd10a44b69b
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:16:47 2007 -0300
+
+ V4L/DVB (6632): xc2028: fix inverted logic in audio standard check
+
+ strcasecmp returns 0 on match, not true.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index 6e23fad0e560..166fede7d0e3 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -200,17 +200,17 @@ void dump_firm_type(unsigned int type)
+
+ static v4l2_std_id parse_audio_std_option(void)
+ {
+- if (strcasecmp(audio_std, "A2"))
++ if (strcasecmp(audio_std, "A2") == 0)
+ return V4L2_STD_A2;
+- if (strcasecmp(audio_std, "A2/A"))
++ if (strcasecmp(audio_std, "A2/A") == 0)
+ return V4L2_STD_A2_A;
+- if (strcasecmp(audio_std, "A2/B"))
++ if (strcasecmp(audio_std, "A2/B") == 0)
+ return V4L2_STD_A2_B;
+- if (strcasecmp(audio_std, "NICAM"))
++ if (strcasecmp(audio_std, "NICAM") == 0)
+ return V4L2_STD_NICAM;
+- if (strcasecmp(audio_std, "NICAM/A"))
++ if (strcasecmp(audio_std, "NICAM/A") == 0)
+ return V4L2_STD_NICAM_A;
+- if (strcasecmp(audio_std, "NICAM/B"))
++ if (strcasecmp(audio_std, "NICAM/B") == 0)
+ return V4L2_STD_NICAM_B;
+
+ return 0;
+ commit 47cc5b78102b4e9993ea1c054b4f077cf7aac7db
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 04:14:23 2007 -0300
+
+ V4L/DVB (6631): xc2028: eliminate i2c macro side-effects
+
+ The I2C macros have side effects and send_seq could cause a return from
+ a function with a mutex held. Change them to behave like real functions.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
+index d23b33a1f696..6e23fad0e560 100644
+--- a/drivers/media/video/tuner-xc2028.c
++++ b/drivers/media/video/tuner-xc2028.c
+@@ -83,31 +83,35 @@ struct xc2028_data {
+ struct mutex lock;
+ };
+
+-#define i2c_send(rc, priv, buf, size) do { \
+- rc = tuner_i2c_xfer_send(&priv->i2c_props, buf, size); \
+- if (size != rc) \
+- tuner_err("i2c output error: rc = %d (should be %d)\n", \
+- rc, (int)size); \
+-} while (0)
+-
+-#define i2c_rcv(rc, priv, buf, size) do { \
+- rc = tuner_i2c_xfer_recv(&priv->i2c_props, buf, size); \
+- if (size != rc) \
++#define i2c_send(priv, buf, size) ({ \
++ int _rc; \
++ _rc = tuner_i2c_xfer_send(&priv->i2c_props, buf, size); \
++ if (size != _rc) \
++ tuner_info("i2c output error: rc = %d (should be %d)\n",\
++ _rc, (int)size); \
++ _rc; \
++})
++
++#define i2c_rcv(priv, buf, size) ({ \
++ int _rc; \
++ _rc = tuner_i2c_xfer_recv(&priv->i2c_props, buf, size); \
++ if (size != _rc) \
+ tuner_err("i2c input error: rc = %d (should be %d)\n", \
+- rc, (int)size); \
+-} while (0)
++ _rc, (int)size); \
++ _rc; \
++})
+
+-#define send_seq(priv, data...) do { \
+- int rc; \
++#define send_seq(priv, data...) ({ \
+ static u8 _val[] = data; \
++ int _rc; \
+ if (sizeof(_val) != \
+- (rc = tuner_i2c_xfer_send(&priv->i2c_props, \
++ (_rc = tuner_i2c_xfer_send(&priv->i2c_props, \
+ _val, sizeof(_val)))) { \
+- tuner_err("Error on line %d: %d\n", __LINE__, rc); \
+- return -EINVAL; \
+- } \
+- msleep(10); \
+-} while (0)
++ tuner_err("Error on line %d: %d\n", __LINE__, _rc); \
++ } else \
++ msleep(10); \
++ _rc; \
++})
+
+ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg)
+ {
+@@ -119,11 +123,11 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg)
+ buf[0] = reg>>8;
+ buf[1] = (unsigned char) reg;
+
+- i2c_send(rc, priv, buf, 2);
++ rc = i2c_send(priv, buf, 2);
+ if (rc < 0)
+ return rc;
+
+- i2c_rcv(rc, priv, buf, 2);
++ rc = i2c_rcv(priv, buf, 2);
+ if (rc < 0)
+ return rc;
+
+@@ -505,7 +509,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
+
+ memcpy(buf + 1, p, len);
+
+- i2c_send(rc, priv, buf, len + 1);
++ rc = i2c_send(priv, buf, len + 1);
+ if (rc < 0) {
+ tuner_err("%d returned from send\n", rc);
+ return -EINVAL;
+@@ -541,15 +545,20 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
+ if ((priv->firm[pos].size != 12 * 16) || (scode >= 16))
+ return -EINVAL;
+
+- if (priv->version < 0x0202) {
+- send_seq(priv, {0x20, 0x00, 0x00, 0x00});
+- } else {
+- send_seq(priv, {0xa0, 0x00, 0x00, 0x00});
+- }
++ if (priv->version < 0x0202)
++ rc = send_seq(priv, {0x20, 0x00, 0x00, 0x00});
++ else
++ rc = send_seq(priv, {0xa0, 0x00, 0x00, 0x00});
++ if (rc < 0)
++ return -EIO;
+
+- i2c_send(rc, priv, p + 12 * scode, 12);
++ rc = i2c_send(priv, p + 12 * scode, 12);
++ if (rc < 0)
++ return -EIO;
+
+- send_seq(priv, {0x00, 0x8c});
++ rc = send_seq(priv, {0x00, 0x8c});
++ if (rc < 0)
++ return -EIO;
+
+ return 0;
+ }
+@@ -766,11 +775,12 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+
+ /* CMD= Set frequency */
+
+- if (priv->version < 0x0202) {
+- send_seq(priv, {0x00, 0x02, 0x00, 0x00});
+- } else {
+- send_seq(priv, {0x80, 0x02, 0x00, 0x00});
+- }
++ if (priv->version < 0x0202)
++ rc = send_seq(priv, {0x00, 0x02, 0x00, 0x00});
++ else
++ rc = send_seq(priv, {0x80, 0x02, 0x00, 0x00});
++ if (rc < 0)
++ goto ret;
+
+ rc = priv->tuner_callback(priv->video_dev, XC2028_RESET_CLK, 1);
+ if (rc < 0)
+@@ -784,7 +794,7 @@ static int generic_set_tv_freq(struct dvb_frontend *fe, u32 freq /* in Hz */ ,
+ buf[3] = 0xff & (div);
+ buf[4] = 0;
+
+- i2c_send(rc, priv, buf, sizeof(buf));
++ rc = i2c_send(priv, buf, sizeof(buf));
+ if (rc < 0)
+ goto ret;
+ msleep(100);commit 794604c3efb511b74fb664af72c5dd7046e91075
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 03:55:45 2007 -0300
+
+ V4L/DVB (6630): zl10353: calculate input frequency register instead of using hardcoded value
+
+ Now we know the zl10353's correct ADC clock, we can calculate the input
+ frequency registers correctly instead of just blindly setting them.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index 9bfdc01fed2c..1736c6ac39cc 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -1,7 +1,7 @@
+ /*
+ * Driver for Zarlink DVB-T ZL10353 demodulator
+ *
+- * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ * Copyright (C) 2006, 2007 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
+ *
+ * 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
+@@ -16,7 +16,7 @@
+ *
+ * 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.=
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+ #include <linux/kernel.h>
+@@ -25,6 +25,7 @@
+ #include <linux/delay.h>
+ #include <linux/string.h>
+ #include <linux/slab.h>
++#include <asm/div64.h>
+
+ #include "dvb_frontend.h"
+ #include "zl10353_priv.h"
+@@ -148,6 +149,35 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+ __FUNCTION__, bw, adc_clock, *nominal_rate);
+ }
+
++static void zl10353_calc_input_freq(struct dvb_frontend *fe,
++ u16 *input_freq)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ u32 adc_clock = 45056; /* 45.056 MHz */
++ int if2 = 36167; /* 36.167 MHz */
++ int ife;
++ u64 value;
++
++ if (state->config.adc_clock)
++ adc_clock = state->config.adc_clock;
++ if (state->config.if2)
++ if2 = state->config.if2;
++
++ if (adc_clock >= if2 * 2)
++ ife = if2;
++ else {
++ ife = adc_clock - (if2 % adc_clock);
++ if (ife > adc_clock / 2)
++ ife = adc_clock - ife;
++ }
++ value = 65536ULL * ife + adc_clock / 2;
++ do_div(value, adc_clock);
++ *input_freq = -value;
++
++ dprintk("%s: if2 %d, ife %d, adc_clock %d => %d / 0x%x\n",
++ __FUNCTION__, if2, ife, adc_clock, -(int)value, *input_freq);
++}
++
+ static int zl10353_sleep(struct dvb_frontend *fe)
+ {
+ static u8 zl10353_softdown[] = { 0x50, 0x0C, 0x44 };
+@@ -160,7 +190,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
+ struct dvb_frontend_parameters *param)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+- u16 nominal_rate;
++ u16 nominal_rate, input_freq;
+ u8 pllbuf[6] = { 0x67 };
+
+ /* These settings set "auto-everything" and start the FSM. */
+@@ -178,8 +208,10 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
+ zl10353_single_write(fe, TRL_NOMINAL_RATE_1, msb(nominal_rate));
+ zl10353_single_write(fe, TRL_NOMINAL_RATE_0, lsb(nominal_rate));
+
+- zl10353_single_write(fe, 0x6C, 0xCD);
+- zl10353_single_write(fe, 0x6D, 0x7E);
++ zl10353_calc_input_freq(fe, &input_freq);
++ zl10353_single_write(fe, INPUT_FREQ_1, msb(input_freq));
++ zl10353_single_write(fe, INPUT_FREQ_0, lsb(input_freq));
++
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
+
+diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
+index 1c3d494a6da9..2660cec93f83 100644
+--- a/drivers/media/dvb/frontends/zl10353.h
++++ b/drivers/media/dvb/frontends/zl10353.h
+@@ -1,7 +1,7 @@
+ /*
+ * Driver for Zarlink DVB-T ZL10353 demodulator
+ *
+- * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ * Copyright (C) 2006, 2007 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
+ *
+ * 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
+@@ -31,6 +31,7 @@ struct zl10353_config
+
+ /* frequencies in kHz */
+ int adc_clock; /* default: 45056 */
++ int if2; /* default: 36167 */
+
+ /* set if no pll is connected to the secondary i2c bus */
+ int no_tuner;
+diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
+index 42855dfe31a7..fcad9221945e 100644
+--- a/drivers/media/dvb/frontends/zl10353_priv.h
++++ b/drivers/media/dvb/frontends/zl10353_priv.h
+@@ -1,7 +1,7 @@
+ /*
+ * Driver for Zarlink DVB-T ZL10353 demodulator
+ *
+- * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ * Copyright (C) 2006, 2007 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
+ *
+ * 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
+@@ -16,7 +16,7 @@
+ *
+ * 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.=
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+ #ifndef _ZL10353_PRIV_
+@@ -48,6 +48,8 @@ enum zl10353_reg_addr {
+ RS_UBC_0 = 0x15,
+ TRL_NOMINAL_RATE_1 = 0x65,
+ TRL_NOMINAL_RATE_0 = 0x66,
++ INPUT_FREQ_1 = 0x6C,
++ INPUT_FREQ_0 = 0x6D,
+ TUNER_GO = 0x70,
+ FSM_GO = 0x71,
+ CHIP_ID = 0x7F,commit 58d834ea89664b41e6e21ed2d8dc5680d0dd76b6
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 03:32:06 2007 -0300
+
+ V4L/DVB (6628): zl10353: Improve support for boards without a tuner on secondary i2c
+
+ Issue FSM_GO instead of TUNER_GO if there is no tuner attached to the
+ secondary i2c bus.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index 0106df4c55e8..9bfdc01fed2c 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -183,35 +183,31 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
+
+- // if there is no attached secondary tuner, we call set_params to program
+- // a potential tuner attached somewhere else
++ /*
++ * If there is no tuner attached to the secondary I2C bus, we call
++ * set_params to program a potential tuner attached somewhere else.
++ * Otherwise, we update the PLL registers via calc_regs.
++ */
+ if (state->config.no_tuner) {
+ if (fe->ops.tuner_ops.set_params) {
+ fe->ops.tuner_ops.set_params(fe, param);
+ if (fe->ops.i2c_gate_ctrl)
+ fe->ops.i2c_gate_ctrl(fe, 0);
+ }
+- }
+-
+- // if pllbuf is defined, retrieve the settings
+- if (fe->ops.tuner_ops.calc_regs) {
+- fe->ops.tuner_ops.calc_regs(fe, param, pllbuf+1, 5);
++ } else if (fe->ops.tuner_ops.calc_regs) {
++ fe->ops.tuner_ops.calc_regs(fe, param, pllbuf + 1, 5);
+ pllbuf[1] <<= 1;
+- } else {
+- // fake pllbuf settings
+- pllbuf[1] = 0x61 << 1;
+- pllbuf[2] = 0;
+- pllbuf[3] = 0;
+- pllbuf[3] = 0;
+- pllbuf[4] = 0;
++ zl10353_write(fe, pllbuf, sizeof(pllbuf));
+ }
+
+- // there is no call to _just_ start decoding, so we send the pllbuf anyway
+- // even if there isn't a PLL attached to the secondary bus
+- zl10353_write(fe, pllbuf, sizeof(pllbuf));
+-
+ zl10353_single_write(fe, 0x5F, 0x13);
+- zl10353_single_write(fe, 0x70, 0x01);
++
++ /* If no attached tuner or invalid PLL registers, just start the FSM. */
++ if (state->config.no_tuner || fe->ops.tuner_ops.calc_regs == NULL)
++ zl10353_single_write(fe, FSM_GO, 0x01);
++ else
++ zl10353_single_write(fe, TUNER_GO, 0x01);
++
+ udelay(250);
+ zl10353_single_write(fe, 0xE4, 0x00);
+ zl10353_single_write(fe, 0xE5, 0x2A);
+diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
+index 4962434b35e7..42855dfe31a7 100644
+--- a/drivers/media/dvb/frontends/zl10353_priv.h
++++ b/drivers/media/dvb/frontends/zl10353_priv.h
+@@ -48,6 +48,8 @@ enum zl10353_reg_addr {
+ RS_UBC_0 = 0x15,
+ TRL_NOMINAL_RATE_1 = 0x65,
+ TRL_NOMINAL_RATE_0 = 0x66,
++ TUNER_GO = 0x70,
++ FSM_GO = 0x71,
+ CHIP_ID = 0x7F,
+ };
+ commit a644e4a3e95f8ca6eca019c92d8dfde101150687
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 03:05:09 2007 -0300
+
+ V4L/DVB (6627): CXUSB: handle write then read from different address
+
+ The path to perform a read immediately after a write was not checking that
+ the address being read from was the same as the one that was written.
+
+ Handling this case correctly should mean that we now can handle more than
+ two i2c messages at a time.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index 016a3780b714..74eeb168f241 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -83,9 +83,6 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+ return -EAGAIN;
+
+- if (num > 2)
+- warn("more than two i2c messages at a time is not handled yet. TODO.");
+-
+ for (i = 0; i < num; i++) {
+
+ if (d->udev->descriptor.idVendor == USB_VID_MEDION)
+@@ -111,8 +108,9 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ break;
+ }
+ memcpy(msg[i].buf, &ibuf[1], msg[i].len);
+- } else if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+- /* write then read */
++ } else if (i+1 < num && (msg[i+1].flags & I2C_M_RD) &&
++ msg[i].addr == msg[i+1].addr) {
++ /* write to then read from same address */
+ u8 obuf[3+msg[i].len], ibuf[1+msg[i+1].len];
+ obuf[0] = msg[i].len;
+ obuf[1] = msg[i+1].len;commit 272479d7ab067344d118e7633b624bf98f8896f3
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 03:01:22 2007 -0300
+
+ V4L/DVB (6626): CXUSB: support only-read i2c requests
+
+ Any i2c read request that was not immediately preceded by a write request was
+ incorrectly taking the write path. Add the capability to handle individual
+ read requests.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index 86fbd6c73ea9..016a3780b714 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -98,8 +98,21 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ break;
+ }
+
+- /* read request */
+- if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
++ if (msg[i].flags & I2C_M_RD) {
++ /* read only */
++ u8 obuf[3], ibuf[1+msg[i].len];
++ obuf[0] = 0;
++ obuf[1] = msg[i].len;
++ obuf[2] = msg[i].addr;
++ if (cxusb_ctrl_msg(d, CMD_I2C_READ,
++ obuf, 3,
++ ibuf, 1+msg[i].len) < 0) {
++ warn("i2c read failed");
++ break;
++ }
++ memcpy(msg[i].buf, &ibuf[1], msg[i].len);
++ } else if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
++ /* write then read */
+ u8 obuf[3+msg[i].len], ibuf[1+msg[i+1].len];
+ obuf[0] = msg[i].len;
+ obuf[1] = msg[i+1].len;
+@@ -117,7 +130,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
+ memcpy(msg[i+1].buf, &ibuf[1], msg[i+1].len);
+
+ i++;
+- } else { /* write */
++ } else {
++ /* write only */
+ u8 obuf[2+msg[i].len], ibuf;
+ obuf[0] = msg[i].addr;
+ obuf[1] = msg[i].len;commit 13e001dfe3aeb9e7b05445af76e5b47235e81285 +Author: Chris Pascoe <c.pascoe@itee.uq.edu.au> +Date: Mon Nov 19 02:48:27 2007 -0300 + + V4L/DVB (6625): CXUSB: i2c transfer failure notification + + The i2c master_xfer routine should return a negative result if not all + transfers completed successfully. + + Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> + Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> + +diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c +index b4a3f7baf1b7..86fbd6c73ea9 100644 +--- a/drivers/media/dvb/dvb-usb/cxusb.c ++++ b/drivers/media/dvb/dvb-usb/cxusb.c +@@ -132,7 +132,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], + } + + mutex_unlock(&d->i2c_mutex); +- return i; ++ return i == num ? num : -EREMOTEIO; + } + + static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
commit b17f109df1cd9fe1009501d59e466701106590d7
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 02:42:44 2007 -0300
+
+ V4L/DVB (6624): CXUSB: return control message transfer result to caller
+
+ Callers to cxusb_ctrl_msg currently do not receive any indication that their
+ transfer failed. Return the true return code from dvb_usb_generic_{rw,write}.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index 5b6431ea38c1..b4a3f7baf1b7 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -49,11 +49,9 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
+ sndbuf[0] = cmd;
+ memcpy(&sndbuf[1], wbuf, wlen);
+ if (wo)
+- dvb_usb_generic_write(d, sndbuf, 1+wlen);
++ return dvb_usb_generic_write(d, sndbuf, 1+wlen);
+ else
+- dvb_usb_generic_rw(d, sndbuf, 1+wlen, rbuf, rlen, 0);
+-
+- return 0;
++ return dvb_usb_generic_rw(d, sndbuf, 1+wlen, rbuf, rlen, 0);
+ }
+
+ /* GPIO */commit 78f3b0b672c79df9ffa55399a7d6fc4b173e9b4b
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Mon Nov 19 03:47:07 2007 -0300
+
+ V4L/DVB (6629): zl10353: fix default adc_clock and TRL nominal rate calculation
+
+ The default adc_clock for the zl10353 is different from what was originally
+ thought to be the case and the TRL nominal rate formula was incorrect as a
+ result. Use a better (and hopefully now correct) formula.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index a97a7fd2c891..0106df4c55e8 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -122,7 +122,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+ enum fe_bandwidth bandwidth,
+ u16 *nominal_rate)
+ {
+- u32 adc_clock = 22528; /* 20.480 MHz on the board(!?) */
++ u32 adc_clock = 45056; /* 45.056 MHz */
+ u8 bw;
+ struct zl10353_state *state = fe->demodulator_priv;
+
+@@ -142,7 +142,7 @@ static void zl10353_calc_nominal_rate(struct dvb_frontend *fe,
+ break;
+ }
+
+- *nominal_rate = (64 * bw * (1<<16) / (7 * 8) * 4000 / adc_clock + 2) / 4;
++ *nominal_rate = (bw * (1 << 23) / 7 * 125 + adc_clock / 2) / adc_clock;
+
+ dprintk("%s: bw %d, adc_clock %d => 0x%x\n",
+ __FUNCTION__, bw, adc_clock, *nominal_rate);
+diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
+index cb274dc12b82..1c3d494a6da9 100644
+--- a/drivers/media/dvb/frontends/zl10353.h
++++ b/drivers/media/dvb/frontends/zl10353.h
+@@ -30,7 +30,7 @@ struct zl10353_config
+ u8 demod_address;
+
+ /* frequencies in kHz */
+- int adc_clock; // default: 22528
++ int adc_clock; /* default: 45056 */
+
+ /* set if no pll is connected to the secondary i2c bus */
+ int no_tuner;commit 6345f0f6428cc7a3f73b83624c6f97629a9fddd1
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Feb 10 10:19:16 2007 -0300
+
+ V4L/DVB (5218): Zl10353: register definitions update
+
+ Update the descriptions of "discovered" registers on the zl10353, using the
+ equivalaent mt352 register names.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index dbb53ba6f414..245f9b7dddfa 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -258,9 +258,9 @@ static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+
+- *ber = zl10353_read_register(state, 0x11) << 16 |
+- zl10353_read_register(state, 0x12) << 8 |
+- zl10353_read_register(state, 0x13);
++ *ber = zl10353_read_register(state, RS_ERR_CNT_2) << 16 |
++ zl10353_read_register(state, RS_ERR_CNT_1) << 8 |
++ zl10353_read_register(state, RS_ERR_CNT_0);
+
+ return 0;
+ }
+@@ -269,8 +269,8 @@ static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+
+- u16 signal = zl10353_read_register(state, 0x0a) << 10 |
+- zl10353_read_register(state, 0x0b) << 2 | 3;
++ u16 signal = zl10353_read_register(state, AGC_GAIN_1) << 10 |
++ zl10353_read_register(state, AGC_GAIN_0) << 2 | 3;
+
+ *strength = ~signal;
+
+@@ -295,8 +295,8 @@ static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+
+- *ucblocks = zl10353_read_register(state, 0x14) << 8 |
+- zl10353_read_register(state, 0x15);
++ *ucblocks = zl10353_read_register(state, RS_UBC_1) << 8 |
++ zl10353_read_register(state, RS_UBC_0);
+
+ return 0;
+ }
+diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
+index d2186927f8f1..4962434b35e7 100644
+--- a/drivers/media/dvb/frontends/zl10353_priv.h
++++ b/drivers/media/dvb/frontends/zl10353_priv.h
+@@ -38,7 +38,14 @@ enum zl10353_reg_addr {
+ STATUS_7 = 0x07,
+ STATUS_8 = 0x08,
+ STATUS_9 = 0x09,
++ AGC_GAIN_1 = 0x0A,
++ AGC_GAIN_0 = 0x0B,
+ SNR = 0x10,
++ RS_ERR_CNT_2 = 0x11,
++ RS_ERR_CNT_1 = 0x12,
++ RS_ERR_CNT_0 = 0x13,
++ RS_UBC_1 = 0x14,
++ RS_UBC_0 = 0x15,
+ TRL_NOMINAL_RATE_1 = 0x65,
+ TRL_NOMINAL_RATE_0 = 0x66,
+ CHIP_ID = 0x7F,commit 67b60aad168cfdd40ffec12f14b93e2e68f7d486
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Feb 10 10:17:57 2007 -0300
+
+ V4L/DVB (5215): Experimental support for signal strength/BER/uncorrectable count
+
+ After studying many hours worth of register dumps of MT352 and ZL10353 fed
+ with identically damaged RF signals I have made an educated guess at which
+ registers contain the AGC level, bit error rate and uncorrectable error
+ count values.
+ Implement the IOCTLs that return these values to userspace.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index a1b0afbd47ba..0d8241de89ee 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -213,6 +213,29 @@ static int zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status)
+ return 0;
+ }
+
++static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++
++ *ber = zl10353_read_register(state, 0x11) << 16 |
++ zl10353_read_register(state, 0x12) << 8 |
++ zl10353_read_register(state, 0x13);
++
++ return 0;
++}
++
++static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++
++ u16 signal = zl10353_read_register(state, 0x0a) << 10 |
++ zl10353_read_register(state, 0x0b) << 2 | 3;
++
++ *strength = ~signal;
++
++ return 0;
++}
++
+ static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
+ {
+ struct zl10353_state *state = fe->demodulator_priv;
+@@ -227,6 +250,16 @@ static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
+ return 0;
+ }
+
++static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++
++ *ucblocks = zl10353_read_register(state, 0x14) << 8 |
++ zl10353_read_register(state, 0x15);
++
++ return 0;
++}
++
+ static int zl10353_get_tune_settings(struct dvb_frontend *fe,
+ struct dvb_frontend_tune_settings
+ *fe_tune_settings)
+@@ -325,7 +358,10 @@ static struct dvb_frontend_ops zl10353_ops = {
+ .get_tune_settings = zl10353_get_tune_settings,
+
+ .read_status = zl10353_read_status,
++ .read_ber = zl10353_read_ber,
++ .read_signal_strength = zl10353_read_signal_strength,
+ .read_snr = zl10353_read_snr,
++ .read_ucblocks = zl10353_read_ucblocks,
+ };
+
+ module_param(debug_regs, int, 0644);
+ commit d536e9c41f78c9959c585181f8a1e7fe8b157197
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Thu Aug 10 03:22:21 2006 -0300
+
+ V4L/DVB (4497): Reset USB part of DViCO Dual Digital during PCI driver attach
+
+ If the FX2 does not reset properly during reboot, it can present an
+ invalid USB device ID and fail to attach. Prevent this situation
+ from occuring by resetting the USB part of the card when the PCI part
+ probes.
+ Also fix the GPIO configurations so that analog capture will not
+ inadvertantly reset the USB part.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index ba3ff57bba75..29ba5d53ce34 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -1041,11 +1041,11 @@ struct cx88_board cx88_boards[] = {
+ .input = {{
+ .type = CX88_VMUX_COMPOSITE1,
+ .vmux = 1,
+- .gpio0 = 0x000027df,
++ .gpio0 = 0x000067df,
+ },{
+ .type = CX88_VMUX_SVIDEO,
+ .vmux = 2,
+- .gpio0 = 0x000027df,
++ .gpio0 = 0x000067df,
+ }},
+ .dvb = 1,
+ },
+@@ -1759,9 +1759,15 @@ void cx88_card_setup(struct cx88_core *core)
+ cx_write(MO_GP0_IO, 0x000007f8);
+ cx_write(MO_GP1_IO, 0x00000001);
+ break;
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
++ /* GPIO0:6 is hooked to FX2 reset pin */
++ cx_set(MO_GP0_IO, 0x00004040);
++ cx_clear(MO_GP0_IO, 0x00000040);
++ msleep(1000);
++ cx_set(MO_GP0_IO, 0x00004040);
++ /* FALLTHROUGH */
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+- case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
+ /* GPIO0:0 is hooked to mt352 reset pin */
+ cx_set(MO_GP0_IO, 0x00000101);commit fc3398d8b317bebe542f57c65572d9b9f52112f7 +Author: Chris Pascoe <c.pascoe@itee.uq.edu.au> +Date: Thu Aug 10 03:17:42 2006 -0300 + + V4L/DVB (4496): Tuning tweaks for ZL10353 + + More register setup which improves the ZL10353's tuning characteristics. + + Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> + Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> + +diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c +index 84abbaf362fb..0e9b59af271e 100644 +--- a/drivers/media/dvb/frontends/zl10353.c ++++ b/drivers/media/dvb/frontends/zl10353.c +@@ -140,6 +140,8 @@ static int zl10353_set_parameters(struct dvb_frontend *fe, + zl10353_single_write(fe, 0x5E, 0x00); + zl10353_single_write(fe, 0x65, 0x5A); + zl10353_single_write(fe, 0x66, 0xE9); ++ zl10353_single_write(fe, 0x6C, 0xCD); ++ zl10353_single_write(fe, 0x6D, 0x7E); + zl10353_single_write(fe, 0x62, 0x0A); + + // if there is no attached secondary tuner, we call set_params to program +@@ -168,6 +170,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe, + // even if there isn't a PLL attached to the secondary bus + zl10353_write(fe, pllbuf, sizeof(pllbuf)); + ++ zl10353_single_write(fe, 0x5F, 0x13); + zl10353_single_write(fe, 0x70, 0x01); + udelay(250); + zl10353_single_write(fe, 0xE4, 0x00);
commit 8fb957841b2f4311e6418dcbef24564e4cebb87d
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Thu Aug 10 03:17:16 2006 -0300
+
+ V4L/DVB (4495): Fix "no data from ZL10353 based USB tuner" problem
+
+ Force parallel transport stream output on the ZL10353 attached to a
+ bluebird device.
+ Addresses the problem where a frontend lock was observed, but no MPEG
+ transport data was received.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index ac72e7ed9fcc..c710c0176e07 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -349,6 +349,7 @@ static struct mt352_config cxusb_dee1601_config = {
+
+ static struct zl10353_config cxusb_zl10353_dee1601_config = {
+ .demod_address = 0x0f,
++ .parallel_ts = 1,
+ };
+
+ static struct mt352_config cxusb_mt352_config = {
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+index 953fb55d87b6..84abbaf362fb 100644
+--- a/drivers/media/dvb/frontends/zl10353.c
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -243,9 +243,12 @@ static int zl10353_init(struct dvb_frontend *fe)
+
+ if (debug_regs)
+ zl10353_dump_regs(fe);
++ if (state->config.parallel_ts)
++ zl10353_reset_attach[2] &= ~0x20;
+
+ /* Do a "hard" reset if not already done */
+- if (zl10353_read_register(state, 0x50) != 0x03) {
++ if (zl10353_read_register(state, 0x50) != zl10353_reset_attach[1] ||
++ zl10353_read_register(state, 0x51) != zl10353_reset_attach[2]) {
+ rc = zl10353_write(fe, zl10353_reset_attach,
+ sizeof(zl10353_reset_attach));
+ if (debug_regs)
+diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
+index 6aec655d8814..79a947215c4d 100644
+--- a/drivers/media/dvb/frontends/zl10353.h
++++ b/drivers/media/dvb/frontends/zl10353.h
+@@ -31,6 +31,9 @@ struct zl10353_config
+
+ /* set if no pll is connected to the secondary i2c bus */
+ int no_tuner;
++
++ /* set if parallel ts output is required */
++ int parallel_ts;
+ };
+
+ #if defined(CONFIG_DVB_ZL10353) || defined(CONFIG_DVB_ZL10353_MODULE)commit 47922e9c3f583adf05a23842ff98f3b0bf7eec6d
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Sat Aug 5 23:47:16 2006 -0300
+
+ V4L/DVB (4441): Flexcop/nxt200x attach fix
+
+ Address another case where the test in dvb-pll to see if a tuner's
+ PLL responds when attaching may fail.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+index 0c3bab37d8df..b8ba87863457 100644
+--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
++++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+@@ -527,7 +527,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
+ /* try the air atsc 2nd generation (nxt2002) */
+ if ((fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
+ fc->dev_type = FC_AIR_ATSC2;
+- dvb_attach(dvb_pll_attach, fc->fe, 0x61, &fc->i2c_adap, &dvb_pll_samsung_tbmv);
++ dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, &dvb_pll_samsung_tbmv);
+ info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
+ } else
+ /* try the air atsc 3nd generation (lgdt3303) */commit c162dff6437d5f66c272b1811074ee32c53d17b9
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Aug 8 15:48:08 2006 -0300
+
+ V4L/DVB (4436): Dvb-pll support for MT352/ZL10353 based tuners.
+
+ Typical wiring of MT352 and ZL10353 based tuners differs from dvb-pll's
+ expectation that the PLL is directly accessible. On these boards, the
+ PLL is actually hidden behind the demodulator, and as such can only be
+ accessed via the demodulator's interface. It was failing to communicate
+ with the PLL during an attach test and subsequently not connecting the
+ tuner ops.
+ By passing a NULL I2C bus handle to dvb_pll_attach, this accessibility
+ check can be bypassed. Do this for the affected boards. Also fix a
+ possible NULL dereference at sleep time, which would otherwise be
+ exposed by this change.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Acked-by: Andrew de Quincey <adq_dvb@lidskialf.net>
+ Acked-by: Manu Abraham <manu@linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
+index c92877baada2..b7e7108ee5b3 100644
+--- a/drivers/media/dvb/frontends/dvb-pll.c
++++ b/drivers/media/dvb/frontends/dvb-pll.c
+@@ -493,6 +493,9 @@ static int dvb_pll_sleep(struct dvb_frontend *fe)
+ int i;
+ int result;
+
++ if (priv->i2c == NULL)
++ return -EINVAL;
++
+ for (i = 0; i < priv->pll_desc->count; i++) {
+ if (priv->pll_desc->entries[i].limit == 0)
+ break;
+diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
+index 81654954c338..b39b3629f1d0 100644
+--- a/drivers/media/video/cx88/cx88-dvb.c
++++ b/drivers/media/video/cx88/cx88-dvb.c
+@@ -543,8 +543,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
+- &dev->core->i2c_adap,
+- &dvb_pll_thomson_dtt7579);
++ NULL, &dvb_pll_thomson_dtt7579);
+ break;
+ }
+ /* ZL10353 replaces MT352 on later cards */
+@@ -552,8 +551,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
+- &dev->core->i2c_adap,
+- &dvb_pll_thomson_dtt7579);
++ NULL, &dvb_pll_thomson_dtt7579);
+ }
+ break;
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
+@@ -563,8 +561,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+- &dev->core->i2c_adap,
+- &dvb_pll_thomson_dtt7579);
++ NULL, &dvb_pll_thomson_dtt7579);
+ break;
+ }
+ /* ZL10353 replaces MT352 on later cards */
+@@ -572,8 +569,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+- &dev->core->i2c_adap,
+- &dvb_pll_thomson_dtt7579);
++ NULL, &dvb_pll_thomson_dtt7579);
+ }
+ break;
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+@@ -581,8 +577,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+- &dev->core->i2c_adap,
+- &dvb_pll_lg_z201);
++ NULL, &dvb_pll_lg_z201);
+ }
+ break;
+ case CX88_BOARD_KWORLD_DVB_T:
+@@ -592,8 +587,7 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ if (dev->dvb.frontend != NULL) {
+ dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+- &dev->core->i2c_adap,
+- &dvb_pll_unknown_1);
++ NULL, &dvb_pll_unknown_1);
+ }
+ break;
+ case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:commit 69b27e3dfebff8f59e979d57263e1cd83c4d8370
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Feb 28 20:23:11 2006 -0300
+
+ V4L/DVB (3410): Move DViCO hybrid initialisation data from stack.
+
+ The init_data array is never changed and need not be on the stack.
+ Turn it into a static variable.
+
+ Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index d91e5b3a64ef..f655567a8ecd 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -1435,7 +1435,7 @@ static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core)
+ {
+ struct i2c_msg msg = { .addr = 0x45, .flags = 0 };
+ int i, err;
+- u8 init_bufs[13][5] = {
++ static u8 init_bufs[13][5] = {
+ { 0x10, 0x00, 0x20, 0x01, 0x03 },
+ { 0x10, 0x10, 0x01, 0x00, 0x21 },
+ { 0x10, 0x10, 0x10, 0x00, 0xCA },commit 780dfef37e2c941985b708f67aa0074edc922bea
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Feb 28 08:34:59 2006 -0300
+
+ V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support
+
+ Add support for the FE6600 tuner used on the DVB-T Hybrid board.
+ Add support for the Zarlink ZL10353 DVB-T demodulator, which supersedes the
+ MT352, used on the DViCO FusionHDTV DVB-T Hybrid and later model Plus boards.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
+index d852ad4f93a2..3b39a91b24bd 100644
+--- a/Documentation/video4linux/CARDLIST.cx88
++++ b/Documentation/video4linux/CARDLIST.cx88
+@@ -44,3 +44,4 @@
+ 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1]
+ 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]
+ 45 -> KWorld HardwareMpegTV XPert [17de:0840]
++ 46 -> DViCO FusionHDTV DVB-T Hybrid [18ac:db40,18ac:db44]
+diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
+index de48438d5115..ab344c94c0a2 100644
+--- a/Documentation/video4linux/CARDLIST.tuner
++++ b/Documentation/video4linux/CARDLIST.tuner
+@@ -70,3 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC dual in
+ tuner=69 - Tena TNF 5335 MF
+ tuner=70 - Samsung TCPN 2121P30A
+ tuner=71 - Xceive xc3028
++tuner=72 - FE6600
+diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
+index c676b1e23ab0..a1a894d81040 100644
+--- a/drivers/media/dvb/frontends/Kconfig
++++ b/drivers/media/dvb/frontends/Kconfig
+@@ -116,6 +116,12 @@ config DVB_MT352
+ help
+ A DVB-T tuner module. Say Y when you want to support this frontend.
+
++config DVB_ZL10353
++ tristate "Zarlink ZL10353 based"
++ depends on DVB_CORE
++ help
++ A DVB-T tuner module. Say Y when you want to support this frontend.
++
+ config DVB_DIB3000MB
+ tristate "DiBcom 3000M-B"
+ depends on DVB_CORE
+diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
+index 1af769cd90c0..d09b6071fbaf 100644
+--- a/drivers/media/dvb/frontends/Makefile
++++ b/drivers/media/dvb/frontends/Makefile
+@@ -20,6 +20,7 @@ obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o
+ obj-$(CONFIG_DVB_SP887X) += sp887x.o
+ obj-$(CONFIG_DVB_NXT6000) += nxt6000.o
+ obj-$(CONFIG_DVB_MT352) += mt352.o
++obj-$(CONFIG_DVB_ZL10353) += zl10353.o
+ obj-$(CONFIG_DVB_CX22702) += cx22702.o
+ obj-$(CONFIG_DVB_TDA10021) += tda10021.o
+ obj-$(CONFIG_DVB_STV0297) += stv0297.o
+diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
+index 4f682534df42..8a4c904d3a27 100644
+--- a/drivers/media/dvb/frontends/dvb-pll.c
++++ b/drivers/media/dvb/frontends/dvb-pll.c
+@@ -404,6 +404,21 @@ struct dvb_pll_desc dvb_pll_philips_td1316 = {
+ };
+ EXPORT_SYMBOL(dvb_pll_philips_td1316);
+
++/* FE6600 used on DViCO Hybrid */
++struct dvb_pll_desc dvb_pll_unknown_fe6600 = {
++ .name = "FE6600",
++ .min = 44250000,
++ .max = 858000000,
++ .count = 4,
++ .entries = {
++ { 250000000, 36213333, 166667, 0xb4, 0x12 },
++ { 455000000, 36213333, 166667, 0xfe, 0x11 },
++ { 775500000, 36213333, 166667, 0xbc, 0x18 },
++ { 999999999, 36213333, 166667, 0xf4, 0x18 },
++ }
++};
++EXPORT_SYMBOL(dvb_pll_unknown_fe6600);
++
+ /* ----------------------------------------------------------- */
+ /* code */
+
+diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
+index 56c3cd76a7fa..8a7f0b941c38 100644
+--- a/drivers/media/dvb/frontends/dvb-pll.h
++++ b/drivers/media/dvb/frontends/dvb-pll.h
+@@ -42,6 +42,8 @@ extern struct dvb_pll_desc dvb_pll_samsung_tbmv;
+ extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
+ extern struct dvb_pll_desc dvb_pll_philips_td1316;
+
++extern struct dvb_pll_desc dvb_pll_unknown_fe6600;
++
+ int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
+ u32 freq, int bandwidth);
+
+diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
+new file mode 100644
+index 000000000000..23846c4452ad
+--- /dev/null
++++ b/drivers/media/dvb/frontends/zl10353.c
+@@ -0,0 +1,311 @@
++/*
++ * Driver for Zarlink DVB-T ZL10353 demodulator
++ *
++ * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ *
++ * 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/kernel.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/string.h>
++#include <linux/slab.h>
++
++#include "dvb_frontend.h"
++#include "zl10353_priv.h"
++#include "zl10353.h"
++
++struct zl10353_state {
++ struct i2c_adapter *i2c;
++ struct dvb_frontend frontend;
++ struct dvb_frontend_ops ops;
++
++ struct zl10353_config config;
++};
++
++static int debug_regs = 0;
++
++static int zl10353_single_write(struct dvb_frontend *fe, u8 reg, u8 val)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ u8 buf[2] = { reg, val };
++ struct i2c_msg msg = { .addr = state->config.demod_address, .flags = 0,
++ .buf = buf, .len = 2 };
++ int err = i2c_transfer(state->i2c, &msg, 1);
++ if (err != 1) {
++ printk("zl10353: write to reg %x failed (err = %d)!\n", reg, err);
++ return err;
++ }
++ return 0;
++}
++
++int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen)
++{
++ int err, i;
++ for (i = 0; i < ilen - 1; i++)
++ if ((err = zl10353_single_write(fe, ibuf[0] + i, ibuf[i + 1])))
++ return err;
++
++ return 0;
++}
++
++static int zl10353_read_register(struct zl10353_state *state, u8 reg)
++{
++ int ret;
++ u8 b0[1] = { reg };
++ u8 b1[1] = { 0 };
++ struct i2c_msg msg[2] = { { .addr = state->config.demod_address,
++ .flags = 0,
++ .buf = b0, .len = 1 },
++ { .addr = state->config.demod_address,
++ .flags = I2C_M_RD,
++ .buf = b1, .len = 1 } };
++
++ ret = i2c_transfer(state->i2c, msg, 2);
++
++ if (ret != 2) {
++ printk("%s: readreg error (reg=%d, ret==%i)\n",
++ __FUNCTION__, reg, ret);
++ return ret;
++ }
++
++ return b1[0];
++}
++
++void zl10353_dump_regs(struct dvb_frontend *fe)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ char buf[52], buf2[4];
++ int ret;
++ u8 reg;
++
++ /* Dump all registers. */
++ for (reg = 0; ; reg++) {
++ if (reg % 16 == 0) {
++ if (reg)
++ printk(KERN_DEBUG "%s\n", buf);
++ sprintf(buf, "%02x: ", reg);
++ }
++ ret = zl10353_read_register(state, reg);
++ if (ret >= 0)
++ sprintf(buf2, "%02x ", (u8)ret);
++ else
++ strcpy(buf2, "-- ");
++ strcat(buf, buf2);
++ if (reg == 0xff)
++ break;
++ }
++ printk(KERN_DEBUG "%s\n", buf);
++}
++
++static int zl10353_sleep(struct dvb_frontend *fe)
++{
++ static u8 zl10353_softdown[] = { 0x50, 0x0C, 0x44 };
++
++ zl10353_write(fe, zl10353_softdown, sizeof(zl10353_softdown));
++ return 0;
++}
++
++static int zl10353_set_parameters(struct dvb_frontend *fe,
++ struct dvb_frontend_parameters *param)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ u8 pllbuf[6] = { 0x67 };
++
++ /* These settings set "auto-everything" and start the FSM. */
++ zl10353_single_write(fe, 0x55, 0x80);
++ udelay(200);
++ zl10353_single_write(fe, 0xEA, 0x01);
++ udelay(200);
++ zl10353_single_write(fe, 0xEA, 0x00);
++
++ zl10353_single_write(fe, 0x56, 0x28);
++ zl10353_single_write(fe, 0x89, 0x20);
++ zl10353_single_write(fe, 0x5E, 0x00);
++ zl10353_single_write(fe, 0x65, 0x5A);
++ zl10353_single_write(fe, 0x66, 0xE9);
++ zl10353_single_write(fe, 0x62, 0x0A);
++
++ state->config.pll_set(fe, param, pllbuf + 1);
++ zl10353_write(fe, pllbuf, sizeof(pllbuf));
++
++ zl10353_single_write(fe, 0x70, 0x01);
++ udelay(250);
++ zl10353_single_write(fe, 0xE4, 0x00);
++ zl10353_single_write(fe, 0xE5, 0x2A);
++ zl10353_single_write(fe, 0xE9, 0x02);
++ zl10353_single_write(fe, 0xE7, 0x40);
++ zl10353_single_write(fe, 0xE8, 0x10);
++
++ return 0;
++}
++
++static int zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ int s6, s7, s8;
++
++ if ((s6 = zl10353_read_register(state, STATUS_6)) < 0)
++ return -EREMOTEIO;
++ if ((s7 = zl10353_read_register(state, STATUS_7)) < 0)
++ return -EREMOTEIO;
++ if ((s8 = zl10353_read_register(state, STATUS_8)) < 0)
++ return -EREMOTEIO;
++
++ *status = 0;
++ if (s6 & (1 << 2))
++ *status |= FE_HAS_CARRIER;
++ if (s6 & (1 << 1))
++ *status |= FE_HAS_VITERBI;
++ if (s6 & (1 << 5))
++ *status |= FE_HAS_LOCK;
++ if (s7 & (1 << 4))
++ *status |= FE_HAS_SYNC;
++ if (s8 & (1 << 6))
++ *status |= FE_HAS_SIGNAL;
++
++ if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
++ (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
++ *status &= ~FE_HAS_LOCK;
++
++ return 0;
++}
++
++static int zl10353_read_snr(struct dvb_frontend *fe, u16 *snr)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ u8 _snr;
++
++ if (debug_regs)
++ zl10353_dump_regs(fe);
++
++ _snr = zl10353_read_register(state, SNR);
++ *snr = (_snr << 8) | _snr;
++
++ return 0;
++}
++
++static int zl10353_get_tune_settings(struct dvb_frontend *fe,
++ struct dvb_frontend_tune_settings
++ *fe_tune_settings)
++{
++ fe_tune_settings->min_delay_ms = 1000;
++ fe_tune_settings->step_size = 0;
++ fe_tune_settings->max_drift = 0;
++
++ return 0;
++}
++
++static int zl10353_init(struct dvb_frontend *fe)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++ u8 zl10353_reset_attach[6] = { 0x50, 0x03, 0x64, 0x46, 0x15, 0x0F };
++ int rc = 0;
++
++ if (debug_regs)
++ zl10353_dump_regs(fe);
++
++ /* Do a "hard" reset if not already done */
++ if (zl10353_read_register(state, 0x50) != 0x03) {
++ rc = zl10353_write(fe, zl10353_reset_attach,
++ sizeof(zl10353_reset_attach));
++ if (debug_regs)
++ zl10353_dump_regs(fe);
++ }
++
++ return 0;
++}
++
++static void zl10353_release(struct dvb_frontend *fe)
++{
++ struct zl10353_state *state = fe->demodulator_priv;
++
++ kfree(state);
++}
++
++static struct dvb_frontend_ops zl10353_ops;
++
++struct dvb_frontend *zl10353_attach(const struct zl10353_config *config,
++ struct i2c_adapter *i2c)
++{
++ struct zl10353_state *state = NULL;
++
++ /* allocate memory for the internal state */
++ state = kzalloc(sizeof(struct zl10353_state), GFP_KERNEL);
++ if (state == NULL)
++ goto error;
++
++ /* setup the state */
++ state->i2c = i2c;
++ memcpy(&state->config, config, sizeof(struct zl10353_config));
++ memcpy(&state->ops, &zl10353_ops, sizeof(struct dvb_frontend_ops));
++
++ /* check if the demod is there */
++ if (zl10353_read_register(state, CHIP_ID) != ID_ZL10353)
++ goto error;
++
++ /* create dvb_frontend */
++ state->frontend.ops = &state->ops;
++ state->frontend.demodulator_priv = state;
++
++ return &state->frontend;
++error:
++ kfree(state);
++ return NULL;
++}
++
++static struct dvb_frontend_ops zl10353_ops = {
++
++ .info = {
++ .name = "Zarlink ZL10353 DVB-T",
++ .type = FE_OFDM,
++ .frequency_min = 174000000,
++ .frequency_max = 862000000,
++ .frequency_stepsize = 166667,
++ .frequency_tolerance = 0,
++ .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
++ FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 |
++ FE_CAN_FEC_AUTO |
++ FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
++ FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
++ FE_CAN_HIERARCHY_AUTO | FE_CAN_RECOVER |
++ FE_CAN_MUTE_TS
++ },
++
++ .release = zl10353_release,
++
++ .init = zl10353_init,
++ .sleep = zl10353_sleep,
++
++ .set_frontend = zl10353_set_parameters,
++ .get_tune_settings = zl10353_get_tune_settings,
++
++ .read_status = zl10353_read_status,
++ .read_snr = zl10353_read_snr,
++};
++
++module_param(debug_regs, int, 0644);
++MODULE_PARM_DESC(debug_regs, "Turn on/off frontend register dumps (default:off).");
++
++MODULE_DESCRIPTION("Zarlink ZL10353 DVB-T demodulator driver");
++MODULE_AUTHOR("Chris Pascoe");
++MODULE_LICENSE("GPL");
++
++EXPORT_SYMBOL(zl10353_attach);
++EXPORT_SYMBOL(zl10353_write);
+diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
+new file mode 100644
+index 000000000000..5cc4ae718d8c
+--- /dev/null
++++ b/drivers/media/dvb/frontends/zl10353.h
+@@ -0,0 +1,43 @@
++/*
++ * Driver for Zarlink DVB-T ZL10353 demodulator
++ *
++ * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ *
++ * 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.=
++ */
++
++#ifndef ZL10353_H
++#define ZL10353_H
++
++#include <linux/dvb/frontend.h>
++
++struct zl10353_config
++{
++ /* demodulator's I2C address */
++ u8 demod_address;
++
++ /* function which configures the PLL buffer (for secondary I2C
++ * connected tuner) or tunes the PLL (for direct connected tuner) */
++ int (*pll_set)(struct dvb_frontend *fe,
++ struct dvb_frontend_parameters *params, u8 *pllbuf);
++};
++
++extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
++ struct i2c_adapter *i2c);
++
++extern int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen);
++
++#endif /* ZL10353_H */
+diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
+new file mode 100644
+index 000000000000..b72224bd7dde
+--- /dev/null
++++ b/drivers/media/dvb/frontends/zl10353_priv.h
+@@ -0,0 +1,42 @@
++/*
++ * Driver for Zarlink DVB-T ZL10353 demodulator
++ *
++ * Copyright (C) 2006 Christopher Pascoe <c.pascoe@itee.uq.edu.au>
++ *
++ * 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.=
++ */
++
++#ifndef _ZL10353_PRIV_
++#define _ZL10353_PRIV_
++
++#define ID_ZL10353 0x14
++
++enum zl10353_reg_addr {
++ INTERRUPT_0 = 0x00,
++ INTERRUPT_1 = 0x01,
++ INTERRUPT_2 = 0x02,
++ INTERRUPT_3 = 0x03,
++ INTERRUPT_4 = 0x04,
++ INTERRUPT_5 = 0x05,
++ STATUS_6 = 0x06,
++ STATUS_7 = 0x07,
++ STATUS_8 = 0x08,
++ STATUS_9 = 0x09,
++ SNR = 0x10,
++ CHIP_ID = 0x7F,
++};
++
++#endif /* _ZL10353_PRIV_ */
+diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile
+index 2b902784facc..6482b9aa6a1f 100644
+--- a/drivers/media/video/cx88/Makefile
++++ b/drivers/media/video/cx88/Makefile
+@@ -17,6 +17,7 @@ extra-cflags-$(CONFIG_DVB_CX22702) += -DHAVE_CX22702=1
+ extra-cflags-$(CONFIG_DVB_OR51132) += -DHAVE_OR51132=1
+ extra-cflags-$(CONFIG_DVB_LGDT330X) += -DHAVE_LGDT330X=1
+ extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1
++extra-cflags-$(CONFIG_DVB_ZL10353) += -DHAVE_ZL10353=1
+ extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1
+ extra-cflags-$(CONFIG_DVB_CX24123) += -DHAVE_CX24123=1
+ extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1
+diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
+index 44e27dc646ae..d91e5b3a64ef 100644
+--- a/drivers/media/video/cx88/cx88-cards.c
++++ b/drivers/media/video/cx88/cx88-cards.c
+@@ -1071,6 +1071,27 @@ struct cx88_board cx88_boards[] = {
+ .gpio2 = 0x00ff,
+ },
+ },
++ [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
++ .name = "DViCO FusionHDTV DVB-T Hybrid",
++ .tuner_type = TUNER_FE6600,
++ .radio_type = UNSET,
++ .tuner_addr = ADDR_UNSET,
++ .radio_addr = ADDR_UNSET,
++ .input = {{
++ .type = CX88_VMUX_TELEVISION,
++ .vmux = 0,
++ .gpio0 = 0x0000a75f,
++ },{
++ .type = CX88_VMUX_COMPOSITE1,
++ .vmux = 1,
++ .gpio0 = 0x0000a75b,
++ },{
++ .type = CX88_VMUX_SVIDEO,
++ .vmux = 2,
++ .gpio0 = 0x0000a75b,
++ }},
++ .dvb = 1,
++ },
+
+ };
+ const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
+@@ -1281,6 +1302,14 @@ struct cx88_subid cx88_subids[] = {
+ .subvendor = 0x17de,
+ .subdevice = 0x0840,
+ .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT,
++ },{
++ .subvendor = 0x18ac,
++ .subdevice = 0xdb40,
++ .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,
++ },{
++ .subvendor = 0x18ac,
++ .subdevice = 0xdb44,
++ .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID,
+ },
+ };
+ const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
+@@ -1399,6 +1428,40 @@ static void gdi_eeprom(struct cx88_core *core, u8 *eeprom_data)
+ core->has_radio = gdi_tuner[eeprom_data[0x0d]].fm;
+ }
+
++/* ----------------------------------------------------------------------- */
++/* some DViCO specific stuff */
++
++static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core)
++{
++ struct i2c_msg msg = { .addr = 0x45, .flags = 0 };
++ int i, err;
++ u8 init_bufs[13][5] = {
++ { 0x10, 0x00, 0x20, 0x01, 0x03 },
++ { 0x10, 0x10, 0x01, 0x00, 0x21 },
++ { 0x10, 0x10, 0x10, 0x00, 0xCA },
++ { 0x10, 0x10, 0x12, 0x00, 0x08 },
++ { 0x10, 0x10, 0x13, 0x00, 0x0A },
++ { 0x10, 0x10, 0x16, 0x01, 0xC0 },
++ { 0x10, 0x10, 0x22, 0x01, 0x3D },
++ { 0x10, 0x10, 0x73, 0x01, 0x2E },
++ { 0x10, 0x10, 0x72, 0x00, 0xC5 },
++ { 0x10, 0x10, 0x71, 0x01, 0x97 },
++ { 0x10, 0x10, 0x70, 0x00, 0x0F },
++ { 0x10, 0x10, 0xB0, 0x00, 0x01 },
++ { 0x03, 0x0C },
++ };
++
++ for (i = 0; i < 13; i++) {
++ msg.buf = init_bufs[i];
++ msg.len = (i != 12 ? 5 : 2);
++ err = i2c_transfer(&core->i2c_adap, &msg, 1);
++ if (err != 1) {
++ printk("dvico_fusionhdtv_hybrid_init buf %d failed (err = %d)!\n", i, err);
++ return;
++ }
++ }
++}
++
+ /* ----------------------------------------------------------------------- */
+
+ void cx88_card_list(struct cx88_core *core, struct pci_dev *pci)
+@@ -1465,11 +1528,15 @@ void cx88_card_setup(struct cx88_core *core)
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
+ /* GPIO0:0 is hooked to mt352 reset pin */
+ cx_set(MO_GP0_IO, 0x00000101);
+ cx_clear(MO_GP0_IO, 0x00000001);
+ msleep(1);
+ cx_set(MO_GP0_IO, 0x00000101);
++ if (0 == core->i2c_rc &&
++ core->board == CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID)
++ dvico_fusionhdtv_hybrid_init(core);
+ break;
+ case CX88_BOARD_KWORLD_DVB_T:
+ case CX88_BOARD_DNTV_LIVE_DVB_T:
+diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
+index e48aa3f6e500..2c97d3f7101a 100644
+--- a/drivers/media/video/cx88/cx88-dvb.c
++++ b/drivers/media/video/cx88/cx88-dvb.c
+@@ -40,6 +40,9 @@
+ # include "cx88-vp3054-i2c.h"
+ # endif
+ #endif
++#ifdef HAVE_ZL10353
++# include "zl10353.h"
++#endif
+ #ifdef HAVE_CX22702
+ # include "cx22702.h"
+ #endif
+@@ -111,6 +114,21 @@ static struct videobuf_queue_ops dvb_qops = {
+
+ /* ------------------------------------------------------------------ */
+
++#if defined(HAVE_MT352) || defined(HAVE_ZL10353)
++static int zarlink_pll_set(struct dvb_frontend *fe,
++ struct dvb_frontend_parameters *params,
++ u8 *pllbuf)
++{
++ struct cx8802_dev *dev = fe->dvb->priv;
++
++ pllbuf[0] = dev->core->pll_addr << 1;
++ dvb_pll_configure(dev->core->pll_desc, pllbuf + 1,
++ params->frequency,
++ params->u.ofdm.bandwidth);
++ return 0;
++}
++#endif
++
+ #ifdef HAVE_MT352
+ static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
+ {
+@@ -176,35 +194,22 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
+ return 0;
+ }
+
+-static int mt352_pll_set(struct dvb_frontend* fe,
+- struct dvb_frontend_parameters* params,
+- u8* pllbuf)
+-{
+- struct cx8802_dev *dev= fe->dvb->priv;
+-
+- pllbuf[0] = dev->core->pll_addr << 1;
+- dvb_pll_configure(dev->core->pll_desc, pllbuf+1,
+- params->frequency,
+- params->u.ofdm.bandwidth);
+- return 0;
+-}
+-
+ static struct mt352_config dvico_fusionhdtv = {
+ .demod_address = 0x0F,
+ .demod_init = dvico_fusionhdtv_demod_init,
+- .pll_set = mt352_pll_set,
++ .pll_set = zarlink_pll_set,
+ };
+
+ static struct mt352_config dntv_live_dvbt_config = {
+ .demod_address = 0x0f,
+ .demod_init = dntv_live_dvbt_demod_init,
+- .pll_set = mt352_pll_set,
++ .pll_set = zarlink_pll_set,
+ };
+
+ static struct mt352_config dvico_fusionhdtv_dual = {
+ .demod_address = 0x0F,
+ .demod_init = dvico_dual_demod_init,
+- .pll_set = mt352_pll_set,
++ .pll_set = zarlink_pll_set,
+ };
+
+ #ifdef HAVE_VP3054_I2C
+@@ -294,6 +299,46 @@ static struct mt352_config dntv_live_dvbt_pro_config = {
+ #endif
+ #endif
+
++#ifdef HAVE_ZL10353
++static int dvico_hybrid_tune_pll(struct dvb_frontend *fe,
++ struct dvb_frontend_parameters *params,
++ u8 *pllbuf)
++{
++ struct cx8802_dev *dev= fe->dvb->priv;
++ struct i2c_msg msg =
++ { .addr = dev->core->pll_addr, .flags = 0,
++ .buf = pllbuf + 1, .len = 4 };
++ int err;
++
++ pllbuf[0] = dev->core->pll_addr << 1;
++ dvb_pll_configure(dev->core->pll_desc, pllbuf + 1,
++ params->frequency,
++ params->u.ofdm.bandwidth);
++
++ if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
++ printk(KERN_WARNING "cx88-dvb: %s error "
++ "(addr %02x <- %02x, err = %i)\n",
++ __FUNCTION__, pllbuf[0], pllbuf[1], err);
++ if (err < 0)
++ return err;
++ else
++ return -EREMOTEIO;
++ }
++
++ return 0;
++}
++
++static struct zl10353_config dvico_fusionhdtv_hybrid = {
++ .demod_address = 0x0F,
++ .pll_set = dvico_hybrid_tune_pll,
++};
++
++static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
++ .demod_address = 0x0F,
++ .pll_set = zarlink_pll_set,
++};
++#endif
++
+ #ifdef HAVE_CX22702
+ static struct cx22702_config connexant_refboard_config = {
+ .demod_address = 0x43,
+@@ -500,16 +545,27 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ break;
+ #endif
++#if defined(HAVE_MT352) || defined(HAVE_ZL10353)
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
++ dev->core->pll_addr = 0x60;
++ dev->core->pll_desc = &dvb_pll_thomson_dtt7579;
+ #ifdef HAVE_MT352
+- case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+- dev->core->pll_addr = 0x61;
+- dev->core->pll_desc = &dvb_pll_lg_z201;
+ dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
+ &dev->core->i2c_adap);
++ if (dev->dvb.frontend != NULL)
++ break;
++#endif
++#ifdef HAVE_ZL10353
++ /* ZL10353 replaces MT352 on later cards */
++ dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
++ &dev->core->i2c_adap);
++#endif
+ break;
+- case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+- dev->core->pll_addr = 0x60;
+- dev->core->pll_desc = &dvb_pll_thomson_dtt7579;
++#endif /* HAVE_MT352 || HAVE_ZL10353 */
++#ifdef HAVE_MT352
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
++ dev->core->pll_addr = 0x61;
++ dev->core->pll_desc = &dvb_pll_lg_z201;
+ dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
+ &dev->core->i2c_adap);
+ break;
+@@ -540,6 +596,14 @@ static int dvb_register(struct cx8802_dev *dev)
+ &dev->core->i2c_adap);
+ break;
+ #endif
++#ifdef HAVE_ZL10353
++ case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
++ dev->core->pll_addr = 0x61;
++ dev->core->pll_desc = &dvb_pll_unknown_fe6600;
++ dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
++ &dev->core->i2c_adap);
++ break;
++#endif
+ #ifdef HAVE_OR51132
+ case CX88_BOARD_PCHDTV_HD3000:
+ dev->dvb.frontend = or51132_attach(&pchdtv_hd3000,
+diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
+index a4cf2473eacf..21738b664bc9 100644
+--- a/drivers/media/video/cx88/cx88.h
++++ b/drivers/media/video/cx88/cx88.h
+@@ -189,6 +189,7 @@ extern struct sram_channel cx88_sram_channels[];
+ #define CX88_BOARD_KWORLD_DVB_T_CX22702 43
+ #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44
+ #define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45
++#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46
+
+ enum cx88_itype {
+ CX88_VMUX_COMPOSITE1 = 1,
+diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
+index 15761dd8607d..d10cfd400f2b 100644
+--- a/drivers/media/video/tuner-types.c
++++ b/drivers/media/video/tuner-types.c
+@@ -983,6 +983,22 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
+ },
+ };
+
++/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */
++
++static struct tuner_range tuner_fe6600_ranges[] = {
++ { 16 * 160.00 /*MHz*/, 0xfe, 0x11, },
++ { 16 * 442.00 /*MHz*/, 0xf6, 0x12, },
++ { 16 * 999.99 , 0xf6, 0x18, },
++};
++
++static struct tuner_params tuner_fe6600_params[] = {
++ {
++ .type = TUNER_PARAM_TYPE_PAL,
++ .ranges = tuner_fe6600_ranges,
++ .count = ARRAY_SIZE(tuner_fe6600_ranges),
++ },
++};
++
+ /* --------------------------------------------------------------------- */
+
+ struct tunertype tuners[] = {
+@@ -1354,6 +1370,10 @@ struct tunertype tuners[] = {
+ .name = "Xceive xc3028",
+ /* see xc3028.c for details */
+ },
++ [TUNER_FE6600] = { /* */
++ .name = "FE6600",
++ .params = tuner_fe6600_params,
++ },
+ };
+
+ unsigned const int tuner_count = ARRAY_SIZE(tuners);
+diff --git a/include/media/tuner.h b/include/media/tuner.h
+index f51759c0d180..039c77e02d34 100644
+--- a/include/media/tuner.h
++++ b/include/media/tuner.h
+@@ -116,9 +116,10 @@
+ #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */
+ #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */
+ #define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */
+-
+ #define TUNER_XCEIVE_XC3028 71
+
++#define TUNER_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
++
+ /* tv card specific */
+ #define TDA9887_PRESENT (1<<0)
+ #define TDA9887_PORT1_INACTIVE (1<<1)commit 4055d392aa0256462758b40cedb9eb7d564de93a
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Feb 7 06:49:11 2006 -0200
+
+ V4L/DVB (3308): Use parallel transport for FusionHDTV Dual Digital USB
+
+ Use the parallel transport function of the MT352 in USB demodulator of the
+ Dual Digital board.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index f14003736afe..650536a4169c 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -234,7 +234,7 @@ static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {
+
+ static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
+ {
+- static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x38 };
++ static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x28 };
+ static u8 reset [] = { RESET, 0x80 };
+ static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 };
+ static u8 agc_cfg [] = { AGC_TARGET, 0x28, 0x20 };commit d9ed881c66525ac0d95fbf76a46187a5de43be2d
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Tue Feb 7 06:49:11 2006 -0200
+
+ V4L/DVB (3308): Use parallel transport for FusionHDTV Dual Digital USB
+
+ Use the parallel transport function of the MT352 in USB demodulator of the
+ Dual Digital board.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
+index f14003736afe..650536a4169c 100644
+--- a/drivers/media/dvb/dvb-usb/cxusb.c
++++ b/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -234,7 +234,7 @@ static struct dvb_usb_rc_key dvico_mce_rc_keys[] = {
+
+ static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
+ {
+- static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x38 };
++ static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x28 };
+ static u8 reset [] = { RESET, 0x80 };
+ static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 };
+ static u8 agc_cfg [] = { AGC_TARGET, 0x28, 0x20 };commit 30367bfda384ccb96c0fe35aaa001c7624e9fd01
+Author: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+Date: Wed Jan 11 19:40:01 2006 -0200
+
+ V4L/DVB (3339): Activate remote control on HVR1100
+
+
+ - Add a missing case which was preventing the operation of the HVR1100
+ remote.
+
+ Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
+diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
+index 286c85b6bdf9..da2ad5c4b553 100644
+--- a/drivers/media/video/cx88/cx88-input.c
++++ b/drivers/media/video/cx88/cx88-input.c
+@@ -697,6 +697,7 @@ void cx88_ir_irq(struct cx88_core *core)
+ case CX88_BOARD_HAUPPAUGE_DVB_T1:
+ case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
+ case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
++ case CX88_BOARD_HAUPPAUGE_HVR1100:
+ ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+ ir_dprintk("biphase decoded: %x\n", ircode);
+ if ((ircode & 0xfffff000) != 0x3000)
+