# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1190871224 -32400
# Node ID a6c821204255b27285e965dd2496160063633f56
# Parent  42d4313b5fddca1b188f365eb17d37b14abd9f07
make vacpi SMP-safe by adding lock similar to x86 pmtimer
PATCHNAME: vacpi_smp_safe

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 42d4313b5fdd -r a6c821204255 xen/arch/ia64/vmx/vacpi.c
--- a/xen/arch/ia64/vmx/vacpi.c	Mon Sep 24 14:21:02 2007 -0600
+++ b/xen/arch/ia64/vmx/vacpi.c	Thu Sep 27 14:33:44 2007 +0900
@@ -4,6 +4,9 @@
  *
  * Copyright (c) 2007, FUJITSU LIMITED
  *      Kouya Shimura <kouya at jp fujitsu com>
+ * Copyright (c) 2007 VA Linux Systems Japan K.K
+ *      Isaku Yamahata <yamahata at valinux co jp>
+ *      SMP support
  *
  * Copyright (c) 2007, XenSource inc.
  * Copyright (c) 2006, Intel Corporation.
@@ -49,9 +52,14 @@
 #define TMR_VAL_MASK  (0xffffffff)
 #define TMR_VAL_MSB   (0x80000000)
 
+/*
+ * Locking order: vacpi->lock => viosapic->lock
+ * pmt_update_sci() => viosapic_set_irq() => viosapic->lock
+ */
 /* Dispatch SCIs based on the PM1a_STS and PM1a_EN registers */
 static void pmt_update_sci(struct domain *d, struct vacpi *s)
 {
+	ASSERT(spin_is_locked(&s->lock));
 	if (s->regs.pm1a_en & s->regs.pm1a_sts & SCI_MASK)
 		viosapic_set_irq(d, SCI_IRQ, 1);  /* Assert */
 	else
@@ -67,6 +75,8 @@ static void pmt_update_time(struct domai
 	unsigned long delta;
 	uint32_t msb = s->regs.tmr_val & TMR_VAL_MSB;
 
+	ASSERT(spin_is_locked(&s->lock));
+	
 	/* Update the timer */
 	curr_gtime = NOW();
 	delta = curr_gtime - s->last_gtime;
@@ -91,6 +101,8 @@ static void pmt_timer_callback(void *opa
 	struct vacpi *s = &d->arch.hvm_domain.vacpi;
 	uint64_t cycles, time_flip;
 
+	spin_lock(&s->lock);
+
 	/* Recalculate the timer and make sure we get an SCI if we need one */
 	pmt_update_time(d);
 
@@ -102,6 +114,8 @@ static void pmt_timer_callback(void *opa
 
 	/* Wake up again near the next bit-flip */
 	set_timer(&s->timer, NOW() + time_flip + MILLISECS(1));
+
+	spin_unlock(&s->lock);
 }
 
 int vacpi_intercept(ioreq_t * iop, u64 * val)
@@ -113,6 +127,7 @@ int vacpi_intercept(ioreq_t * iop, u64 *
 	if (addr_off < 4) {	/* Access to PM1a_STS and PM1a_EN registers */
 		void *p = (void *)&s->regs.evt_blk + addr_off;
 
+		spin_lock(&s->lock);
 		if (iop->dir == 1) {	/* Read */
 			if (iop->size == 1)
 				*val = *(uint8_t *) p;
@@ -137,6 +152,7 @@ int vacpi_intercept(ioreq_t * iop, u64 *
 			/* Fix the SCI state to match the new register state */
 			pmt_update_sci(d, s);
 		}
+		spin_unlock(&s->lock);
 
 		iop->state = STATE_IORESP_READY;
 		vmx_io_assist(current);
@@ -147,8 +163,10 @@ int vacpi_intercept(ioreq_t * iop, u64 *
 		if (iop->size != 4)
 			panic_domain(NULL, "wrong ACPI PM timer access\n");
 		if (iop->dir == 1) {	/* Read */
+			spin_lock(&s->lock);
 			pmt_update_time(d);
 			*val = s->regs.tmr_val;
+			spin_unlock(&s->lock);
 		}
 		/* PM_TMR_BLK is read-only */
 		iop->state = STATE_IORESP_READY;
@@ -162,6 +180,8 @@ void vacpi_init(struct domain *d)
 void vacpi_init(struct domain *d)
 {
 	struct vacpi *s = &d->arch.hvm_domain.vacpi;
+
+	spin_lock_init(&s->lock);
 
 	s->regs.tmr_val = 0;
 	s->regs.evt_blk = 0;
diff -r 42d4313b5fdd -r a6c821204255 xen/include/asm-ia64/hvm/vacpi.h
--- a/xen/include/asm-ia64/hvm/vacpi.h	Mon Sep 24 14:21:02 2007 -0600
+++ b/xen/include/asm-ia64/hvm/vacpi.h	Thu Sep 27 14:33:44 2007 +0900
@@ -46,6 +46,7 @@ struct vacpi {
 	struct vacpi_regs regs;
 	s_time_t last_gtime;
 	struct timer timer;
+	spinlock_t lock;
 };
 
 int vacpi_intercept(ioreq_t * p, u64 * val);