From owner-svn-src-all@FreeBSD.ORG  Fri May  8 04:38:02 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 369F8EE1;
 Fri,  8 May 2015 04:38:02 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 263C11DCF;
 Fri,  8 May 2015 04:38:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t484c2p9001210;
 Fri, 8 May 2015 04:38:02 GMT (envelope-from ganbold@FreeBSD.org)
Received: (from ganbold@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t484c2RO001209;
 Fri, 8 May 2015 04:38:02 GMT (envelope-from ganbold@FreeBSD.org)
Message-Id: <201505080438.t484c2RO001209@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ganbold set sender to
 ganbold@FreeBSD.org using -f
From: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
Date: Fri, 8 May 2015 04:38:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282620 - head/sys/arm/amlogic/aml8726
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: <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: Fri, 08 May 2015 04:38:02 -0000

Author: ganbold
Date: Fri May  8 04:38:01 2015
New Revision: 282620
URL: https://svnweb.freebsd.org/changeset/base/282620

Log:
  This follows the gic and ti/aintc code by adding additional barriers to the
  Amlogic pic driver.
  
  Differential Revision:	https://reviews.freebsd.org/D2472
  Submitted by:		John Wehle

Modified:
  head/sys/arm/amlogic/aml8726/aml8726_pic.c

Modified: head/sys/arm/amlogic/aml8726/aml8726_pic.c
==============================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_pic.c	Fri May  8 04:22:11 2015	(r282619)
+++ head/sys/arm/amlogic/aml8726/aml8726_pic.c	Fri May  8 04:38:01 2015	(r282620)
@@ -121,6 +121,8 @@ aml8726_pic_eoi(void *arg)
 	if (nb >= AML_PIC_NIRQS)
 		return;
 
+	arm_irq_memory_barrier(nb);
+
 	CSR_WRITE_4(aml8726_pic_sc, AML_PIC_STAT_CLR_REG(nb), AML_PIC_BIT(nb));
 
 	CSR_BARRIER(aml8726_pic_sc, AML_PIC_STAT_CLR_REG(nb));
@@ -265,8 +267,12 @@ arm_unmask_irq(uintptr_t nb)
 	if (nb >= AML_PIC_NIRQS)
 		return;
 
+	arm_irq_memory_barrier(nb);
+
 	mask = CSR_READ_4(aml8726_pic_sc, AML_PIC_MASK_REG(nb));
 	mask |= AML_PIC_BIT(nb);
 	CSR_WRITE_4(aml8726_pic_sc, AML_PIC_MASK_REG(nb), mask);
+
+	CSR_BARRIER(aml8726_pic_sc, AML_PIC_MASK_REG(nb));
 }
 #endif