From: Fernando Guzman Lugo <x0095840@ti.com>
To: <gregkh@suse.de>
Cc: <felipe.contreras@nokia.com>, <Hiroshi.DOYU@nokia.com>,
<linux-kernel@vger.kernel.org>, <andy.shevchenko@gmail.com>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Fernando Guzman Lugo <x0095840@ti.com>
Subject: [PATCH 7/8] staging: tidspbridge - fix some issues after iommu patches
Date: Mon, 25 Oct 2010 19:51:45 -0500 [thread overview]
Message-ID: <1288054306-4361-8-git-send-email-x0095840@ti.com> (raw)
In-Reply-To: <1288054306-4361-7-git-send-email-x0095840@ti.com>
This patch fixes:
* In delete_node() we need to check for udsp_heap_addr in order
to unmap the head instead of udsp_heap_res_addr which used
to be the reserved memory a not valid anymore.
* Fix in get_io_pages() as pointed by Felipe Contreras in this
mail:
http://marc.info/?l=linux-kernel&m=128735502205183&w=2
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
---
drivers/staging/tidspbridge/core/dsp-mmu.c | 2 +-
drivers/staging/tidspbridge/rmgr/node.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/tidspbridge/core/dsp-mmu.c b/drivers/staging/tidspbridge/core/dsp-mmu.c
index 3a00087..54f3ba4 100644
--- a/drivers/staging/tidspbridge/core/dsp-mmu.c
+++ b/drivers/staging/tidspbridge/core/dsp-mmu.c
@@ -196,7 +196,7 @@ static int get_io_pages(struct mm_struct *mm, u32 uva, unsigned pages,
int i;
struct page *pg;
- for (i = 0; i < pages; i++) {
+ for (i = 0; i < pages; i++, uva += PAGE_SIZE) {
pa = user_va2_pa(mm, uva);
if (!pfn_valid(__phys_to_pfn(pa)))
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 3f5abcf..f7fe6c0 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -2541,7 +2541,7 @@ static void delete_node(struct node_object *hnode,
kfree(task_arg_obj.strm_out_def);
task_arg_obj.strm_out_def = NULL;
}
- if (task_arg_obj.udsp_heap_res_addr) {
+ if (task_arg_obj.udsp_heap_addr) {
status = proc_un_map(hnode->hprocessor, (void *)
task_arg_obj.udsp_heap_addr,
pr_ctxt);
--
1.6.3.3
next prev parent reply other threads:[~2010-10-26 0:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-26 0:51 [PATCH 0/8] staging: tidspbridge - misc fixes Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 1/8] staging: tidspbridge - remove req_addr from proc_map Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 2/8] staging: tidspbridge - add kconfig parameter for DMM size Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 3/8] staging: tidspbridge - change mmufault tasklet to a workqueue Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 4/8] staging: tidspbridge - fix timeout in dsp_gpt_wait_overflow Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 5/8] staging: tidspbridge - use GTP7 for DSP stack dump Fernando Guzman Lugo
2010-10-26 0:51 ` [PATCH 6/8] staging: tidspbridge - remove disabling twl when printing DSP stack Fernando Guzman Lugo
2010-10-26 0:51 ` Fernando Guzman Lugo [this message]
2010-10-26 0:51 ` [PATCH 8/8] staging: tidspbridge - make sync_wait_on_event interruptible Fernando Guzman Lugo
2010-10-26 0:58 ` Felipe Contreras
2010-10-26 15:50 ` Guzman Lugo, Fernando
2010-10-26 17:03 ` Felipe Contreras
2010-10-26 17:58 ` Guzman Lugo, Fernando
2010-10-26 19:27 ` Felipe Contreras
2010-10-26 20:01 ` Guzman Lugo, Fernando
2010-12-06 8:51 ` Ramirez Luna, Omar
2010-10-26 11:46 ` [PATCH 1/8] staging: tidspbridge - remove req_addr from proc_map Felipe Contreras
2010-10-26 15:52 ` Guzman Lugo, Fernando
2010-10-26 17:07 ` Felipe Contreras
2010-10-26 18:08 ` Guzman Lugo, Fernando
2010-10-26 19:37 ` Felipe Contreras
2010-10-26 20:39 ` Guzman Lugo, Fernando
2010-10-27 8:19 ` Felipe Contreras
2010-10-28 15:38 ` Guzman Lugo, Fernando
2010-10-28 15:56 ` Russell King - ARM Linux
2010-10-26 4:06 ` [PATCH 0/8] staging: tidspbridge - misc fixes Greg KH
2010-10-26 14:43 ` Felipe Contreras
2010-10-26 14:55 ` Omar Ramirez Luna
2010-10-26 15:46 ` Guzman Lugo, Fernando
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288054306-4361-8-git-send-email-x0095840@ti.com \
--to=x0095840@ti.com \
--cc=Hiroshi.DOYU@nokia.com \
--cc=andy.shevchenko@gmail.com \
--cc=felipe.contreras@nokia.com \
--cc=gregkh@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®