From patchwork Sun May 16 15:45:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99969 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4GFkL0N025236 for ; Sun, 16 May 2010 15:46:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275Ab0EPPqU (ORCPT ); Sun, 16 May 2010 11:46:20 -0400 Received: from fg-out-1718.google.com ([72.14.220.157]:34390 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268Ab0EPPqT (ORCPT ); Sun, 16 May 2010 11:46:19 -0400 Received: by fg-out-1718.google.com with SMTP id 22so178499fge.1 for ; Sun, 16 May 2010 08:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=1xAarvtPTBSG58DSbOxSuzRTVzjrcACQ2QZTAt8Esso=; b=dlGhcwVNJvc9jFjkmGEconc2d5EuGt7CRYRFtaX93C+zJx5eyTbAire8yr6XBsBuVG 1nlSgch33rfP2J1WEXobCEH4IlNxiVEUR2+jZqaslGGJfEbgEEWT5Mlun46U0HikF9F8 IZdewvnzs7X7Y7dU5x78VE2Hyc4Kz2w2qfylU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ALjarfZdMeE7wRDc0UoU2ZRe+TbS2ihm/7M7dlMN/3Cd+FwW0VZjmvFuiQvreXmvpt x5LlzPLqEcEUgAMvA6Ciupqm2tPyx10NgM2NPmkgTCNO8boM5s5ySJXt4X907mg2Gj4C kEt3oiuRDajnOwfda1DIR+Mqk+qoeQstaJPIo= Received: by 10.87.40.32 with SMTP id s32mr6814953fgj.21.1274024778628; Sun, 16 May 2010 08:46:18 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 4sm11682362fgg.12.2010.05.16.08.46.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 May 2010 08:46:18 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Fernando Guzman Lugo , Felipe Contreras Subject: [PATCH 05/14] dspbridge: remove unused code Date: Sun, 16 May 2010 18:45:56 +0300 Message-Id: <1274024765-21076-6-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274024765-21076-1-git-send-email-felipe.contreras@gmail.com> References: <1274024765-21076-1-git-send-email-felipe.contreras@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 16 May 2010 15:46:21 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/dspdeh.h b/arch/arm/plat-omap/include/dspbridge/dspdeh.h index 33cce90..e263184 100644 --- a/arch/arm/plat-omap/include/dspbridge/dspdeh.h +++ b/arch/arm/plat-omap/include/dspbridge/dspdeh.h @@ -43,5 +43,4 @@ extern dsp_status bridge_deh_register_notify(struct deh_mgr *deh_mgr, extern void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo); -extern void bridge_deh_release_dummy_mem(void); #endif /* DSPDEH_ */ diff --git a/drivers/dsp/bridge/core/_tiomap.h b/drivers/dsp/bridge/core/_tiomap.h index df73964..7021fce 100644 --- a/drivers/dsp/bridge/core/_tiomap.h +++ b/drivers/dsp/bridge/core/_tiomap.h @@ -339,11 +339,7 @@ struct bridge_dev_context { */ /* DMMU TLB entries */ struct bridge_ioctl_extproc atlb_entry[BRDIOCTL_NUMOFMMUTLB]; - u32 dw_brd_state; /* Last known board state. */ - u32 ul_int_mask; /* int mask */ - u16 io_base; /* Board I/O base */ - u32 num_tlb_entries; /* DSP MMU TLB entry counter */ - u32 fixed_tlb_entries; /* Fixed DSPMMU TLB entry count */ + u32 dw_brd_state; /* Last known board state. */ /* TC Settings */ bool tc_word_swap_on; /* Traffic Controller Word Swap */ diff --git a/drivers/dsp/bridge/core/tiomap3430.c b/drivers/dsp/bridge/core/tiomap3430.c index c7b0d83..8a3eff9 100644 --- a/drivers/dsp/bridge/core/tiomap3430.c +++ b/drivers/dsp/bridge/core/tiomap3430.c @@ -844,7 +844,6 @@ static dsp_status bridge_dev_create(OUT struct bridge_dev_context dev_context->atlb_entry[entry_ndx].ul_gpp_pa = dev_context->atlb_entry[entry_ndx].ul_dsp_va = 0; } - dev_context->num_tlb_entries = 0; dev_context->dw_dsp_base_addr = (u32) MEM_LINEAR_ADDRESS((void *) (pConfig-> dw_mem_base @@ -947,7 +946,6 @@ static dsp_status bridge_dev_create(OUT struct bridge_dev_context } if (DSP_SUCCEEDED(status)) { dev_context->hdev_obj = hdev_obj; - dev_context->ul_int_mask = 0; /* Store current board state. */ dev_context->dw_brd_state = BRD_STOPPED; dev_context->resources = resources; diff --git a/drivers/dsp/bridge/core/ue_deh.c b/drivers/dsp/bridge/core/ue_deh.c index 593a0e3..61e5e4e 100644 --- a/drivers/dsp/bridge/core/ue_deh.c +++ b/drivers/dsp/bridge/core/ue_deh.c @@ -127,8 +127,6 @@ dsp_status bridge_deh_destroy(struct deh_mgr *deh_mgr) if (!deh_mgr) return -EFAULT; - /* Release dummy VA buffer */ - bridge_deh_release_dummy_mem(); /* If notification object exists, delete it */ if (deh_mgr->ntfy_obj) { ntfy_delete(deh_mgr->ntfy_obj); @@ -194,7 +192,6 @@ static void wait_for_timer(void) void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) { struct bridge_dev_context *dev_context; - u32 hw_mmu_max_tlb_count = 31; struct cfg_hostres *resources; struct hw_mmu_map_attrs_t map_attrs = { .endianism = HW_LITTLE_ENDIAN, @@ -238,16 +235,6 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) print_dsp_trace_buffer(dev_context); dump_dl_modules(dev_context); - /* - * Reset the dynamic mmu index to fixed count if it exceeds - * 31. So that the dynmmuindex is always between the range of - * standard/fixed entries and 31. - */ - if (dev_context->num_tlb_entries > - hw_mmu_max_tlb_count) { - dev_context->num_tlb_entries = - dev_context->fixed_tlb_entries; - } hw_mmu_tlb_add(resources->dw_dmmu_base, virt_to_phys(dummy_va_addr), fault_addr, HW_PAGE_SIZE4KB, 1, @@ -320,7 +307,3 @@ dsp_status bridge_deh_get_info(struct deh_mgr *deh_mgr, return 0; } - -void bridge_deh_release_dummy_mem(void) -{ -} diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index 7dc9b5c..f9efe6a 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -1362,11 +1362,6 @@ dsp_status proc_stop(void *hprocessor) status = -EFAULT; goto func_end; } - if (DSP_SUCCEEDED((*p_proc_object->intf_fxns->pfn_brd_status) - (p_proc_object->hbridge_context, &brd_state))) { - if (brd_state == BRD_ERROR) - bridge_deh_release_dummy_mem(); - } /* check if there are any running nodes */ status = dev_get_node_manager(p_proc_object->hdev_obj, &hnode_mgr); if (DSP_SUCCEEDED(status) && hnode_mgr) {