From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AADBC47082 for ; Tue, 8 Jun 2021 14:57:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1953760233 for ; Tue, 8 Jun 2021 14:57:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1953760233 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HanhXkwcl0FGKOcMZHD+YvBJLMqdukgWmSylPDXsSbQ=; b=q+ikFrfbKAblOr gpeVI77BLHvILlbB8d5A9L5kUqjNfNu6ZbJy7KRZQiB1D1b6aS67AiHzHNSuWJge+iVlqlaawoLxY mZJgJ9iDfTQGL+Eh9bt/QsT45dMFTFoWhJIfRn+tCQicP4Y2ZY601WlwceLtNLpBgGm4vr1fVmppP WmmeSbN+dWuLWovriAw9LRzWTRxnH7lWnY00nc048G4DXfKJZsMVNOYcVSgkSXVmvR+/WD9wTtdpa MgBQqgVzmjBJqcKXnwH2p7peK/WfFMCSzJtbGRac9dirC6PgpqPrNsA6SzU5+nCvLZESMZzxyWPpZ RuRflmm2QiJR/wWdPTMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqd8P-0092IJ-0D; Tue, 08 Jun 2021 14:55:17 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqd8G-0092E7-4g for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 14:55:09 +0000 Received: by mail-pg1-x52e.google.com with SMTP id t9so16712666pgn.4 for ; Tue, 08 Jun 2021 07:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=BXIJhrJtCnUwRr3BS6zPrJx1Jt47CrNizQ5dotc5JuM=; b=r9YQx1mjItYpJg8dKYY7v+z8vtEZRnEaBoGEki83EOyzIKmBac8w1hvvpwk4MhwWh1 mBrEmQV6jbXnHYAW85BnGXYKSq1KMOYZsBdRzlr9fGLdwg5BCy2jqB56q5IvJaOvHJMy 4tH04qu4LNbldjD4k6i0AL1GQ19OIBYG3QOkyY4eAL7AEQNqogQebUxqI66dDmLLIpq2 VIMJxLhWIfwwP+zfFpXtjMGYFJnCKoa9PL+iBiW/nw4uzdWS2KSCzpFK4kWiuo657rFn tYxnyHQfK8pnT4Bp9BMJu3UXy6KIQtkVx4DZN+ueAwql2VR9ULeoYehQtkHTF34MsDFN MBQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BXIJhrJtCnUwRr3BS6zPrJx1Jt47CrNizQ5dotc5JuM=; b=ei5dvycbFbMS3EL7K2EcOfN8nncMaf54ruaOYdquuZO1L2qr4cKXoHSeFzHV2LzeZp BKRSeWOxwFeKc9R9+YFPlQinRgEEG3rxBJLjrhaIoNmG07ffHwlWH8CX70MVMbJP4h/m uljrl/wMNm6Ac+o8JizGlyfi1brbMJMNtVujJXYLs1Z5w/MFMWoXDQEVgamGtnn0r5Dh HHZsEqUL4ol+QSLPOdlgHqzw8PUHOpavbly6B14VLnW9eIfDXy/8/SECpTlZKWdecVNy 1IGUMREHEAT/PnF5LVzdFX2aX7qsP9yXZZqRGKch0Wk3SGqbcp083hoxu8UieR+hsoi7 1q0A== X-Gm-Message-State: AOAM533kav1+q05Uwcd+FgcO/As8Url9W2Ek9ea73Qr3rqkmBO9NOc/Z 9e+chu538B0zgkR2lVzi8Co= X-Google-Smtp-Source: ABdhPJyKxi1AwxQYdbPLhPt/9PtnIXI+zxCtPTWSSFFYrmDMjiZTlo6M3Xy70SGobC4sSTE6fy/pYQ== X-Received: by 2002:aa7:8194:0:b029:2aa:db3a:4c1d with SMTP id g20-20020aa781940000b02902aadb3a4c1dmr308216pfi.58.1623164103922; Tue, 08 Jun 2021 07:55:03 -0700 (PDT) Received: from localhost ([103.200.106.115]) by smtp.gmail.com with ESMTPSA id gg22sm2569437pjb.17.2021.06.08.07.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 07:55:03 -0700 (PDT) Date: Tue, 8 Jun 2021 20:25:00 +0530 From: Amey Narkhede To: Will Deacon Cc: Rob Clark , Robin Murphy , Joerg Roedel , iommu@lists.linux-foundation.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iommu/qcom: Cleanup resources in case of probe error path Message-ID: <20210608145500.wxtes4wpp4rpw7si@archlinux> References: <20210421221030.70647-1-ameynarkhede03@gmail.com> <20210608092958.GA8935@willie-the-truck> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210608092958.GA8935@willie-the-truck> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210608_075508_218838_D261535B X-CRM114-Status: GOOD ( 21.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 21/06/08 10:29AM, Will Deacon wrote: > On Thu, Apr 22, 2021 at 03:40:30AM +0530, Amey Narkhede wrote: > > If device registration fails, remove sysfs attribute > > and if setting bus callbacks fails, unregister the device > > and cleanup the sysfs attribute. > > > > Signed-off-by: Amey Narkhede > > --- > > drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 ++++++++++++-- > > 1 file changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c > > index 4294abe389b2..5fa128a1f7f0 100644 > > --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c > > +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c > > @@ -850,10 +850,12 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) > > ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev); > > if (ret) { > > dev_err(dev, "Failed to register iommu\n"); > > - return ret; > > + goto err_sysfs_remove; > > } > > > > - bus_set_iommu(&platform_bus_type, &qcom_iommu_ops); > > + ret = bus_set_iommu(&platform_bus_type, &qcom_iommu_ops); > > + if (ret) > > + goto err_unregister_device; > > > > if (qcom_iommu->local_base) { > > pm_runtime_get_sync(dev); > > @@ -862,6 +864,14 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) > > } > > > > return 0; > > + > > +err_unregister_device: > > + iommu_device_unregister(&qcom_iommu->iommu); > > + > > +err_sysfs_remove: > > + iommu_device_sysfs_remove(&qcom_iommu->iommu); > > + > > + return ret; > > It looks like we're also missing this logic in arm-smmu/arm-smmu.c and > arm-smmu-v3/arm-smmu-v3.c. Would you be able to fix those up too, please? > > Will Sure, I will send a v2 with this and new patches. Thanks, Amey _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel