]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Nov 2019 22:32:05 +0000 (23:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Nov 2019 22:32:05 +0000 (23:32 +0100)
added patches:
apparmor-fix-module-parameters-can-be-changed-after-policy-is-locked.patch
apparmor-fix-uninitialized-lsm_audit-member.patch
apparmor-fix-update-the-mtime-of-the-profile-file-on-replacement.patch
block-introduce-blk_rq_is_passthrough.patch
fbdev-ditch-fb_edid_add_monspecs.patch
fbdev-remove-unused-sh-mobile-hdmi-driver.patch
kprobes-x86-prohibit-probing-on-exception-masking-instructions.patch
libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch
uprobes-x86-prohibit-probing-on-mov-ss-instruction.patch
x86-atomic-fix-smp_mb__-before-after-_atomic.patch

queue-4.4/apparmor-fix-module-parameters-can-be-changed-after-policy-is-locked.patch [new file with mode: 0644]
queue-4.4/apparmor-fix-uninitialized-lsm_audit-member.patch [new file with mode: 0644]
queue-4.4/apparmor-fix-update-the-mtime-of-the-profile-file-on-replacement.patch [new file with mode: 0644]
queue-4.4/block-introduce-blk_rq_is_passthrough.patch [new file with mode: 0644]
queue-4.4/fbdev-ditch-fb_edid_add_monspecs.patch [new file with mode: 0644]
queue-4.4/fbdev-remove-unused-sh-mobile-hdmi-driver.patch [new file with mode: 0644]
queue-4.4/kprobes-x86-prohibit-probing-on-exception-masking-instructions.patch [new file with mode: 0644]
queue-4.4/libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch [new file with mode: 0644]
queue-4.4/series
queue-4.4/uprobes-x86-prohibit-probing-on-mov-ss-instruction.patch [new file with mode: 0644]
queue-4.4/x86-atomic-fix-smp_mb__-before-after-_atomic.patch [new file with mode: 0644]

diff --git a/queue-4.4/apparmor-fix-module-parameters-can-be-changed-after-policy-is-locked.patch b/queue-4.4/apparmor-fix-module-parameters-can-be-changed-after-policy-is-locked.patch
new file mode 100644 (file)
index 0000000..f8bbe53
--- /dev/null
@@ -0,0 +1,158 @@
+From 58acf9d911c8831156634a44d0b022d683e1e50c Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Wed, 22 Jun 2016 18:01:08 -0700
+Subject: apparmor: fix module parameters can be changed after policy is locked
+
+From: John Johansen <john.johansen@canonical.com>
+
+commit 58acf9d911c8831156634a44d0b022d683e1e50c upstream.
+
+the policy_lock parameter is a one way switch that prevents policy
+from being further modified. Unfortunately some of the module parameters
+can effectively modify policy by turning off enforcement.
+
+split policy_admin_capable into a view check and a full admin check,
+and update the admin check to test the policy_lock parameter.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/apparmor/include/policy.h |    2 ++
+ security/apparmor/lsm.c            |   22 ++++++++++------------
+ security/apparmor/policy.c         |   18 +++++++++++++++++-
+ 3 files changed, 29 insertions(+), 13 deletions(-)
+
+--- a/security/apparmor/include/policy.h
++++ b/security/apparmor/include/policy.h
+@@ -403,6 +403,8 @@ static inline int AUDIT_MODE(struct aa_p
+       return profile->audit;
+ }
++bool policy_view_capable(void);
++bool policy_admin_capable(void);
+ bool aa_may_manage_policy(int op);
+ #endif /* __AA_POLICY_H */
+--- a/security/apparmor/lsm.c
++++ b/security/apparmor/lsm.c
+@@ -749,51 +749,49 @@ __setup("apparmor=", apparmor_enabled_se
+ /* set global flag turning off the ability to load policy */
+ static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+-      if (aa_g_lock_policy)
+-              return -EACCES;
+       return param_set_bool(val, kp);
+ }
+ static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_view_capable())
+               return -EPERM;
+       return param_get_bool(buffer, kp);
+ }
+ static int param_set_aabool(const char *val, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+       return param_set_bool(val, kp);
+ }
+ static int param_get_aabool(char *buffer, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_view_capable())
+               return -EPERM;
+       return param_get_bool(buffer, kp);
+ }
+ static int param_set_aauint(const char *val, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+       return param_set_uint(val, kp);
+ }
+ static int param_get_aauint(char *buffer, const struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_view_capable())
+               return -EPERM;
+       return param_get_uint(buffer, kp);
+ }
+ static int param_get_audit(char *buffer, struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_view_capable())
+               return -EPERM;
+       if (!apparmor_enabled)
+@@ -805,7 +803,7 @@ static int param_get_audit(char *buffer,
+ static int param_set_audit(const char *val, struct kernel_param *kp)
+ {
+       int i;
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+       if (!apparmor_enabled)
+@@ -826,7 +824,7 @@ static int param_set_audit(const char *v
+ static int param_get_mode(char *buffer, struct kernel_param *kp)
+ {
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+       if (!apparmor_enabled)
+@@ -838,7 +836,7 @@ static int param_get_mode(char *buffer,
+ static int param_set_mode(const char *val, struct kernel_param *kp)
+ {
+       int i;
+-      if (!capable(CAP_MAC_ADMIN))
++      if (!policy_admin_capable())
+               return -EPERM;
+       if (!apparmor_enabled)
+--- a/security/apparmor/policy.c
++++ b/security/apparmor/policy.c
+@@ -916,6 +916,22 @@ static int audit_policy(int op, gfp_t gf
+                       &sa, NULL);
+ }
++bool policy_view_capable(void)
++{
++      struct user_namespace *user_ns = current_user_ns();
++      bool response = false;
++
++      if (ns_capable(user_ns, CAP_MAC_ADMIN))
++              response = true;
++
++      return response;
++}
++
++bool policy_admin_capable(void)
++{
++      return policy_view_capable() && !aa_g_lock_policy;
++}
++
+ /**
+  * aa_may_manage_policy - can the current task manage policy
+  * @op: the policy manipulation operation being done
+@@ -930,7 +946,7 @@ bool aa_may_manage_policy(int op)
+               return 0;
+       }
+-      if (!capable(CAP_MAC_ADMIN)) {
++      if (!policy_admin_capable()) {
+               audit_policy(op, GFP_KERNEL, NULL, "not policy admin", -EACCES);
+               return 0;
+       }
diff --git a/queue-4.4/apparmor-fix-uninitialized-lsm_audit-member.patch b/queue-4.4/apparmor-fix-uninitialized-lsm_audit-member.patch
new file mode 100644 (file)
index 0000000..fd9cd87
--- /dev/null
@@ -0,0 +1,86 @@
+From b6b1b81b3afba922505b57f4c812bba022f7c4a9 Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Sun, 8 Jun 2014 11:20:54 -0700
+Subject: apparmor: fix uninitialized lsm_audit member
+
+From: John Johansen <john.johansen@canonical.com>
+
+commit b6b1b81b3afba922505b57f4c812bba022f7c4a9 upstream.
+
+BugLink: http://bugs.launchpad.net/bugs/1268727
+
+The task field in the lsm_audit struct needs to be initialized if
+a change_hat fails, otherwise the following oops will occur
+
+BUG: unable to handle kernel paging request at 0000002fbead7d08
+IP: [<ffffffff8171153e>] _raw_spin_lock+0xe/0x50
+PGD 1e3f35067 PUD 0
+Oops: 0002 [#1] SMP
+Modules linked in: pppox crc_ccitt p8023 p8022 psnap llc ax25 btrfs raid6_pq xor xfs libcrc32c dm_multipath scsi_dh kvm_amd dcdbas kvm microcode amd64_edac_mod joydev edac_core psmouse edac_mce_amd serio_raw k10temp sp5100_tco i2c_piix4 ipmi_si ipmi_msghandler acpi_power_meter mac_hid lp parport hid_generic usbhid hid pata_acpi mpt2sas ahci raid_class pata_atiixp bnx2 libahci scsi_transport_sas [last unloaded: tipc]
+CPU: 2 PID: 699 Comm: changehat_twice Tainted: GF          O 3.13.0-7-generic #25-Ubuntu
+Hardware name: Dell Inc. PowerEdge R415/08WNM9, BIOS 1.8.6 12/06/2011
+task: ffff8802135c6000 ti: ffff880212986000 task.ti: ffff880212986000
+RIP: 0010:[<ffffffff8171153e>]  [<ffffffff8171153e>] _raw_spin_lock+0xe/0x50
+RSP: 0018:ffff880212987b68  EFLAGS: 00010006
+RAX: 0000000000020000 RBX: 0000002fbead7500 RCX: 0000000000000000
+RDX: 0000000000000292 RSI: ffff880212987ba8 RDI: 0000002fbead7d08
+RBP: ffff880212987b68 R08: 0000000000000246 R09: ffff880216e572a0
+R10: ffffffff815fd677 R11: ffffea0008469580 R12: ffffffff8130966f
+R13: ffff880212987ba8 R14: 0000002fbead7d08 R15: ffff8800d8c6b830
+FS:  00002b5e6c84e7c0(0000) GS:ffff880216e40000(0000) knlGS:0000000055731700
+CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+CR2: 0000002fbead7d08 CR3: 000000021270f000 CR4: 00000000000006e0
+Stack:
+ ffff880212987b98 ffffffff81075f17 ffffffff8130966f 0000000000000009
+ 0000000000000000 0000000000000000 ffff880212987bd0 ffffffff81075f7c
+ 0000000000000292 ffff880212987c08 ffff8800d8c6b800 0000000000000026
+Call Trace:
+ [<ffffffff81075f17>] __lock_task_sighand+0x47/0x80
+ [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50
+ [<ffffffff81075f7c>] do_send_sig_info+0x2c/0x80
+ [<ffffffff81075fee>] send_sig_info+0x1e/0x30
+ [<ffffffff8130242d>] aa_audit+0x13d/0x190
+ [<ffffffff8130c1dc>] aa_audit_file+0xbc/0x130
+ [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50
+ [<ffffffff81304cc2>] aa_change_hat+0x202/0x530
+ [<ffffffff81308fc6>] aa_setprocattr_changehat+0x116/0x1d0
+ [<ffffffff8130a11d>] apparmor_setprocattr+0x25d/0x300
+ [<ffffffff812cee56>] security_setprocattr+0x16/0x20
+ [<ffffffff8121fc87>] proc_pid_attr_write+0x107/0x130
+ [<ffffffff811b7604>] vfs_write+0xb4/0x1f0
+ [<ffffffff811b8039>] SyS_write+0x49/0xa0
+ [<ffffffff8171a1bf>] tracesys+0xe1/0xe6
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Seth Arnold <seth.arnold@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/apparmor/audit.c |    3 ++-
+ security/apparmor/file.c  |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/security/apparmor/audit.c
++++ b/security/apparmor/audit.c
+@@ -200,7 +200,8 @@ int aa_audit(int type, struct aa_profile
+       if (sa->aad->type == AUDIT_APPARMOR_KILL)
+               (void)send_sig_info(SIGKILL, NULL,
+-                                  sa->u.tsk ?  sa->u.tsk : current);
++                      sa->type == LSM_AUDIT_DATA_TASK && sa->u.tsk ?
++                                  sa->u.tsk : current);
+       if (sa->aad->type == AUDIT_APPARMOR_ALLOWED)
+               return complain_error(sa->aad->error);
+--- a/security/apparmor/file.c
++++ b/security/apparmor/file.c
+@@ -110,7 +110,8 @@ int aa_audit_file(struct aa_profile *pro
+       int type = AUDIT_APPARMOR_AUTO;
+       struct common_audit_data sa;
+       struct apparmor_audit_data aad = {0,};
+-      sa.type = LSM_AUDIT_DATA_NONE;
++      sa.type = LSM_AUDIT_DATA_TASK;
++      sa.u.tsk = NULL;
+       sa.aad = &aad;
+       aad.op = op,
+       aad.fs.request = request;
diff --git a/queue-4.4/apparmor-fix-update-the-mtime-of-the-profile-file-on-replacement.patch b/queue-4.4/apparmor-fix-update-the-mtime-of-the-profile-file-on-replacement.patch
new file mode 100644 (file)
index 0000000..8940f51
--- /dev/null
@@ -0,0 +1,28 @@
+From d671e890205a663429da74e1972e652bea4d73ab Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Fri, 25 Jul 2014 04:01:56 -0700
+Subject: apparmor: fix update the mtime of the profile file on replacement
+
+From: John Johansen <john.johansen@canonical.com>
+
+commit d671e890205a663429da74e1972e652bea4d73ab upstream.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Seth Arnold <seth.arnold@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/apparmor/apparmorfs.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -380,6 +380,8 @@ void __aa_fs_profile_migrate_dents(struc
+       for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
+               new->dents[i] = old->dents[i];
++              if (new->dents[i])
++                      new->dents[i]->d_inode->i_mtime = CURRENT_TIME;
+               old->dents[i] = NULL;
+       }
+ }
diff --git a/queue-4.4/block-introduce-blk_rq_is_passthrough.patch b/queue-4.4/block-introduce-blk_rq_is_passthrough.patch
new file mode 100644 (file)
index 0000000..6f3e27c
--- /dev/null
@@ -0,0 +1,69 @@
+From 57292b58ddb58689e8c3b4c6eadbef10d9ca44dd Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Tue, 31 Jan 2017 16:57:29 +0100
+Subject: block: introduce blk_rq_is_passthrough
+
+From: Christoph Hellwig <hch@lst.de>
+
+commit 57292b58ddb58689e8c3b4c6eadbef10d9ca44dd upstream.
+
+This can be used to check for fs vs non-fs requests and basically
+removes all knowledge of BLOCK_PC specific from the block layer,
+as well as preparing for removing the cmd_type field in struct request.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+[only take the blkdev.h changes as we only want the function for backported
+patches - gregkh]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/blkdev.h |   16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -199,6 +199,11 @@ struct request {
+       struct request *next_rq;
+ };
++static inline bool blk_rq_is_passthrough(struct request *rq)
++{
++      return rq->cmd_type != REQ_TYPE_FS;
++}
++
+ static inline unsigned short req_get_ioprio(struct request *req)
+ {
+       return req->ioprio;
+@@ -582,9 +587,10 @@ static inline void queue_flag_clear(unsi
+       ((rq)->cmd_flags & (REQ_FAILFAST_DEV|REQ_FAILFAST_TRANSPORT| \
+                            REQ_FAILFAST_DRIVER))
+-#define blk_account_rq(rq) \
+-      (((rq)->cmd_flags & REQ_STARTED) && \
+-       ((rq)->cmd_type == REQ_TYPE_FS))
++static inline bool blk_account_rq(struct request *rq)
++{
++      return (rq->cmd_flags & REQ_STARTED) && !blk_rq_is_passthrough(rq);
++}
+ #define blk_rq_cpu_valid(rq)  ((rq)->cpu != -1)
+ #define blk_bidi_rq(rq)               ((rq)->next_rq != NULL)
+@@ -645,7 +651,7 @@ static inline void blk_clear_rl_full(str
+ static inline bool rq_mergeable(struct request *rq)
+ {
+-      if (rq->cmd_type != REQ_TYPE_FS)
++      if (blk_rq_is_passthrough(rq))
+               return false;
+       if (rq->cmd_flags & REQ_NOMERGE_FLAGS)
+@@ -890,7 +896,7 @@ static inline unsigned int blk_rq_get_ma
+ {
+       struct request_queue *q = rq->q;
+-      if (unlikely(rq->cmd_type != REQ_TYPE_FS))
++      if (blk_rq_is_passthrough(rq))
+               return q->limits.max_hw_sectors;
+       if (!q->limits.chunk_sectors || (rq->cmd_flags & REQ_DISCARD))
diff --git a/queue-4.4/fbdev-ditch-fb_edid_add_monspecs.patch b/queue-4.4/fbdev-ditch-fb_edid_add_monspecs.patch
new file mode 100644 (file)
index 0000000..681b841
--- /dev/null
@@ -0,0 +1,237 @@
+From 3b8720e63f4a1fc6f422a49ecbaa3b59c86d5aaf Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Sun, 21 Jul 2019 22:19:56 +0200
+Subject: fbdev: Ditch fb_edid_add_monspecs
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 3b8720e63f4a1fc6f422a49ecbaa3b59c86d5aaf upstream.
+
+It's dead code ever since
+
+commit 34280340b1dc74c521e636f45cd728f9abf56ee2
+Author: Geert Uytterhoeven <geert+renesas@glider.be>
+Date:   Fri Dec 4 17:01:43 2015 +0100
+
+    fbdev: Remove unused SH-Mobile HDMI driver
+
+Also with this gone we can remove the cea_modes db. This entire thing
+is massively incomplete anyway, compared to the CEA parsing that
+drm_edid.c does.
+
+Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Tavis Ormandy <taviso@gmail.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
+Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190721201956.941-1-daniel.vetter@ffwll.ch
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/fbdev/core/fbmon.c  |   95 --------------------------------------
+ drivers/video/fbdev/core/modedb.c |   57 ----------------------
+ include/linux/fb.h                |    3 -
+ 3 files changed, 155 deletions(-)
+
+--- a/drivers/video/fbdev/core/fbmon.c
++++ b/drivers/video/fbdev/core/fbmon.c
+@@ -997,97 +997,6 @@ void fb_edid_to_monspecs(unsigned char *
+       DPRINTK("========================================\n");
+ }
+-/**
+- * fb_edid_add_monspecs() - add monitor video modes from E-EDID data
+- * @edid:     128 byte array with an E-EDID block
+- * @spacs:    monitor specs to be extended
+- */
+-void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
+-{
+-      unsigned char *block;
+-      struct fb_videomode *m;
+-      int num = 0, i;
+-      u8 svd[64], edt[(128 - 4) / DETAILED_TIMING_DESCRIPTION_SIZE];
+-      u8 pos = 4, svd_n = 0;
+-
+-      if (!edid)
+-              return;
+-
+-      if (!edid_checksum(edid))
+-              return;
+-
+-      if (edid[0] != 0x2 ||
+-          edid[2] < 4 || edid[2] > 128 - DETAILED_TIMING_DESCRIPTION_SIZE)
+-              return;
+-
+-      DPRINTK("  Short Video Descriptors\n");
+-
+-      while (pos < edid[2]) {
+-              u8 len = edid[pos] & 0x1f, type = (edid[pos] >> 5) & 7;
+-              pr_debug("Data block %u of %u bytes\n", type, len);
+-              if (type == 2) {
+-                      for (i = pos; i < pos + len; i++) {
+-                              u8 idx = edid[pos + i] & 0x7f;
+-                              svd[svd_n++] = idx;
+-                              pr_debug("N%sative mode #%d\n",
+-                                       edid[pos + i] & 0x80 ? "" : "on-n", idx);
+-                      }
+-              } else if (type == 3 && len >= 3) {
+-                      /* Check Vendor Specific Data Block.  For HDMI,
+-                         it is always 00-0C-03 for HDMI Licensing, LLC. */
+-                      if (edid[pos + 1] == 3 && edid[pos + 2] == 0xc &&
+-                          edid[pos + 3] == 0)
+-                              specs->misc |= FB_MISC_HDMI;
+-              }
+-              pos += len + 1;
+-      }
+-
+-      block = edid + edid[2];
+-
+-      DPRINTK("  Extended Detailed Timings\n");
+-
+-      for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE;
+-           i++, block += DETAILED_TIMING_DESCRIPTION_SIZE)
+-              if (PIXEL_CLOCK)
+-                      edt[num++] = block - edid;
+-
+-      /* Yikes, EDID data is totally useless */
+-      if (!(num + svd_n))
+-              return;
+-
+-      m = kzalloc((specs->modedb_len + num + svd_n) *
+-                     sizeof(struct fb_videomode), GFP_KERNEL);
+-
+-      if (!m)
+-              return;
+-
+-      memcpy(m, specs->modedb, specs->modedb_len * sizeof(struct fb_videomode));
+-
+-      for (i = specs->modedb_len; i < specs->modedb_len + num; i++) {
+-              get_detailed_timing(edid + edt[i - specs->modedb_len], &m[i]);
+-              if (i == specs->modedb_len)
+-                      m[i].flag |= FB_MODE_IS_FIRST;
+-              pr_debug("Adding %ux%u@%u\n", m[i].xres, m[i].yres, m[i].refresh);
+-      }
+-
+-      for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) {
+-              int idx = svd[i - specs->modedb_len - num];
+-              if (!idx || idx >= ARRAY_SIZE(cea_modes)) {
+-                      pr_warning("Reserved SVD code %d\n", idx);
+-              } else if (!cea_modes[idx].xres) {
+-                      pr_warning("Unimplemented SVD code %d\n", idx);
+-              } else {
+-                      memcpy(&m[i], cea_modes + idx, sizeof(m[i]));
+-                      pr_debug("Adding SVD #%d: %ux%u@%u\n", idx,
+-                               m[i].xres, m[i].yres, m[i].refresh);
+-              }
+-      }
+-
+-      kfree(specs->modedb);
+-      specs->modedb = m;
+-      specs->modedb_len = specs->modedb_len + num + svd_n;
+-}
+-
+ /*
+  * VESA Generalized Timing Formula (GTF)
+  */
+@@ -1498,9 +1407,6 @@ void fb_edid_to_monspecs(unsigned char *
+ {
+       specs = NULL;
+ }
+-void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
+-{
+-}
+ void fb_destroy_modedb(struct fb_videomode *modedb)
+ {
+ }
+@@ -1608,7 +1514,6 @@ EXPORT_SYMBOL(fb_firmware_edid);
+ EXPORT_SYMBOL(fb_parse_edid);
+ EXPORT_SYMBOL(fb_edid_to_monspecs);
+-EXPORT_SYMBOL(fb_edid_add_monspecs);
+ EXPORT_SYMBOL(fb_get_mode);
+ EXPORT_SYMBOL(fb_validate_mode);
+ EXPORT_SYMBOL(fb_destroy_modedb);
+--- a/drivers/video/fbdev/core/modedb.c
++++ b/drivers/video/fbdev/core/modedb.c
+@@ -289,63 +289,6 @@ static const struct fb_videomode modedb[
+ };
+ #ifdef CONFIG_FB_MODE_HELPERS
+-const struct fb_videomode cea_modes[65] = {
+-      /* #1: 640x480p@59.94/60Hz */
+-      [1] = {
+-              NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #3: 720x480p@59.94/60Hz */
+-      [3] = {
+-              NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #5: 1920x1080i@59.94/60Hz */
+-      [5] = {
+-              NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5,
+-              FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+-              FB_VMODE_INTERLACED, 0,
+-      },
+-      /* #7: 720(1440)x480iH@59.94/60Hz */
+-      [7] = {
+-              NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0,
+-              FB_VMODE_INTERLACED, 0,
+-      },
+-      /* #9: 720(1440)x240pH@59.94/60Hz */
+-      [9] = {
+-              NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #18: 720x576pH@50Hz */
+-      [18] = {
+-              NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #19: 1280x720p@50Hz */
+-      [19] = {
+-              NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5,
+-              FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #20: 1920x1080i@50Hz */
+-      [20] = {
+-              NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5,
+-              FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+-              FB_VMODE_INTERLACED, 0,
+-      },
+-      /* #32: 1920x1080p@23.98/24Hz */
+-      [32] = {
+-              NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5,
+-              FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-      /* #35: (2880)x480p4x@59.94/60Hz */
+-      [35] = {
+-              NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0,
+-              FB_VMODE_NONINTERLACED, 0,
+-      },
+-};
+-
+ const struct fb_videomode vesa_modes[] = {
+       /* 0 640x350-85 VESA */
+       { NULL, 85, 640, 350, 31746,  96, 32, 60, 32, 64, 3,
+--- a/include/linux/fb.h
++++ b/include/linux/fb.h
+@@ -716,8 +716,6 @@ extern int fb_parse_edid(unsigned char *
+ extern const unsigned char *fb_firmware_edid(struct device *device);
+ extern void fb_edid_to_monspecs(unsigned char *edid,
+                               struct fb_monspecs *specs);
+-extern void fb_edid_add_monspecs(unsigned char *edid,
+-                               struct fb_monspecs *specs);
+ extern void fb_destroy_modedb(struct fb_videomode *modedb);
+ extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
+ extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
+@@ -791,7 +789,6 @@ struct dmt_videomode {
+ extern const char *fb_mode_option;
+ extern const struct fb_videomode vesa_modes[];
+-extern const struct fb_videomode cea_modes[65];
+ extern const struct dmt_videomode dmt_modes[];
+ struct fb_modelist {
diff --git a/queue-4.4/fbdev-remove-unused-sh-mobile-hdmi-driver.patch b/queue-4.4/fbdev-remove-unused-sh-mobile-hdmi-driver.patch
new file mode 100644 (file)
index 0000000..0ee9359
--- /dev/null
@@ -0,0 +1,1601 @@
+From 34280340b1dc74c521e636f45cd728f9abf56ee2 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Fri, 4 Dec 2015 17:01:43 +0100
+Subject: fbdev: Remove unused SH-Mobile HDMI driver
+
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+
+commit 34280340b1dc74c521e636f45cd728f9abf56ee2 upstream.
+
+As of commit 44d88c754e57a6d9 ("ARM: shmobile: Remove legacy SoC code
+for R-Mobile A1"), the SH-Mobile HDMI driver is no longer used.
+In theory it could still be used on R-Mobile A1 SoCs, but that requires
+adding DT support to the driver, which is not planned.
+
+Remove the driver, it can be resurrected from git history when needed.
+
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Acked-by: Simon Horman <horms+renesas@verge.net.au>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/fbdev/Kconfig          |   10 
+ drivers/video/fbdev/Makefile         |    1 
+ drivers/video/fbdev/sh_mobile_hdmi.c | 1489 -----------------------------------
+ include/video/sh_mobile_hdmi.h       |   49 -
+ 4 files changed, 1549 deletions(-)
+
+--- a/drivers/video/fbdev/Kconfig
++++ b/drivers/video/fbdev/Kconfig
+@@ -1991,16 +1991,6 @@ config FB_SH_MOBILE_LCDC
+       ---help---
+         Frame buffer driver for the on-chip SH-Mobile LCD controller.
+-config FB_SH_MOBILE_HDMI
+-      tristate "SuperH Mobile HDMI controller support"
+-      depends on FB_SH_MOBILE_LCDC
+-      select FB_MODE_HELPERS
+-      select SOUND
+-      select SND
+-      select SND_SOC
+-      ---help---
+-        Driver for the on-chip SH-Mobile HDMI controller.
+-
+ config FB_TMIO
+       tristate "Toshiba Mobile IO FrameBuffer support"
+       depends on FB && (MFD_TMIO || COMPILE_TEST)
+--- a/drivers/video/fbdev/Makefile
++++ b/drivers/video/fbdev/Makefile
+@@ -118,7 +118,6 @@ obj-$(CONFIG_FB_UDL)                 += udlfb.o
+ obj-$(CONFIG_FB_SMSCUFX)        += smscufx.o
+ obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
+ obj-$(CONFIG_SH_MIPI_DSI)       += sh_mipi_dsi.o
+-obj-$(CONFIG_FB_SH_MOBILE_HDMI)         += sh_mobile_hdmi.o
+ obj-$(CONFIG_FB_SH_MOBILE_MERAM)  += sh_mobile_meram.o
+ obj-$(CONFIG_FB_SH_MOBILE_LCDC)         += sh_mobile_lcdcfb.o
+ obj-$(CONFIG_FB_OMAP)             += omap/
+--- a/drivers/video/fbdev/sh_mobile_hdmi.c
++++ /dev/null
+@@ -1,1489 +0,0 @@
+-/*
+- * SH-Mobile High-Definition Multimedia Interface (HDMI) driver
+- * for SLISHDMI13T and SLIPHDMIT IP cores
+- *
+- * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+- *
+- * 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/clk.h>
+-#include <linux/console.h>
+-#include <linux/delay.h>
+-#include <linux/err.h>
+-#include <linux/init.h>
+-#include <linux/interrupt.h>
+-#include <linux/io.h>
+-#include <linux/module.h>
+-#include <linux/platform_device.h>
+-#include <linux/pm_runtime.h>
+-#include <linux/slab.h>
+-#include <linux/types.h>
+-#include <linux/workqueue.h>
+-#include <sound/soc.h>
+-#include <sound/soc-dapm.h>
+-#include <sound/initval.h>
+-
+-#include <video/sh_mobile_hdmi.h>
+-#include <video/sh_mobile_lcdc.h>
+-
+-#include "sh_mobile_lcdcfb.h"
+-
+-/* HDMI Core Control Register (HTOP0) */
+-#define HDMI_SYSTEM_CTRL                      0x00 /* System control */
+-#define HDMI_L_R_DATA_SWAP_CTRL_RPKT          0x01 /* L/R data swap control,
+-                                                      bits 19..16 of 20-bit N for Audio Clock Regeneration packet */
+-#define HDMI_20_BIT_N_FOR_AUDIO_RPKT_15_8     0x02 /* bits 15..8 of 20-bit N for Audio Clock Regeneration packet */
+-#define HDMI_20_BIT_N_FOR_AUDIO_RPKT_7_0      0x03 /* bits 7..0 of 20-bit N for Audio Clock Regeneration packet */
+-#define HDMI_SPDIF_AUDIO_SAMP_FREQ_CTS                0x04 /* SPDIF audio sampling frequency,
+-                                                      bits 19..16 of Internal CTS */
+-#define HDMI_INTERNAL_CTS_15_8                        0x05 /* bits 15..8 of Internal CTS */
+-#define HDMI_INTERNAL_CTS_7_0                 0x06 /* bits 7..0 of Internal CTS */
+-#define HDMI_EXTERNAL_CTS_19_16                       0x07 /* External CTS */
+-#define HDMI_EXTERNAL_CTS_15_8                        0x08 /* External CTS */
+-#define HDMI_EXTERNAL_CTS_7_0                 0x09 /* External CTS */
+-#define HDMI_AUDIO_SETTING_1                  0x0A /* Audio setting.1 */
+-#define HDMI_AUDIO_SETTING_2                  0x0B /* Audio setting.2 */
+-#define HDMI_I2S_AUDIO_SET                    0x0C /* I2S audio setting */
+-#define HDMI_DSD_AUDIO_SET                    0x0D /* DSD audio setting */
+-#define HDMI_DEBUG_MONITOR_1                  0x0E /* Debug monitor.1 */
+-#define HDMI_DEBUG_MONITOR_2                  0x0F /* Debug monitor.2 */
+-#define HDMI_I2S_INPUT_PIN_SWAP                       0x10 /* I2S input pin swap */
+-#define HDMI_AUDIO_STATUS_BITS_SETTING_1      0x11 /* Audio status bits setting.1 */
+-#define HDMI_AUDIO_STATUS_BITS_SETTING_2      0x12 /* Audio status bits setting.2 */
+-#define HDMI_CATEGORY_CODE                    0x13 /* Category code */
+-#define HDMI_SOURCE_NUM_AUDIO_WORD_LEN                0x14 /* Source number/Audio word length */
+-#define HDMI_AUDIO_VIDEO_SETTING_1            0x15 /* Audio/Video setting.1 */
+-#define HDMI_VIDEO_SETTING_1                  0x16 /* Video setting.1 */
+-#define HDMI_DEEP_COLOR_MODES                 0x17 /* Deep Color Modes */
+-
+-/* 12 16- and 10-bit Color space conversion parameters: 0x18..0x2f */
+-#define HDMI_COLOR_SPACE_CONVERSION_PARAMETERS        0x18
+-
+-#define HDMI_EXTERNAL_VIDEO_PARAM_SETTINGS    0x30 /* External video parameter settings */
+-#define HDMI_EXTERNAL_H_TOTAL_7_0             0x31 /* External horizontal total (LSB) */
+-#define HDMI_EXTERNAL_H_TOTAL_11_8            0x32 /* External horizontal total (MSB) */
+-#define HDMI_EXTERNAL_H_BLANK_7_0             0x33 /* External horizontal blank (LSB) */
+-#define HDMI_EXTERNAL_H_BLANK_9_8             0x34 /* External horizontal blank (MSB) */
+-#define HDMI_EXTERNAL_H_DELAY_7_0             0x35 /* External horizontal delay (LSB) */
+-#define HDMI_EXTERNAL_H_DELAY_9_8             0x36 /* External horizontal delay (MSB) */
+-#define HDMI_EXTERNAL_H_DURATION_7_0          0x37 /* External horizontal duration (LSB) */
+-#define HDMI_EXTERNAL_H_DURATION_9_8          0x38 /* External horizontal duration (MSB) */
+-#define HDMI_EXTERNAL_V_TOTAL_7_0             0x39 /* External vertical total (LSB) */
+-#define HDMI_EXTERNAL_V_TOTAL_9_8             0x3A /* External vertical total (MSB) */
+-#define HDMI_AUDIO_VIDEO_SETTING_2            0x3B /* Audio/Video setting.2 */
+-#define HDMI_EXTERNAL_V_BLANK                 0x3D /* External vertical blank */
+-#define HDMI_EXTERNAL_V_DELAY                 0x3E /* External vertical delay */
+-#define HDMI_EXTERNAL_V_DURATION              0x3F /* External vertical duration */
+-#define HDMI_CTRL_PKT_MANUAL_SEND_CONTROL     0x40 /* Control packet manual send control */
+-#define HDMI_CTRL_PKT_AUTO_SEND                       0x41 /* Control packet auto send with VSYNC control */
+-#define HDMI_AUTO_CHECKSUM_OPTION             0x42 /* Auto checksum option */
+-#define HDMI_VIDEO_SETTING_2                  0x45 /* Video setting.2 */
+-#define HDMI_OUTPUT_OPTION                    0x46 /* Output option */
+-#define HDMI_SLIPHDMIT_PARAM_OPTION           0x51 /* SLIPHDMIT parameter option */
+-#define HDMI_HSYNC_PMENT_AT_EMB_7_0           0x52 /* HSYNC placement at embedded sync (LSB) */
+-#define HDMI_HSYNC_PMENT_AT_EMB_15_8          0x53 /* HSYNC placement at embedded sync (MSB) */
+-#define HDMI_VSYNC_PMENT_AT_EMB_7_0           0x54 /* VSYNC placement at embedded sync (LSB) */
+-#define HDMI_VSYNC_PMENT_AT_EMB_14_8          0x55 /* VSYNC placement at embedded sync (MSB) */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_1               0x56 /* SLIPHDMIT parameter settings.1 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_2               0x57 /* SLIPHDMIT parameter settings.2 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_3               0x58 /* SLIPHDMIT parameter settings.3 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_5               0x59 /* SLIPHDMIT parameter settings.5 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_6               0x5A /* SLIPHDMIT parameter settings.6 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_7               0x5B /* SLIPHDMIT parameter settings.7 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_8               0x5C /* SLIPHDMIT parameter settings.8 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_9               0x5D /* SLIPHDMIT parameter settings.9 */
+-#define HDMI_SLIPHDMIT_PARAM_SETTINGS_10      0x5E /* SLIPHDMIT parameter settings.10 */
+-#define HDMI_CTRL_PKT_BUF_INDEX                       0x5F /* Control packet buffer index */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_HB0          0x60 /* Control packet data buffer access window - HB0 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_HB1          0x61 /* Control packet data buffer access window - HB1 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_HB2          0x62 /* Control packet data buffer access window - HB2 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB0          0x63 /* Control packet data buffer access window - PB0 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB1          0x64 /* Control packet data buffer access window - PB1 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB2          0x65 /* Control packet data buffer access window - PB2 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB3          0x66 /* Control packet data buffer access window - PB3 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB4          0x67 /* Control packet data buffer access window - PB4 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB5          0x68 /* Control packet data buffer access window - PB5 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB6          0x69 /* Control packet data buffer access window - PB6 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB7          0x6A /* Control packet data buffer access window - PB7 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB8          0x6B /* Control packet data buffer access window - PB8 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB9          0x6C /* Control packet data buffer access window - PB9 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB10         0x6D /* Control packet data buffer access window - PB10 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB11         0x6E /* Control packet data buffer access window - PB11 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB12         0x6F /* Control packet data buffer access window - PB12 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB13         0x70 /* Control packet data buffer access window - PB13 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB14         0x71 /* Control packet data buffer access window - PB14 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB15         0x72 /* Control packet data buffer access window - PB15 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB16         0x73 /* Control packet data buffer access window - PB16 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB17         0x74 /* Control packet data buffer access window - PB17 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB18         0x75 /* Control packet data buffer access window - PB18 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB19         0x76 /* Control packet data buffer access window - PB19 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB20         0x77 /* Control packet data buffer access window - PB20 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB21         0x78 /* Control packet data buffer access window - PB21 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB22         0x79 /* Control packet data buffer access window - PB22 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB23         0x7A /* Control packet data buffer access window - PB23 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB24         0x7B /* Control packet data buffer access window - PB24 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB25         0x7C /* Control packet data buffer access window - PB25 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB26         0x7D /* Control packet data buffer access window - PB26 */
+-#define HDMI_CTRL_PKT_BUF_ACCESS_PB27         0x7E /* Control packet data buffer access window - PB27 */
+-#define HDMI_EDID_KSV_FIFO_ACCESS_WINDOW      0x80 /* EDID/KSV FIFO access window */
+-#define HDMI_DDC_BUS_ACCESS_FREQ_CTRL_7_0     0x81 /* DDC bus access frequency control (LSB) */
+-#define HDMI_DDC_BUS_ACCESS_FREQ_CTRL_15_8    0x82 /* DDC bus access frequency control (MSB) */
+-#define HDMI_INTERRUPT_MASK_1                 0x92 /* Interrupt mask.1 */
+-#define HDMI_INTERRUPT_MASK_2                 0x93 /* Interrupt mask.2 */
+-#define HDMI_INTERRUPT_STATUS_1                       0x94 /* Interrupt status.1 */
+-#define HDMI_INTERRUPT_STATUS_2                       0x95 /* Interrupt status.2 */
+-#define HDMI_INTERRUPT_MASK_3                 0x96 /* Interrupt mask.3 */
+-#define HDMI_INTERRUPT_MASK_4                 0x97 /* Interrupt mask.4 */
+-#define HDMI_INTERRUPT_STATUS_3                       0x98 /* Interrupt status.3 */
+-#define HDMI_INTERRUPT_STATUS_4                       0x99 /* Interrupt status.4 */
+-#define HDMI_SOFTWARE_HDCP_CONTROL_1          0x9A /* Software HDCP control.1 */
+-#define HDMI_FRAME_COUNTER                    0x9C /* Frame counter */
+-#define HDMI_FRAME_COUNTER_FOR_RI_CHECK               0x9D /* Frame counter for Ri check */
+-#define HDMI_HDCP_CONTROL                     0xAF /* HDCP control */
+-#define HDMI_RI_FRAME_COUNT_REGISTER          0xB2 /* Ri frame count register */
+-#define HDMI_DDC_BUS_CONTROL                  0xB7 /* DDC bus control */
+-#define HDMI_HDCP_STATUS                      0xB8 /* HDCP status */
+-#define HDMI_SHA0                             0xB9 /* sha0 */
+-#define HDMI_SHA1                             0xBA /* sha1 */
+-#define HDMI_SHA2                             0xBB /* sha2 */
+-#define HDMI_SHA3                             0xBC /* sha3 */
+-#define HDMI_SHA4                             0xBD /* sha4 */
+-#define HDMI_BCAPS_READ                               0xBE /* BCAPS read / debug */
+-#define HDMI_AKSV_BKSV_7_0_MONITOR            0xBF /* AKSV/BKSV[7:0] monitor */
+-#define HDMI_AKSV_BKSV_15_8_MONITOR           0xC0 /* AKSV/BKSV[15:8] monitor */
+-#define HDMI_AKSV_BKSV_23_16_MONITOR          0xC1 /* AKSV/BKSV[23:16] monitor */
+-#define HDMI_AKSV_BKSV_31_24_MONITOR          0xC2 /* AKSV/BKSV[31:24] monitor */
+-#define HDMI_AKSV_BKSV_39_32_MONITOR          0xC3 /* AKSV/BKSV[39:32] monitor */
+-#define HDMI_EDID_SEGMENT_POINTER             0xC4 /* EDID segment pointer */
+-#define HDMI_EDID_WORD_ADDRESS                        0xC5 /* EDID word address */
+-#define HDMI_EDID_DATA_FIFO_ADDRESS           0xC6 /* EDID data FIFO address */
+-#define HDMI_NUM_OF_HDMI_DEVICES              0xC7 /* Number of HDMI devices */
+-#define HDMI_HDCP_ERROR_CODE                  0xC8 /* HDCP error code */
+-#define HDMI_100MS_TIMER_SET                  0xC9 /* 100ms timer setting */
+-#define HDMI_5SEC_TIMER_SET                   0xCA /* 5sec timer setting */
+-#define HDMI_RI_READ_COUNT                    0xCB /* Ri read count */
+-#define HDMI_AN_SEED                          0xCC /* An seed */
+-#define HDMI_MAX_NUM_OF_RCIVRS_ALLOWED                0xCD /* Maximum number of receivers allowed */
+-#define HDMI_HDCP_MEMORY_ACCESS_CONTROL_1     0xCE /* HDCP memory access control.1 */
+-#define HDMI_HDCP_MEMORY_ACCESS_CONTROL_2     0xCF /* HDCP memory access control.2 */
+-#define HDMI_HDCP_CONTROL_2                   0xD0 /* HDCP Control 2 */
+-#define HDMI_HDCP_KEY_MEMORY_CONTROL          0xD2 /* HDCP Key Memory Control */
+-#define HDMI_COLOR_SPACE_CONV_CONFIG_1                0xD3 /* Color space conversion configuration.1 */
+-#define HDMI_VIDEO_SETTING_3                  0xD4 /* Video setting.3 */
+-#define HDMI_RI_7_0                           0xD5 /* Ri[7:0] */
+-#define HDMI_RI_15_8                          0xD6 /* Ri[15:8] */
+-#define HDMI_PJ                                       0xD7 /* Pj */
+-#define HDMI_SHA_RD                           0xD8 /* sha_rd */
+-#define HDMI_RI_7_0_SAVED                     0xD9 /* Ri[7:0] saved */
+-#define HDMI_RI_15_8_SAVED                    0xDA /* Ri[15:8] saved */
+-#define HDMI_PJ_SAVED                         0xDB /* Pj saved */
+-#define HDMI_NUM_OF_DEVICES                   0xDC /* Number of devices */
+-#define HDMI_HOT_PLUG_MSENS_STATUS            0xDF /* Hot plug/MSENS status */
+-#define HDMI_BCAPS_WRITE                      0xE0 /* bcaps */
+-#define HDMI_BSTAT_7_0                                0xE1 /* bstat[7:0] */
+-#define HDMI_BSTAT_15_8                               0xE2 /* bstat[15:8] */
+-#define HDMI_BKSV_7_0                         0xE3 /* bksv[7:0] */
+-#define HDMI_BKSV_15_8                                0xE4 /* bksv[15:8] */
+-#define HDMI_BKSV_23_16                               0xE5 /* bksv[23:16] */
+-#define HDMI_BKSV_31_24                               0xE6 /* bksv[31:24] */
+-#define HDMI_BKSV_39_32                               0xE7 /* bksv[39:32] */
+-#define HDMI_AN_7_0                           0xE8 /* An[7:0] */
+-#define HDMI_AN_15_8                          0xE9 /* An [15:8] */
+-#define HDMI_AN_23_16                         0xEA /* An [23:16] */
+-#define HDMI_AN_31_24                         0xEB /* An [31:24] */
+-#define HDMI_AN_39_32                         0xEC /* An [39:32] */
+-#define HDMI_AN_47_40                         0xED /* An [47:40] */
+-#define HDMI_AN_55_48                         0xEE /* An [55:48] */
+-#define HDMI_AN_63_56                         0xEF /* An [63:56] */
+-#define HDMI_PRODUCT_ID                               0xF0 /* Product ID */
+-#define HDMI_REVISION_ID                      0xF1 /* Revision ID */
+-#define HDMI_TEST_MODE                                0xFE /* Test mode */
+-
+-/* HDMI Control Register (HTOP1) */
+-#define HDMI_HTOP1_TEST_MODE                  0x0000 /* Test mode */
+-#define HDMI_HTOP1_VIDEO_INPUT                        0x0008 /* VideoInput */
+-#define HDMI_HTOP1_CORE_RSTN                  0x000C /* CoreResetn */
+-#define HDMI_HTOP1_PLLBW                      0x0018 /* PLLBW */
+-#define HDMI_HTOP1_CLK_TO_PHY                 0x001C /* Clk to Phy */
+-#define HDMI_HTOP1_VIDEO_INPUT2                       0x0020 /* VideoInput2 */
+-#define HDMI_HTOP1_TISEMP0_1                  0x0024 /* tisemp0-1 */
+-#define HDMI_HTOP1_TISEMP2_C                  0x0028 /* tisemp2-c */
+-#define HDMI_HTOP1_TISIDRV                    0x002C /* tisidrv */
+-#define HDMI_HTOP1_TISEN                      0x0034 /* tisen */
+-#define HDMI_HTOP1_TISDREN                    0x0038 /* tisdren  */
+-#define HDMI_HTOP1_CISRANGE                   0x003C /* cisrange  */
+-#define HDMI_HTOP1_ENABLE_SELECTOR            0x0040 /* Enable Selector */
+-#define HDMI_HTOP1_MACRO_RESET                        0x0044 /* Macro reset */
+-#define HDMI_HTOP1_PLL_CALIBRATION            0x0048 /* PLL calibration */
+-#define HDMI_HTOP1_RE_CALIBRATION             0x004C /* Re-calibration */
+-#define HDMI_HTOP1_CURRENT                    0x0050 /* Current */
+-#define HDMI_HTOP1_PLL_LOCK_DETECT            0x0054 /* PLL lock detect */
+-#define HDMI_HTOP1_PHY_TEST_MODE              0x0058 /* PHY Test Mode */
+-#define HDMI_HTOP1_CLK_SET                    0x0080 /* Clock Set */
+-#define HDMI_HTOP1_DDC_FAIL_SAFE              0x0084 /* DDC fail safe */
+-#define HDMI_HTOP1_PRBS                               0x0088 /* PRBS */
+-#define HDMI_HTOP1_EDID_AINC_CONTROL          0x008C /* EDID ainc Control */
+-#define HDMI_HTOP1_HTOP_DCL_MODE              0x00FC /* Deep Coloer Mode */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0         0x0100 /* Deep Color:FRC COEF0 */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1         0x0104 /* Deep Color:FRC COEF1 */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2         0x0108 /* Deep Color:FRC COEF2 */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3         0x010C /* Deep Color:FRC COEF3 */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0_C               0x0110 /* Deep Color:FRC COEF0C */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1_C               0x0114 /* Deep Color:FRC COEF1C */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2_C               0x0118 /* Deep Color:FRC COEF2C */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3_C               0x011C /* Deep Color:FRC COEF3C */
+-#define HDMI_HTOP1_HTOP_DCL_FRC_MODE          0x0120 /* Deep Color:FRC Mode */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_START1               0x0124 /* Deep Color:Rect Start1 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE1                0x0128 /* Deep Color:Rect Size1 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_START2               0x012C /* Deep Color:Rect Start2 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE2                0x0130 /* Deep Color:Rect Size2 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_START3               0x0134 /* Deep Color:Rect Start3 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE3                0x0138 /* Deep Color:Rect Size3 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_START4               0x013C /* Deep Color:Rect Start4 */
+-#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE4                0x0140 /* Deep Color:Rect Size4 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1     0x0144 /* Deep Color:Fil Para Y1_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2     0x0148 /* Deep Color:Fil Para Y1_2 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1    0x014C /* Deep Color:Fil Para CB1_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2    0x0150 /* Deep Color:Fil Para CB1_2 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1    0x0154 /* Deep Color:Fil Para CR1_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2    0x0158 /* Deep Color:Fil Para CR1_2 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1     0x015C /* Deep Color:Fil Para Y2_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2     0x0160 /* Deep Color:Fil Para Y2_2 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1    0x0164 /* Deep Color:Fil Para CB2_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2    0x0168 /* Deep Color:Fil Para CB2_2 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1    0x016C /* Deep Color:Fil Para CR2_1 */
+-#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2    0x0170 /* Deep Color:Fil Para CR2_2 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1               0x0174 /* Deep Color:Cor Para Y1 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1      0x0178 /* Deep Color:Cor Para CB1 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1      0x017C /* Deep Color:Cor Para CR1 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2               0x0180 /* Deep Color:Cor Para Y2 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2      0x0184 /* Deep Color:Cor Para CB2 */
+-#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2      0x0188 /* Deep Color:Cor Para CR2 */
+-#define HDMI_HTOP1_EDID_DATA_READ             0x0200 /* EDID Data Read 128Byte:0x03FC */
+-
+-enum hotplug_state {
+-      HDMI_HOTPLUG_DISCONNECTED,
+-      HDMI_HOTPLUG_CONNECTED,
+-      HDMI_HOTPLUG_EDID_DONE,
+-};
+-
+-struct sh_hdmi {
+-      struct sh_mobile_lcdc_entity entity;
+-
+-      void __iomem *base;
+-      void __iomem *htop1;
+-      enum hotplug_state hp_state;    /* hot-plug status */
+-      u8 preprogrammed_vic;           /* use a pre-programmed VIC or
+-                                         the external mode */
+-      u8 edid_block_addr;
+-      u8 edid_segment_nr;
+-      u8 edid_blocks;
+-      int irq;
+-      struct clk *hdmi_clk;
+-      struct device *dev;
+-      struct delayed_work edid_work;
+-      struct fb_videomode mode;
+-      struct fb_monspecs monspec;
+-
+-      /* register access functions */
+-      void (*write)(struct sh_hdmi *hdmi, u8 data, u8 reg);
+-      u8 (*read)(struct sh_hdmi *hdmi, u8 reg);
+-};
+-
+-#define entity_to_sh_hdmi(e)  container_of(e, struct sh_hdmi, entity)
+-
+-static void __hdmi_write8(struct sh_hdmi *hdmi, u8 data, u8 reg)
+-{
+-      iowrite8(data, hdmi->base + reg);
+-}
+-
+-static u8 __hdmi_read8(struct sh_hdmi *hdmi, u8 reg)
+-{
+-      return ioread8(hdmi->base + reg);
+-}
+-
+-static void __hdmi_write32(struct sh_hdmi *hdmi, u8 data, u8 reg)
+-{
+-      iowrite32((u32)data, hdmi->base + (reg * 4));
+-      udelay(100);
+-}
+-
+-static u8 __hdmi_read32(struct sh_hdmi *hdmi, u8 reg)
+-{
+-      return (u8)ioread32(hdmi->base + (reg * 4));
+-}
+-
+-static void hdmi_write(struct sh_hdmi *hdmi, u8 data, u8 reg)
+-{
+-      hdmi->write(hdmi, data, reg);
+-}
+-
+-static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
+-{
+-      return hdmi->read(hdmi, reg);
+-}
+-
+-static void hdmi_bit_set(struct sh_hdmi *hdmi, u8 mask, u8 data, u8 reg)
+-{
+-      u8 val = hdmi_read(hdmi, reg);
+-
+-      val &= ~mask;
+-      val |= (data & mask);
+-
+-      hdmi_write(hdmi, val, reg);
+-}
+-
+-static void hdmi_htop1_write(struct sh_hdmi *hdmi, u32 data, u32 reg)
+-{
+-      iowrite32(data, hdmi->htop1 + reg);
+-      udelay(100);
+-}
+-
+-static u32 hdmi_htop1_read(struct sh_hdmi *hdmi, u32 reg)
+-{
+-      return ioread32(hdmi->htop1 + reg);
+-}
+-
+-/*
+- *    HDMI sound
+- */
+-static unsigned int sh_hdmi_snd_read(struct snd_soc_codec *codec,
+-                                   unsigned int reg)
+-{
+-      struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+-
+-      return hdmi_read(hdmi, reg);
+-}
+-
+-static int sh_hdmi_snd_write(struct snd_soc_codec *codec,
+-                           unsigned int reg,
+-                           unsigned int value)
+-{
+-      struct sh_hdmi *hdmi = snd_soc_codec_get_drvdata(codec);
+-
+-      hdmi_write(hdmi, value, reg);
+-      return 0;
+-}
+-
+-static struct snd_soc_dai_driver sh_hdmi_dai = {
+-      .name = "sh_mobile_hdmi-hifi",
+-      .playback = {
+-              .stream_name = "Playback",
+-              .channels_min = 2,
+-              .channels_max = 8,
+-              .rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100  |
+-                       SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200  |
+-                       SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |
+-                       SNDRV_PCM_RATE_192000,
+-              .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,
+-      },
+-};
+-
+-static int sh_hdmi_snd_probe(struct snd_soc_codec *codec)
+-{
+-      dev_info(codec->dev, "SH Mobile HDMI Audio Codec");
+-
+-      return 0;
+-}
+-
+-static struct snd_soc_codec_driver soc_codec_dev_sh_hdmi = {
+-      .probe          = sh_hdmi_snd_probe,
+-      .read           = sh_hdmi_snd_read,
+-      .write          = sh_hdmi_snd_write,
+-};
+-
+-/*
+- *    HDMI video
+- */
+-
+-/* External video parameter settings */
+-static void sh_hdmi_external_video_param(struct sh_hdmi *hdmi)
+-{
+-      struct fb_videomode *mode = &hdmi->mode;
+-      u16 htotal, hblank, hdelay, vtotal, vblank, vdelay, voffset;
+-      u8 sync = 0;
+-
+-      htotal = mode->xres + mode->right_margin + mode->left_margin
+-             + mode->hsync_len;
+-      hdelay = mode->hsync_len + mode->left_margin;
+-      hblank = mode->right_margin + hdelay;
+-
+-      /*
+-       * Vertical timing looks a bit different in Figure 18,
+-       * but let's try the same first by setting offset = 0
+-       */
+-      vtotal = mode->yres + mode->upper_margin + mode->lower_margin
+-             + mode->vsync_len;
+-      vdelay = mode->vsync_len + mode->upper_margin;
+-      vblank = mode->lower_margin + vdelay;
+-      voffset = min(mode->upper_margin / 2, 6U);
+-
+-      /*
+-       * [3]: VSYNC polarity: Positive
+-       * [2]: HSYNC polarity: Positive
+-       * [1]: Interlace/Progressive: Progressive
+-       * [0]: External video settings enable: used.
+-       */
+-      if (mode->sync & FB_SYNC_HOR_HIGH_ACT)
+-              sync |= 4;
+-      if (mode->sync & FB_SYNC_VERT_HIGH_ACT)
+-              sync |= 8;
+-
+-      dev_dbg(hdmi->dev, "H: %u, %u, %u, %u; V: %u, %u, %u, %u; sync 0x%x\n",
+-              htotal, hblank, hdelay, mode->hsync_len,
+-              vtotal, vblank, vdelay, mode->vsync_len, sync);
+-
+-      hdmi_write(hdmi, sync | (voffset << 4), HDMI_EXTERNAL_VIDEO_PARAM_SETTINGS);
+-
+-      hdmi_write(hdmi, htotal, HDMI_EXTERNAL_H_TOTAL_7_0);
+-      hdmi_write(hdmi, htotal >> 8, HDMI_EXTERNAL_H_TOTAL_11_8);
+-
+-      hdmi_write(hdmi, hblank, HDMI_EXTERNAL_H_BLANK_7_0);
+-      hdmi_write(hdmi, hblank >> 8, HDMI_EXTERNAL_H_BLANK_9_8);
+-
+-      hdmi_write(hdmi, hdelay, HDMI_EXTERNAL_H_DELAY_7_0);
+-      hdmi_write(hdmi, hdelay >> 8, HDMI_EXTERNAL_H_DELAY_9_8);
+-
+-      hdmi_write(hdmi, mode->hsync_len, HDMI_EXTERNAL_H_DURATION_7_0);
+-      hdmi_write(hdmi, mode->hsync_len >> 8, HDMI_EXTERNAL_H_DURATION_9_8);
+-
+-      hdmi_write(hdmi, vtotal, HDMI_EXTERNAL_V_TOTAL_7_0);
+-      hdmi_write(hdmi, vtotal >> 8, HDMI_EXTERNAL_V_TOTAL_9_8);
+-
+-      hdmi_write(hdmi, vblank, HDMI_EXTERNAL_V_BLANK);
+-
+-      hdmi_write(hdmi, vdelay, HDMI_EXTERNAL_V_DELAY);
+-
+-      hdmi_write(hdmi, mode->vsync_len, HDMI_EXTERNAL_V_DURATION);
+-
+-      /* Set bit 0 of HDMI_EXTERNAL_VIDEO_PARAM_SETTINGS here for external mode */
+-      if (!hdmi->preprogrammed_vic)
+-              hdmi_write(hdmi, sync | 1 | (voffset << 4),
+-                         HDMI_EXTERNAL_VIDEO_PARAM_SETTINGS);
+-}
+-
+-/**
+- * sh_hdmi_video_config()
+- */
+-static void sh_hdmi_video_config(struct sh_hdmi *hdmi)
+-{
+-      /*
+-       * [7:4]: Audio sampling frequency: 48kHz
+-       * [3:1]: Input video format: RGB and YCbCr 4:4:4 (Y on Green)
+-       * [0]: Internal/External DE select: internal
+-       */
+-      hdmi_write(hdmi, 0x20, HDMI_AUDIO_VIDEO_SETTING_1);
+-
+-      /*
+-       * [7:6]: Video output format: RGB 4:4:4
+-       * [5:4]: Input video data width: 8 bit
+-       * [3:1]: EAV/SAV location: channel 1
+-       * [0]: Video input color space: RGB
+-       */
+-      hdmi_write(hdmi, 0x34, HDMI_VIDEO_SETTING_1);
+-
+-      /*
+-       * [7:6]: Together with bit [6] of HDMI_AUDIO_VIDEO_SETTING_2, which is
+-       * left at 0 by default, this configures 24bpp and sets the Color Depth
+-       * (CD) field in the General Control Packet
+-       */
+-      hdmi_write(hdmi, 0x20, HDMI_DEEP_COLOR_MODES);
+-}
+-
+-/**
+- * sh_hdmi_audio_config()
+- */
+-static void sh_hdmi_audio_config(struct sh_hdmi *hdmi)
+-{
+-      u8 data;
+-      struct sh_mobile_hdmi_info *pdata = dev_get_platdata(hdmi->dev);
+-
+-      /*
+-       * [7:4] L/R data swap control
+-       * [3:0] appropriate N[19:16]
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_L_R_DATA_SWAP_CTRL_RPKT);
+-      /* appropriate N[15:8] */
+-      hdmi_write(hdmi, 0x18, HDMI_20_BIT_N_FOR_AUDIO_RPKT_15_8);
+-      /* appropriate N[7:0] */
+-      hdmi_write(hdmi, 0x00, HDMI_20_BIT_N_FOR_AUDIO_RPKT_7_0);
+-
+-      /* [7:4] 48 kHz SPDIF not used */
+-      hdmi_write(hdmi, 0x20, HDMI_SPDIF_AUDIO_SAMP_FREQ_CTS);
+-
+-      /*
+-       * [6:5] set required down sampling rate if required
+-       * [4:3] set required audio source
+-       */
+-      switch (pdata->flags & HDMI_SND_SRC_MASK) {
+-      default:
+-              /* fall through */
+-      case HDMI_SND_SRC_I2S:
+-              data = 0x0 << 3;
+-              break;
+-      case HDMI_SND_SRC_SPDIF:
+-              data = 0x1 << 3;
+-              break;
+-      case HDMI_SND_SRC_DSD:
+-              data = 0x2 << 3;
+-              break;
+-      case HDMI_SND_SRC_HBR:
+-              data = 0x3 << 3;
+-              break;
+-      }
+-      hdmi_write(hdmi, data, HDMI_AUDIO_SETTING_1);
+-
+-      /* [3:0] set sending channel number for channel status */
+-      hdmi_write(hdmi, 0x40, HDMI_AUDIO_SETTING_2);
+-
+-      /*
+-       * [5:2] set valid I2S source input pin
+-       * [1:0] set input I2S source mode
+-       */
+-      hdmi_write(hdmi, 0x04, HDMI_I2S_AUDIO_SET);
+-
+-      /* [7:4] set valid DSD source input pin */
+-      hdmi_write(hdmi, 0x00, HDMI_DSD_AUDIO_SET);
+-
+-      /* [7:0] set appropriate I2S input pin swap settings if required */
+-      hdmi_write(hdmi, 0x00, HDMI_I2S_INPUT_PIN_SWAP);
+-
+-      /*
+-       * [7] set validity bit for channel status
+-       * [3:0] set original sample frequency for channel status
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_AUDIO_STATUS_BITS_SETTING_1);
+-
+-      /*
+-       * [7] set value for channel status
+-       * [6] set value for channel status
+-       * [5] set copyright bit for channel status
+-       * [4:2] set additional information for channel status
+-       * [1:0] set clock accuracy for channel status
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_AUDIO_STATUS_BITS_SETTING_2);
+-
+-      /* [7:0] set category code for channel status */
+-      hdmi_write(hdmi, 0x00, HDMI_CATEGORY_CODE);
+-
+-      /*
+-       * [7:4] set source number for channel status
+-       * [3:0] set word length for channel status
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_SOURCE_NUM_AUDIO_WORD_LEN);
+-
+-      /* [7:4] set sample frequency for channel status */
+-      hdmi_write(hdmi, 0x20, HDMI_AUDIO_VIDEO_SETTING_1);
+-}
+-
+-/**
+- * sh_hdmi_phy_config() - configure the HDMI PHY for the used video mode
+- */
+-static void sh_hdmi_phy_config(struct sh_hdmi *hdmi)
+-{
+-      if (hdmi->mode.pixclock < 10000) {
+-              /* for 1080p8bit 148MHz */
+-              hdmi_write(hdmi, 0x1d, HDMI_SLIPHDMIT_PARAM_SETTINGS_1);
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_2);
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_3);
+-              hdmi_write(hdmi, 0x4c, HDMI_SLIPHDMIT_PARAM_SETTINGS_5);
+-              hdmi_write(hdmi, 0x1e, HDMI_SLIPHDMIT_PARAM_SETTINGS_6);
+-              hdmi_write(hdmi, 0x48, HDMI_SLIPHDMIT_PARAM_SETTINGS_7);
+-              hdmi_write(hdmi, 0x0e, HDMI_SLIPHDMIT_PARAM_SETTINGS_8);
+-              hdmi_write(hdmi, 0x25, HDMI_SLIPHDMIT_PARAM_SETTINGS_9);
+-              hdmi_write(hdmi, 0x04, HDMI_SLIPHDMIT_PARAM_SETTINGS_10);
+-      } else if (hdmi->mode.pixclock < 30000) {
+-              /* 720p, 8bit, 74.25MHz. Might need to be adjusted for other formats */
+-              /*
+-               * [1:0]        Speed_A
+-               * [3:2]        Speed_B
+-               * [4]          PLLA_Bypass
+-               * [6]          DRV_TEST_EN
+-               * [7]          DRV_TEST_IN
+-               */
+-              hdmi_write(hdmi, 0x0f, HDMI_SLIPHDMIT_PARAM_SETTINGS_1);
+-              /* PLLB_CONFIG[17], PLLA_CONFIG[17] - not in PHY datasheet */
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_2);
+-              /*
+-               * [2:0]        BGR_I_OFFSET
+-               * [6:4]        BGR_V_OFFSET
+-               */
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_3);
+-              /* PLLA_CONFIG[7:0]: VCO gain, VCO offset, LPF resistance[0] */
+-              hdmi_write(hdmi, 0x44, HDMI_SLIPHDMIT_PARAM_SETTINGS_5);
+-              /*
+-               * PLLA_CONFIG[15:8]: regulator voltage[0], CP current,
+-               * LPF capacitance, LPF resistance[1]
+-               */
+-              hdmi_write(hdmi, 0x32, HDMI_SLIPHDMIT_PARAM_SETTINGS_6);
+-              /* PLLB_CONFIG[7:0]: LPF resistance[0], VCO offset, VCO gain */
+-              hdmi_write(hdmi, 0x4A, HDMI_SLIPHDMIT_PARAM_SETTINGS_7);
+-              /*
+-               * PLLB_CONFIG[15:8]: regulator voltage[0], CP current,
+-               * LPF capacitance, LPF resistance[1]
+-               */
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_8);
+-              /* DRV_CONFIG, PE_CONFIG */
+-              hdmi_write(hdmi, 0x25, HDMI_SLIPHDMIT_PARAM_SETTINGS_9);
+-              /*
+-               * [2:0]        AMON_SEL (4 == LPF voltage)
+-               * [4]          PLLA_CONFIG[16]
+-               * [5]          PLLB_CONFIG[16]
+-               */
+-              hdmi_write(hdmi, 0x04, HDMI_SLIPHDMIT_PARAM_SETTINGS_10);
+-      } else {
+-              /* for 480p8bit 27MHz */
+-              hdmi_write(hdmi, 0x19, HDMI_SLIPHDMIT_PARAM_SETTINGS_1);
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_2);
+-              hdmi_write(hdmi, 0x00, HDMI_SLIPHDMIT_PARAM_SETTINGS_3);
+-              hdmi_write(hdmi, 0x44, HDMI_SLIPHDMIT_PARAM_SETTINGS_5);
+-              hdmi_write(hdmi, 0x32, HDMI_SLIPHDMIT_PARAM_SETTINGS_6);
+-              hdmi_write(hdmi, 0x48, HDMI_SLIPHDMIT_PARAM_SETTINGS_7);
+-              hdmi_write(hdmi, 0x0F, HDMI_SLIPHDMIT_PARAM_SETTINGS_8);
+-              hdmi_write(hdmi, 0x20, HDMI_SLIPHDMIT_PARAM_SETTINGS_9);
+-              hdmi_write(hdmi, 0x04, HDMI_SLIPHDMIT_PARAM_SETTINGS_10);
+-      }
+-}
+-
+-/**
+- * sh_hdmi_avi_infoframe_setup() - Auxiliary Video Information InfoFrame CONTROL PACKET
+- */
+-static void sh_hdmi_avi_infoframe_setup(struct sh_hdmi *hdmi)
+-{
+-      u8 vic;
+-
+-      /* AVI InfoFrame */
+-      hdmi_write(hdmi, 0x06, HDMI_CTRL_PKT_BUF_INDEX);
+-
+-      /* Packet Type = 0x82 */
+-      hdmi_write(hdmi, 0x82, HDMI_CTRL_PKT_BUF_ACCESS_HB0);
+-
+-      /* Version = 0x02 */
+-      hdmi_write(hdmi, 0x02, HDMI_CTRL_PKT_BUF_ACCESS_HB1);
+-
+-      /* Length = 13 (0x0D) */
+-      hdmi_write(hdmi, 0x0D, HDMI_CTRL_PKT_BUF_ACCESS_HB2);
+-
+-      /* N. A. Checksum */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB0);
+-
+-      /*
+-       * Y = RGB
+-       * A0 = No Data
+-       * B = Bar Data not valid
+-       * S = No Data
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB1);
+-
+-      /*
+-       * [7:6] C = Colorimetry: no data
+-       * [5:4] M = 2: 16:9, 1: 4:3 Picture Aspect Ratio
+-       * [3:0] R = 8: Active Frame Aspect Ratio: same as picture aspect ratio
+-       */
+-      hdmi_write(hdmi, 0x28, HDMI_CTRL_PKT_BUF_ACCESS_PB2);
+-
+-      /*
+-       * ITC = No Data
+-       * EC = xvYCC601
+-       * Q = Default (depends on video format)
+-       * SC = No Known non_uniform Scaling
+-       */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB3);
+-
+-      /*
+-       * VIC should be ignored if external config is used, so, we could just use 0,
+-       * but play safe and use a valid value in any case just in case
+-       */
+-      if (hdmi->preprogrammed_vic)
+-              vic = hdmi->preprogrammed_vic;
+-      else
+-              vic = 4;
+-      hdmi_write(hdmi, vic, HDMI_CTRL_PKT_BUF_ACCESS_PB4);
+-
+-      /* PR = No Repetition */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB5);
+-
+-      /* Line Number of End of Top Bar (lower 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB6);
+-
+-      /* Line Number of End of Top Bar (upper 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB7);
+-
+-      /* Line Number of Start of Bottom Bar (lower 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB8);
+-
+-      /* Line Number of Start of Bottom Bar (upper 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB9);
+-
+-      /* Pixel Number of End of Left Bar (lower 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB10);
+-
+-      /* Pixel Number of End of Left Bar (upper 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB11);
+-
+-      /* Pixel Number of Start of Right Bar (lower 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB12);
+-
+-      /* Pixel Number of Start of Right Bar (upper 8 bits) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB13);
+-}
+-
+-/**
+- * sh_hdmi_audio_infoframe_setup() - Audio InfoFrame of CONTROL PACKET
+- */
+-static void sh_hdmi_audio_infoframe_setup(struct sh_hdmi *hdmi)
+-{
+-      /* Audio InfoFrame */
+-      hdmi_write(hdmi, 0x08, HDMI_CTRL_PKT_BUF_INDEX);
+-
+-      /* Packet Type = 0x84 */
+-      hdmi_write(hdmi, 0x84, HDMI_CTRL_PKT_BUF_ACCESS_HB0);
+-
+-      /* Version Number = 0x01 */
+-      hdmi_write(hdmi, 0x01, HDMI_CTRL_PKT_BUF_ACCESS_HB1);
+-
+-      /* 0 Length = 10 (0x0A) */
+-      hdmi_write(hdmi, 0x0A, HDMI_CTRL_PKT_BUF_ACCESS_HB2);
+-
+-      /* n. a. Checksum */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB0);
+-
+-      /* Audio Channel Count = Refer to Stream Header */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB1);
+-
+-      /* Refer to Stream Header */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB2);
+-
+-      /* Format depends on coding type (i.e. CT0...CT3) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB3);
+-
+-      /* Speaker Channel Allocation = Front Right + Front Left */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB4);
+-
+-      /* Level Shift Value = 0 dB, Down - mix is permitted or no information */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB5);
+-
+-      /* Reserved (0) */
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB6);
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB7);
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB8);
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB9);
+-      hdmi_write(hdmi, 0x00, HDMI_CTRL_PKT_BUF_ACCESS_PB10);
+-}
+-
+-/**
+- * sh_hdmi_configure() - Initialise HDMI for output
+- */
+-static void sh_hdmi_configure(struct sh_hdmi *hdmi)
+-{
+-      /* Configure video format */
+-      sh_hdmi_video_config(hdmi);
+-
+-      /* Configure audio format */
+-      sh_hdmi_audio_config(hdmi);
+-
+-      /* Configure PHY */
+-      sh_hdmi_phy_config(hdmi);
+-
+-      /* Auxiliary Video Information (AVI) InfoFrame */
+-      sh_hdmi_avi_infoframe_setup(hdmi);
+-
+-      /* Audio InfoFrame */
+-      sh_hdmi_audio_infoframe_setup(hdmi);
+-
+-      /*
+-       * Control packet auto send with VSYNC control: auto send
+-       * General control, Gamut metadata, ISRC, and ACP packets
+-       */
+-      hdmi_write(hdmi, 0x8E, HDMI_CTRL_PKT_AUTO_SEND);
+-
+-      /* FIXME */
+-      msleep(10);
+-
+-      /* PS mode b->d, reset PLLA and PLLB */
+-      hdmi_bit_set(hdmi, 0xFC, 0x4C, HDMI_SYSTEM_CTRL);
+-
+-      udelay(10);
+-
+-      hdmi_bit_set(hdmi, 0xFC, 0x40, HDMI_SYSTEM_CTRL);
+-}
+-
+-static unsigned long sh_hdmi_rate_error(struct sh_hdmi *hdmi,
+-              const struct fb_videomode *mode,
+-              unsigned long *hdmi_rate, unsigned long *parent_rate)
+-{
+-      unsigned long target = PICOS2KHZ(mode->pixclock) * 1000, rate_error;
+-      struct sh_mobile_hdmi_info *pdata = dev_get_platdata(hdmi->dev);
+-
+-      *hdmi_rate = clk_round_rate(hdmi->hdmi_clk, target);
+-      if ((long)*hdmi_rate < 0)
+-              *hdmi_rate = clk_get_rate(hdmi->hdmi_clk);
+-
+-      rate_error = (long)*hdmi_rate > 0 ? abs(*hdmi_rate - target) : ULONG_MAX;
+-      if (rate_error && pdata->clk_optimize_parent)
+-              rate_error = pdata->clk_optimize_parent(target, hdmi_rate, parent_rate);
+-      else if (clk_get_parent(hdmi->hdmi_clk))
+-              *parent_rate = clk_get_rate(clk_get_parent(hdmi->hdmi_clk));
+-
+-      dev_dbg(hdmi->dev, "%u-%u-%u-%u x %u-%u-%u-%u\n",
+-              mode->left_margin, mode->xres,
+-              mode->right_margin, mode->hsync_len,
+-              mode->upper_margin, mode->yres,
+-              mode->lower_margin, mode->vsync_len);
+-
+-      dev_dbg(hdmi->dev, "\t@%lu(+/-%lu)Hz, e=%lu / 1000, r=%uHz, p=%luHz\n", target,
+-              rate_error, rate_error ? 10000 / (10 * target / rate_error) : 0,
+-              mode->refresh, *parent_rate);
+-
+-      return rate_error;
+-}
+-
+-static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
+-                           unsigned long *parent_rate)
+-{
+-      struct sh_mobile_lcdc_chan *ch = hdmi->entity.lcdc;
+-      const struct fb_videomode *mode, *found = NULL;
+-      unsigned int f_width = 0, f_height = 0, f_refresh = 0;
+-      unsigned long found_rate_error = ULONG_MAX; /* silly compiler... */
+-      bool scanning = false, preferred_bad = false;
+-      bool use_edid_mode = false;
+-      u8 edid[128];
+-      char *forced;
+-      int i;
+-
+-      /* Read EDID */
+-      dev_dbg(hdmi->dev, "Read back EDID code:");
+-      for (i = 0; i < 128; i++) {
+-              edid[i] = (hdmi->htop1) ?
+-                      (u8)hdmi_htop1_read(hdmi, HDMI_HTOP1_EDID_DATA_READ + (i * 4)) :
+-                      hdmi_read(hdmi, HDMI_EDID_KSV_FIFO_ACCESS_WINDOW);
+-#ifdef DEBUG
+-              if ((i % 16) == 0) {
+-                      printk(KERN_CONT "\n");
+-                      printk(KERN_DEBUG "%02X | %02X", i, edid[i]);
+-              } else {
+-                      printk(KERN_CONT " %02X", edid[i]);
+-              }
+-#endif
+-      }
+-#ifdef DEBUG
+-      printk(KERN_CONT "\n");
+-#endif
+-
+-      if (!hdmi->edid_blocks) {
+-              fb_edid_to_monspecs(edid, &hdmi->monspec);
+-              hdmi->edid_blocks = edid[126] + 1;
+-
+-              dev_dbg(hdmi->dev, "%d main modes, %d extension blocks\n",
+-                      hdmi->monspec.modedb_len, hdmi->edid_blocks - 1);
+-      } else {
+-              dev_dbg(hdmi->dev, "Extension %u detected, DTD start %u\n",
+-                      edid[0], edid[2]);
+-              fb_edid_add_monspecs(edid, &hdmi->monspec);
+-      }
+-
+-      if (hdmi->edid_blocks > hdmi->edid_segment_nr * 2 +
+-          (hdmi->edid_block_addr >> 7) + 1) {
+-              /* More blocks to read */
+-              if (hdmi->edid_block_addr) {
+-                      hdmi->edid_block_addr = 0;
+-                      hdmi->edid_segment_nr++;
+-              } else {
+-                      hdmi->edid_block_addr = 0x80;
+-              }
+-              /* Set EDID word address  */
+-              hdmi_write(hdmi, hdmi->edid_block_addr, HDMI_EDID_WORD_ADDRESS);
+-              /* Enable EDID interrupt */
+-              hdmi_write(hdmi, 0xC6, HDMI_INTERRUPT_MASK_1);
+-              /* Set EDID segment pointer - starts reading EDID */
+-              hdmi_write(hdmi, hdmi->edid_segment_nr, HDMI_EDID_SEGMENT_POINTER);
+-              return -EAGAIN;
+-      }
+-
+-      /* All E-EDID blocks ready */
+-      dev_dbg(hdmi->dev, "%d main and extended modes\n", hdmi->monspec.modedb_len);
+-
+-      fb_get_options("sh_mobile_lcdc", &forced);
+-      if (forced && *forced) {
+-              /* Only primitive parsing so far */
+-              i = sscanf(forced, "%ux%u@%u",
+-                         &f_width, &f_height, &f_refresh);
+-              if (i < 2) {
+-                      f_width = 0;
+-                      f_height = 0;
+-              } else {
+-                      /* The user wants us to use the EDID data */
+-                      scanning = true;
+-              }
+-              dev_dbg(hdmi->dev, "Forced mode %ux%u@%uHz\n",
+-                      f_width, f_height, f_refresh);
+-      }
+-
+-      /* Walk monitor modes to find the best or the exact match */
+-      for (i = 0, mode = hdmi->monspec.modedb;
+-           i < hdmi->monspec.modedb_len && scanning;
+-           i++, mode++) {
+-              unsigned long rate_error;
+-
+-              if (!f_width && !f_height) {
+-                      /*
+-                       * A parameter string "video=sh_mobile_lcdc:0x0" means
+-                       * use the preferred EDID mode. If it is rejected by
+-                       * .fb_check_var(), keep looking, until an acceptable
+-                       * one is found.
+-                       */
+-                      if ((mode->flag & FB_MODE_IS_FIRST) || preferred_bad)
+-                              scanning = false;
+-                      else
+-                              continue;
+-              } else if (f_width != mode->xres || f_height != mode->yres) {
+-                      /* No interest in unmatching modes */
+-                      continue;
+-              }
+-
+-              rate_error = sh_hdmi_rate_error(hdmi, mode, hdmi_rate, parent_rate);
+-
+-              if (scanning) {
+-                      if (f_refresh == mode->refresh || (!f_refresh && !rate_error))
+-                              /*
+-                               * Exact match if either the refresh rate
+-                               * matches or it hasn't been specified and we've
+-                               * found a mode, for which we can configure the
+-                               * clock precisely
+-                               */
+-                              scanning = false;
+-                      else if (found && found_rate_error <= rate_error)
+-                              /*
+-                               * We otherwise search for the closest matching
+-                               * clock rate - either if no refresh rate has
+-                               * been specified or we cannot find an exactly
+-                               * matching one
+-                               */
+-                              continue;
+-              }
+-
+-              /* Check if supported: sufficient fb memory, supported clock-rate */
+-              if (ch && ch->notify &&
+-                  ch->notify(ch, SH_MOBILE_LCDC_EVENT_DISPLAY_MODE, mode,
+-                             NULL)) {
+-                      scanning = true;
+-                      preferred_bad = true;
+-                      continue;
+-              }
+-
+-              found = mode;
+-              found_rate_error = rate_error;
+-              use_edid_mode = true;
+-      }
+-
+-      /*
+-       * TODO 1: if no default mode is present, postpone running the config
+-       * until after the LCDC channel is initialized.
+-       * TODO 2: consider registering the HDMI platform device from the LCDC
+-       * driver.
+-       */
+-      if (!found && hdmi->entity.def_mode.xres != 0) {
+-              found = &hdmi->entity.def_mode;
+-              found_rate_error = sh_hdmi_rate_error(hdmi, found, hdmi_rate,
+-                                                    parent_rate);
+-      }
+-
+-      /* No cookie today */
+-      if (!found)
+-              return -ENXIO;
+-
+-      if (found->xres == 640 && found->yres == 480 && found->refresh == 60)
+-              hdmi->preprogrammed_vic = 1;
+-      else if (found->xres == 720 && found->yres == 480 && found->refresh == 60)
+-              hdmi->preprogrammed_vic = 2;
+-      else if (found->xres == 720 && found->yres == 576 && found->refresh == 50)
+-              hdmi->preprogrammed_vic = 17;
+-      else if (found->xres == 1280 && found->yres == 720 && found->refresh == 60)
+-              hdmi->preprogrammed_vic = 4;
+-      else if (found->xres == 1920 && found->yres == 1080 && found->refresh == 24)
+-              hdmi->preprogrammed_vic = 32;
+-      else if (found->xres == 1920 && found->yres == 1080 && found->refresh == 50)
+-              hdmi->preprogrammed_vic = 31;
+-      else if (found->xres == 1920 && found->yres == 1080 && found->refresh == 60)
+-              hdmi->preprogrammed_vic = 16;
+-      else
+-              hdmi->preprogrammed_vic = 0;
+-
+-      dev_dbg(hdmi->dev, "Using %s %s mode %ux%u@%uHz (%luHz), "
+-              "clock error %luHz\n", use_edid_mode ? "EDID" : "default",
+-              hdmi->preprogrammed_vic ? "VIC" : "external", found->xres,
+-              found->yres, found->refresh, PICOS2KHZ(found->pixclock) * 1000,
+-              found_rate_error);
+-
+-      hdmi->mode = *found;
+-      sh_hdmi_external_video_param(hdmi);
+-
+-      return 0;
+-}
+-
+-static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
+-{
+-      struct sh_hdmi *hdmi = dev_id;
+-      u8 status1, status2, mask1, mask2;
+-
+-      /* mode_b and PLLA and PLLB reset */
+-      hdmi_bit_set(hdmi, 0xFC, 0x2C, HDMI_SYSTEM_CTRL);
+-
+-      /* How long shall reset be held? */
+-      udelay(10);
+-
+-      /* mode_b and PLLA and PLLB reset release */
+-      hdmi_bit_set(hdmi, 0xFC, 0x20, HDMI_SYSTEM_CTRL);
+-
+-      status1 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_1);
+-      status2 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_2);
+-
+-      mask1 = hdmi_read(hdmi, HDMI_INTERRUPT_MASK_1);
+-      mask2 = hdmi_read(hdmi, HDMI_INTERRUPT_MASK_2);
+-
+-      /* Correct would be to ack only set bits, but the datasheet requires 0xff */
+-      hdmi_write(hdmi, 0xFF, HDMI_INTERRUPT_STATUS_1);
+-      hdmi_write(hdmi, 0xFF, HDMI_INTERRUPT_STATUS_2);
+-
+-      if (printk_ratelimit())
+-              dev_dbg(hdmi->dev, "IRQ #%d: Status #1: 0x%x & 0x%x, #2: 0x%x & 0x%x\n",
+-                      irq, status1, mask1, status2, mask2);
+-
+-      if (!((status1 & mask1) | (status2 & mask2))) {
+-              return IRQ_NONE;
+-      } else if (status1 & 0xc0) {
+-              u8 msens;
+-
+-              /* Datasheet specifies 10ms... */
+-              udelay(500);
+-
+-              msens = hdmi_read(hdmi, HDMI_HOT_PLUG_MSENS_STATUS);
+-              dev_dbg(hdmi->dev, "MSENS 0x%x\n", msens);
+-              /* Check, if hot plug & MSENS pin status are both high */
+-              if ((msens & 0xC0) == 0xC0) {
+-                      /* Display plug in */
+-                      hdmi->edid_segment_nr = 0;
+-                      hdmi->edid_block_addr = 0;
+-                      hdmi->edid_blocks = 0;
+-                      hdmi->hp_state = HDMI_HOTPLUG_CONNECTED;
+-
+-                      /* Set EDID word address  */
+-                      hdmi_write(hdmi, 0x00, HDMI_EDID_WORD_ADDRESS);
+-                      /* Enable EDID interrupt */
+-                      hdmi_write(hdmi, 0xC6, HDMI_INTERRUPT_MASK_1);
+-                      /* Set EDID segment pointer - starts reading EDID */
+-                      hdmi_write(hdmi, 0x00, HDMI_EDID_SEGMENT_POINTER);
+-              } else if (!(status1 & 0x80)) {
+-                      /* Display unplug, beware multiple interrupts */
+-                      if (hdmi->hp_state != HDMI_HOTPLUG_DISCONNECTED) {
+-                              hdmi->hp_state = HDMI_HOTPLUG_DISCONNECTED;
+-                              schedule_delayed_work(&hdmi->edid_work, 0);
+-                      }
+-                      /* display_off will switch back to mode_a */
+-              }
+-      } else if (status1 & 2) {
+-              /* EDID error interrupt: retry */
+-              /* Set EDID word address  */
+-              hdmi_write(hdmi, hdmi->edid_block_addr, HDMI_EDID_WORD_ADDRESS);
+-              /* Set EDID segment pointer */
+-              hdmi_write(hdmi, hdmi->edid_segment_nr, HDMI_EDID_SEGMENT_POINTER);
+-      } else if (status1 & 4) {
+-              /* Disable EDID interrupt */
+-              hdmi_write(hdmi, 0xC0, HDMI_INTERRUPT_MASK_1);
+-              schedule_delayed_work(&hdmi->edid_work, msecs_to_jiffies(10));
+-      }
+-
+-      return IRQ_HANDLED;
+-}
+-
+-static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
+-{
+-      struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity);
+-
+-      dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi,
+-              hdmi->hp_state);
+-
+-      /*
+-       * hp_state can be set to
+-       * HDMI_HOTPLUG_DISCONNECTED:   on monitor unplug
+-       * HDMI_HOTPLUG_CONNECTED:      on monitor plug-in
+-       * HDMI_HOTPLUG_EDID_DONE:      on EDID read completion
+-       */
+-      if (hdmi->hp_state == HDMI_HOTPLUG_EDID_DONE) {
+-              /* PS mode d->e. All functions are active */
+-              hdmi_bit_set(hdmi, 0xFC, 0x80, HDMI_SYSTEM_CTRL);
+-              dev_dbg(hdmi->dev, "HDMI running\n");
+-      }
+-
+-      return hdmi->hp_state == HDMI_HOTPLUG_DISCONNECTED
+-              ? SH_MOBILE_LCDC_DISPLAY_DISCONNECTED
+-              : SH_MOBILE_LCDC_DISPLAY_CONNECTED;
+-}
+-
+-static void sh_hdmi_display_off(struct sh_mobile_lcdc_entity *entity)
+-{
+-      struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity);
+-
+-      dev_dbg(hdmi->dev, "%s(%p)\n", __func__, hdmi);
+-      /* PS mode e->a */
+-      hdmi_bit_set(hdmi, 0xFC, 0x10, HDMI_SYSTEM_CTRL);
+-}
+-
+-static const struct sh_mobile_lcdc_entity_ops sh_hdmi_ops = {
+-      .display_on = sh_hdmi_display_on,
+-      .display_off = sh_hdmi_display_off,
+-};
+-
+-/**
+- * sh_hdmi_clk_configure() - set HDMI clock frequency and enable the clock
+- * @hdmi:             driver context
+- * @hdmi_rate:                HDMI clock frequency in Hz
+- * @parent_rate:      if != 0 - set parent clock rate for optimal precision
+- * return:            configured positive rate if successful
+- *                    0 if couldn't set the rate, but managed to enable the
+- *                    clock, negative error, if couldn't enable the clock
+- */
+-static long sh_hdmi_clk_configure(struct sh_hdmi *hdmi, unsigned long hdmi_rate,
+-                                unsigned long parent_rate)
+-{
+-      int ret;
+-
+-      if (parent_rate && clk_get_parent(hdmi->hdmi_clk)) {
+-              ret = clk_set_rate(clk_get_parent(hdmi->hdmi_clk), parent_rate);
+-              if (ret < 0) {
+-                      dev_warn(hdmi->dev, "Cannot set parent rate %ld: %d\n", parent_rate, ret);
+-                      hdmi_rate = clk_round_rate(hdmi->hdmi_clk, hdmi_rate);
+-              } else {
+-                      dev_dbg(hdmi->dev, "HDMI set parent frequency %lu\n", parent_rate);
+-              }
+-      }
+-
+-      ret = clk_set_rate(hdmi->hdmi_clk, hdmi_rate);
+-      if (ret < 0) {
+-              dev_warn(hdmi->dev, "Cannot set rate %ld: %d\n", hdmi_rate, ret);
+-              hdmi_rate = 0;
+-      } else {
+-              dev_dbg(hdmi->dev, "HDMI set frequency %lu\n", hdmi_rate);
+-      }
+-
+-      return hdmi_rate;
+-}
+-
+-/* Hotplug interrupt occurred, read EDID */
+-static void sh_hdmi_edid_work_fn(struct work_struct *work)
+-{
+-      struct sh_hdmi *hdmi = container_of(work, struct sh_hdmi, edid_work.work);
+-      struct sh_mobile_lcdc_chan *ch = hdmi->entity.lcdc;
+-      int ret;
+-
+-      dev_dbg(hdmi->dev, "%s(%p): begin, hotplug status %d\n", __func__, hdmi,
+-              hdmi->hp_state);
+-
+-      if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) {
+-              unsigned long parent_rate = 0, hdmi_rate;
+-
+-              ret = sh_hdmi_read_edid(hdmi, &hdmi_rate, &parent_rate);
+-              if (ret < 0)
+-                      goto out;
+-
+-              hdmi->hp_state = HDMI_HOTPLUG_EDID_DONE;
+-
+-              /* Reconfigure the clock */
+-              ret = sh_hdmi_clk_configure(hdmi, hdmi_rate, parent_rate);
+-              if (ret < 0)
+-                      goto out;
+-
+-              msleep(10);
+-              sh_hdmi_configure(hdmi);
+-              /* Switched to another (d) power-save mode */
+-              msleep(10);
+-
+-              if (ch && ch->notify)
+-                      ch->notify(ch, SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT,
+-                                 &hdmi->mode, &hdmi->monspec);
+-      } else {
+-              hdmi->monspec.modedb_len = 0;
+-              fb_destroy_modedb(hdmi->monspec.modedb);
+-              hdmi->monspec.modedb = NULL;
+-
+-              if (ch && ch->notify)
+-                      ch->notify(ch, SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT,
+-                                 NULL, NULL);
+-
+-              ret = 0;
+-      }
+-
+-out:
+-      if (ret < 0 && ret != -EAGAIN)
+-              hdmi->hp_state = HDMI_HOTPLUG_DISCONNECTED;
+-
+-      dev_dbg(hdmi->dev, "%s(%p): end\n", __func__, hdmi);
+-}
+-
+-static void sh_hdmi_htop1_init(struct sh_hdmi *hdmi)
+-{
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_MODE);
+-      hdmi_htop1_write(hdmi, 0x0000000b, 0x0010);
+-      hdmi_htop1_write(hdmi, 0x00006710, HDMI_HTOP1_HTOP_DCL_FRC_MODE);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2);
+-      hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1);
+-      hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2);
+-      hdmi_htop1_write(hdmi, 0x00000008, HDMI_HTOP1_CURRENT);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP0_1);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP2_C);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PHY_TEST_MODE);
+-      hdmi_htop1_write(hdmi, 0x00000081, HDMI_HTOP1_TISIDRV);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PLLBW);
+-      hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+-      hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+-      hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+-      hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+-      hdmi_htop1_write(hdmi, 0x00000016, HDMI_HTOP1_CISRANGE);
+-      msleep(100);
+-      hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_ENABLE_SELECTOR);
+-      msleep(100);
+-      hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+-      hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+-      hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+-      hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_CLK_TO_PHY);
+-      hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT2);
+-      hdmi_htop1_write(hdmi, 0x0000000a, HDMI_HTOP1_CLK_SET);
+-}
+-
+-static int __init sh_hdmi_probe(struct platform_device *pdev)
+-{
+-      struct sh_mobile_hdmi_info *pdata = dev_get_platdata(&pdev->dev);
+-      struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-      struct resource *htop1_res;
+-      int irq = platform_get_irq(pdev, 0), ret;
+-      struct sh_hdmi *hdmi;
+-      long rate;
+-
+-      if (!res || !pdata || irq < 0)
+-              return -ENODEV;
+-
+-      htop1_res = NULL;
+-      if (pdata->flags & HDMI_HAS_HTOP1) {
+-              htop1_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+-              if (!htop1_res) {
+-                      dev_err(&pdev->dev, "htop1 needs register base\n");
+-                      return -EINVAL;
+-              }
+-      }
+-
+-      hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
+-      if (!hdmi) {
+-              dev_err(&pdev->dev, "Cannot allocate device data\n");
+-              return -ENOMEM;
+-      }
+-
+-      hdmi->dev = &pdev->dev;
+-      hdmi->entity.owner = THIS_MODULE;
+-      hdmi->entity.ops = &sh_hdmi_ops;
+-      hdmi->irq = irq;
+-
+-      hdmi->hdmi_clk = clk_get(&pdev->dev, "ick");
+-      if (IS_ERR(hdmi->hdmi_clk)) {
+-              ret = PTR_ERR(hdmi->hdmi_clk);
+-              dev_err(&pdev->dev, "Unable to get clock: %d\n", ret);
+-              return ret;
+-      }
+-
+-      /* select register access functions */
+-      if (pdata->flags & HDMI_32BIT_REG) {
+-              hdmi->write     = __hdmi_write32;
+-              hdmi->read      = __hdmi_read32;
+-      } else {
+-              hdmi->write     = __hdmi_write8;
+-              hdmi->read      = __hdmi_read8;
+-      }
+-
+-      /* An arbitrary relaxed pixclock just to get things started: from standard 480p */
+-      rate = clk_round_rate(hdmi->hdmi_clk, PICOS2KHZ(37037));
+-      if (rate > 0)
+-              rate = sh_hdmi_clk_configure(hdmi, rate, 0);
+-
+-      if (rate < 0) {
+-              ret = rate;
+-              goto erate;
+-      }
+-
+-      ret = clk_prepare_enable(hdmi->hdmi_clk);
+-      if (ret < 0) {
+-              dev_err(hdmi->dev, "Cannot enable clock: %d\n", ret);
+-              goto erate;
+-      }
+-
+-      dev_dbg(&pdev->dev, "Enabled HDMI clock at %luHz\n", rate);
+-
+-      if (!request_mem_region(res->start, resource_size(res), dev_name(&pdev->dev))) {
+-              dev_err(&pdev->dev, "HDMI register region already claimed\n");
+-              ret = -EBUSY;
+-              goto ereqreg;
+-      }
+-
+-      hdmi->base = ioremap(res->start, resource_size(res));
+-      if (!hdmi->base) {
+-              dev_err(&pdev->dev, "HDMI register region already claimed\n");
+-              ret = -ENOMEM;
+-              goto emap;
+-      }
+-
+-      platform_set_drvdata(pdev, &hdmi->entity);
+-
+-      INIT_DELAYED_WORK(&hdmi->edid_work, sh_hdmi_edid_work_fn);
+-
+-      pm_runtime_enable(&pdev->dev);
+-      pm_runtime_get_sync(&pdev->dev);
+-
+-      /* init interrupt polarity */
+-      if (pdata->flags & HDMI_OUTPUT_PUSH_PULL)
+-              hdmi_bit_set(hdmi, 0x02, 0x02, HDMI_SYSTEM_CTRL);
+-
+-      if (pdata->flags & HDMI_OUTPUT_POLARITY_HI)
+-              hdmi_bit_set(hdmi, 0x01, 0x01, HDMI_SYSTEM_CTRL);
+-
+-      /* enable htop1 register if needed */
+-      if (htop1_res) {
+-              hdmi->htop1 = ioremap(htop1_res->start, resource_size(htop1_res));
+-              if (!hdmi->htop1) {
+-                      dev_err(&pdev->dev, "control register region already claimed\n");
+-                      ret = -ENOMEM;
+-                      goto emap_htop1;
+-              }
+-              sh_hdmi_htop1_init(hdmi);
+-      }
+-
+-      /* Product and revision IDs are 0 in sh-mobile version */
+-      dev_info(&pdev->dev, "Detected HDMI controller 0x%x:0x%x\n",
+-               hdmi_read(hdmi, HDMI_PRODUCT_ID), hdmi_read(hdmi, HDMI_REVISION_ID));
+-
+-      ret = request_irq(irq, sh_hdmi_hotplug, 0,
+-                        dev_name(&pdev->dev), hdmi);
+-      if (ret < 0) {
+-              dev_err(&pdev->dev, "Unable to request irq: %d\n", ret);
+-              goto ereqirq;
+-      }
+-
+-      ret = snd_soc_register_codec(&pdev->dev,
+-                      &soc_codec_dev_sh_hdmi, &sh_hdmi_dai, 1);
+-      if (ret < 0) {
+-              dev_err(&pdev->dev, "codec registration failed\n");
+-              goto ecodec;
+-      }
+-
+-      return 0;
+-
+-ecodec:
+-      free_irq(irq, hdmi);
+-ereqirq:
+-      if (hdmi->htop1)
+-              iounmap(hdmi->htop1);
+-emap_htop1:
+-      pm_runtime_put(&pdev->dev);
+-      pm_runtime_disable(&pdev->dev);
+-      iounmap(hdmi->base);
+-emap:
+-      release_mem_region(res->start, resource_size(res));
+-ereqreg:
+-      clk_disable_unprepare(hdmi->hdmi_clk);
+-erate:
+-      clk_put(hdmi->hdmi_clk);
+-
+-      return ret;
+-}
+-
+-static int __exit sh_hdmi_remove(struct platform_device *pdev)
+-{
+-      struct sh_hdmi *hdmi = entity_to_sh_hdmi(platform_get_drvdata(pdev));
+-      struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-
+-      snd_soc_unregister_codec(&pdev->dev);
+-
+-      /* No new work will be scheduled, wait for running ISR */
+-      free_irq(hdmi->irq, hdmi);
+-      /* Wait for already scheduled work */
+-      cancel_delayed_work_sync(&hdmi->edid_work);
+-      pm_runtime_put(&pdev->dev);
+-      pm_runtime_disable(&pdev->dev);
+-      clk_disable_unprepare(hdmi->hdmi_clk);
+-      clk_put(hdmi->hdmi_clk);
+-      if (hdmi->htop1)
+-              iounmap(hdmi->htop1);
+-      iounmap(hdmi->base);
+-      release_mem_region(res->start, resource_size(res));
+-
+-      return 0;
+-}
+-
+-static int sh_hdmi_suspend(struct device *dev)
+-{
+-      struct platform_device *pdev = to_platform_device(dev);
+-      struct sh_hdmi *hdmi = entity_to_sh_hdmi(platform_get_drvdata(pdev));
+-
+-      disable_irq(hdmi->irq);
+-      /* Wait for already scheduled work */
+-      cancel_delayed_work_sync(&hdmi->edid_work);
+-      return 0;
+-}
+-
+-static int sh_hdmi_resume(struct device *dev)
+-{
+-      struct platform_device *pdev = to_platform_device(dev);
+-      struct sh_mobile_hdmi_info *pdata = dev_get_platdata(dev);
+-      struct sh_hdmi *hdmi = entity_to_sh_hdmi(platform_get_drvdata(pdev));
+-
+-      /* Re-init interrupt polarity */
+-      if (pdata->flags & HDMI_OUTPUT_PUSH_PULL)
+-              hdmi_bit_set(hdmi, 0x02, 0x02, HDMI_SYSTEM_CTRL);
+-
+-      if (pdata->flags & HDMI_OUTPUT_POLARITY_HI)
+-              hdmi_bit_set(hdmi, 0x01, 0x01, HDMI_SYSTEM_CTRL);
+-
+-      /* Re-init htop1 */
+-      if (hdmi->htop1)
+-              sh_hdmi_htop1_init(hdmi);
+-
+-      /* Now it's safe to enable interrupts again */
+-      enable_irq(hdmi->irq);
+-      return 0;
+-}
+-
+-static const struct dev_pm_ops sh_hdmi_pm_ops = {
+-      .suspend        = sh_hdmi_suspend,
+-      .resume         = sh_hdmi_resume,
+-};
+-
+-static struct platform_driver sh_hdmi_driver = {
+-      .remove         = __exit_p(sh_hdmi_remove),
+-      .driver = {
+-              .name   = "sh-mobile-hdmi",
+-              .pm     = &sh_hdmi_pm_ops,
+-      },
+-};
+-
+-module_platform_driver_probe(sh_hdmi_driver, sh_hdmi_probe);
+-
+-MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
+-MODULE_DESCRIPTION("SuperH / ARM-shmobile HDMI driver");
+-MODULE_LICENSE("GPL v2");
+--- a/include/video/sh_mobile_hdmi.h
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/*
+- * SH-Mobile High-Definition Multimedia Interface (HDMI)
+- *
+- * Copyright (C) 2010, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+- *
+- * 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 SH_MOBILE_HDMI_H
+-#define SH_MOBILE_HDMI_H
+-
+-struct sh_mobile_lcdc_chan_cfg;
+-struct device;
+-struct clk;
+-
+-/*
+- * flags format
+- *
+- * 0x00000CBA
+- *
+- * A: Audio source select
+- * B: Int output option
+- * C: Chip specific option
+- */
+-
+-/* Audio source select */
+-#define HDMI_SND_SRC_MASK     (0xF << 0)
+-#define HDMI_SND_SRC_I2S      (0 << 0) /* default */
+-#define HDMI_SND_SRC_SPDIF    (1 << 0)
+-#define HDMI_SND_SRC_DSD      (2 << 0)
+-#define HDMI_SND_SRC_HBR      (3 << 0)
+-
+-/* Int output option */
+-#define HDMI_OUTPUT_PUSH_PULL (1 << 4) /* System control : output mode */
+-#define HDMI_OUTPUT_POLARITY_HI       (1 << 5) /* System control : output polarity */
+-
+-/* Chip specific option */
+-#define HDMI_32BIT_REG                (1 << 8)
+-#define HDMI_HAS_HTOP1                (1 << 9)
+-
+-struct sh_mobile_hdmi_info {
+-      unsigned int                     flags;
+-      long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
+-                                  unsigned long *parent_freq);
+-};
+-
+-#endif
diff --git a/queue-4.4/kprobes-x86-prohibit-probing-on-exception-masking-instructions.patch b/queue-4.4/kprobes-x86-prohibit-probing-on-exception-masking-instructions.patch
new file mode 100644 (file)
index 0000000..22771e9
--- /dev/null
@@ -0,0 +1,83 @@
+From ee6a7354a3629f9b65bc18dbe393503e9440d6f5 Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Wed, 9 May 2018 21:58:15 +0900
+Subject: kprobes/x86: Prohibit probing on exception masking instructions
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+commit ee6a7354a3629f9b65bc18dbe393503e9440d6f5 upstream.
+
+Since MOV SS and POP SS instructions will delay the exceptions until the
+next instruction is executed, single-stepping on it by kprobes must be
+prohibited.
+
+However, kprobes usually executes those instructions directly on trampoline
+buffer (a.k.a. kprobe-booster), except for the kprobes which has
+post_handler. Thus if kprobe user probes MOV SS with post_handler, it will
+do single-stepping on the MOV SS.
+
+This means it is safe that if it is used via ftrace or perf/bpf since those
+don't use the post_handler.
+
+Anyway, since the stack switching is a rare case, it is safer just
+rejecting kprobes on such instructions.
+
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
+Cc: Francis Deslauriers <francis.deslauriers@efficios.com>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: Alexei Starovoitov <ast@kernel.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: "H . Peter Anvin" <hpa@zytor.com>
+Cc: Yonghong Song <yhs@fb.com>
+Cc: Borislav Petkov <bp@suse.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: "David S . Miller" <davem@davemloft.net>
+Link: https://lkml.kernel.org/r/152587069574.17316.3311695234863248641.stgit@devbox
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/insn.h    |   18 ++++++++++++++++++
+ arch/x86/kernel/kprobes/core.c |    4 ++++
+ 2 files changed, 22 insertions(+)
+
+--- a/arch/x86/include/asm/insn.h
++++ b/arch/x86/include/asm/insn.h
+@@ -198,4 +198,22 @@ static inline int insn_offset_immediate(
+       return insn_offset_displacement(insn) + insn->displacement.nbytes;
+ }
++#define POP_SS_OPCODE 0x1f
++#define MOV_SREG_OPCODE 0x8e
++
++/*
++ * Intel SDM Vol.3A 6.8.3 states;
++ * "Any single-step trap that would be delivered following the MOV to SS
++ * instruction or POP to SS instruction (because EFLAGS.TF is 1) is
++ * suppressed."
++ * This function returns true if @insn is MOV SS or POP SS. On these
++ * instructions, single stepping is suppressed.
++ */
++static inline int insn_masking_exception(struct insn *insn)
++{
++      return insn->opcode.bytes[0] == POP_SS_OPCODE ||
++              (insn->opcode.bytes[0] == MOV_SREG_OPCODE &&
++               X86_MODRM_REG(insn->modrm.bytes[0]) == 2);
++}
++
+ #endif /* _ASM_X86_INSN_H */
+--- a/arch/x86/kernel/kprobes/core.c
++++ b/arch/x86/kernel/kprobes/core.c
+@@ -372,6 +372,10 @@ int __copy_instruction(u8 *dest, u8 *src
+               return 0;
+       memcpy(dest, insn.kaddr, length);
++      /* We should not singlestep on the exception masking instructions */
++      if (insn_masking_exception(&insn))
++              return 0;
++
+ #ifdef CONFIG_X86_64
+       if (insn_rip_relative(&insn)) {
+               s64 newdisp;
diff --git a/queue-4.4/libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch b/queue-4.4/libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch
new file mode 100644 (file)
index 0000000..88a5467
--- /dev/null
@@ -0,0 +1,80 @@
+From 2d7271501720038381d45fb3dcbe4831228fc8cc Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Wed, 7 Aug 2019 12:20:52 -0600
+Subject: libata: have ata_scsi_rw_xlat() fail invalid passthrough requests
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit 2d7271501720038381d45fb3dcbe4831228fc8cc upstream.
+
+For passthrough requests, libata-scsi takes what the user passes in
+as gospel. This can be problematic if the user fills in the CDB
+incorrectly. One example of that is in request sizes. For read/write
+commands, the CDB contains fields describing the transfer length of
+the request. These should match with the SG_IO header fields, but
+libata-scsi currently does no validation of that.
+
+Check that the number of blocks in the CDB for passthrough requests
+matches what was mapped into the request. If the CDB asks for more
+data then the validated SG_IO header fields, error it.
+
+Reported-by: Krishna Ram Prakash R <krp@gtux.in>
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/libata-scsi.c |   21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+--- a/drivers/ata/libata-scsi.c
++++ b/drivers/ata/libata-scsi.c
+@@ -1654,6 +1654,21 @@ nothing_to_do:
+       return 1;
+ }
++static bool ata_check_nblocks(struct scsi_cmnd *scmd, u32 n_blocks)
++{
++      struct request *rq = scmd->request;
++      u32 req_blocks;
++
++      if (!blk_rq_is_passthrough(rq))
++              return true;
++
++      req_blocks = blk_rq_bytes(rq) / scmd->device->sector_size;
++      if (n_blocks > req_blocks)
++              return false;
++
++      return true;
++}
++
+ /**
+  *    ata_scsi_rw_xlat - Translate SCSI r/w command into an ATA one
+  *    @qc: Storage for translated ATA taskfile
+@@ -1693,6 +1708,8 @@ static unsigned int ata_scsi_rw_xlat(str
+               scsi_10_lba_len(cdb, &block, &n_block);
+               if (cdb[1] & (1 << 3))
+                       tf_flags |= ATA_TFLAG_FUA;
++              if (!ata_check_nblocks(scmd, n_block))
++                      goto invalid_fld;
+               break;
+       case READ_6:
+       case WRITE_6:
+@@ -1705,6 +1722,8 @@ static unsigned int ata_scsi_rw_xlat(str
+                */
+               if (!n_block)
+                       n_block = 256;
++              if (!ata_check_nblocks(scmd, n_block))
++                      goto invalid_fld;
+               break;
+       case READ_16:
+       case WRITE_16:
+@@ -1713,6 +1732,8 @@ static unsigned int ata_scsi_rw_xlat(str
+               scsi_16_lba_len(cdb, &block, &n_block);
+               if (cdb[1] & (1 << 3))
+                       tf_flags |= ATA_TFLAG_FUA;
++              if (!ata_check_nblocks(scmd, n_block))
++                      goto invalid_fld;
+               break;
+       default:
+               DPRINTK("no-byte command\n");
index f2a52963311743fae9c5dc355547d2ebbef97c43..8be4129001c5a4de6ee4da94a9575bc30d316180 100644 (file)
@@ -98,3 +98,13 @@ bluetooth-hci_ldisc-postpone-hci_uart_proto_ready-bit-set-in-hci_uart_set_proto.
 memfd-use-radix_tree_deref_slot_protected-to-avoid-the-warning.patch
 slcan-fix-memory-leak-in-error-path.patch
 net-cdc_ncm-signedness-bug-in-cdc_ncm_set_dgram_size.patch
+x86-atomic-fix-smp_mb__-before-after-_atomic.patch
+apparmor-fix-uninitialized-lsm_audit-member.patch
+apparmor-fix-update-the-mtime-of-the-profile-file-on-replacement.patch
+apparmor-fix-module-parameters-can-be-changed-after-policy-is-locked.patch
+kprobes-x86-prohibit-probing-on-exception-masking-instructions.patch
+uprobes-x86-prohibit-probing-on-mov-ss-instruction.patch
+fbdev-remove-unused-sh-mobile-hdmi-driver.patch
+fbdev-ditch-fb_edid_add_monspecs.patch
+block-introduce-blk_rq_is_passthrough.patch
+libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch
diff --git a/queue-4.4/uprobes-x86-prohibit-probing-on-mov-ss-instruction.patch b/queue-4.4/uprobes-x86-prohibit-probing-on-mov-ss-instruction.patch
new file mode 100644 (file)
index 0000000..e1e1073
--- /dev/null
@@ -0,0 +1,50 @@
+From 13ebe18c94f5b0665c01ae7fad2717ae959f4212 Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Wed, 9 May 2018 21:58:45 +0900
+Subject: uprobes/x86: Prohibit probing on MOV SS instruction
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+commit 13ebe18c94f5b0665c01ae7fad2717ae959f4212 upstream.
+
+Since MOV SS and POP SS instructions will delay the exceptions until the
+next instruction is executed, single-stepping on it by uprobes must be
+prohibited.
+
+uprobe already rejects probing on POP SS (0x1f), but allows probing on MOV
+SS (0x8e and reg == 2).  This checks the target instruction and if it is
+MOV SS or POP SS, returns -ENOTSUPP to reject probing.
+
+Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Acked-by: Oleg Nesterov <oleg@redhat.com>
+Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
+Cc: Francis Deslauriers <francis.deslauriers@efficios.com>
+Cc: Alexei Starovoitov <ast@kernel.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: "H . Peter Anvin" <hpa@zytor.com>
+Cc: Yonghong Song <yhs@fb.com>
+Cc: Borislav Petkov <bp@suse.de>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: "David S . Miller" <davem@davemloft.net>
+Link: https://lkml.kernel.org/r/152587072544.17316.5950935243917346341.stgit@devbox
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/uprobes.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/x86/kernel/uprobes.c
++++ b/arch/x86/kernel/uprobes.c
+@@ -296,6 +296,10 @@ static int uprobe_init_insn(struct arch_
+       if (is_prefix_bad(insn))
+               return -ENOTSUPP;
++      /* We should not singlestep on the exception masking instructions */
++      if (insn_masking_exception(insn))
++              return -ENOTSUPP;
++
+       if (x86_64)
+               good_insns = good_insns_64;
+       else
diff --git a/queue-4.4/x86-atomic-fix-smp_mb__-before-after-_atomic.patch b/queue-4.4/x86-atomic-fix-smp_mb__-before-after-_atomic.patch
new file mode 100644 (file)
index 0000000..0190edb
--- /dev/null
@@ -0,0 +1,143 @@
+From 69d927bba39517d0980462efc051875b7f4db185 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Wed, 24 Apr 2019 13:38:23 +0200
+Subject: x86/atomic: Fix smp_mb__{before,after}_atomic()
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit 69d927bba39517d0980462efc051875b7f4db185 upstream.
+
+Recent probing at the Linux Kernel Memory Model uncovered a
+'surprise'. Strongly ordered architectures where the atomic RmW
+primitive implies full memory ordering and
+smp_mb__{before,after}_atomic() are a simple barrier() (such as x86)
+fail for:
+
+       *x = 1;
+       atomic_inc(u);
+       smp_mb__after_atomic();
+       r0 = *y;
+
+Because, while the atomic_inc() implies memory order, it
+(surprisingly) does not provide a compiler barrier. This then allows
+the compiler to re-order like so:
+
+       atomic_inc(u);
+       *x = 1;
+       smp_mb__after_atomic();
+       r0 = *y;
+
+Which the CPU is then allowed to re-order (under TSO rules) like:
+
+       atomic_inc(u);
+       r0 = *y;
+       *x = 1;
+
+And this very much was not intended. Therefore strengthen the atomic
+RmW ops to include a compiler barrier.
+
+NOTE: atomic_{or,and,xor} and the bitops already had the compiler
+barrier.
+
+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>
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Jari Ruusu <jari.ruusu@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/atomic.h      |    8 ++++----
+ arch/x86/include/asm/atomic64_64.h |    8 ++++----
+ arch/x86/include/asm/barrier.h     |    4 ++--
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+--- a/arch/x86/include/asm/atomic.h
++++ b/arch/x86/include/asm/atomic.h
+@@ -49,7 +49,7 @@ static __always_inline void atomic_add(i
+ {
+       asm volatile(LOCK_PREFIX "addl %1,%0"
+                    : "+m" (v->counter)
+-                   : "ir" (i));
++                   : "ir" (i) : "memory");
+ }
+ /**
+@@ -63,7 +63,7 @@ static __always_inline void atomic_sub(i
+ {
+       asm volatile(LOCK_PREFIX "subl %1,%0"
+                    : "+m" (v->counter)
+-                   : "ir" (i));
++                   : "ir" (i) : "memory");
+ }
+ /**
+@@ -89,7 +89,7 @@ static __always_inline int atomic_sub_an
+ static __always_inline void atomic_inc(atomic_t *v)
+ {
+       asm volatile(LOCK_PREFIX "incl %0"
+-                   : "+m" (v->counter));
++                   : "+m" (v->counter) :: "memory");
+ }
+ /**
+@@ -101,7 +101,7 @@ static __always_inline void atomic_inc(a
+ static __always_inline void atomic_dec(atomic_t *v)
+ {
+       asm volatile(LOCK_PREFIX "decl %0"
+-                   : "+m" (v->counter));
++                   : "+m" (v->counter) :: "memory");
+ }
+ /**
+--- a/arch/x86/include/asm/atomic64_64.h
++++ b/arch/x86/include/asm/atomic64_64.h
+@@ -44,7 +44,7 @@ static __always_inline void atomic64_add
+ {
+       asm volatile(LOCK_PREFIX "addq %1,%0"
+                    : "=m" (v->counter)
+-                   : "er" (i), "m" (v->counter));
++                   : "er" (i), "m" (v->counter) : "memory");
+ }
+ /**
+@@ -58,7 +58,7 @@ static inline void atomic64_sub(long i,
+ {
+       asm volatile(LOCK_PREFIX "subq %1,%0"
+                    : "=m" (v->counter)
+-                   : "er" (i), "m" (v->counter));
++                   : "er" (i), "m" (v->counter) : "memory");
+ }
+ /**
+@@ -85,7 +85,7 @@ static __always_inline void atomic64_inc
+ {
+       asm volatile(LOCK_PREFIX "incq %0"
+                    : "=m" (v->counter)
+-                   : "m" (v->counter));
++                   : "m" (v->counter) : "memory");
+ }
+ /**
+@@ -98,7 +98,7 @@ static __always_inline void atomic64_dec
+ {
+       asm volatile(LOCK_PREFIX "decq %0"
+                    : "=m" (v->counter)
+-                   : "m" (v->counter));
++                   : "m" (v->counter) : "memory");
+ }
+ /**
+--- a/arch/x86/include/asm/barrier.h
++++ b/arch/x86/include/asm/barrier.h
+@@ -116,7 +116,7 @@ do {                                                                       \
+ #endif
+ /* Atomic operations are already serializing on x86 */
+-#define smp_mb__before_atomic()       barrier()
+-#define smp_mb__after_atomic()        barrier()
++#define smp_mb__before_atomic()       do { } while (0)
++#define smp_mb__after_atomic()        do { } while (0)
+ #endif /* _ASM_X86_BARRIER_H */