From de10a3aa9d218a58b3dd5640b76656ddfce18390 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Thu, 25 Mar 2010 13:03:30 -0700 Subject: [PATCH] --- yaml --- r: 190215 b: refs/heads/master c: 4352aa5bbf1d0080c2dcf904ce1e4be0a1cb5937 h: refs/heads/master i: 190213: 8e6283e68e21c4c7b468e7f7b106183a069f3413 190211: 7952b78ac9eefd0c58e2d18d7fd9cf947f77adea 190207: 70b22e19b0010161132c94feebf72163c0a434c5 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/aer/aerdrv.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index be25a338a28c..a73a4c16707e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a0e614580fb650846be1e9315f6b7b6069b9cc +refs/heads/master: 4352aa5bbf1d0080c2dcf904ce1e4be0a1cb5937 diff --git a/trunk/drivers/pci/pcie/aer/aerdrv.c b/trunk/drivers/pci/pcie/aer/aerdrv.c index aa495ad9bbd4..7a711ee314b7 100644 --- a/trunk/drivers/pci/pcie/aer/aerdrv.c +++ b/trunk/drivers/pci/pcie/aer/aerdrv.c @@ -244,11 +244,17 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) /* Assert Secondary Bus Reset */ pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &p2p_ctrl); - p2p_ctrl |= PCI_CB_BRIDGE_CTL_CB_RESET; + p2p_ctrl |= PCI_BRIDGE_CTL_BUS_RESET; pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); + /* + * we should send hot reset message for 2ms to allow it time to + * propogate to all downstream ports + */ + msleep(2); + /* De-assert Secondary Bus Reset */ - p2p_ctrl &= ~PCI_CB_BRIDGE_CTL_CB_RESET; + p2p_ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; pci_write_config_word(dev, PCI_BRIDGE_CONTROL, p2p_ctrl); /*