diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /drivers/ntb/hw/intel/ntb_hw_intel.c | |
parent | tcp: use page_ref_inc() in tcp_sendmsg() (diff) | |
parent | ipv6: release dst on error in ip6_dst_lookup_tail (diff) | |
download | linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.xz linux-dev-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/ntb/hw/intel/ntb_hw_intel.c')
-rw-r--r-- | drivers/ntb/hw/intel/ntb_hw_intel.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c index eca9688bf9d9..c00238491673 100644 --- a/drivers/ntb/hw/intel/ntb_hw_intel.c +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c @@ -1629,6 +1629,28 @@ static void atom_deinit_dev(struct intel_ntb_dev *ndev) /* Skylake Xeon NTB */ +static int skx_poll_link(struct intel_ntb_dev *ndev) +{ + u16 reg_val; + int rc; + + ndev->reg->db_iowrite(ndev->db_link_mask, + ndev->self_mmio + + ndev->self_reg->db_clear); + + rc = pci_read_config_word(ndev->ntb.pdev, + SKX_LINK_STATUS_OFFSET, ®_val); + if (rc) + return 0; + + if (reg_val == ndev->lnk_sta) + return 0; + + ndev->lnk_sta = reg_val; + + return 1; +} + static u64 skx_db_ioread(void __iomem *mmio) { return ioread64(mmio); @@ -2852,7 +2874,7 @@ static struct intel_b2b_addr xeon_b2b_dsd_addr = { }; static const struct intel_ntb_reg skx_reg = { - .poll_link = xeon_poll_link, + .poll_link = skx_poll_link, .link_is_up = xeon_link_is_up, .db_ioread = skx_db_ioread, .db_iowrite = skx_db_iowrite, |