svn commit: r282620 - head/sys/arm/amlogic/aml8726

Ganbold Tsagaankhuu ganbold at FreeBSD.org
Fri May 8 04:38:02 UTC 2015


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


More information about the svn-src-all mailing list