From patchwork Tue Oct 9 13:24:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10632555 Return-Path: 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 9DDB1112B for ; Tue, 9 Oct 2018 13:26:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9239E289C4 for ; Tue, 9 Oct 2018 13:26:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84301289F5; Tue, 9 Oct 2018 13:26:54 +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 14FCF289C4 for ; Tue, 9 Oct 2018 13:26:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D20C36B0286; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C9E426B0289; Tue, 9 Oct 2018 09:26:15 -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 9B9FD6B0288; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 515336B0285 for ; Tue, 9 Oct 2018 09:26:15 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id x2-v6so834258pgr.8 for ; Tue, 09 Oct 2018 06:26:15 -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=+X8AkMvhaCh2A6t5uXBVRn35aMYZZ+/hh9Cwb5Qv+ts=; b=hOLFgjetwQshjgKSAvyThYhXj5r7jjb7eaFhPUj3CvYPnT6qitlqzRBxoQpajRQYCA 2yHsdcpez4tCEOKWikJhj3egVgZXu2z/1mrR0w7j6x7LSkwehsbjOf7G8lpoHPMMFrQO qUPOhBpB7s3NswqlhHGm4ExpbL6cXgSq40uey8CLDR6iGNQJlLe16fRgbuXjp0On0cOT tgU2ESuT7v/ogMBJeU2iQtUeuvk3Or+PfWxku4tfLmPMKoKFRBiAso0WmSnJYhAbvzuV iFrgd3FnefmNvTKwZPsuUB3xyJ1E95dGZMtGXHpkPVKgC/ivHI1Ez4RyycxEzNlxwmbG qYiw== X-Gm-Message-State: ABuFfoiLTK30mEUrKaTPWlIWblbjhZE5JByCqT2ywMfYaU0toNR0yR1Q zIKazvajLRE6raREdcKriE86lLqgFnDls9R2QOQyUcZKYgsvyWGt5OVIIPqa1qaECKdBHYatqUG 2s+slsL2BV1k94BSqV+lnEV+9sZAvbFHr4xGQMfvjoam+wKcyM2OGt1oH+arYwps= X-Received: by 2002:a63:4cb:: with SMTP id 194-v6mr25777113pge.183.1539091575019; Tue, 09 Oct 2018 06:26:15 -0700 (PDT) X-Google-Smtp-Source: ACcGV632VVW+z+6Vt0M7hMlMua6xgB//oJvolxJsgFId8E3BklII9XJ5xo5DiiSiWpAIg4pEmqiP X-Received: by 2002:a63:4cb:: with SMTP id 194-v6mr25777061pge.183.1539091574191; Tue, 09 Oct 2018 06:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539091574; cv=none; d=google.com; s=arc-20160816; b=EQfz2R5E1GUJcmaq+nLktkDyQ4Bl9JS98STQqJG178b7ysod9LG7NcU5eZy9GWIw1/ uV5M40aUynEx2MO8bTlTkVXOi+0IlZ2UVFRivKwiKuJRvxeoRiGE+9oyj+dv1Y61gtXU HwYRcd0uAGmkXH9+8skXwzKcQi1bqYSGp/ay+5ttGzCsMYxJFprpvnCpQd/syxYO6w3O jV0/1OayDl7Lum4U7KzM27niMWxYP9s1Cnokkmw3u+Nkd2NUsiDPtv6jof8tl53AMen+ Y5m1FWc2bsWLVjebPjfkFm6/jR2D7zN1J/L7jepJ8r06SPG2PxumAiK6N75xoVlzQDj/ +lnQ== 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=+X8AkMvhaCh2A6t5uXBVRn35aMYZZ+/hh9Cwb5Qv+ts=; b=AtHWEtJ78IKS3rsxYI+9QDcGajp+3n7vTt0smDVduvKNn7JjdXybzlGER8YYTXKczW M5znFi9rNQ2qZ0P5+i9MhPVnFjbsjOkkjxVKaulkqHhm5Oo3viFKAnkIIAe65HXUzFZV C/DhmMY7rPX5SaWt+DUYVzts5joZTA7ba0UEImyGPBL+mGc/emHcwleSZQj4ESfAwkVb onGfRUhREFV74iPIpWJGC3GTUsZydh6SbZvamWmDbuXKxVlib5s6jffDnhBrXMYsJvK+ KwLzkCT7IVZXPxZTYsgD0N1+QbTPUUpdWiSe7OWJsJN/uYx0sb/UPgiKcUQsFhe2SUID GOcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=rpyLZ6Yv; 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 k123-v6si19250553pfc.150.2018.10.09.06.26.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Oct 2018 06:26:14 -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=rpyLZ6Yv; 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=+X8AkMvhaCh2A6t5uXBVRn35aMYZZ+/hh9Cwb5Qv+ts=; b=rpyLZ6YvZXHfiGUtIIrCY/qTI3 NbJFMlXogf9f9yqOcfRPbnZhcyu0MzTVOzBxq/9rnc7ArXxSu6Zjv07gqCTZS+pfOi3a5opVFMut5 R2HBm6b201wRWNUTC/xmvVRZLqZanoVvu5VbAmOgb8s2QERa9LBR0qTpEVBJmXTgNrXAQNae3/2tQ QUYwo68x4wPzlMOkbR4ukjwJN3SxuJTFdTQ1ocfY6d6tZW+P21kFrBQIGH1LyUXROGkqLNTpap1ga kZakTm2C41zhMHGd23oBHeyEWYzDYMFKao3HxrDenHxHyF0mXxB7f24YLHII5yKeTzYi96i2xHobh smXPsyoQ==; 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 1g9s13-0001CT-Uu; Tue, 09 Oct 2018 13:25:38 +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 15/33] powerpc/powernv: remove pnv_pci_ioda_pe_single_vendor Date: Tue, 9 Oct 2018 15:24:42 +0200 Message-Id: <20181009132500.17643-16-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 X-SRS-Rewrite: SMTP reverse-path rewritten from 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: X-Virus-Scanned: ClamAV using ClamSMTP 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 cde710297a4e..913175ba1c10 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1746,31 +1746,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. * @@ -1871,7 +1846,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);