Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp264928pxa; Wed, 19 Aug 2020 00:05:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwetaJKuuFiL0qDYbPzEawJuwfwq7rOzDa/TY2lHXKbvqWdyvt6fZSj8KlF0rNjiNbPwwwT X-Received: by 2002:a17:907:42cc:: with SMTP id nz20mr24393158ejb.429.1597820743515; Wed, 19 Aug 2020 00:05:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597820743; cv=none; d=google.com; s=arc-20160816; b=oVU551Dp6mEv7BQeeGkcUSBd16Xi93leXKpfyhaWYKbpuYLNbWFmwMIrWjMjDe3oU8 /Y0COYlGV9PFpsdcKc0OlNgWVJY32e0Nxcg1QDakNrQ48ekMwJ7Cek6BATuUjhFhz1sb A/7khxWOmlsp9HJJf7Px6gUNAsXvih0UuxIyF4vYItIS4239bCvAsyDCwdG0tHw++qG6 SVGblS+YkknW72OE6fsbAwJpn2uYnO5jt0YzcEKI7QEfP5e7kixtQHaUTcsj6Zx6qTXD gDDFmgNXBb2e2F6yUvm4NYtfhkGksgCSwZRNcvXrl299ktTTPIfByJA2jyIo05MXHysp 39jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Iqi9DC545gQ9g/f8jSVVhsHYzLAUQX784ygGs4ZRRGA=; b=iKpPTCrephStBuVF/EPhXMnOeQTFS9rErdzlIWwX2pp5CRd0rlUiQoJljmg7ib5ZXI 41Boe23O5j+mQbLGfJLtsNk9WpCGlW/n9nzSpMLvmQj+DSdhZLO9FTV5g9GdcFHYsEVN fzRUWkmyw6CfDSSz6kVbpRYQkgiZSbim6ozTRkZmroEh6kI2WOTT85BO6walon2Y6FHt vgCpe7w5xa5tt4WYzeI3PvHlnzB7PYlYb/RNHUGrVtrZ6tTR1BEX0xAR5gJzz2peVZbh V321kj81iWLHx9Wf6wGkIMjxAjMiU578eKfMeaPL7vsBv2W+p+Kv4SHLm4mS19UsCwYN nucA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=D7imtfyJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a5si14917261ejb.582.2020.08.19.00.05.19; Wed, 19 Aug 2020 00:05:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=D7imtfyJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbgHSHE2 (ORCPT + 99 others); Wed, 19 Aug 2020 03:04:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726749AbgHSG5U (ORCPT ); Wed, 19 Aug 2020 02:57:20 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6E5AC061389; Tue, 18 Aug 2020 23:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Iqi9DC545gQ9g/f8jSVVhsHYzLAUQX784ygGs4ZRRGA=; b=D7imtfyJmxTmDyfgn+f/LPtdHL JFZyrzg4cAvUvkGLFi8hr63dDldNzvDvjdUfyKGi3rCKELJdsb/0ku9p330bHyqU7mDN25/UoKGQC 6LlycBSAi/XryA293desvAT603BNGQXCefSTgvyP48l1Xuna09iOtPoh5V11H5m7rxNkmvaiK+58J LTIReZzMh7JVtZ/xDjqBJitk59Ky6y6ydtrtA9bniyP8j5wL7gfEINESidgPs2A1Qe+pSEFfTkI3j H16A3Wo77NIcudSUJb0dKatozTNv8uTjdMCRxhGt4KoM20trnSq8WcXP3gryV7oxhsJG60dlQHTPn MJ/Z5Ggg==; Received: from [2001:4bb8:198:f3b2:86b6:2277:f429:37a1] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8I1I-0008PN-Re; Wed, 19 Aug 2020 06:56:25 +0000 From: Christoph Hellwig To: Mauro Carvalho Chehab , Thomas Bogendoerfer , "James E.J. Bottomley" , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , Ben Skeggs , Pawel Osciak , Marek Szyprowski , Matt Porter , iommu@lists.linux-foundation.org Cc: Tom Lendacky , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-samsung-soc@vger.kernel.org, nouveau@lists.freedesktop.org, netdev@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, linux-mm@kvack.org, alsa-devel@alsa-project.org Subject: [PATCH 14/28] dma-direct: use phys_to_dma_direct in dma_direct_alloc Date: Wed, 19 Aug 2020 08:55:41 +0200 Message-Id: <20200819065555.1802761-15-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200819065555.1802761-1-hch@lst.de> References: <20200819065555.1802761-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the currently open code copy. Signed-off-by: Christoph Hellwig --- kernel/dma/direct.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 01120510968fa1..2e280b9c063449 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -235,10 +235,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, goto out_encrypt_pages; } done: - if (force_dma_unencrypted(dev)) - *dma_handle = __phys_to_dma(dev, page_to_phys(page)); - else - *dma_handle = phys_to_dma(dev, page_to_phys(page)); + *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); return ret; out_encrypt_pages: -- 2.28.0