fix vpu stuck at 200M bug
[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-rk / vpu_service.c
index 96f391729cd997ae312ca0835d8b15594915fb28..4bcec8421ca459066f70cd3f950f59a4091e878e 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/timer.h>
+#include <linux/wakelock.h>
 
 #include <asm/uaccess.h>
 
 #include <mach/irqs.h>
-#include <plat/vpu_service.h>
 #include <mach/pmu.h>
 #include <mach/cru.h>
 
+#include <plat/vpu_service.h>
+#include <plat/cpu.h>
+
+typedef enum {
+       VPU_DEC_ID_9190         = 0x6731,
+       VPU_ID_8270             = 0x8270,
+       VPU_ID_4831             = 0x4831,
+} VPU_HW_ID;
+
+typedef enum {
+       VPU_DEC_TYPE_9190       = 0,
+       VPU_ENC_TYPE_8270       = 0x100,
+       VPU_ENC_TYPE_4831       ,
+} VPU_HW_TYPE_E;
+
+typedef enum VPU_FREQ {
+       VPU_FREQ_200M,
+       VPU_FREQ_266M,
+       VPU_FREQ_300M,
+       VPU_FREQ_400M,
+       VPU_FREQ_DEFAULT,
+       VPU_FREQ_BUT,
+} VPU_FREQ;
+
+typedef struct {
+       VPU_HW_ID               hw_id;
+       unsigned long           hw_addr;
+       unsigned long           enc_offset;
+       unsigned long           enc_reg_num;
+       unsigned long           enc_io_size;
+       unsigned long           dec_offset;
+       unsigned long           dec_reg_num;
+       unsigned long           dec_io_size;
+} VPU_HW_INFO_E;
+
+#define VPU_SERVICE_SHOW_TIME                  0
+
+#if VPU_SERVICE_SHOW_TIME
+static struct timeval enc_start, enc_end;
+static struct timeval dec_start, dec_end;
+static struct timeval pp_start,  pp_end;
+#endif
+
+#define MHZ                                    (1000*1000)
+
+#define VCODEC_PHYS                            (0x10104000)
+
+#define REG_NUM_9190_DEC                       (60)
+#define REG_NUM_9190_PP                                (41)
+#define REG_NUM_9190_DEC_PP                    (REG_NUM_9190_DEC+REG_NUM_9190_PP)
+
+#define REG_NUM_DEC_PP                         (REG_NUM_9190_DEC+REG_NUM_9190_PP)
+
+#define REG_NUM_ENC_8270                       (96)
+#define REG_SIZE_ENC_8270                      (0x200)
+#define REG_NUM_ENC_4831                       (164)
+#define REG_SIZE_ENC_4831                      (0x400)
+
+#define SIZE_REG(reg)                          ((reg)*4)
+
+VPU_HW_INFO_E vpu_hw_set[] = {
+       [0] = {
+               .hw_id          = VPU_ID_8270,
+               .hw_addr        = VCODEC_PHYS,
+               .enc_offset     = 0x0,
+               .enc_reg_num    = REG_NUM_ENC_8270,
+               .enc_io_size    = REG_NUM_ENC_8270 * 4,
+               .dec_offset     = REG_SIZE_ENC_8270,
+               .dec_reg_num    = REG_NUM_9190_DEC_PP,
+               .dec_io_size    = REG_NUM_9190_DEC_PP * 4,
+       },
+       [1] = {
+               .hw_id          = VPU_ID_4831,
+               .hw_addr        = VCODEC_PHYS,
+               .enc_offset     = 0x0,
+               .enc_reg_num    = REG_NUM_ENC_4831,
+               .enc_io_size    = REG_NUM_ENC_4831 * 4,
+               .dec_offset     = REG_SIZE_ENC_4831,
+               .dec_reg_num    = REG_NUM_9190_DEC_PP,
+               .dec_io_size    = REG_NUM_9190_DEC_PP * 4,
+       },
+};
+
 
 #define DEC_INTERRUPT_REGISTER                 1
 #define PP_INTERRUPT_REGISTER                  60
 #define PP_INTERRUPT_BIT                        0x100
 #define ENC_INTERRUPT_BIT                       0x1
 
-#define REG_NUM_DEC                            (60)
-#define REG_NUM_PP                             (41)
-#define REG_NUM_ENC                            (96)
-#define REG_NUM_DEC_PP                         (REG_NUM_DEC+REG_NUM_PP)
-#define SIZE_REG(reg)                          ((reg)*4)
-
-#define DEC_IO_SIZE                            ((100 + 1) * 4) /* bytes */
-#define ENC_IO_SIZE                            (96 * 4)        /* bytes */
-static const u16 dec_hw_ids[] = { 0x8190, 0x8170, 0x9170, 0x9190, 0x6731 };
-#if defined(CONFIG_ARCH_RK29)
-static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270 };
-#define DEC_PHY_OFFSET                                 0x200
-#elif defined(CONFIG_ARCH_RK30)
-static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270, 0x8290, 0x4831 };
-#define DEC_PHY_OFFSET                                 0x400
-#endif
-
 #define VPU_REG_EN_ENC                         14
 #define VPU_REG_ENC_GATE                       2
 #define VPU_REG_ENC_GATE_BIT                   (1<<4)
@@ -86,7 +151,6 @@ static const u16 enc_hw_ids[] = { 0x6280, 0x7280, 0x8270, 0x8290, 0x4831 };
 #define VPU_REG_DEC_PP_GATE                    61
 #define VPU_REG_DEC_PP_GATE_BIT                (1<<8)
 
-
 /**
  * struct for process session which connect to vpu
  *
@@ -114,22 +178,26 @@ typedef struct vpu_session {
  */
 typedef struct vpu_reg {
        VPU_CLIENT_TYPE         type;
+       VPU_FREQ                freq;
        vpu_session             *session;
        struct list_head        session_link;           /* link to vpu service session */
        struct list_head        status_link;            /* link to register set list */
        unsigned long           size;
-       unsigned long           reg[VPU_REG_NUM_DEC_PP];
+       unsigned long           *reg;
 } vpu_reg;
 
 typedef struct vpu_device {
+       atomic_t                irq_count_codec;
+       atomic_t                irq_count_pp;
        unsigned long           iobaseaddr;
        unsigned int            iosize;
        volatile u32            *hwregs;
 } vpu_device;
 
 typedef struct vpu_service_info {
-       spinlock_t              lock;
-       struct timer_list       timer;                  /* timer for power off */
+       struct wake_lock        wake_lock;
+       struct delayed_work     power_off_work;
+       struct mutex            lock;
        struct list_head        waiting;                /* link to link_reg in struct vpu_reg */
        struct list_head        running;                /* link to link_reg in struct vpu_reg */
        struct list_head        done;                   /* link to link_reg in struct vpu_reg */
@@ -141,6 +209,10 @@ typedef struct vpu_service_info {
        vpu_reg                 *reg_resev;
        VPUHwDecConfig_t        dec_config;
        VPUHwEncConfig_t        enc_config;
+       VPU_HW_INFO_E           *hw_info;
+       unsigned long           reg_size;
+       bool                    auto_freq;
+       atomic_t                freq_status;
 } vpu_service_info;
 
 typedef struct vpu_request
@@ -149,7 +221,7 @@ typedef struct vpu_request
        unsigned long   size;
 } vpu_request;
 
-static struct clk *clk_vpu; /* for power on notify */
+static struct clk *pd_video;
 static struct clk *aclk_vepu;
 static struct clk *hclk_vepu;
 static struct clk *aclk_ddr_vepu;
@@ -158,21 +230,36 @@ static vpu_service_info service;
 static vpu_device      dec_dev;
 static vpu_device      enc_dev;
 
-#define POWER_OFF_DELAY        4*HZ /* 4s */
-#define TIMEOUT_DELAY  2*HZ /* 2s */
+#define VPU_POWER_OFF_DELAY            4*HZ /* 4s */
+#define VPU_TIMEOUT_DELAY              2*HZ /* 2s */
 
 static void vpu_get_clk(void)
 {
-       clk_vpu         = clk_get(NULL, "vpu");
+       pd_video        = clk_get(NULL, "pd_video");
+       if (IS_ERR(pd_video)) {
+               pr_err("failed on clk_get pd_video\n");
+       }
        aclk_vepu       = clk_get(NULL, "aclk_vepu");
+       if (IS_ERR(aclk_vepu)) {
+               pr_err("failed on clk_get aclk_vepu\n");
+       }
        hclk_vepu       = clk_get(NULL, "hclk_vepu");
+       if (IS_ERR(hclk_vepu)) {
+               pr_err("failed on clk_get hclk_vepu\n");
+       }
        aclk_ddr_vepu   = clk_get(NULL, "aclk_ddr_vepu");
+       if (IS_ERR(aclk_ddr_vepu)) {
+               pr_err("failed on clk_get aclk_ddr_vepu\n");
+       }
        hclk_cpu_vcodec = clk_get(NULL, "hclk_cpu_vcodec");
+       if (IS_ERR(hclk_cpu_vcodec)) {
+               pr_err("failed on clk_get hclk_cpu_vcodec\n");
+       }
 }
 
 static void vpu_put_clk(void)
 {
-       clk_put(clk_vpu);
+       clk_put(pd_video);
        clk_put(aclk_vepu);
        clk_put(hclk_vepu);
        clk_put(aclk_ddr_vepu);
@@ -199,7 +286,7 @@ static void vpu_reset(void)
        cru_set_soft_reset(SOFT_RST_VCODEC_NIU_AXI, true);
        cru_set_soft_reset(SOFT_RST_VCODEC_AHB, true);
        cru_set_soft_reset(SOFT_RST_VCODEC_AXI, true);
-       mdelay(10);
+       mdelay(1);
        cru_set_soft_reset(SOFT_RST_VCODEC_AXI, false);
        cru_set_soft_reset(SOFT_RST_VCODEC_AHB, false);
        cru_set_soft_reset(SOFT_RST_VCODEC_NIU_AXI, false);
@@ -258,100 +345,132 @@ static void vpu_service_dump(void)
 static void vpu_service_power_off(void)
 {
        int total_running;
-
-       if (!service.enabled)
+       if (!service.enabled) {
                return;
+       }
 
        service.enabled = false;
        total_running = atomic_read(&service.total_running);
        if (total_running) {
-               pr_alert("power off when %d task running!!\n", total_running);
+               pr_alert("alert: power off when %d task running!!\n", total_running);
                mdelay(50);
-               pr_alert("delay 50 ms for running task\n");
+               pr_alert("alert: delay 50 ms for running task\n");
                vpu_service_dump();
        }
 
        printk("vpu: power off...");
+#ifdef CONFIG_ARCH_RK29
        pmu_set_power_domain(PD_VCODEC, false);
+#else
+       clk_disable(pd_video);
+#endif
        udelay(10);
        clk_disable(hclk_cpu_vcodec);
        clk_disable(aclk_ddr_vepu);
        clk_disable(hclk_vepu);
        clk_disable(aclk_vepu);
-       clk_disable(clk_vpu);
+       wake_unlock(&service.wake_lock);
        printk("done\n");
 }
 
-static void vpu_service_power_off_work_func(unsigned long data)
+static inline void vpu_queue_power_off_work(void)
 {
-       printk("delayed ");
-       vpu_service_power_off();
+       queue_delayed_work(system_nrt_wq, &service.power_off_work, VPU_POWER_OFF_DELAY);
 }
 
-static void vpu_service_power_maintain(void)
+static void vpu_power_off_work(struct work_struct *work)
 {
-       if (service.enabled) {
-               mod_timer(&service.timer, jiffies + POWER_OFF_DELAY);
+       if (mutex_trylock(&service.lock)) {
+               vpu_service_power_off();
+               mutex_unlock(&service.lock);
        } else {
-               pr_err("maintain power when power is off!\n");
+               /* Come back later if the device is busy... */
+               vpu_queue_power_off_work();
        }
 }
 
 static void vpu_service_power_on(void)
 {
-       clk_enable(clk_vpu); /* notify vpu on without lock. */
-
-       spin_lock_bh(&service.lock);
-       if (!service.enabled) {
-               service.enabled = true;
-               printk("vpu: power on\n");
-
-               clk_enable(clk_vpu);
-               clk_enable(aclk_vepu);
-               clk_enable(hclk_vepu);
-               clk_enable(hclk_cpu_vcodec);
-               udelay(10);
-               pmu_set_power_domain(PD_VCODEC, true);
-               udelay(10);
-               clk_enable(aclk_ddr_vepu);
-               init_timer(&service.timer);
-               service.timer.expires = jiffies + POWER_OFF_DELAY;
-               service.timer.function = vpu_service_power_off_work_func;
-               add_timer(&service.timer);
-               spin_unlock_bh(&service.lock);
-       } else {
-               spin_unlock_bh(&service.lock);
-               vpu_service_power_maintain();
+       static ktime_t last;
+       ktime_t now = ktime_get();
+       if (ktime_to_ns(ktime_sub(now, last)) > NSEC_PER_SEC) {
+               cancel_delayed_work_sync(&service.power_off_work);
+               vpu_queue_power_off_work();
+               last = now;
        }
+       if (service.enabled)
+               return ;
+
+       service.enabled = true;
+       printk("vpu: power on\n");
 
-       clk_disable(clk_vpu);
+       clk_enable(aclk_vepu);
+       clk_enable(hclk_vepu);
+       clk_enable(hclk_cpu_vcodec);
+       udelay(10);
+#ifdef CONFIG_ARCH_RK29
+       pmu_set_power_domain(PD_VCODEC, true);
+#else
+       clk_enable(pd_video);
+#endif
+       udelay(10);
+       clk_enable(aclk_ddr_vepu);
+       wake_lock(&service.wake_lock);
+}
+
+static inline bool reg_check_rmvb_wmv(vpu_reg *reg)
+{
+       unsigned long type = (reg->reg[3] & 0xF0000000) >> 28;
+       return ((type == 8) || (type == 4));
+}
+
+static inline bool reg_check_interlace(vpu_reg *reg)
+{
+       unsigned long type = (reg->reg[3] & (1 << 23));
+       return (type > 0);
 }
 
 static vpu_reg *reg_init(vpu_session *session, void __user *src, unsigned long size)
 {
-       unsigned long flag;
-       vpu_reg *reg = kmalloc(sizeof(vpu_reg), GFP_KERNEL);
+       vpu_reg *reg = kmalloc(sizeof(vpu_reg)+service.reg_size, GFP_KERNEL);
        if (NULL == reg) {
-               pr_err("kmalloc fail in reg_init\n");
+               pr_err("error: kmalloc fail in reg_init\n");
                return NULL;
        }
 
        reg->session = session;
        reg->type = session->type;
        reg->size = size;
+       reg->freq = VPU_FREQ_DEFAULT;
+       reg->reg = (unsigned long *)&reg[1];
        INIT_LIST_HEAD(&reg->session_link);
        INIT_LIST_HEAD(&reg->status_link);
 
        if (copy_from_user(&reg->reg[0], (void __user *)src, size)) {
-               pr_err("copy_from_user failed in reg_init\n");
+               pr_err("error: copy_from_user failed in reg_init\n");
                kfree(reg);
                return NULL;
        }
 
-       spin_lock_irqsave(&service.lock, flag);
+       mutex_lock(&service.lock);
        list_add_tail(&reg->status_link, &service.waiting);
        list_add_tail(&reg->session_link, &session->waiting);
-       spin_unlock_irqrestore(&service.lock, flag);
+       mutex_unlock(&service.lock);
+
+       if (service.auto_freq) {
+               if (reg->type == VPU_DEC || reg->type == VPU_DEC_PP) {
+                       if (reg_check_rmvb_wmv(reg)) {
+                               reg->freq = VPU_FREQ_200M;
+                       } else {
+                               if (reg_check_interlace(reg)) {
+                                       reg->freq = VPU_FREQ_400M;
+                               }
+                       }
+               }
+               if (reg->type == VPU_PP) {
+                       reg->freq = VPU_FREQ_400M;
+               }
+       }
 
        return reg;
 }
@@ -360,9 +479,9 @@ static void reg_deinit(vpu_reg *reg)
 {
        list_del_init(&reg->session_link);
        list_del_init(&reg->status_link);
-       kfree(reg);
        if (reg == service.reg_codec) service.reg_codec = NULL;
        if (reg == service.reg_pproc) service.reg_pproc = NULL;
+       kfree(reg);
 }
 
 static void reg_from_wait_to_run(vpu_reg *reg)
@@ -384,7 +503,6 @@ static void reg_copy_from_hw(vpu_reg *reg, volatile u32 *src, u32 count)
 
 static void reg_from_run_to_done(vpu_reg *reg)
 {
-       spin_lock(&service.lock);
        list_del_init(&reg->status_link);
        list_add_tail(&reg->status_link, &service.done);
 
@@ -394,47 +512,87 @@ static void reg_from_run_to_done(vpu_reg *reg)
        switch (reg->type) {
        case VPU_ENC : {
                service.reg_codec = NULL;
-               reg_copy_from_hw(reg, enc_dev.hwregs, REG_NUM_ENC);
+               reg_copy_from_hw(reg, enc_dev.hwregs, service.hw_info->enc_reg_num);
                break;
        }
        case VPU_DEC : {
                service.reg_codec = NULL;
-               reg_copy_from_hw(reg, dec_dev.hwregs, REG_NUM_DEC);
+               reg_copy_from_hw(reg, dec_dev.hwregs, REG_NUM_9190_DEC);
                break;
        }
        case VPU_PP : {
                service.reg_pproc = NULL;
-               reg_copy_from_hw(reg, dec_dev.hwregs + PP_INTERRUPT_REGISTER, REG_NUM_PP);
+               reg_copy_from_hw(reg, dec_dev.hwregs + PP_INTERRUPT_REGISTER, REG_NUM_9190_PP);
                dec_dev.hwregs[PP_INTERRUPT_REGISTER] = 0;
                break;
        }
        case VPU_DEC_PP : {
                service.reg_codec = NULL;
                service.reg_pproc = NULL;
-               reg_copy_from_hw(reg, dec_dev.hwregs, REG_NUM_DEC_PP);
+               reg_copy_from_hw(reg, dec_dev.hwregs, REG_NUM_9190_DEC_PP);
                dec_dev.hwregs[PP_INTERRUPT_REGISTER] = 0;
                break;
        }
        default : {
-               pr_err("copy reg from hw with unknown type %d\n", reg->type);
+               pr_err("error: copy reg from hw with unknown type %d\n", reg->type);
                break;
        }
        }
        atomic_sub(1, &reg->session->task_running);
        atomic_sub(1, &service.total_running);
        wake_up_interruptible_sync(&reg->session->wait);
-       spin_unlock(&service.lock);
 }
 
-void reg_copy_to_hw(vpu_reg *reg)
+static void vpu_service_set_freq(vpu_reg *reg)
+{
+       VPU_FREQ curr = atomic_read(&service.freq_status);
+       if (curr == reg->freq) {
+               return ;
+       }
+       atomic_set(&service.freq_status, reg->freq);
+       switch (reg->freq) {
+       case VPU_FREQ_200M : {
+               clk_set_rate(aclk_vepu, 200*MHZ);
+               //printk("default: 200M\n");
+       } break;
+       case VPU_FREQ_266M : {
+               clk_set_rate(aclk_vepu, 266*MHZ);
+               //printk("default: 266M\n");
+       } break;
+       case VPU_FREQ_300M : {
+               clk_set_rate(aclk_vepu, 300*MHZ);
+               //printk("default: 300M\n");
+       } break;
+       case VPU_FREQ_400M : {
+               clk_set_rate(aclk_vepu, 400*MHZ);
+               //printk("default: 400M\n");
+       } break;
+       default : {
+               clk_set_rate(aclk_vepu, 300*MHZ);
+               //printk("default: 300M\n");
+       } break;
+       }
+}
+
+static void reg_copy_to_hw(vpu_reg *reg)
 {
        int i;
        u32 *src = (u32 *)&reg->reg[0];
        atomic_add(1, &service.total_running);
        atomic_add(1, &reg->session->task_running);
+       if (service.auto_freq) {
+               vpu_service_set_freq(reg);
+       }
        switch (reg->type) {
        case VPU_ENC : {
+               int enc_count = service.hw_info->enc_reg_num;
                u32 *dst = (u32 *)enc_dev.hwregs;
+#if defined(CONFIG_ARCH_RK30)
+               cru_set_soft_reset(SOFT_RST_CPU_VCODEC, true);
+               cru_set_soft_reset(SOFT_RST_VCODEC_AHB, true);
+               cru_set_soft_reset(SOFT_RST_VCODEC_AHB, false);
+               cru_set_soft_reset(SOFT_RST_CPU_VCODEC, false);
+#endif
                service.reg_codec = reg;
 
                dst[VPU_REG_EN_ENC] = src[VPU_REG_EN_ENC] & 0x6;
@@ -442,25 +600,35 @@ void reg_copy_to_hw(vpu_reg *reg)
                for (i = 0; i < VPU_REG_EN_ENC; i++)
                        dst[i] = src[i];
 
-               for (i = VPU_REG_EN_ENC + 1; i < REG_NUM_ENC; i++)
+               for (i = VPU_REG_EN_ENC + 1; i < enc_count; i++)
                        dst[i] = src[i];
 
                dsb();
 
                dst[VPU_REG_ENC_GATE] = src[VPU_REG_ENC_GATE] | VPU_REG_ENC_GATE_BIT;
                dst[VPU_REG_EN_ENC]   = src[VPU_REG_EN_ENC];
+
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&enc_start);
+#endif
+
        } break;
        case VPU_DEC : {
                u32 *dst = (u32 *)dec_dev.hwregs;
                service.reg_codec = reg;
 
-               for (i = REG_NUM_DEC - 1; i > VPU_REG_DEC_GATE; i--)
+               for (i = REG_NUM_9190_DEC - 1; i > VPU_REG_DEC_GATE; i--)
                        dst[i] = src[i];
 
                dsb();
 
                dst[VPU_REG_DEC_GATE] = src[VPU_REG_DEC_GATE] | VPU_REG_DEC_GATE_BIT;
                dst[VPU_REG_EN_DEC]   = src[VPU_REG_EN_DEC];
+
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&dec_start);
+#endif
+
        } break;
        case VPU_PP : {
                u32 *dst = (u32 *)dec_dev.hwregs + PP_INTERRUPT_REGISTER;
@@ -468,19 +636,24 @@ void reg_copy_to_hw(vpu_reg *reg)
 
                dst[VPU_REG_PP_GATE] = src[VPU_REG_PP_GATE] | VPU_REG_PP_GATE_BIT;
 
-               for (i = VPU_REG_PP_GATE + 1; i < REG_NUM_PP; i++)
+               for (i = VPU_REG_PP_GATE + 1; i < REG_NUM_9190_PP; i++)
                        dst[i] = src[i];
 
                dsb();
 
                dst[VPU_REG_EN_PP] = src[VPU_REG_EN_PP];
+
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&pp_start);
+#endif
+
        } break;
        case VPU_DEC_PP : {
                u32 *dst = (u32 *)dec_dev.hwregs;
                service.reg_codec = reg;
                service.reg_pproc = reg;
 
-               for (i = VPU_REG_EN_DEC_PP + 1; i < REG_NUM_DEC_PP; i++)
+               for (i = VPU_REG_EN_DEC_PP + 1; i < REG_NUM_9190_DEC_PP; i++)
                        dst[i] = src[i];
 
                dst[VPU_REG_EN_DEC_PP]   = src[VPU_REG_EN_DEC_PP] | 0x2;
@@ -489,9 +662,14 @@ void reg_copy_to_hw(vpu_reg *reg)
                dst[VPU_REG_DEC_PP_GATE] = src[VPU_REG_DEC_PP_GATE] | VPU_REG_PP_GATE_BIT;
                dst[VPU_REG_DEC_GATE]    = src[VPU_REG_DEC_GATE]    | VPU_REG_DEC_GATE_BIT;
                dst[VPU_REG_EN_DEC]      = src[VPU_REG_EN_DEC];
+
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&dec_start);
+#endif
+
        } break;
        default : {
-               pr_err("unsupport session type %d", reg->type);
+               pr_err("error: unsupport session type %d", reg->type);
                atomic_sub(1, &service.total_running);
                atomic_sub(1, &reg->session->task_running);
                break;
@@ -501,22 +679,24 @@ void reg_copy_to_hw(vpu_reg *reg)
 
 static void try_set_reg(void)
 {
-       unsigned long flag;
        // first get reg from reg list
-       spin_lock_irqsave(&service.lock, flag);
        if (!list_empty(&service.waiting)) {
                int can_set = 0;
                vpu_reg *reg = list_entry(service.waiting.next, vpu_reg, status_link);
 
-               vpu_service_power_maintain();
+               vpu_service_power_on();
+
                switch (reg->type) {
                case VPU_ENC : {
                        if ((NULL == service.reg_codec) &&  (NULL == service.reg_pproc))
-                       can_set = 1;
+                               can_set = 1;
                } break;
                case VPU_DEC : {
                        if (NULL == service.reg_codec)
                                can_set = 1;
+                       if (service.auto_freq && (NULL != service.reg_pproc)) {
+                               can_set = 0;
+                       }
                } break;
                case VPU_PP : {
                        if (NULL == service.reg_codec) {
@@ -525,6 +705,10 @@ static void try_set_reg(void)
                        } else {
                                if ((VPU_DEC == service.reg_codec->type) && (NULL == service.reg_pproc))
                                        can_set = 1;
+                               // can not charge frequency when vpu is working
+                               if (service.auto_freq) {
+                                       can_set = 0;
+                               }
                        }
                } break;
                case VPU_DEC_PP : {
@@ -540,7 +724,6 @@ static void try_set_reg(void)
                        reg_copy_to_hw(reg);
                }
        }
-       spin_unlock_irqrestore(&service.lock, flag);
 }
 
 static int return_reg(vpu_reg *reg, u32 __user *dst)
@@ -548,28 +731,28 @@ static int return_reg(vpu_reg *reg, u32 __user *dst)
        int ret = 0;
        switch (reg->type) {
        case VPU_ENC : {
-               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_ENC)))
+               if (copy_to_user(dst, &reg->reg[0], service.hw_info->enc_io_size))
                        ret = -EFAULT;
                break;
        }
        case VPU_DEC : {
-               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_DEC)))
+               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_9190_DEC)))
                        ret = -EFAULT;
                break;
        }
        case VPU_PP : {
-               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_PP)))
+               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_9190_PP)))
                        ret = -EFAULT;
                break;
        }
        case VPU_DEC_PP : {
-               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_DEC_PP)))
+               if (copy_to_user(dst, &reg->reg[0], SIZE_REG(REG_NUM_9190_DEC_PP)))
                        ret = -EFAULT;
                break;
        }
        default : {
                ret = -EFAULT;
-               pr_err("copy reg to user with unknown type %d\n", reg->type);
+               pr_err("error: copy reg to user with unknown type %d\n", reg->type);
                break;
        }
        }
@@ -586,23 +769,23 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
 
        switch (cmd) {
        case VPU_IOC_SET_CLIENT_TYPE : {
-       session->type = (VPU_CLIENT_TYPE)arg;
+               session->type = (VPU_CLIENT_TYPE)arg;
                break;
        }
        case VPU_IOC_GET_HW_FUSE_STATUS : {
                vpu_request req;
                if (copy_from_user(&req, (void __user *)arg, sizeof(vpu_request))) {
-                       pr_err("VPU_IOC_GET_HW_FUSE_STATUS copy_from_user failed\n");
+                       pr_err("error: VPU_IOC_GET_HW_FUSE_STATUS copy_from_user failed\n");
                        return -EFAULT;
                } else {
                        if (VPU_ENC != session->type) {
                                if (copy_to_user((void __user *)req.req, &service.dec_config, sizeof(VPUHwDecConfig_t))) {
-                                       pr_err("VPU_IOC_GET_HW_FUSE_STATUS copy_to_user failed type %d\n", session->type);
+                                       pr_err("error: VPU_IOC_GET_HW_FUSE_STATUS copy_to_user failed type %d\n", session->type);
                                        return -EFAULT;
                                }
                        } else {
                                if (copy_to_user((void __user *)req.req, &service.enc_config, sizeof(VPUHwEncConfig_t))) {
-                                       pr_err("VPU_IOC_GET_HW_FUSE_STATUS copy_to_user failed type %d\n", session->type);
+                                       pr_err("error: VPU_IOC_GET_HW_FUSE_STATUS copy_to_user failed type %d\n", session->type);
                                        return -EFAULT;
                                }
                        }
@@ -614,7 +797,7 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
                vpu_request req;
                vpu_reg *reg;
                if (copy_from_user(&req, (void __user *)arg, sizeof(vpu_request))) {
-                       pr_err("VPU_IOC_SET_REG copy_from_user failed\n");
+                       pr_err("error: VPU_IOC_SET_REG copy_from_user failed\n");
                        return -EFAULT;
                }
 
@@ -622,8 +805,9 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
                if (NULL == reg) {
                        return -EFAULT;
                } else {
-                       vpu_service_power_on();
+                       mutex_lock(&service.lock);
                        try_set_reg();
+                       mutex_unlock(&service.lock);
                }
 
                break;
@@ -631,21 +815,27 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
        case VPU_IOC_GET_REG : {
                vpu_request req;
                vpu_reg *reg;
-               unsigned long flag;
                if (copy_from_user(&req, (void __user *)arg, sizeof(vpu_request))) {
-                       pr_err("VPU_IOC_GET_REG copy_from_user failed\n");
+                       pr_err("error: VPU_IOC_GET_REG copy_from_user failed\n");
                        return -EFAULT;
                } else {
-                       int ret = wait_event_interruptible_timeout(session->wait, !list_empty(&session->done), TIMEOUT_DELAY);
-                       if (unlikely(ret < 0)) {
-                               pr_err("pid %d wait task ret %d\n", session->pid, ret);
-                       } else if (0 == ret) {
-                               pr_err("pid %d wait %d task done timeout\n", session->pid, atomic_read(&session->task_running));
-                               ret = -ETIMEDOUT;
+                       int ret = wait_event_interruptible_timeout(session->wait, !list_empty(&session->done), VPU_TIMEOUT_DELAY);
+                       if (!list_empty(&session->done)) {
+                               if (ret < 0) {
+                                       pr_err("warning: pid %d wait task sucess but wait_evernt ret %d\n", session->pid, ret);
+                               }
+                               ret = 0;
+                       } else {
+                               if (unlikely(ret < 0)) {
+                                       pr_err("error: pid %d wait task ret %d\n", session->pid, ret);
+                               } else if (0 == ret) {
+                                       pr_err("error: pid %d wait %d task done timeout\n", session->pid, atomic_read(&session->task_running));
+                                       ret = -ETIMEDOUT;
+                               }
                        }
-                       spin_lock_irqsave(&service.lock, flag);
                        if (ret < 0) {
                                int task_running = atomic_read(&session->task_running);
+                               mutex_lock(&service.lock);
                                vpu_service_dump();
                                if (task_running) {
                                        atomic_set(&session->task_running, 0);
@@ -655,19 +845,18 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
                                        printk("done\n");
                                }
                                vpu_service_session_clear(session);
-                               spin_unlock_irqrestore(&service.lock, flag);
+                               mutex_unlock(&service.lock);
                                return ret;
                        }
-                       spin_unlock_irqrestore(&service.lock, flag);
                }
-               spin_lock_irqsave(&service.lock, flag);
+               mutex_lock(&service.lock);
                reg = list_entry(session->done.next, vpu_reg, session_link);
                return_reg(reg, (u32 __user *)req.req);
-               spin_unlock_irqrestore(&service.lock, flag);
+               mutex_unlock(&service.lock);
                break;
        }
        default : {
-               pr_err("unknow vpu service ioctl cmd %x\n", cmd);
+               pr_err("error: unknow vpu service ioctl cmd %x\n", cmd);
                break;
        }
        }
@@ -675,33 +864,46 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd, unsigned long
        return 0;
 }
 
-static int vpu_service_check_hw_id(struct vpu_device * dev, const u16 *hwids, size_t num)
+static int vpu_service_check_hw(vpu_service_info *p, unsigned long hw_addr)
 {
-       u32 hwid = readl(dev->hwregs);
-       pr_info("HW ID = 0x%08x\n", hwid);
-
-       hwid = (hwid >> 16) & 0xFFFF;   /* product version only */
-
-       while (num--) {
-               if (hwid == hwids[num]) {
-                       pr_info("Compatible HW found at 0x%08lx\n", dev->iobaseaddr);
-                       return 1;
+       int ret = -EINVAL, i = 0;
+       volatile u32 *tmp = (volatile u32 *)ioremap_nocache(hw_addr, 0x4);
+       u32 enc_id = *tmp;
+       enc_id = (enc_id >> 16) & 0xFFFF;
+       pr_info("checking hw id %x\n", enc_id);
+       p->hw_info = NULL;
+       for (i = 0; i < ARRAY_SIZE(vpu_hw_set); i++) {
+               if (enc_id == vpu_hw_set[i].hw_id) {
+                       p->hw_info = &vpu_hw_set[i];
+                       ret = 0;
+                       break;
                }
        }
-
-       pr_info("No Compatible HW found at 0x%08lx\n", dev->iobaseaddr);
-       return 0;
+       iounmap((void *)tmp);
+       return ret;
 }
 
 static void vpu_service_release_io(void)
 {
-       if (dec_dev.hwregs)
+       if (dec_dev.hwregs) {
                iounmap((void *)dec_dev.hwregs);
-       release_mem_region(dec_dev.iobaseaddr, dec_dev.iosize);
+               dec_dev.hwregs = NULL;
+       }
+       if (dec_dev.iobaseaddr) {
+               release_mem_region(dec_dev.iobaseaddr, dec_dev.iosize);
+               dec_dev.iobaseaddr = 0;
+               dec_dev.iosize = 0;
+       }
 
-       if (enc_dev.hwregs)
+       if (enc_dev.hwregs) {
                iounmap((void *)enc_dev.hwregs);
-       release_mem_region(enc_dev.iobaseaddr, enc_dev.iosize);
+               enc_dev.hwregs = NULL;
+       }
+       if (enc_dev.iobaseaddr) {
+               release_mem_region(enc_dev.iobaseaddr, enc_dev.iosize);
+               enc_dev.iobaseaddr = 0;
+               enc_dev.iosize = 0;
+       }
 }
 
 static int vpu_service_reserve_io(void)
@@ -724,15 +926,10 @@ static int vpu_service_reserve_io(void)
                goto err;
        }
 
-       /* check for correct HW */
-       if (!vpu_service_check_hw_id(&dec_dev, dec_hw_ids, ARRAY_SIZE(dec_hw_ids))) {
-               goto err;
-       }
-
        iobaseaddr      = enc_dev.iobaseaddr;
        iosize          = enc_dev.iosize;
 
-       if (!request_mem_region(iobaseaddr, iosize, "hx280enc")) {
+       if (!request_mem_region(iobaseaddr, iosize, "vepu_io")) {
                pr_info("failed to reserve enc HW regs\n");
                goto err;
        }
@@ -744,14 +941,9 @@ static int vpu_service_reserve_io(void)
                goto err;
        }
 
-       /* check for correct HW */
-       if (!vpu_service_check_hw_id(&enc_dev, enc_hw_ids, ARRAY_SIZE(enc_hw_ids))) {
-               goto err;
-       }
        return 0;
 
 err:
-       vpu_service_release_io();
        return -EBUSY;
 }
 
@@ -759,7 +951,7 @@ static int vpu_service_open(struct inode *inode, struct file *filp)
 {
        vpu_session *session = (vpu_session *)kmalloc(sizeof(vpu_session), GFP_KERNEL);
        if (NULL == session) {
-               pr_err("unable to allocate memory for vpu_session.");
+               pr_err("error: unable to allocate memory for vpu_session.");
                return -ENOMEM;
        }
 
@@ -770,10 +962,11 @@ static int vpu_service_open(struct inode *inode, struct file *filp)
        INIT_LIST_HEAD(&session->done);
        INIT_LIST_HEAD(&session->list_session);
        init_waitqueue_head(&session->wait);
-       /* no need to protect */
-       list_add_tail(&session->list_session, &service.session);
        atomic_set(&session->task_running, 0);
+       mutex_lock(&service.lock);
+       list_add_tail(&session->list_session, &service.session);
        filp->private_data = (void *)session;
+       mutex_unlock(&service.lock);
 
        pr_debug("dev opened\n");
        return nonseekable_open(inode, filp);
@@ -782,27 +975,24 @@ static int vpu_service_open(struct inode *inode, struct file *filp)
 static int vpu_service_release(struct inode *inode, struct file *filp)
 {
        int task_running;
-       unsigned long flag;
        vpu_session *session = (vpu_session *)filp->private_data;
        if (NULL == session)
                return -EINVAL;
 
        task_running = atomic_read(&session->task_running);
        if (task_running) {
-               pr_err("vpu_service session %d still has %d task running when closing\n", session->pid, task_running);
+               pr_err("error: vpu_service session %d still has %d task running when closing\n", session->pid, task_running);
                msleep(50);
        }
        wake_up_interruptible_sync(&session->wait);
 
-       spin_lock_irqsave(&service.lock, flag);
+       mutex_lock(&service.lock);
        /* remove this filp from the asynchronusly notified filp's */
-       //vpu_service_fasync(-1, filp, 0);
-       list_del(&session->list_session);
-
+       list_del_init(&session->list_session);
        vpu_service_session_clear(session);
-
        kfree(session);
-       spin_unlock_irqrestore(&service.lock, flag);
+       filp->private_data = NULL;
+       mutex_unlock(&service.lock);
 
        pr_debug("dev closed\n");
        return 0;
@@ -821,36 +1011,6 @@ static struct miscdevice vpu_service_misc_device = {
        .fops           = &vpu_service_fops,
 };
 
-static void vpu_service_shutdown(struct platform_device *pdev)
-{
-       pr_cont("shutdown...");
-       del_timer(&service.timer);
-       vpu_service_power_off();
-       pr_cont("done\n");
-}
-
-static int vpu_service_suspend(struct platform_device *pdev, pm_message_t state)
-{
-       bool enabled;
-       pr_info("suspend...");
-       del_timer(&service.timer);
-       enabled = service.enabled;
-       vpu_service_power_off();
-       service.enabled = enabled;
-       return 0;
-}
-
-static int vpu_service_resume(struct platform_device *pdev)
-{
-       pr_info("resume...");
-       if (service.enabled) {
-               service.enabled = false;
-               vpu_service_power_on();
-               try_set_reg();
-       }
-       return 0;
-}
-
 static struct platform_device vpu_service_device = {
        .name              = "vpu_service",
        .id                = -1,
@@ -861,9 +1021,6 @@ static struct platform_driver vpu_service_driver = {
                .name  = "vpu_service",
                .owner = THIS_MODULE,
        },
-       .shutdown  = vpu_service_shutdown,
-       .suspend   = vpu_service_suspend,
-       .resume    = vpu_service_resume,
 };
 
 static void get_hw_info(void)
@@ -1036,132 +1193,203 @@ static void get_hw_info(void)
        enc->jpegEnabled = (configReg >> 25) & 1;
        enc->vsEnabled = (configReg >> 24) & 1;
        enc->rgbEnabled = (configReg >> 28) & 1;
-       enc->busType = (configReg >> 20) & 15;
-       enc->synthesisLanguage = (configReg >> 16) & 15;
-       enc->busWidth = (configReg >> 12) & 15;
+       //enc->busType = (configReg >> 20) & 15;
+       //enc->synthesisLanguage = (configReg >> 16) & 15;
+       //enc->busWidth = (configReg >> 12) & 15;
+       enc->reg_size = service.reg_size;
+       enc->reserv[0] = enc->reserv[1] = 0;
+
+       service.auto_freq = soc_is_rk2928g() || soc_is_rk2928l() || soc_is_rk2926();
+       if (service.auto_freq) {
+               printk("vpu_service set to auto frequency mode\n");
+               atomic_set(&service.freq_status, VPU_FREQ_BUT);
+       }
 }
 
-static irqreturn_t vdpu_isr(int irq, void *dev_id)
+static irqreturn_t vdpu_irq(int irq, void *dev_id)
 {
        vpu_device *dev = (vpu_device *) dev_id;
-       u32 irq_status_dec = readl(dev->hwregs + DEC_INTERRUPT_REGISTER);
-       u32 irq_status_pp  = readl(dev->hwregs + PP_INTERRUPT_REGISTER);
+       u32 irq_status = readl(dev->hwregs + DEC_INTERRUPT_REGISTER);
 
-       pr_debug("vdpu_isr dec %x pp %x\n", irq_status_dec, irq_status_pp);
+       pr_debug("vdpu_irq\n");
 
-       if (irq_status_dec & DEC_INTERRUPT_BIT) {
-               irq_status_dec = readl(dev->hwregs + DEC_INTERRUPT_REGISTER);
-               if ((irq_status_dec & 0x40001) == 0x40001)
+       if (irq_status & DEC_INTERRUPT_BIT) {
+               pr_debug("vdpu_isr dec %x\n", irq_status);
+               if ((irq_status & 0x40001) == 0x40001)
                {
                        do {
-                               irq_status_dec = readl(dev->hwregs + DEC_INTERRUPT_REGISTER);
-                       } while ((irq_status_dec & 0x40001) == 0x40001);
+                               irq_status = readl(dev->hwregs + DEC_INTERRUPT_REGISTER);
+                       } while ((irq_status & 0x40001) == 0x40001);
                }
                /* clear dec IRQ */
-               writel(irq_status_dec & (~DEC_INTERRUPT_BIT), dev->hwregs + DEC_INTERRUPT_REGISTER);
-               pr_debug("DEC IRQ received!\n");
+               writel(irq_status & (~DEC_INTERRUPT_BIT), dev->hwregs + DEC_INTERRUPT_REGISTER);
+               atomic_add(1, &dev->irq_count_codec);
+       }
+
+       irq_status  = readl(dev->hwregs + PP_INTERRUPT_REGISTER);
+       if (irq_status & PP_INTERRUPT_BIT) {
+               pr_debug("vdpu_isr pp  %x\n", irq_status);
+               /* clear pp IRQ */
+               writel(irq_status & (~DEC_INTERRUPT_BIT), dev->hwregs + PP_INTERRUPT_REGISTER);
+               atomic_add(1, &dev->irq_count_pp);
+       }
+
+       return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t vdpu_isr(int irq, void *dev_id)
+{
+       vpu_device *dev = (vpu_device *) dev_id;
+
+       mutex_lock(&service.lock);
+       if (atomic_read(&dev->irq_count_codec)) {
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&dec_end);
+               printk("dec task: %ld ms\n",
+                       (dec_end.tv_sec  - dec_start.tv_sec)  * 1000 +
+                       (dec_end.tv_usec - dec_start.tv_usec) / 1000);
+#endif
+               atomic_sub(1, &dev->irq_count_codec);
                if (NULL == service.reg_codec) {
-                       pr_err("dec isr with no task waiting\n");
+                       pr_err("error: dec isr with no task waiting\n");
                } else {
                        reg_from_run_to_done(service.reg_codec);
                }
        }
 
-       if (irq_status_pp & PP_INTERRUPT_BIT) {
-               /* clear pp IRQ */
-               writel(irq_status_pp & (~DEC_INTERRUPT_BIT), dev->hwregs + PP_INTERRUPT_REGISTER);
-               pr_debug("PP IRQ received!\n");
+       if (atomic_read(&dev->irq_count_pp)) {
+
+#if VPU_SERVICE_SHOW_TIME
+               do_gettimeofday(&pp_end);
+               printk("pp  task: %ld ms\n",
+                       (pp_end.tv_sec  - pp_start.tv_sec)  * 1000 +
+                       (pp_end.tv_usec - pp_start.tv_usec) / 1000);
+#endif
+
+               atomic_sub(1, &dev->irq_count_pp);
                if (NULL == service.reg_pproc) {
-                       pr_err("pp isr with no task waiting\n");
+                       pr_err("error: pp isr with no task waiting\n");
                } else {
                        reg_from_run_to_done(service.reg_pproc);
                }
        }
        try_set_reg();
+       mutex_unlock(&service.lock);
        return IRQ_HANDLED;
 }
 
-static irqreturn_t vepu_isr(int irq, void *dev_id)
+static irqreturn_t vepu_irq(int irq, void *dev_id)
 {
        struct vpu_device *dev = (struct vpu_device *) dev_id;
        u32 irq_status = readl(dev->hwregs + ENC_INTERRUPT_REGISTER);
 
-       pr_debug("enc_isr\n");
+       pr_debug("vepu_irq irq status %x\n", irq_status);
+
+#if VPU_SERVICE_SHOW_TIME
+       do_gettimeofday(&enc_end);
+       printk("enc task: %ld ms\n",
+               (enc_end.tv_sec  - enc_start.tv_sec)  * 1000 +
+               (enc_end.tv_usec - enc_start.tv_usec) / 1000);
+#endif
 
        if (likely(irq_status & ENC_INTERRUPT_BIT)) {
                /* clear enc IRQ */
                writel(irq_status & (~ENC_INTERRUPT_BIT), dev->hwregs + ENC_INTERRUPT_REGISTER);
-               pr_debug("ENC IRQ received!\n");
+               atomic_add(1, &dev->irq_count_codec);
+       }
+
+       return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t vepu_isr(int irq, void *dev_id)
+{
+       struct vpu_device *dev = (struct vpu_device *) dev_id;
+
+       mutex_lock(&service.lock);
+       if (atomic_read(&dev->irq_count_codec)) {
+               atomic_sub(1, &dev->irq_count_codec);
                if (NULL == service.reg_codec) {
-                       pr_err("enc isr with no task waiting\n");
+                       pr_err("error: enc isr with no task waiting\n");
                } else {
                        reg_from_run_to_done(service.reg_codec);
                }
        }
        try_set_reg();
+       mutex_unlock(&service.lock);
        return IRQ_HANDLED;
 }
 
+static int __init vpu_service_proc_init(void);
 static int __init vpu_service_init(void)
 {
        int ret;
 
-#if defined(CONFIG_ARCH_RK30)
-#define RK29_VCODEC_PHYS       RK30_VCODEC_PHYS
-#endif
-
-       pr_debug("baseaddr = 0x%08x vdpu irq = %d vepu irq = %d\n", RK29_VCODEC_PHYS, IRQ_VDPU, IRQ_VEPU);
-
-       dec_dev.iobaseaddr      = RK29_VCODEC_PHYS + DEC_PHY_OFFSET;
-       dec_dev.iosize          = DEC_IO_SIZE;
-       enc_dev.iobaseaddr      = RK29_VCODEC_PHYS;
-       enc_dev.iosize          = ENC_IO_SIZE;
+       pr_debug("baseaddr = 0x%08x vdpu irq = %d vepu irq = %d\n", VCODEC_PHYS, IRQ_VDPU, IRQ_VEPU);
 
+       wake_lock_init(&service.wake_lock, WAKE_LOCK_SUSPEND, "vpu");
        INIT_LIST_HEAD(&service.waiting);
        INIT_LIST_HEAD(&service.running);
        INIT_LIST_HEAD(&service.done);
        INIT_LIST_HEAD(&service.session);
-       spin_lock_init(&service.lock);
+       mutex_init(&service.lock);
        service.reg_codec       = NULL;
        service.reg_pproc       = NULL;
        atomic_set(&service.total_running, 0);
        service.enabled         = false;
 
        vpu_get_clk();
+
+       INIT_DELAYED_WORK(&service.power_off_work, vpu_power_off_work);
+
        vpu_service_power_on();
+       ret = vpu_service_check_hw(&service, VCODEC_PHYS);
+       if (ret < 0) {
+               pr_err("error: hw info check faild\n");
+               goto err_hw_id_check;
+       }
+
+       atomic_set(&dec_dev.irq_count_codec, 0);
+       atomic_set(&dec_dev.irq_count_pp, 0);
+       dec_dev.iobaseaddr      = service.hw_info->hw_addr + service.hw_info->dec_offset;
+       dec_dev.iosize          = service.hw_info->dec_io_size;
+       atomic_set(&enc_dev.irq_count_codec, 0);
+       atomic_set(&enc_dev.irq_count_pp, 0);
+       enc_dev.iobaseaddr      = service.hw_info->hw_addr + service.hw_info->enc_offset;
+       enc_dev.iosize          = service.hw_info->enc_io_size;;
+       service.reg_size        = max(dec_dev.iosize, enc_dev.iosize);
 
        ret = vpu_service_reserve_io();
        if (ret < 0) {
-               pr_err("reserve io failed\n");
+               pr_err("error: reserve io failed\n");
                goto err_reserve_io;
        }
 
        /* get the IRQ line */
-       ret = request_irq(IRQ_VDPU, vdpu_isr, IRQF_SHARED, "vdpu", (void *)&dec_dev);
+       ret = request_threaded_irq(IRQ_VDPU, vdpu_irq, vdpu_isr, IRQF_SHARED, "vdpu", (void *)&dec_dev);
        if (ret) {
-               pr_err("can't request vdpu irq %d\n", IRQ_VDPU);
+               pr_err("error: can't request vdpu irq %d\n", IRQ_VDPU);
                goto err_req_vdpu_irq;
        }
 
-       ret = request_irq(IRQ_VEPU, vepu_isr, IRQF_SHARED, "vepu", (void *)&enc_dev);
+       ret = request_threaded_irq(IRQ_VEPU, vepu_irq, vepu_isr, IRQF_SHARED, "vepu", (void *)&enc_dev);
        if (ret) {
-               pr_err("can't request vepu irq %d\n", IRQ_VEPU);
+               pr_err("error: can't request vepu irq %d\n", IRQ_VEPU);
                goto err_req_vepu_irq;
        }
 
        ret = misc_register(&vpu_service_misc_device);
        if (ret) {
-               pr_err("misc_register failed\n");
+               pr_err("error: misc_register failed\n");
                goto err_register;
        }
 
        platform_device_register(&vpu_service_device);
        platform_driver_probe(&vpu_service_driver, NULL);
        get_hw_info();
-       del_timer(&service.timer);
        vpu_service_power_off();
        pr_info("init success\n");
 
+       vpu_service_proc_init();
        return 0;
 
 err_register:
@@ -1171,29 +1399,32 @@ err_req_vepu_irq:
 err_req_vdpu_irq:
        pr_info("init failed\n");
 err_reserve_io:
-       del_timer(&service.timer);
-       vpu_service_power_off();
        vpu_service_release_io();
+err_hw_id_check:
+       vpu_service_power_off();
        vpu_put_clk();
+       wake_lock_destroy(&service.wake_lock);
        pr_info("init failed\n");
        return ret;
 }
 
+static void __exit vpu_service_proc_release(void);
 static void __exit vpu_service_exit(void)
 {
-       del_timer(&service.timer);
+       vpu_service_proc_release();
        vpu_service_power_off();
        platform_device_unregister(&vpu_service_device);
        platform_driver_unregister(&vpu_service_driver);
        misc_deregister(&vpu_service_misc_device);
        free_irq(IRQ_VEPU, (void *)&enc_dev);
        free_irq(IRQ_VDPU, (void *)&dec_dev);
+       vpu_service_release_io();
        vpu_put_clk();
+       wake_lock_destroy(&service.wake_lock);
 }
 
 module_init(vpu_service_init);
 module_exit(vpu_service_exit);
-MODULE_LICENSE("GPL");
 
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
@@ -1202,10 +1433,10 @@ MODULE_LICENSE("GPL");
 static int proc_vpu_service_show(struct seq_file *s, void *v)
 {
        unsigned int i, n;
-       unsigned long flag;
        vpu_reg *reg, *reg_tmp;
        vpu_session *session, *session_tmp;
 
+       mutex_lock(&service.lock);
        vpu_service_power_on();
        seq_printf(s, "\nENC Registers:\n");
        n = enc_dev.iosize >> 2;
@@ -1219,7 +1450,6 @@ static int proc_vpu_service_show(struct seq_file *s, void *v)
        }
 
        seq_printf(s, "\nvpu service status:\n");
-       spin_lock_irqsave(&service.lock, flag);
        list_for_each_entry_safe(session, session_tmp, &service.session, list_session) {
                seq_printf(s, "session pid %d type %d:\n", session->pid, session->type);
                //seq_printf(s, "waiting reg set %d\n");
@@ -1233,7 +1463,7 @@ static int proc_vpu_service_show(struct seq_file *s, void *v)
                        seq_printf(s, "done    register set\n");
                }
        }
-       spin_unlock_irqrestore(&service.lock, flag);
+       mutex_unlock(&service.lock);
 
        return 0;
 }
@@ -1256,6 +1486,9 @@ static int __init vpu_service_proc_init(void)
        return 0;
 
 }
-late_initcall(vpu_service_proc_init);
+static void __exit vpu_service_proc_release(void)
+{
+       remove_proc_entry("vpu_service", NULL);
+}
 #endif /* CONFIG_PROC_FS */