[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180205135414.fa6a6044e5c869e30bb40ff1@kernel.org>
Date: Mon, 5 Feb 2018 13:54:14 +0900
From: Masami Hiramatsu <mhiramat@...nel.org>
To: Pawel Osciak <pawel@...iak.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
Masami Hiramatsu <mhiramat@...nel.org>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
orito.takao@...ionext.com, masami.hiramatsu@...aro.org
Subject: Re: [PATCH] [BUGFIX] media: vb2: Fix videobuf2 to map correct area
On Mon, 5 Feb 2018 11:30:41 +0900
Masami Hiramatsu <mhiramat@...nel.org> wrote:
> Fixes vb2_vmalloc_get_userptr() to ioremap correct area.
> Since the current code does ioremap the page address, if the offset > 0,
> it does not do ioremap the last page and results in kernel panic.
>
> This fixes to pass the page address + offset to ioremap so that ioremap
> can map correct area. Also, this uses __pfn_to_phys() to get the physical
> address of given PFN.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org>
> Reported-by: Takao Orito <orito.takao@...ionext.com>
Oops, I've missed the original reporter.
Reported-by: Fumihiro ATSUMI <atsumi@...initegra.co.jp>
Thank you,
> ---
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> index 3a7c80cd1a17..896f2f378b40 100644
> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> @@ -106,7 +106,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr,
> if (nums[i-1] + 1 != nums[i])
> goto fail_map;
> buf->vaddr = (__force void *)
> - ioremap_nocache(nums[0] << PAGE_SHIFT, size);
> + ioremap_nocache(__pfn_to_phys(nums[0]) + offset, size);
> } else {
> buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
> PAGE_KERNEL);
>
--
Masami Hiramatsu <mhiramat@...nel.org>
Powered by blists - more mailing lists