Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6398147imu; Wed, 14 Nov 2018 00:25:33 -0800 (PST) X-Google-Smtp-Source: AJdET5cSqlrIb2TSEVfVf/Ob2XxB8+4LxtQYg6yxzE2NIoOdrloBui02lyNhTCqz+m4N2EQSQjoO X-Received: by 2002:a17:902:2943:: with SMTP id g61-v6mr1006689plb.82.1542183933078; Wed, 14 Nov 2018 00:25:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183933; cv=none; d=google.com; s=arc-20160816; b=XkQXRR0/Fo2Cys16USbzrnj+mz3J00FABgEs5KVgFJqgjpCGtGGMVZaOe6Mdr3dVHP vSKjgsd/RAvw7wuJ5bar2dpDUnpA24zYzp0wL98y5DNtzsj2Y7tmewfynXEC5+oAFWoH LFyq/SDyWWwRt4O19vW6kNH59yNKZFTbDqQYBAsp0HnTsqtde/veL7TVaLSDaqnMtDVn AE6ts6bvUsjIrAnQEp3+sXW6mX4CaaLn//sCdUdkWorrThrvCGr2w+ZSmCk4f4etIg8c +OaYgseipGN1oqV9QvEywkmAeMmBTZVQUktQCqNeuOHKwkXCS/8lTz5HTH3KorLgbspg Vg2g== 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=vO1AXWRry65fSmV2hiFEz4IJdhQJh8cqGPR7PM+xtEg=; b=godv8hpgWXKUP4nN1XvIJP455LHLpP2O5/jxBnjLY0GYs6ENdw4msd+AWRXfMEMHD7 d3xAL0yYXgF0c4m29d5Mj6lJ/VtWUF6gReMrBf2STcKUSzT7RpGJocUpz25TDJYqUSo/ 7XtNc6fAqbj4oJeY9HgM1eoDhWaqSW1kwAnEKWtUgyBeF0N7IxBdhLBdOsCAmSFY0yh/ tTMtpkxAcNvxVC26UBIexdc4Nk2sxtLgaDt2YEYOjUd34gvL5fsLXPQ1kcdK3xl1X1MP DB6BDKAFjpzlyr2O8uTu9FVcGFGBkpuqg72kLij5Njzfee61yH9qQFQNU0EIH+xofRD4 097w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=ck2crkxJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 28si20208921pgz.593.2018.11.14.00.25.18; Wed, 14 Nov 2018 00:25:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=ck2crkxJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732851AbeKNS0g (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:36 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49794 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728406AbeKNS0f (ORCPT ); Wed, 14 Nov 2018 13:26:35 -0500 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 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman 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 by bombadil.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 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 --- arch/powerpc/platforms/powernv/pci-ioda.c | 28 ++--------------------- 1 file changed, 2 insertions(+), 26 deletions(-) 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); -- 2.19.1