Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp10749875imu; Thu, 6 Dec 2018 06:15:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/UkPP4TCGPu1xTvaiXOdRefeltPC1qxPFQTQKNyZf8vwGpHefKeztIevIIhXTfp+7q3ar91 X-Received: by 2002:a63:ee0e:: with SMTP id e14mr23691818pgi.8.1544105718976; Thu, 06 Dec 2018 06:15:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544105718; cv=none; d=google.com; s=arc-20160816; b=lnFBFPXfQXyfaibWQ442FAswxZdplpOPmamkRTKzRn0FQOXhA6nHWzzU5ya2FJITuH s5o1Gg7ZJxllNzMm/2vGqjklWZArPAjbpLcrClXTiFGK+F78TenPVApQHG9q2j+ayYMG /ct/N1EB7fP9L60LITHBTdkSiT89RRb148LJooGHrT9c99m52+vX8AOisnpY6t1ESjXQ yqkgJKvVJFMgNJhWBrLcfAfc/0xTpN1O+EcBo72sSsLAZa5Ae3k42bnHEyvQHrvic9jS DJjhEEEXnzZeB1XWLqm7piMxSNwO+EwoUeSasLAUc3J3hYjSaDBuQaNfOs9XCmTQ5rYx JGFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=gTDmroXrokXlKA6CmS+cPlnphZoEkVvys0mQa0xzHXI=; b=fRh+OBtpt9Jo/KockkZKHTSY9FWFxDA+t/BYCa9679bb3HUgah9z4SegNDzkl1wz+D b4/+g2TN9TosQjjpiPb+M/o2/n8oeKre/TbUnFwXCMHVn6zcYETVmdflZvJ7qbTKxMVx baPXENTHSsGcQaHfot12EOn+U520PGc469/YBXGjRuTdJwtW3MwB9w+H1L/Ds6WkeM3M l68RqF2Tb2uyq+cTmWxm3nIechrqDSXXMYCZDZ17I22FV8gieyNIHcC7blYkAk/pVijP Y5FdShYBNtjCxgumGh3tWFV6VqRmlQb1q/6wgxa5Lvpz0uaLTi/D90fqt/hgwKdutOYX bkqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=InbbPfhw; 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 g59si360734plb.302.2018.12.06.06.15.02; Thu, 06 Dec 2018 06:15:18 -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=InbbPfhw; 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 S1727704AbeLFOMA (ORCPT + 99 others); Thu, 6 Dec 2018 09:12:00 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:42480 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727737AbeLFOMA (ORCPT ); Thu, 6 Dec 2018 09:12:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding: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=gTDmroXrokXlKA6CmS+cPlnphZoEkVvys0mQa0xzHXI=; b=InbbPfhwSReJPvgAwpYR5MR1S wQw6fLDCd37UIrYY6wW7U1QqevsuSpu7uckHfHkXTkBANZajgBfhhzGK/o+d5xNlgxcv5Hi4N7tqF rgxyJEZuo+ftWpqvRH+sfe1n7WZrfXGN8vn1ffbDYV4NOJTa5DF5sHxkATYDG5mv5Cs01DRpmpof9 CSQ32JM1gMk8BJgletPATM4m36dxoNvdASPTr/tMwRU3fdIgBKc/sT9uJkwiv6vwtfLZJL7Hc4euU FTZRAKkd2o1sHV24kF6WKWC3v6rN9CBfVXlaKX8Ta/JWeF88824fwqcqyMi8AgZT3gKlBMKEgJ2Wt CJeO/Mbqg==; Received: from hch by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUuNL-0001FS-HK; Thu, 06 Dec 2018 14:11:35 +0000 Date: Thu, 6 Dec 2018 06:11:35 -0800 From: Christoph Hellwig To: Christoph Hellwig Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linux-arch@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 14/34] powerpc/dart: remove dead cleanup code in iommu_init_early_dart Message-ID: <20181206141135.GA4770@infradead.org> References: <20181114082314.8965-1-hch@lst.de> <20181114082314.8965-15-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181114082314.8965-15-hch@lst.de> User-Agent: Mutt/1.9.2 (2017-12-15) 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 ping? On Wed, Nov 14, 2018 at 09:22:54AM +0100, Christoph Hellwig wrote: > If dart_init failed we didn't have a chance to setup dma or controller > ops yet, so there is no point in resetting them. > > Signed-off-by: Christoph Hellwig > --- > arch/powerpc/sysdev/dart_iommu.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c > index a5b40d1460f1..283ce04c5844 100644 > --- a/arch/powerpc/sysdev/dart_iommu.c > +++ b/arch/powerpc/sysdev/dart_iommu.c > @@ -428,7 +428,7 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops) > > /* Initialize the DART HW */ > if (dart_init(dn) != 0) > - goto bail; > + return; > > /* Setup bypass if supported */ > if (dart_is_u4) > @@ -439,15 +439,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops) > > /* Setup pci_dma ops */ > set_pci_dma_ops(&dma_iommu_ops); > - return; > - > - bail: > - /* If init failed, use direct iommu and null setup functions */ > - controller_ops->dma_dev_setup = NULL; > - controller_ops->dma_bus_setup = NULL; > - > - /* Setup pci_dma ops */ > - set_pci_dma_ops(&dma_nommu_ops); > } > > #ifdef CONFIG_PM > -- > 2.19.1 > > _______________________________________________ > iommu mailing list > iommu@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu ---end quoted text---