svn commit: r304344 - stable/11/sys/dev/ntb/ntb_hw

[Alexander Motin]

Author: mav
Date: Thu Aug 18 09:16:59 2016
New Revision: 304344
URL: https://svnweb.freebsd.org/changeset/base/304344

Log:
  MFC r302482: Fix NTB_SDOORBELL_LOCKUP workaround.
  
  Since SBARxSZ register can be write-once, it can be unusable for disabling
  the SBAR.  For such case also set SBARxBASE to zero to not intersect with
  config BAR.

Modified:
  stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Aug 18 08:52:55 2016	(r304343)
+++ stable/11/sys/dev/ntb/ntb_hw/ntb_hw.c	Thu Aug 18 09:16:59 2016	(r304344)
@@ -1673,8 +1673,12 @@ xeon_set_sbar_base_and_limit(struct ntb_
 	uint32_t base_reg, lmt_reg;
 
 	bar_get_xlat_params(ntb, idx, &base_reg, NULL, &lmt_reg);
-	if (idx == regbar)
-		bar_addr += ntb->b2b_off;
+	if (idx == regbar) {
+		if (ntb->b2b_off)
+			bar_addr += ntb->b2b_off;
+		else
+			bar_addr = 0;
+	}
 
 	/*
 	 * Set limit registers first to avoid an errata where setting the base