From patchwork Mon Jun 21 16:16:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 464524 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2738394jao; Mon, 21 Jun 2021 09:16:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmzAtFumskTlmagCirlO7Cndp6Q7k7gXxRbgzwoSNN2cr1c75AdGs5BLHH0urHZCNYcTa+ X-Received: by 2002:aa7:d853:: with SMTP id f19mr22518659eds.1.1624292219215; Mon, 21 Jun 2021 09:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624292219; cv=none; d=google.com; s=arc-20160816; b=GWtNjl0jrurA+BPZroqNkFvM2twIEGd3fglrW43qye/rqAC5SS1mgduYuS52fff7iV AwYG6ZoWd/bnKwZyQi97/mdqdtmKPFEb+FD0FzgU1rKgntlpkUlkEiX+QaH5pmceMjvk HNooIEzY18OxolvXv/v4GxCF7W9Kx9lYifWOYJLRbR0SsVSJXRuGDvi5fJMxU192HVKp dbjaapE/T6tCsADXKCaN6B3P+9MzHtmwCAyE4wDU6NfrGwAfV+gJUaUMQcUxH70Rw1d1 7q1mt6DAN4IWdXD3H60zJNZXDAO6bxixfTHSGkvWTJVO0eFpr36GB9Jg7jebCr8VIcZU ZWbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=l7439q0QWn/sG+k50g0pQMNG6HMcUnXDSIhGmcRTE7w=; b=XzBncOgnl/N/d03qTtbyVSSHDYqBF6psiU/VpthzIDyMWAvV4Ed86HmJ6Eldf11/Tn RQRVr8Xxi+OICKbxiqop5TR1lKdPdqLdTFBx0CkUznGPpBCy5N8XJeZ7Ywrcojr+2OBm IFBUbLyhXjpQ+bUsEwqR/Pb9FqYfRx3WIXenmLfLxQ4vZyevYY+EYALFAmui9JJqZUfz v+ZEvlCXMyQyReIkhIKej33N1omZzu99FBFXCC9ESk8QOwLMcusKoCOLQ+476KiP4jyO YVTUGMdjGc6mfw6KauJsB0jMKUSGtdHXFzNVMcCPFZ/Is9EV4hwDuOLYpwHaARq98e7q 7iGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=blOPIW+F; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m13si18028443edr.209.2021.06.21.09.16.58; Mon, 21 Jun 2021 09:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=blOPIW+F; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbhFUQTG (ORCPT + 12 others); Mon, 21 Jun 2021 12:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230415AbhFUQTE (ORCPT ); Mon, 21 Jun 2021 12:19:04 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6CF6C061768 for ; Mon, 21 Jun 2021 09:16:50 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id b3so1195668plg.2 for ; Mon, 21 Jun 2021 09:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l7439q0QWn/sG+k50g0pQMNG6HMcUnXDSIhGmcRTE7w=; b=blOPIW+F55KF4vlpfyGyUepsN7A0d5NO8oKuJvzEvkFQKPLB/wz89k1Uy9pv5Ov7NX 1Vca/9nHQ0HGQoUfEBhap5lLqp20Ich8fjBocMBFaUryg2XxjR5NpYYJCXIfOq0Mlw+n n1gPtq9LCIwX4MMTF1JC/3Zbbakwdf80LI44fR0VG3m5/Hgt1K4sf2oV2WED+68fOSUu mfmXXUUmqzBiyS3DWi5xe7icBCDdd+ClhD9rqXqCMBaxYRUHM+VgJHiVw/ykrUAZsBUk kljweNsyb0taSE18dIllx4T8oLqEA8ZHKUuWz4naFGsi4bKnJxlITD9JNVhks2QZLwIQ jbVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l7439q0QWn/sG+k50g0pQMNG6HMcUnXDSIhGmcRTE7w=; b=e7rTpDemzg6UaakO26zFt9UQi6M5Y4tnCj9j6vu0fRokagneDn++7NYA0kMwM5s7VR H32bLrCfpxLPfSMYdFFYUECo3mJV7RptpYCcpz8i0hIE99iIOkNJ6NzjN9gN7xq1zrex purFLeV9G4wrdZ2Ea7wASrbkNqRCSrEp3YqERTNQNo0V0Ceo6IIDmFN184vpDkOnzNAR tIrfp6KYqGMVxAEe1pQFR5X8IYUVOeaXUgqzKitxP8YEcMP544BSg70EmIwClZsK0Axq pamP6KxdAeh9EDf1rx+H07BBc1xHWI/N07k9lbwajaJ10LLcbZal3nTFe02ZU7+RVSzN 6EYA== X-Gm-Message-State: AOAM533/bV7Mvk81kmmsjMfibwwuhOWPOWIlM+7BFwVOFy2YuBQXBuKy xxf1DDt2xAd/2k3dH3eBdhNG X-Received: by 2002:a17:90b:3886:: with SMTP id mu6mr14319816pjb.112.1624292210136; Mon, 21 Jun 2021 09:16:50 -0700 (PDT) Received: from localhost.localdomain ([120.138.13.116]) by smtp.gmail.com with ESMTPSA id k88sm10734730pjk.15.2021.06.21.09.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 09:16:49 -0700 (PDT) From: Manivannan Sadhasivam To: gregkh@linuxfoundation.org Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, loic.poulain@linaro.org, Christophe JAILLET , stable@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH 5/8] bus: mhi: pci-generic: Add missing 'pci_disable_pcie_error_reporting()' calls Date: Mon, 21 Jun 2021 21:46:13 +0530 Message-Id: <20210621161616.77524-6-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210621161616.77524-1-manivannan.sadhasivam@linaro.org> References: <20210621161616.77524-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe JAILLET If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it must be undone by a corresponding 'pci_disable_pcie_error_reporting()' call Add the missing call in the error handling path of the probe and in the remove function. Cc: Fixes: b012ee6bfe2a ("mhi: pci_generic: Add PCI error handlers") Signed-off-by: Christophe JAILLET Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/f70c14701f4922d67e717633c91b6c481b59f298.1623445348.git.christophe.jaillet@wanadoo.fr Signed-off-by: Manivannan Sadhasivam --- drivers/bus/mhi/pci_generic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 7c810f02a2ef..d84b74396c6a 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -665,7 +665,7 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = mhi_register_controller(mhi_cntrl, mhi_cntrl_config); if (err) - return err; + goto err_disable_reporting; /* MHI bus does not power up the controller by default */ err = mhi_prepare_for_power_up(mhi_cntrl); @@ -699,6 +699,8 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) mhi_unprepare_after_power_down(mhi_cntrl); err_unregister: mhi_unregister_controller(mhi_cntrl); +err_disable_reporting: + pci_disable_pcie_error_reporting(pdev); return err; } @@ -721,6 +723,7 @@ static void mhi_pci_remove(struct pci_dev *pdev) pm_runtime_get_noresume(&pdev->dev); mhi_unregister_controller(mhi_cntrl); + pci_disable_pcie_error_reporting(pdev); } static void mhi_pci_shutdown(struct pci_dev *pdev)