Message ID | 20181114082314.8965-27-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 5EE0314DB for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 550252A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 497F42B020; Wed, 14 Nov 2018 08:24:57 +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 CAEE32A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A74C6B0290; Wed, 14 Nov 2018 03:24:41 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 20C626B0291; Wed, 14 Nov 2018 03:24:41 -0500 (EST) 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 ED7CB6B0292; Wed, 14 Nov 2018 03:24:40 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id A391E6B0290 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 03:24:40 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id g12-v6so11537613plo.14 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 00:24:40 -0800 (PST) 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=86DBsBIMmIhEBTOakHAGIbjLaXZ370gqa5k2c+NEa2M=; b=ZVdxG/dd3I4JGTbNg9Qks7S02zlaFI1obNPVp1b+XuPQSZQnoCEHgqnyOv0XnkW4Zk YWBzvXtFufhbtzfWaDMvjBIlWxnKPmHM9njV01fdb612NWrOongeq+aQlEHYHLZJ+jNI ABrZ5gmcvbmHlXmukZ/pmDxeqekxjcdEB2SFkqH06SZ5RNxwsiuvUYU543pGvAeypnKG j5Ua32dBvdsFX6I5DHoA2O5Uh35vvf8Lbvg4Mo17+guzNVsL40a4+sC/sYNCY1PWIFzO EsbG0PHDSLI1meVJlHMxyrCq9NV2FsWlokbjixi2EiFRi612VfbT3/U4N8fB078IYyxG JjwQ== X-Gm-Message-State: AGRZ1gKXHegBnjjkMlwr2F+SlREz7YohRVXsdEcY4QBup7ov00+WQnyI K6jgzEGUV2/CT9zHznPaaaGqU1tc+HzTt1plVUMr2OuInIEN6K5tl2ygAnY0JYQooH7irLRw8oa 1tNHVRrvqBvWLfi3AC8pKyU2GjJjO/wiSMnNZbJDfO8QDT6xqarHKiTYv1JZGlB0= X-Received: by 2002:a17:902:7882:: with SMTP id q2mr968285pll.305.1542183880346; Wed, 14 Nov 2018 00:24:40 -0800 (PST) X-Google-Smtp-Source: AJdET5cDKRyMoOBW6SsnsT6f0FTreopFTaD+Bx2ogqT3NVL2p6JvETiXR0VcdeOR1bTIomXpwF/O X-Received: by 2002:a17:902:7882:: with SMTP id q2mr968248pll.305.1542183879587; Wed, 14 Nov 2018 00:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183879; cv=none; d=google.com; s=arc-20160816; b=sNG+uXzJWO/p1WcIWHUwdBN2qsXmHrNDAZN3I5fz6Ync8WOK3al4O1l/gmzo5S87Ze k+d+KpFBz1h+NCnHR4ECHNRSRxiUiE6ThetGxFIUC102UjvbjrPhhWDsNWMrMuZ3U2ad yEzEckAuCBk8Aq0qH/HZI92pjQYpLfGG+PGmStlcgnHPFjixXx/GEXmfxaKB1qmKyuuZ n7r75x8s5xKuiA11+9Sv2WVMktbh64bBuh5N/kxsNdQ8zbkVKv7TX/j+JmmHNfJoc5Xg QPSSW3Iu11glPiMrebxSn1qyMMLenjNB14D6l6RSJ1wZFucwVJz7V4rmp8uQDw1+Q7/A NObg== 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=86DBsBIMmIhEBTOakHAGIbjLaXZ370gqa5k2c+NEa2M=; b=E54/Su3x94fgXg1jd/+I7mWso3SUDpj6dHe2R36Kd9A5lPzxKuPxaqjlfBCiX/zgnQ dXtnGD1shO1zcUKOZZ+8fRxRQ+cRsOiCbU4Jx/SjrZb0hv6TzwKfoWyveoClqkx7l4Gg kakW+8ulmqxmiEYnH2i/rxSY18cjuCYIHbpHZ6oFU7XrY0oFeHAFT4ti1uoHw8mbAa+/ vKQMlvNCAW+kgBfVA3dfOtnKgOvEw8BXdihsiy5nMk9p3M4B/7c8hlISfiAUsWAn/CgM aFs06hWv68Zt/U34Tm/8WzS+SeTux6LEDO+dzDK9Qiotn6SnNypQhkoygJboBasY04nx nj6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=pf9XkHGx; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+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 f4-v6si26557226plm.393.2018.11.14.00.24.39 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+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=pf9XkHGx; spf=pass (google.com: best guess record for domain of batv+ddbc6e1cf1a82b64ebec+5561+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+ddbc6e1cf1a82b64ebec+5561+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=86DBsBIMmIhEBTOakHAGIbjLaXZ370gqa5k2c+NEa2M=; b=pf9XkHGx0G+Yt49BZ8HaetquH6 xCzsmiWUWokmww8rosEuIi+B8DvjqWCnoJkRoSFbbBfMycJiJ8Wn7Bpi1XFPSw4baiL38sLlwEOgv 6HWhYtNUF0TYTGH/p+tnU65juWdf/VB+VP86ooFfW0kyUgSH1vRyY2V87ZjfSk1XAeqFXEU3NRJlf hKtTAVNr3uIcAZ1a9Shsv2SEyPIg6nA5JVefiZj0si2NeyXcrR9Gbj8AxbHMTmR+TTsp7yaP7N/tt fj8w2UTffKlK20MfzGYk0uoSsapT+FdvE3hx45oYCFAy8dLG05OJ1obFrdktfXqEgVJL1Xdxx6dlz nrTnfeQg==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqTL-00054A-Nu; Wed, 14 Nov 2018 08:24:28 +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 26/34] powerpc/dma: fix an off-by-one in dma_capable Date: Wed, 14 Nov 2018 09:23:06 +0100 Message-Id: <20181114082314.8965-27-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-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/34] powerpc: use mm zones more sensibly
|
expand
|
diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h index e00ab5d0612d..92d8aed86422 100644 --- a/arch/powerpc/include/asm/dma-direct.h +++ b/arch/powerpc/include/asm/dma-direct.h @@ -4,15 +4,11 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { -#ifdef CONFIG_SWIOTLB - if (dev->bus_dma_mask && addr + size > dev->bus_dma_mask) - return false; -#endif - if (!dev->dma_mask) return false; - return addr + size - 1 <= *dev->dma_mask; + return addr + size - 1 <= + min_not_zero(*dev->dma_mask, dev->bus_dma_mask); } static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)
We need to compare the last byte in the dma range and not the one after it for the bus_dma_mask, just like we do for the regular dma_mask. Fix this cleanly by merging the two comparisms into one. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/include/asm/dma-direct.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)