lkml.org 
[lkml]   [2017]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] liquidio: use pcie_flr instead of duplicating it
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 15 +--------------
    1 file changed, 1 insertion(+), 14 deletions(-)

    diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
    index 9d5e03502c76..afdbf7fa016e 100644
    --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
    +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
    @@ -869,20 +869,7 @@ static void octeon_pci_flr(struct octeon_device *oct)
    pci_write_config_word(oct->pci_dev, PCI_COMMAND,
    PCI_COMMAND_INTX_DISABLE);

    - /* Wait for Transaction Pending bit clean */
    - msleep(100);
    - pcie_capability_read_word(oct->pci_dev, PCI_EXP_DEVSTA, &status);
    - if (status & PCI_EXP_DEVSTA_TRPND) {
    - dev_info(&oct->pci_dev->dev, "Function reset incomplete after 100ms, sleeping for 5 seconds\n");
    - ssleep(5);
    - pcie_capability_read_word(oct->pci_dev, PCI_EXP_DEVSTA,
    - &status);
    - if (status & PCI_EXP_DEVSTA_TRPND)
    - dev_info(&oct->pci_dev->dev, "Function reset still incomplete after 5s, reset anyway\n");
    - }
    - pcie_capability_set_word(oct->pci_dev, PCI_EXP_DEVCTL,
    - PCI_EXP_DEVCTL_BCR_FLR);
    - mdelay(100);
    + pcie_flr(oct->pci_dev);

    pci_cfg_access_unlock(oct->pci_dev);

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-04-14 21:13    [W:2.619 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site