From owner-svn-src-stable@freebsd.org  Wed Sep 16 00:45:49 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 CED799C2F4D;
 Wed, 16 Sep 2015 00:45:49 +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 BF7EA1E63;
 Wed, 16 Sep 2015 00:45:49 +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 t8G0jnpq086191;
 Wed, 16 Sep 2015 00:45:49 GMT (envelope-from yongari@FreeBSD.org)
Received: (from yongari@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8G0jnMs086190;
 Wed, 16 Sep 2015 00:45:49 GMT (envelope-from yongari@FreeBSD.org)
Message-Id: <201509160045.t8G0jnMs086190@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: Wed, 16 Sep 2015 00:45:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r287840 - stable/9/sys/dev/msk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2015 00:45:49 -0000

Author: yongari
Date: Wed Sep 16 00:45:48 2015
New Revision: 287840
URL: https://svnweb.freebsd.org/changeset/base/287840

Log:
  MFC r287238:
    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.

Modified:
  stable/9/sys/dev/msk/if_mskreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/msk/if_mskreg.h
==============================================================================
--- stable/9/sys/dev/msk/if_mskreg.h	Wed Sep 16 00:25:40 2015	(r287839)
+++ stable/9/sys/dev/msk/if_mskreg.h	Wed Sep 16 00:45:48 2015	(r287840)
@@ -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 {