c296141d92
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.105 Removed upstreamed: generic/backport-6.1/860-v6.6-bus-mhi-host-pci_generic-add-support-for-Telit-FE990.patch See: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/drivers/bus/mhi/host/pci_generic.c?h=v6.1.105&id=da578d3b2d236b50e356b1a9d770ad19165de31c All other patches automatically rebased. Build system: bcm4908 bcm53xx Adjusted generic/config-6.1 for new ksym: ARM64_ERRATUM_3194386 and 3312417[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/arch/arm64/Kconfig?h=linux-6.1.y&id=286c8ca924b220212fdeab81cb652fdaa77e38fe Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16174 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From 6c00e1e4e9817e85b8ba83024cfa88382f898841 Mon Sep 17 00:00:00 2001
|
|
From: Bjorn Helgaas <bhelgaas@google.com>
|
|
Date: Tue, 7 Mar 2023 14:16:25 -0600
|
|
Subject: [PATCH 04/13] bus: mhi: host: pci_generic: Drop redundant
|
|
pci_enable_pcie_error_reporting()
|
|
|
|
pci_enable_pcie_error_reporting() enables the device to send ERR_*
|
|
Messages. Since commit <f26e58bf6f54> ("PCI/AER: Enable error reporting
|
|
when AER is native"), the PCI core does this for all devices during
|
|
enumeration, so the driver doesn't need to do it itself.
|
|
|
|
Remove the redundant pci_enable_pcie_error_reporting() call from the
|
|
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
|
|
from the driver .remove() path.
|
|
|
|
Note that this only controls ERR_* Messages from the device. An ERR_*
|
|
Message may cause the Root Port to generate an interrupt, depending on the
|
|
AER Root Error Command register managed by the AER service driver.
|
|
|
|
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
|
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
|
|
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230307201625.879567-1-helgaas@kernel.org
|
|
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
---
|
|
drivers/bus/mhi/host/pci_generic.c | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
--- a/drivers/bus/mhi/host/pci_generic.c
|
|
+++ b/drivers/bus/mhi/host/pci_generic.c
|
|
@@ -8,7 +8,6 @@
|
|
* Copyright (C) 2020 Linaro Ltd <loic.poulain@linaro.org>
|
|
*/
|
|
|
|
-#include <linux/aer.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/device.h>
|
|
#include <linux/mhi.h>
|
|
@@ -904,11 +903,9 @@ static int mhi_pci_probe(struct pci_dev
|
|
mhi_pdev->pci_state = pci_store_saved_state(pdev);
|
|
pci_load_saved_state(pdev, NULL);
|
|
|
|
- pci_enable_pcie_error_reporting(pdev);
|
|
-
|
|
err = mhi_register_controller(mhi_cntrl, mhi_cntrl_config);
|
|
if (err)
|
|
- goto err_disable_reporting;
|
|
+ return err;
|
|
|
|
/* MHI bus does not power up the controller by default */
|
|
err = mhi_prepare_for_power_up(mhi_cntrl);
|
|
@@ -942,8 +939,6 @@ err_unprepare:
|
|
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;
|
|
}
|
|
@@ -966,7 +961,6 @@ static void mhi_pci_remove(struct pci_de
|
|
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)
|