From: Jiang Liu <liuj97@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tony Luck <tony.luck@intel.com>,
Yijing Wang <wangyijing@huawei.com>,
Yinghai Lu <yinghai@kernel.org>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Jiang Liu <liuj97@gmail.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Jiang Liu <jiang.liu@huawei.com>
Subject: [PATCH v2 9/9] PCI/AER: update AER configuration when PCI hotplug event happens
Date: Sat, 15 Sep 2012 11:05:12 +0800 [thread overview]
Message-ID: <1347678312-11124-10-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1347678312-11124-1-git-send-email-jiang.liu@huawei.com>
From: Yijing Wang <wangyijing@huawei.com>
The AER driver only configures downstream PCIe devices at driver
binding time and all hot-added PCIe devices won't be managed by
the AER driver. So hook PCIe device hotplug events to setup AER
configuration for hot-added PCIe devices.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
---
drivers/pci/pcie/aer/aerdrv.c | 63 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 62 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 030cf12..b70ec84 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -408,6 +408,55 @@ static void aer_error_resume(struct pci_dev *dev)
pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);
}
+static void acpi_pcie_aer_notify_dev(struct pcie_device *dev, bool enable)
+{
+ int rc, pos;
+ u32 val = 0;
+ struct pci_dev *pdev = dev->port;
+
+ if (dev->service != PCIE_PORT_SERVICE_AER)
+ return;
+ if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT)
+ return;
+ while (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) {
+ pdev = pdev->bus->self;
+ if (!pdev)
+ return;
+ }
+
+ pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_ERR);
+ if (!pos)
+ return;
+ rc = pci_read_config_dword(pdev, pos + PCI_ERR_ROOT_COMMAND, &val);
+ if (rc || val == 0xFFFFFFFF || !(val & ROOT_PORT_INTR_ON_MESG_MASK))
+ return;
+
+ set_device_error_reporting(dev->port, &enable);
+}
+
+static int acpi_pcie_aer_notify(struct notifier_block *nb,
+ unsigned long event, void *data)
+{
+ struct device *dev = data;
+
+ switch (event) {
+ case BUS_NOTIFY_ADD_DEVICE:
+ acpi_pcie_aer_notify_dev(to_pcie_device(dev), true);
+ break;
+ case BUS_NOTIFY_DEL_DEVICE:
+ acpi_pcie_aer_notify_dev(to_pcie_device(dev), false);
+ break;
+ default:
+ return NOTIFY_DONE;
+ }
+
+ return NOTIFY_OK;
+}
+
+static struct notifier_block acpi_pcie_aer_notifier = {
+ .notifier_call = &acpi_pcie_aer_notify,
+};
+
/**
* aer_service_init - register AER root service driver
*
@@ -415,9 +464,20 @@ static void aer_error_resume(struct pci_dev *dev)
*/
static int __init aer_service_init(void)
{
+ int ret;
+
if (!pci_aer_available() || aer_acpi_firmware_first())
return -ENXIO;
- return pcie_port_service_register(&aerdriver);
+
+ ret = pcie_port_service_register(&aerdriver);
+ if (!ret) {
+ ret = bus_register_notifier(&pcie_port_bus_type,
+ &acpi_pcie_aer_notifier);
+ if (ret)
+ pcie_port_service_unregister(&aerdriver);
+ }
+
+ return ret;
}
/**
@@ -427,6 +487,7 @@ static int __init aer_service_init(void)
*/
static void __exit aer_service_exit(void)
{
+ bus_unregister_notifier(&pcie_port_bus_type, &acpi_pcie_aer_notifier);
pcie_port_service_unregister(&aerdriver);
}
--
1.7.9.5
prev parent reply other threads:[~2012-09-15 3:14 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-15 3:05 [PATCH v2 0/9] enhance PCI related drivers to handle hotplug events Jiang Liu
2012-09-15 3:05 ` [PATCH v2 1/9] PCI: make PCI device create/destroy logic symmetric Jiang Liu
2012-09-15 3:05 ` [PATCH v2 2/9] PCI: split registration of PCI bus devices into two stages Jiang Liu
2012-09-15 8:03 ` Yinghai Lu
2012-09-15 18:47 ` Yinghai Lu
2012-09-16 13:16 ` [PATCH v3] " Jiang Liu
2012-09-15 3:05 ` [PATCH v2 3/9] PCI: preserve dev->subordinate until pci_stop_dev() has been called Jiang Liu
2012-09-15 5:09 ` Yinghai Lu
2012-09-15 7:02 ` Jiang Liu
2012-09-15 3:05 ` [PATCH v2 4/9] ACPI/pci_bind: correctly update binding relationship for PCI hotplug Jiang Liu
2012-09-15 3:05 ` [PATCH v2 5/9] ACPI/pci-bind: remove bind/unbind callbacks from acpi_device_ops Jiang Liu
2012-09-15 18:53 ` Yinghai Lu
2012-09-16 14:09 ` [PATCH v3] " Jiang Liu
2012-09-16 16:49 ` Yinghai Lu
2012-09-16 18:02 ` Yinghai Lu
2012-09-17 3:06 ` Yinghai Lu
2012-09-17 15:26 ` Jiang Liu
2012-09-15 23:27 ` [PATCH v2 5/9] " Yinghai Lu
2012-09-17 3:03 ` Yinghai Lu
2012-09-17 14:22 ` Jiang Liu
2012-09-17 14:31 ` Jiang Liu
2012-09-17 15:41 ` Yinghai Lu
2012-09-15 3:05 ` [PATCH v2 6/9] ACPI/pci_slot: update PCI slot information when PCI hotplug event happens Jiang Liu
2012-09-15 3:05 ` [PATCH v2 7/9] PCI/acpiphp: update ACPI hotplug slot information when PCI hotplug happens Jiang Liu
2012-09-15 3:05 ` [PATCH v2 8/9] PCI/acpiphp: serialize access to the bridge_list list Jiang Liu
2012-09-15 3:05 ` Jiang Liu [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=1347678312-11124-10-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=bhelgaas@google.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=wangyijing@huawei.com \
--cc=yinghai@kernel.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).