From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbbJWVBb (ORCPT ); Fri, 23 Oct 2015 17:01:31 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:45748 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbbJWVB3 (ORCPT ); Fri, 23 Oct 2015 17:01:29 -0400 X-IBM-Helo: d01dlp02.pok.ibm.com X-IBM-MailFrom: nacc@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;sparclinux@vger.kernel.org Date: Fri, 23 Oct 2015 14:01:15 -0700 From: Nishanth Aravamudan To: "David S. Miller" Cc: Matthew Wilcox , Keith Busch , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Alexey Kardashevskiy , David Gibson , Christoph Hellwig , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org Subject: [RFC PATCH 6/7] sparc/dma-mapping: override dma_get_page_shift Message-ID: <20151023210115.GH10197@linux.vnet.ibm.com> References: <20151023205420.GA10197@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151023205420.GA10197@linux.vnet.ibm.com> X-Operating-System: Linux 3.13.0-40-generic (x86_64) User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15102321-0033-0000-0000-000006895FD8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On sparc, the kernel's page size differs from the IOMMU's page size, so override the generic implementation, which always returns the kernel's page size, and return IOMMU_PAGE_SHIFT instead. Signed-off-by: Nishanth Aravamudan --- I know very little about sparc, so please correct me if this patch is invalid. arch/sparc/include/asm/dma-mapping.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h index a21da59..76ba470 100644 --- a/arch/sparc/include/asm/dma-mapping.h +++ b/arch/sparc/include/asm/dma-mapping.h @@ -52,6 +52,14 @@ static inline int dma_set_mask(struct device *dev, u64 mask) return -EINVAL; } +/* for IOMMU_PAGE_SHIFT */ +#include +#define HAVE_ARCH_DMA_GET_PAGE_SHIFT 1 +static inline unsigned long dma_get_page_shift(struct device *dev) +{ + return IOMMU_PAGE_SHIFT; +} + #include #endif -- 1.9.1