Date: Wed, 18 Nov 2015 22:20:31 +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: r291032 - head/sys/dev/ntb/ntb_hw Message-ID: <201511182220.tAIMKV7i084418@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Wed Nov 18 22:20:31 2015 New Revision: 291032 URL: https://svnweb.freebsd.org/changeset/base/291032 Log: NTB: Mask off the low 12 bits of address/range registers Sometimes they'll read spurious values (observed: 0xc on Broadwell-DE), failing link negotiation. Discussed with: Dave Jiang, Allen Hubbe 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 Wed Nov 18 22:20:21 2015 (r291031) +++ head/sys/dev/ntb/ntb_hw/ntb_hw.c Wed Nov 18 22:20:31 2015 (r291032) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #define NTB_HB_TIMEOUT 1 /* second */ #define ATOM_LINK_RECOVERY_TIME 500 /* ms */ +#define BAR_HIGH_MASK (~((1ull << 12) - 1)) #define DEVICE2SOFTC(dev) ((struct ntb_softc *) device_get_softc(dev)) @@ -2560,14 +2561,14 @@ ntb_mw_set_trans(struct ntb_softc *ntb, limit = 0; if (bar_is_64bit(ntb, bar_num)) { - base = ntb_reg_read(8, base_reg); + base = ntb_reg_read(8, base_reg) & BAR_HIGH_MASK; if (limit_reg != 0 && size != mw_size) limit = base + size; /* Set and verify translation address */ ntb_reg_write(8, xlat_reg, addr); - reg_val = ntb_reg_read(8, xlat_reg); + reg_val = ntb_reg_read(8, xlat_reg) & BAR_HIGH_MASK; if (reg_val != addr) { ntb_reg_write(8, xlat_reg, 0); return (EIO); @@ -2575,7 +2576,7 @@ ntb_mw_set_trans(struct ntb_softc *ntb, /* Set and verify the limit */ ntb_reg_write(8, limit_reg, limit); - reg_val = ntb_reg_read(8, limit_reg); + reg_val = ntb_reg_read(8, limit_reg) & BAR_HIGH_MASK; if (reg_val != limit) { ntb_reg_write(8, limit_reg, base); ntb_reg_write(8, xlat_reg, 0); @@ -2589,14 +2590,14 @@ ntb_mw_set_trans(struct ntb_softc *ntb, if (((addr + size) & UINT32_MAX) != (addr + size)) return (EINVAL); - base = ntb_reg_read(4, base_reg); + base = ntb_reg_read(4, base_reg) & BAR_HIGH_MASK; if (limit_reg != 0 && size != mw_size) limit = base + size; /* Set and verify translation address */ ntb_reg_write(4, xlat_reg, addr); - reg_val = ntb_reg_read(4, xlat_reg); + reg_val = ntb_reg_read(4, xlat_reg) & BAR_HIGH_MASK; if (reg_val != addr) { ntb_reg_write(4, xlat_reg, 0); return (EIO); @@ -2604,7 +2605,7 @@ ntb_mw_set_trans(struct ntb_softc *ntb, /* Set and verify the limit */ ntb_reg_write(4, limit_reg, limit); - reg_val = ntb_reg_read(4, limit_reg); + reg_val = ntb_reg_read(4, limit_reg) & BAR_HIGH_MASK; if (reg_val != limit) { ntb_reg_write(4, limit_reg, base); ntb_reg_write(4, xlat_reg, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511182220.tAIMKV7i084418>