From: Manivannan Sadhasivam <mani@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: hemantk@codeaurora.org, loic.poulain@linaro.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] bus: mhi: pci-generic: Add missing 'pci_disable_pcie_error_reporting()' calls
Date: Sat, 12 Jun 2021 12:39:14 +0530 [thread overview]
Message-ID: <20210612070914.GD22149@thinkpad> (raw)
In-Reply-To: <f70c14701f4922d67e717633c91b6c481b59f298.1623445348.git.christophe.jaillet@wanadoo.fr>
On Fri, Jun 11, 2021 at 11:03:50PM +0200, Christophe JAILLET wrote:
> 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.
>
> Fixes: b012ee6bfe2a ("mhi: pci_generic: Add PCI error handlers")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cced stable and applied to mhi-next!
Thanks,
Mani
> ---
> drivers/bus/mhi/pci_generic.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> 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)
> --
> 2.30.2
>
prev parent reply other threads:[~2021-06-12 7:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 21:03 [PATCH] bus: mhi: pci-generic: Add missing 'pci_disable_pcie_error_reporting()' calls Christophe JAILLET
2021-06-12 7:06 ` Manivannan Sadhasivam
2021-06-12 7:09 ` Manivannan Sadhasivam [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210612070914.GD22149@thinkpad \
--to=mani@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=hemantk@codeaurora.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).