From patchwork Sun May 16 15:45:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 99968 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 o4GFkHfc025161 for ; Sun, 16 May 2010 15:46:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753138Ab0EPPqS (ORCPT ); Sun, 16 May 2010 11:46:18 -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 S1753268Ab0EPPqR (ORCPT ); Sun, 16 May 2010 11:46:17 -0400 Received: by fg-out-1718.google.com with SMTP id 22so178499fge.1 for ; Sun, 16 May 2010 08:46:17 -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=n1+f/9qUps4bOX2mb19nbQ2HhsBGubRTTAYIWELCeSw=; b=TkWD5UINq9FqdDq+BMAHPmX+MKAcRcJ/snZB09CSM4HF0MWA4GRy+2ln1QRcEJYFSz kCtQr+Yhp0iKDWH0WH8WwznalIyvAGovLh9BfFnftmZTS9S3UAEIH9/3UncIEhJ7aCX+ nOj/bH20LNQkeUN+szbWn6eo+z+R+F7LZkbWI= 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=Z6K6RNrMcXlIETZKdpigxaZMh9eGeHXYh7IlAL/W49FRAaq3w3wAxV2mRgvrJ1HWLt Jzcs8U5fbAnV6i0or7VQvu3EGjscvLBGaZIhfA53MyHzEaVZXFXDTHHMznyAN1ywfBbv WKqXf164QSdFnY6A7a7fU+jIsX6sRXFFLDnLM= Received: by 10.87.29.33 with SMTP id g33mr6800152fgj.27.1274024776897; Sun, 16 May 2010 08:46:16 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id 4sm11649099fgg.22.2010.05.16.08.46.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 16 May 2010 08:46:16 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Omar Ramirez Luna , Fernando Guzman Lugo , Felipe Contreras Subject: [PATCH 04/14] dspbridge: deh: free dummy page immediately Date: Sun, 16 May 2010 18:45:55 +0300 Message-Id: <1274024765-21076-5-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:19 +0000 (UTC) diff --git a/drivers/dsp/bridge/core/ue_deh.c b/drivers/dsp/bridge/core/ue_deh.c index 605cec7..593a0e3 100644 --- a/drivers/dsp/bridge/core/ue_deh.c +++ b/drivers/dsp/bridge/core/ue_deh.c @@ -60,8 +60,6 @@ /* Max time to check for GP Timer IRQ */ #define GPTIMER_IRQ_WAIT_MAX_CNT 1000 -static void *dummy_va_addr; - static struct omap_dm_timer *timer; dsp_status bridge_deh_create(struct deh_mgr **ret_deh_mgr, @@ -203,6 +201,7 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) .element_size = HW_ELEM_SIZE16BIT, .mixed_size = HW_MMU_CPUES, }; + void *dummy_va_addr; if (!deh_mgr) return; @@ -259,6 +258,9 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) hw_mmu_event_ack(resources->dw_dmmu_base, HW_MMU_TRANSLATION_FAULT); dump_dsp_stack(dev_context); + + hw_mmu_disable(resources->dw_dmmu_base); + free_page((unsigned long)dummy_va_addr); break; #ifdef CONFIG_BRIDGE_NTFY_PWRERR case DSP_PWRERROR: @@ -321,6 +323,4 @@ dsp_status bridge_deh_get_info(struct deh_mgr *deh_mgr, void bridge_deh_release_dummy_mem(void) { - free_page((unsigned long)dummy_va_addr); - dummy_va_addr = NULL; }