From owner-svn-src-all@freebsd.org  Fri Aug 28 01:32:43 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 038939C45CA;
 Fri, 28 Aug 2015 01:32:43 +0000 (UTC)
 (envelope-from yongari@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E87D282E;
 Fri, 28 Aug 2015 01:32:42 +0000 (UTC)
 (envelope-from yongari@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7S1Wg8j059052;
 Fri, 28 Aug 2015 01:32:42 GMT (envelope-from yongari@FreeBSD.org)
Received: (from yongari@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7S1Wg7n059051;
 Fri, 28 Aug 2015 01:32:42 GMT (envelope-from yongari@FreeBSD.org)
Message-Id: <201508280132.t7S1Wg7n059051@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yongari set sender to
 yongari@FreeBSD.org using -f
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 28 Aug 2015 01:32:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287238 - head/sys/dev/msk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Aug 2015 01:32:43 -0000

Author: yongari
Date: Fri Aug 28 01:32:42 2015
New Revision: 287238
URL: https://svnweb.freebsd.org/changeset/base/287238

Log:
  Set DMA alignment constraint of status, TX and RX LEs(List Elements
  in Marvell terms) to 32768.  32768 looks overkill but it will
  ensure correct DMAed update.  This change addresses occasional
  watchdog timeouts reported on 10.2-RELEASE.
  
  Tested by:	Johann Hugo <jhugo@meraka.csir.co.za>
  MFC after:	2 weeks

Modified:
  head/sys/dev/msk/if_mskreg.h

Modified: head/sys/dev/msk/if_mskreg.h
==============================================================================
--- head/sys/dev/msk/if_mskreg.h	Fri Aug 28 00:49:30 2015	(r287237)
+++ head/sys/dev/msk/if_mskreg.h	Fri Aug 28 01:32:42 2015	(r287238)
@@ -2175,13 +2175,8 @@
 #define MSK_ADDR_LO(x)	((uint64_t) (x) & 0xffffffffUL)
 #define MSK_ADDR_HI(x)	((uint64_t) (x) >> 32)
 
-/*
- * At first I guessed 8 bytes, the size of a single descriptor, would be
- * required alignment constraints. But, it seems that Yukon II have 4096
- * bytes boundary alignment constraints.
- */
-#define MSK_RING_ALIGN	4096
-#define	MSK_STAT_ALIGN	4096
+#define	MSK_RING_ALIGN	32768
+#define	MSK_STAT_ALIGN	32768
 
 /* Rx descriptor data structure */
 struct msk_rx_desc {