From patchwork Thu Mar 12 15:24:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Ramesh" X-Patchwork-Id: 11401 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2CFPS2X000944 for ; Thu, 12 Mar 2009 15:25:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583AbZCLPZ2 (ORCPT ); Thu, 12 Mar 2009 11:25:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753293AbZCLPZ2 (ORCPT ); Thu, 12 Mar 2009 11:25:28 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:45178 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753583AbZCLPZ1 convert rfc822-to-8bit (ORCPT ); Thu, 12 Mar 2009 11:25:27 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n2CFPJft026122 for ; Thu, 12 Mar 2009 10:25:25 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n2CFPHRY024117 for ; Thu, 12 Mar 2009 20:55:18 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Thu, 12 Mar 2009 20:55:18 +0530 From: "Gupta, Ramesh" To: "linux-omap@vger.kernel.org" CC: "Menon, Nishanth" , "Kanigeri, Hari" Date: Thu, 12 Mar 2009 20:54:38 +0530 Subject: [PATCH] DSPBRIDGE Fix for auto image load updated Thread-Topic: [PATCH] DSPBRIDGE Fix for auto image load updated Thread-Index: AcmjJqgWcRrQ0HYjThqKd5Ww+UbZow== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From 757beb63e8e66c168231dd990440816fc5789d6c Mon Sep 17 00:00:00 2001 From: Ramesh Gupta Date: Thu, 12 Mar 2009 09:32:31 -0500 Subject: [PATCH] DSPBRIDGE Fix for auto image load updated Resending as the previous patch was not applyng cleanly. This is updated patch to fix the auto image loading while bridgedriver initialization. Signed-off-by: Ramesh Gupta G Tested-by: Nishanth Menon --- drivers/dsp/bridge/rmgr/drv_interface.c | 32 +++++++++++++++--------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index 3ad7a43..80edc4d 100755 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -400,7 +400,7 @@ static int __init bridge_init(void) REG_SetValue(NULL, NULL, AUTOSTART, REG_DWORD, (u8 *)&temp, sizeof(temp)); REG_SetValue(NULL, NULL, DEFEXEC, REG_SZ, (u8 *)base_img, - strlen(base_img) + 1); + strlen(base_img) + 1); } else { temp = false; REG_SetValue(NULL, NULL, AUTOSTART, REG_DWORD, (u8 *)&temp, @@ -408,7 +408,7 @@ static int __init bridge_init(void) REG_SetValue(NULL, NULL, DEFEXEC, REG_SZ, (u8 *) "\0", (u32)2); } REG_SetValue(NULL, NULL, NUMPROCS, REG_SZ, (u8 *) num_procs, - strlen(num_procs) + 1); + strlen(num_procs) + 1); if (shm_size >= 0x10000) { /* 64 KB */ initStatus = REG_SetValue(NULL, NULL, SHMSIZE, REG_DWORD, @@ -450,18 +450,9 @@ static int __init bridge_init(void) sizeof(tc_wordswapon)); } if (DSP_SUCCEEDED(initStatus)) { - driverContext = DSP_Init(&initStatus); - if (DSP_FAILED(initStatus)) { - status = -1; - GT_0trace(driverTrace, GT_7CLASS, - "DSP/BIOS Bridge initialization Failed\n"); - } else { - GT_0trace(driverTrace, GT_5CLASS, - "DSP/BIOS Bridge driver loaded\n"); - } #ifdef CONFIG_BRIDGE_DVFS - for (i = 0; i < 5; i++) - pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; + for (i = 0; i < 6; i++) + pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; clk_handle = clk_get(NULL, "iva2_ck"); if (!clk_handle) { @@ -479,6 +470,15 @@ static int __init bridge_init(void) "clk_notifier_register FAIL for iva2_ck \n"); } #endif + driverContext = DSP_Init(&initStatus); + if (DSP_FAILED(initStatus)) { + status = -1; + GT_0trace(driverTrace, GT_7CLASS, + "DSP/BIOS Bridge initialization Failed\n"); + } else { + GT_0trace(driverTrace, GT_5CLASS, + "DSP/BIOS Bridge driver loaded\n"); + } } DBC_Assert(status == 0); @@ -655,11 +655,11 @@ func_cont: (struct DRV_OBJECT *)hDrvObject, &pPctxt); if (pPctxt != NULL) { - /* Return PID instead of process handle */ - hProcess = current->pid; + /* Return PID instead of process handle */ + hProcess = current->pid; DRV_ProcUpdatestate(pPctxt, PROC_RES_ALLOCATED); - DRV_ProcSetPID(pPctxt, hProcess); + DRV_ProcSetPID(pPctxt, hProcess); } #endif