Message ID | 20181114082314.8965-17-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 889951747 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EFCF2A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 735272B020; Wed, 14 Nov 2018 08:24:35 +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 EDB142A654 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 14 Nov 2018 08:24:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF26E6B0282; Wed, 14 Nov 2018 03:24:25 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D04BC6B0283; Wed, 14 Nov 2018 03:24:25 -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 BAA686B0284; Wed, 14 Nov 2018 03:24:25 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 6872F6B0282 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 03:24:25 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id y8so10098237pgq.12 for <linux-mm@kvack.org>; Wed, 14 Nov 2018 00:24:25 -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=vO1AXWRry65fSmV2hiFEz4IJdhQJh8cqGPR7PM+xtEg=; b=X16vk3CJ8roo7s/veFKAB9vzkJKGbyjGX8VskhXhvJgC5H07HG4fcwn+dmeLxUziIx pQVpAgESH+gn3AeODSMd40PBJro4H3/nGbLzQ2fYyLBE1IeISg09nRG8N+fqFFjcTXOb 36DNSnghK+R0emoPJaGOCr8A4kxWTOXWz9V6PQsgJNwftML1YnWvtwZboV3zbXt3eWQ1 k9AnSlCh2F6K+R1a7vg6vDQMdgD0X6G5+FXnoO9vvMkW/AhckkH5GJpL6ixZvIRnLNZD CgUgumbMXXJTR/JHqBmeDfF9rxmAQ+9yDrppGsmHv3plNyFu3AZNv/N916Zr+nXkDmCW kFtQ== X-Gm-Message-State: AGRZ1gLZantzylH82P6xZMgBlShYSO+BxAcYrZ/eeWCRJ4q29Ss6s8ky HNAjOYxTOAcg/ABiMxu+L+80eIluFsfFlAaCNTPxR1G0xXzI8A4ZNIJ61CoTLONmXDRNeySZ2+7 +089z85CUWcfWnOIP/FeTFyfRtdzd2rOkiaKq7Q5rAshjUSjb9dvnCYigTyE2tzA= X-Received: by 2002:a63:77ce:: with SMTP id s197mr859110pgc.89.1542183865095; Wed, 14 Nov 2018 00:24:25 -0800 (PST) X-Google-Smtp-Source: AJdET5eao7sCbzYK70xj89Cs13okHMCxn8sHHkgtaJ/FBk4Df5X5LTK8qDMNFQZQ5AreHw9QvYkZ X-Received: by 2002:a63:77ce:: with SMTP id s197mr859089pgc.89.1542183864427; Wed, 14 Nov 2018 00:24:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183864; cv=none; d=google.com; s=arc-20160816; b=rC1Lk7RwATZBrGJqnsNuBYJJ2spbENJM0F8Gs4fWp8OriPMCfWL0lHSr1shZpyznE4 VAPEB7X5kUgfSLPz1rzR6PdMkTnVcsnUHmtK4xKBM2At8RHJVQyqkjOdvVB9KKiebDMy Fel9da4q0xZyDSJg39GGG3BU1gEcxVywNVa1H+k390rGtWfw05zq0heZ7xJCxee788/J J6uQK5vMlndDjjVeqihWkQDupWV5Fs8uyUfpjehLo0SG8st971JdKcEbgvpCtvFsvkvK 5d8v9IpdPBmMiXlYPQFSVcQMiLtkJGM6s5XUj93w2Vcj9vyRxUaSLhpB/bp2LlNrnkIO WCSQ== 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=vO1AXWRry65fSmV2hiFEz4IJdhQJh8cqGPR7PM+xtEg=; b=kocjgx2whA0myGJ+x3RAtrGQohBaH8A1yjA3a4joIo0VSY1PnwunpDGvZmFc0fypZX jFMNoq2zXkPWV1HOt8uSvyYchlrisvEK2QpY83w07O0aH/84ikAtSxQU10RH2JdyQOEn 9GI/EuUu8FF66QrG/3tF/N8veSSKaQw57x5npjorVfL3A1LyfRPuQQbHGzz1lKZLguAS NezMNkY3TUSCClhkeYewhzcazYAxXSPNFGrxWRaJNxGVOleKbY7g+QcRDtYwQdMKDvSD 4eSy/c4fRL2O3VkaKyYUE5ruMawdSZYUFW1OLRzOZL61HwAX+MROmSfZa8AktdZi6iab U2zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=ck2crkxJ; 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 u5si9202900pgr.316.2018.11.14.00.24.24 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 00:24:24 -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=ck2crkxJ; 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=vO1AXWRry65fSmV2hiFEz4IJdhQJh8cqGPR7PM+xtEg=; b=ck2crkxJfGquKIGlFA8BjbnFCD tQsAQJRhiX6/YuIyStFiRR6hHTUTP47CG/vV/y8aJ2Wz2p+IT8qQIpDW1038JyUZxNzuM6eeRwZBr Wa2KwWsjRkO/KmwJ7Xsy97N89M3WQDX8BMRkrOv4Vb30rQW+N5I75qjJ+lriKAMddiKh8Q950SxJz e5/Ey/+zyv/SDWxpZZQFP6l+ecdgNP5f+DJ696B3lLF6InjexNhq5YkIPEAM5pL+lk/7sG7GpZGbx Gc8RZt3BC1T5M4wE+kwyh2xMAcLiTIkbH+cd7zzcuPCbws0KFPLjZkzZAYeZeAka3L0jYC8D+Zaez KzelDSjg==; 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 1gMqSu-0004vj-EF; Wed, 14 Nov 2018 08:24:00 +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 16/34] powerpc/powernv: remove pnv_pci_ioda_pe_single_vendor Date: Wed, 14 Nov 2018 09:22:56 +0100 Message-Id: <20181114082314.8965-17-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/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index dd807446801e..afbb73cd3c5b 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1745,31 +1745,6 @@ static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev */ } -static bool pnv_pci_ioda_pe_single_vendor(struct pnv_ioda_pe *pe) -{ - unsigned short vendor = 0; - struct pci_dev *pdev; - - if (pe->device_count == 1) - return true; - - /* pe->pdev should be set if it's a single device, pe->pbus if not */ - if (!pe->pbus) - return true; - - list_for_each_entry(pdev, &pe->pbus->devices, bus_list) { - if (!vendor) { - vendor = pdev->vendor; - continue; - } - - if (pdev->vendor != vendor) - return false; - } - - return true; -} - /* * Reconfigure TVE#0 to be usable as 64-bit DMA space. * @@ -1870,7 +1845,8 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) */ if (dma_mask >> 32 && dma_mask > (memory_hotplug_max() + (1ULL << 32)) && - pnv_pci_ioda_pe_single_vendor(pe) && + /* pe->pdev should be set if it's a single device, pe->pbus if not */ + (pe->device_count == 1 || !pe->pbus) && phb->model == PNV_PHB_MODEL_PHB3) { /* Configure the bypass mode */ rc = pnv_pci_ioda_dma_64bit_bypass(pe);
This function is completely bogus - the fact that two PCIe devices come from the same vendor has absolutely nothing to say about the DMA capabilities and characteristics. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/powerpc/platforms/powernv/pci-ioda.c | 28 ++--------------------- 1 file changed, 2 insertions(+), 26 deletions(-)