Message ID | 20181009132500.17643-7-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFD01112B for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:25:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1532286A1 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:25:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5CA2289C4; Tue, 9 Oct 2018 13:25:46 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DD85286A1 for <patchwork-linux-mm@patchwork.kernel.org>; Tue, 9 Oct 2018 13:25:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E524B6B026E; Tue, 9 Oct 2018 09:25:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DB2306B026F; Tue, 9 Oct 2018 09:25:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB9666B0270; Tue, 9 Oct 2018 09:25:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 6145C6B026E for <linux-mm@kvack.org>; Tue, 9 Oct 2018 09:25:36 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id n23-v6so1059848pfk.23 for <linux-mm@kvack.org>; Tue, 09 Oct 2018 06:25:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sm64G9zOzLTVHztS2JfrA+dPUB2AqgJ3QVy7QL6eQdU=; b=N+tdOATfaIV0/jn07zW11HrAtmIBPiN/RXgufXunb4VUSYyF4AdfN5FIHIBDieKSDx gAKqRV6lAD9zJONKvDMcdFgry9USpX/2ASAfhUP++OxFQvdtVWmvJTpcjSdZgGipM6Zt o08Zr5h9l1jfldryrLYNk1KHs+xmkGNQFjKyhx8yrK3bQ4SIrAFoisAVsWB4OQcNSyXY kBXp8ZYE07xOLSRdgpPKC1UimWk2dcwf3DJ8aTAO+YqORyLMSApOyjfTBId0L3iCk8ZP otQp39tbr4LZYxK9qLzb2pv4jrPCfPeLCAL58XFUcXCGjzdOuxmMC5jTphXaTP9twucY MSIQ== X-Gm-Message-State: ABuFfogyFeJe5fqTrKkTME8PEQXmWQfEUdAaCCR7j5NJa1HQpct1dwUX ELIgBecuFyb3q6sshveXUctGKsa9SbKgVfcoNe2nKgX/+BIX5NZhfDsq4uog+gognrPbodn7f30 HH8AdqzojKomuOQRDnXo1D+lEFj+L5YN0v8QopqRoAWSlqv7DIVBHNOho/AFLY8A= X-Received: by 2002:a17:902:d694:: with SMTP id v20-v6mr16580500ply.146.1539091536081; Tue, 09 Oct 2018 06:25:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV62FN2vZRdJ5SKwCoJBZ21pfkmqetA+YaI74S51d+6g10qqx3LMqkc0fCtlFqe8r3F9yMfSL X-Received: by 2002:a17:902:d694:: with SMTP id v20-v6mr16580459ply.146.1539091535454; Tue, 09 Oct 2018 06:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091535; cv=none; d=google.com; s=arc-20160816; b=b0UXhPzJO4kF/7EcKiakE+CFQmH5UjO0uqk12BJjqnD8PdVXL+EfuBY9ULMcCWKWTS TmzDD83nEW4GRkWnnZ9GHjW6qlX3w0X8THbQB3qCOqo1bhheNdOEO3XEbad1zzKVovGc vf9tagsglJAhpZFKIVWSE0IZVK3RJFmMODWFfGozU94/7biClTM5jsYRjMgBq5uKMkqJ LChYcY5ucQjklIJgnirtnBUdFXMRKwQcUGSIK2paQaAulUK/JZVV/zOLEOlk9wVq6HcC mNLTWSfrEqRRcn1TtlqOewjJ+Y4xqJuqbKc0Xkh19315YAoAdrw1RZTjS51ELSE5/YFb XraQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=sm64G9zOzLTVHztS2JfrA+dPUB2AqgJ3QVy7QL6eQdU=; b=AX+LXlyHXWdDctw2PQgoEVFdedmXbU3A86+vJTi0iJCevMz1TW6eSQUMa4JmU11YWh RDeT6xQvLUkCrGqLS95unLtLrSNQPy5Rv3HMBMtAAQU9UXjjo4lPCYHLd8sjlnAuhYbV hrlOZ03OJa5MHNaaA6R983CVsE4ZzMNuIUgSk04KbRcAtCgslFwqDamm9cOfMYRHCsWN AdkmHoAlUSHjNeUWJEhT3i9WH5oA1BwijBlPTg2fZ271wGkfWUVKDB6hdrBlNP6T0g8z roZy7D6GbmE5aWySVkaNCCalwKt81ZtT02qKdILtuSxaW5I8+d2RqeKKaL5GLZHilIP2 /qEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tbFfGJFn; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id w71-v6si20142718pgd.163.2018.10.09.06.25.35 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:25:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tbFfGJFn; spf=pass (google.com: best guess record for domain of batv+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+39c443e67938b060f200+5525+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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: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=sm64G9zOzLTVHztS2JfrA+dPUB2AqgJ3QVy7QL6eQdU=; b=tbFfGJFnfB3JeKmr6eXyJMA2lS 3iSQtuWsqXxhhGFqjV7CQTDfEvCNa/5HApusniYRWiFIqdjdx54MWVo4zff2QbFa7xbe/NLgeV92g Mtkmgq+Oolp3YaJ1tQ3RgGayY64YWelr6rCDdmHceAqGZBrGAjWWBf+LdNsc1F9lL6OALqGwmpkm7 nCYbtK4S/lcNmsu3Ji/jzhfnbmVVqtGWP6e5mMrkSZkVz9Bhw69XDAz5w4QlGYlpg2y5Okc4c1Mwu 3OehE8L4l4Ju7IQMR1rzzoaCIPVtKFCjLKOqvrKeFdYSZ0En2BKvYgRoA152b2sgpMDzqumkMYOWT GKd+ybGQ==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1g9s0i-000150-Hp; Tue, 09 Oct 2018 13:25:16 +0000 From: Christoph Hellwig <hch@lst.de> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/33] powerpc/dma: remove the no-op dma_nommu_unmap_{page,sg} routines Date: Tue, 9 Oct 2018 15:24:33 +0200 Message-Id: <20181009132500.17643-7-hch@lst.de> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181009132500.17643-1-hch@lst.de> References: <20181009132500.17643-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[01/33] powerpc: use mm zones more sensibly
|
expand
|
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index d6deb458bb91..7078d72baec2 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -197,12 +197,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, return nents; } -static void dma_nommu_unmap_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - unsigned long attrs) -{ -} - static u64 dma_nommu_get_required_mask(struct device *dev) { u64 end, mask; @@ -228,14 +222,6 @@ static inline dma_addr_t dma_nommu_map_page(struct device *dev, return page_to_phys(page) + offset + get_dma_offset(dev); } -static inline void dma_nommu_unmap_page(struct device *dev, - dma_addr_t dma_address, - size_t size, - enum dma_data_direction direction, - unsigned long attrs) -{ -} - #ifdef CONFIG_NOT_COHERENT_CACHE static inline void dma_nommu_sync_sg(struct device *dev, struct scatterlist *sgl, int nents, @@ -261,10 +247,8 @@ const struct dma_map_ops dma_nommu_ops = { .free = dma_nommu_free_coherent, .mmap = dma_nommu_mmap_coherent, .map_sg = dma_nommu_map_sg, - .unmap_sg = dma_nommu_unmap_sg, .dma_supported = dma_nommu_dma_supported, .map_page = dma_nommu_map_page, - .unmap_page = dma_nommu_unmap_page, .get_required_mask = dma_nommu_get_required_mask, #ifdef CONFIG_NOT_COHERENT_CACHE .sync_single_for_cpu = dma_nommu_sync_single,