From patchwork Sun Jul 4 13:34:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 110131 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o64DYp4W004368 for ; Sun, 4 Jul 2010 13:34:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757722Ab0GDNeu (ORCPT ); Sun, 4 Jul 2010 09:34:50 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:40955 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757698Ab0GDNeu (ORCPT ); Sun, 4 Jul 2010 09:34:50 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so2295322bwz.19 for ; Sun, 04 Jul 2010 06:34:49 -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=0UVuNY5plZy7qEc3o/58fEHbNA4UwT/novmxugEOZM0=; b=RIY16QhXgzUJXL/eIWl8RsjI2NX37e7by6B9oCUW2L9uZ6lhWYfDs98wkjD4YoNQK/ D/emAWyKsaOFiO6SA3s9IdrP2lie7lshaStw2Ktontv0ZNH0OWCYQNIS9e7F/D7dDWyv uO5tNJCDTD58U3L3mvXEkOYm2RsskhmE5KpOk= 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=afW+tO06OtY4SLpCVaVAxEntddnAnBngfm4k8W29ttAAwAIf4JX0YeOsVPOJ+MTkK5 D5h0GrAtT2uBy+t48tO3KUR67+mpeVI2R3OWioqXDoI4g+bUNS7i0Ig2YHiMZ4P+k48b ODuwmyEw2umrvqqGbwZmf3RnLnh2vCjHUedSs= Received: by 10.204.131.132 with SMTP id x4mr1316195bks.183.1278250488960; Sun, 04 Jul 2010 06:34:48 -0700 (PDT) Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80]) by mx.google.com with ESMTPS id o20sm12848487bkw.3.2010.07.04.06.34.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 04 Jul 2010 06:34:48 -0700 (PDT) From: Felipe Contreras To: linux-omap Cc: Ohad Ben-Cohen , Omar Ramirez Luna , Greg KH , Felipe Contreras Subject: [PATCH 03/13] staging: ti dspbridge: deh: free dummy page immediately Date: Sun, 4 Jul 2010 16:34:29 +0300 Message-Id: <1278250479-16982-4-git-send-email-felipe.contreras@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278250479-16982-1-git-send-email-felipe.contreras@gmail.com> References: <1278250479-16982-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, 04 Jul 2010 13:34:51 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c index ee2d23a..50868a4 100644 --- a/drivers/staging/tidspbridge/core/ue_deh.c +++ b/drivers/staging/tidspbridge/core/ue_deh.c @@ -52,8 +52,6 @@ #include -static void *dummy_va_addr; - int bridge_deh_create(struct deh_mgr **ret_deh_mgr, struct dev_object *hdev_obj) { @@ -154,6 +152,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; @@ -214,6 +213,9 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo) HW_MMU_TRANSLATION_FAULT); dump_dsp_stack(dev_context); dsp_clk_disable(DSP_CLK_GPT8); + + hw_mmu_disable(resources->dw_dmmu_base); + free_page((unsigned long)dummy_va_addr); break; #ifdef CONFIG_BRIDGE_NTFY_PWRERR case DSP_PWRERROR: @@ -276,6 +278,4 @@ int 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; }