diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-05-12 16:58:39 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-05-12 16:58:39 +0100 |
| commit | 6d730f359cbdfa84e38f3b33923024a680dff946 (patch) | |
| tree | 139abe8bd20fb7be23385ad8edc02e19257c0432 | |
| parent | c977ae7428002a6784b693643b891e6d2c4d3a17 (diff) | |
| parent | c17d1c8bf03fddbcebf099aff7199b0a1598200c (diff) | |
Merge branch 'lsk-3.18-armlt-fixes' into lsk-3.18-armltlsk-3.18-armlt-20160512
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index b0a14037dfa5..087075af8c72 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -3913,6 +3913,18 @@ static struct rtnl_link_stats64 *sky2_get_stats(struct net_device *dev, unsigned int start; u64 _bytes, _packets; + /* Try and check if device if off. If it is, abort gathering stats as + * any attempt to read hardware registers will generate a bus fault. + * This test is hacky and racy as there's nothing stopping the device + * being powered off immediately after the test. + */ + if (hw->pdev->pm_cap) { + u16 pmcsr; + int ret = pci_read_config_word(hw->pdev, hw->pdev->pm_cap + PCI_PM_CTRL, &pmcsr); + if (ret || (pmcsr & PCI_PM_CTRL_STATE_MASK) > PCI_D2) + return stats; /* Can't read power state or it's state D3 (off) */ + } + do { start = u64_stats_fetch_begin_irq(&sky2->rx_stats.syncp); _bytes = sky2->rx_stats.bytes; |