From patchwork Fri Dec 29 08:18:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10136589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3932B603FA for ; Fri, 29 Dec 2017 08:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26A1D2BF45 for ; Fri, 29 Dec 2017 08:29:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B4C32C169; Fri, 29 Dec 2017 08:29:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE8E72BF45 for ; Fri, 29 Dec 2017 08:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932969AbdL2I3A (ORCPT ); Fri, 29 Dec 2017 03:29:00 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:46088 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755364AbdL2IW6 (ORCPT ); Fri, 29 Dec 2017 03:22:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LRelLG5rQQy1twcwEG5RJGm/fc943jbDguWWiVhJJyM=; b=HsWMhsg8dADDbOL2oim72voZy 9X/VBfjDPCTfyzeiOLq/wsI9ln/vO0KnjQ+v6WnuSJgiRtWPaEFH2Oxrpk1BDW7FIdlkRgVVsUieD XUObWQ109YiuT3UbILs7RuMC9iTTECms15TI2Ls+WyFClG1/uJTL24zJsuX4Lonu73qtbmLWIHu9e vZK5K9tLfgf2k3GfD5z1/8bFkcalNw63cMIwkhUyFUz9iCKraRi5/DUOKRSXuxJ1ctz/JL8jppyz6 HPcHatAf5gBlumLMs6oe0wV24nQitZF522P/ZVwCYOlSuBGBLZznYQzxrdir0sZWB1zybTclBk49q YlRrjAueg==; Received: from 77.117.237.29.wireless.dyn.drei.com ([77.117.237.29] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1eUpwE-0003Bw-1x; Fri, 29 Dec 2017 08:22:46 +0000 From: Christoph Hellwig To: iommu@lists.linux-foundation.org Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, adi-buildroot-devel@lists.sourceforge.net, linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, Michal Simek , linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, Guan Xuetao , x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 48/67] swiotlb: rely on dev->coherent_dma_mask Date: Fri, 29 Dec 2017 09:18:52 +0100 Message-Id: <20171229081911.2802-49-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171229081911.2802-1-hch@lst.de> References: <20171229081911.2802-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These days the coherent DMA mask is always set, so don't work around the lack of it. Signed-off-by: Christoph Hellwig --- lib/swiotlb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/swiotlb.c b/lib/swiotlb.c index e0b8980334c3..a14fff30ee9d 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -716,15 +716,11 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t dev_addr; void *ret; int order = get_order(size); - u64 dma_mask = DMA_BIT_MASK(32); - - if (hwdev && hwdev->coherent_dma_mask) - dma_mask = hwdev->coherent_dma_mask; ret = (void *)__get_free_pages(flags, order); if (ret) { dev_addr = swiotlb_virt_to_bus(hwdev, ret); - if (dev_addr + size - 1 > dma_mask) { + if (dev_addr + size - 1 > hwdev->coherent_dma_mask) { /* * The allocated memory isn't reachable by the device. */ @@ -747,9 +743,9 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size, dev_addr = swiotlb_phys_to_dma(hwdev, paddr); /* Confirm address can be DMA'd by device */ - if (dev_addr + size - 1 > dma_mask) { + if (dev_addr + size - 1 > hwdev->coherent_dma_mask) { printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n", - (unsigned long long)dma_mask, + (unsigned long long)hwdev->coherent_dma_mask, (unsigned long long)dev_addr); /*