From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932640AbcI0KxP (ORCPT ); Tue, 27 Sep 2016 06:53:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58938 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbcI0KxG (ORCPT ); Tue, 27 Sep 2016 06:53:06 -0400 Date: Tue, 27 Sep 2016 12:53:04 +0200 From: Greg Kroah-Hartman To: Mark Craske Cc: linux-kernel@vger.kernel.org, "George G. Davis" , Jiada Wang Subject: Re: [PATCH v1 1/2] drivers: dma-coherent: Fix DMA coherent size for less than page Message-ID: <20160927105304.GA17843@kroah.com> References: <1473932399-23224-1-git-send-email-Mark_Craske@mentor.com> <1473932399-23224-2-git-send-email-Mark_Craske@mentor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1473932399-23224-2-git-send-email-Mark_Craske@mentor.com> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 15, 2016 at 10:39:58AM +0100, Mark Craske wrote: > From: "George G. Davis" > > We fix a bug in dma_mmap_from_coherent() that appears when we map non page > aligned DMA memory. It cuts off the non aligned part (this is different to > dma_alloc_coherent() that always rounds up to full pages). So for mappings > of less than a page we get -ENXIO as dma_mmap_from_coherent() assumes we > want to map zero pages. > > Signed-off-by: George G. Davis > Signed-off-by: Jiada Wang > Signed-off-by: Mark Craske > --- > drivers/base/dma-coherent.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c > index bdf28f7..abd83b7 100644 > --- a/drivers/base/dma-coherent.c > +++ b/drivers/base/dma-coherent.c > @@ -262,7 +262,7 @@ int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma, > unsigned long off = vma->vm_pgoff; > int start = (vaddr - mem->virt_base) >> PAGE_SHIFT; > int user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; > - int count = size >> PAGE_SHIFT; > + int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > > *ret = -ENXIO; > if (off < count && user_count <= count - off) { > -- > 1.7.9.5 > Doesn't apply to my tree (or linux-next) :( Can you refresh this series and resend? thanks, greg k-h