From owner-svn-src-all@FreeBSD.ORG  Wed Feb 26 06:25:37 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 071342D4;
 Wed, 26 Feb 2014 06:25:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E62B410D0;
 Wed, 26 Feb 2014 06:25:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q6PaFB047111;
 Wed, 26 Feb 2014 06:25:36 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q6Patq047110;
 Wed, 26 Feb 2014 06:25:36 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201402260625.s1Q6Patq047110@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Wed, 26 Feb 2014 06:25:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262524 - stable/10/sys/dev/msk
X-SVN-Group: stable-10
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.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 06:25:37 -0000

Author: yongari
Date: Wed Feb 26 06:25:36 2014
New Revision: 262524
URL: http://svnweb.freebsd.org/changeset/base/262524

Log:
  MFC r261577:
    Revert r234666.  Clearing TWSI IRQ seems to cause watchdog timeout
    on old Yukon II controllers.

Modified:
  stable/10/sys/dev/msk/if_msk.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/msk/if_msk.c
==============================================================================
--- stable/10/sys/dev/msk/if_msk.c	Wed Feb 26 04:49:09 2014	(r262523)
+++ stable/10/sys/dev/msk/if_msk.c	Wed Feb 26 06:25:36 2014	(r262524)
@@ -3749,9 +3749,6 @@ msk_intr(void *xsc)
 	if ((status & Y2_IS_STAT_BMU) != 0 && domore == 0)
 		CSR_WRITE_4(sc, STAT_CTRL, SC_STAT_CLR_IRQ);
 
-	/* Clear TWSI IRQ. */
-	if ((status & Y2_IS_TWSI_RDY) != 0)
-		CSR_WRITE_4(sc, B2_I2C_IRQ, 1);
 	/* Reenable interrupts. */
 	CSR_WRITE_4(sc, B0_Y2_SP_ICR, 2);