Date: Tue, 20 Oct 2015 01:45:48 +0000 (UTC) From: "Conrad E. Meyer" <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289608 - head/sys/dev/ntb/ntb_hw Message-ID: <201510200145.t9K1jmbZ027315@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Tue Oct 20 01:45:48 2015 New Revision: 289608 URL: https://svnweb.freebsd.org/changeset/base/289608 Log: NTB: Drop some dead softc members Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c Modified: head/sys/dev/ntb/ntb_hw/ntb_hw.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:45:38 2015 (r289607) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Tue Oct 20 01:45:48 2015 (r289608) @@ -176,8 +176,6 @@ struct ntb_softc { uint32_t ppd; uint8_t conn_type; uint8_t dev_type; - uint8_t link_width; - uint8_t link_speed; /* Offset of peer bar0 in B2B BAR */ uint64_t b2b_off; @@ -1747,7 +1745,7 @@ static void recover_soc_link(void *arg) { struct ntb_softc *ntb = arg; - uint8_t speed, width; + unsigned speed, width, oldspeed, oldwidth; uint32_t status32; soc_perform_link_restart(ntb); @@ -1774,9 +1772,12 @@ recover_soc_link(void *arg) goto out; status32 = ntb_reg_read(4, ntb->reg->lnk_sta); - width = (status32 & NTB_LINK_WIDTH_MASK) >> 4; - speed = (status32 & NTB_LINK_SPEED_MASK); - if (ntb->link_width != width || ntb->link_speed != speed) + width = NTB_LNK_STA_WIDTH(status32); + speed = status32 & NTB_LINK_SPEED_MASK; + + oldwidth = NTB_LNK_STA_WIDTH(ntb->lnk_sta); + oldspeed = ntb->lnk_sta & NTB_LINK_SPEED_MASK; + if (oldwidth != width || oldspeed != speed) goto retry; out:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510200145.t9K1jmbZ027315>