Add x86/acpica/acpi_wakeup.c for amd64 and i386. Difference of

suspend/resume procedures are minimized among them.

common:
- Add global cpuset suspended_cpus to indicate APs are suspended/resumed.
- Remove acpi_waketag and acpi_wakemap from acpivar.h (no longer used).
- Add some variables in acpi_wakecode.S in order to minimize the difference
  among amd64 and i386.
- Disable load_cr3() because now CR3 is restored in resumectx().

amd64:
- Add suspend/resume related members (such as MSR) in PCB.
- Modify savectx() for above new PCB members.
- Merge acpi_switch.S into cpu_switch.S as resumectx().

i386:
- Merge(and remove) suspendctx() into savectx() in order to match with
  amd64 code.

Reviewed by:	attilio@, acpi@

2 files changed, 3 insertions, 378 deletions

diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index 27520f3f4fe1..5f66ef13dcde 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -202,4 +202,7 @@ wakeup_pcb:
 	.long	0
 wakeup_ret:
 	.long	0
+wakeup_gdt:		/* not used */
+	.word	0
+	.long	0
 dummy:
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
deleted file mode 100644
index fdd0732a5438..000000000000
--- a/sys/i386/acpica/acpi_wakeup.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/*-
- * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
- * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
- * Copyright (c) 2003 Peter Wemm
- * Copyright (c) 2008-2012 Jung-uk Kim <jkim@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/eventhandler.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/memrange.h>
-#include <sys/smp.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <machine/clock.h>
-#include <machine/intr_machdep.h>
-#include <x86/mca.h>
-#include <machine/pcb.h>
-#include <machine/pmap.h>
-#include <machine/specialreg.h>
-#include <machine/md_var.h>
-
-#ifdef SMP
-#include <x86/apicreg.h>
-#include <machine/smp.h>
-#include <machine/vmparam.h>
-#endif
-
-#include <contrib/dev/acpica/include/acpi.h>
-
-#include <dev/acpica/acpivar.h>
-
-#include "acpi_wakecode.h"
-#include "acpi_wakedata.h"
-
-/* Make sure the code is less than a page and leave room for the stack. */
-CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024);
-
-extern int		acpi_resume_beep;
-extern int		acpi_reset_video;
-
-#ifdef SMP
-extern struct pcb	**susppcbs;
-static cpuset_t		suspcpus;
-#else
-static struct pcb	**susppcbs;
-#endif
-
-static void		*acpi_alloc_wakeup_handler(void);
-static void		acpi_stop_beep(void *);
-
-#ifdef SMP
-static int		acpi_wakeup_ap(struct acpi_softc *, int);
-static void		acpi_wakeup_cpus(struct acpi_softc *);
-#endif
-
-#define ACPI_PAGETABLES	0
-#define	WAKECODE_VADDR(sc)	((sc)->acpi_wakeaddr + (ACPI_PAGETABLES * PAGE_SIZE))
-#define	WAKECODE_PADDR(sc)	((sc)->acpi_wakephys + (ACPI_PAGETABLES * PAGE_SIZE))
-#define	WAKECODE_FIXUP(offset, type, val) do	{	\
-	type	*addr;					\
-	addr = (type *)(WAKECODE_VADDR(sc) + offset);	\
-	*addr = val;					\
-} while (0)
-
-static void
-acpi_stop_beep(void *arg)
-{
-
-	if (acpi_resume_beep != 0)
-		timer_spkr_release();
-}
-
-#ifdef SMP
-static int
-acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
-{
-	int		vector = (WAKECODE_PADDR(sc) >> 12) & 0xff;
-	int		apic_id = cpu_apic_ids[cpu];
-	int		ms;
-
-	WAKECODE_FIXUP(wakeup_pcb, struct pcb *, susppcbs[cpu]);
-
-	/* do an INIT IPI: assert RESET */
-	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
-	    APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id);
-
-	/* wait for pending status end */
-	lapic_ipi_wait(-1);
-
-	/* do an INIT IPI: deassert RESET */
-	lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL |
-	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0);
-
-	/* wait for pending status end */
-	DELAY(10000);		/* wait ~10mS */
-	lapic_ipi_wait(-1);
-
-	/*
-	 * next we do a STARTUP IPI: the previous INIT IPI might still be
-	 * latched, (P5 bug) this 1st STARTUP would then terminate
-	 * immediately, and the previously started INIT IPI would continue. OR
-	 * the previous INIT IPI has already run. and this STARTUP IPI will
-	 * run. OR the previous INIT IPI was ignored. and this STARTUP IPI
-	 * will run.
-	 */
-
-	/* do a STARTUP IPI */
-	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
-	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
-	    vector, apic_id);
-	lapic_ipi_wait(-1);
-	DELAY(200);		/* wait ~200uS */
-
-	/*
-	 * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF
-	 * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR
-	 * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is
-	 * recognized after hardware RESET or INIT IPI.
-	 */
-
-	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
-	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
-	    vector, apic_id);
-	lapic_ipi_wait(-1);
-	DELAY(200);		/* wait ~200uS */
-
-	/* Wait up to 5 seconds for it to start. */
-	for (ms = 0; ms < 5000; ms++) {
-		if (susppcbs[cpu]->pcb_eip == 0)
-			return (1);	/* return SUCCESS */
-		DELAY(1000);
-	}
-	return (0);		/* return FAILURE */
-}
-
-#define	WARMBOOT_TARGET		0
-#define	WARMBOOT_OFF		(KERNBASE + 0x0467)
-#define	WARMBOOT_SEG		(KERNBASE + 0x0469)
-
-#define	CMOS_REG		(0x70)
-#define	CMOS_DATA		(0x71)
-#define	BIOS_RESET		(0x0f)
-#define	BIOS_WARM		(0x0a)
-
-static void
-acpi_wakeup_cpus(struct acpi_softc *sc)
-{
-	uint32_t	mpbioswarmvec;
-	int		cpu;
-	u_char		mpbiosreason;
-
-	/* save the current value of the warm-start vector */
-	mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF);
-	outb(CMOS_REG, BIOS_RESET);
-	mpbiosreason = inb(CMOS_DATA);
-
-	/* setup a vector to our boot code */
-	*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
-	*((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4;
-	outb(CMOS_REG, BIOS_RESET);
-	outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
-
-	/* Wake up each AP. */
-	for (cpu = 1; cpu < mp_ncpus; cpu++) {
-		if (!CPU_ISSET(cpu, &suspcpus))
-			continue;
-		if (acpi_wakeup_ap(sc, cpu) == 0) {
-			/* restore the warmstart vector */
-			*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
-			panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)",
-			    cpu, cpu_apic_ids[cpu]);
-		}
-	}
-
-	/* restore the warmstart vector */
-	*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
-
-	outb(CMOS_REG, BIOS_RESET);
-	outb(CMOS_DATA, mpbiosreason);
-}
-#endif
-
-int
-acpi_sleep_machdep(struct acpi_softc *sc, int state)
-{
-	ACPI_STATUS	status;
-
-	if (sc->acpi_wakeaddr == 0ul)
-		return (-1);	/* couldn't alloc wake memory */
-
-#ifdef SMP
-	suspcpus = all_cpus;
-	CPU_CLR(PCPU_GET(cpuid), &suspcpus);
-#endif
-
-	if (acpi_resume_beep != 0)
-		timer_spkr_acquire();
-
-	AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc));
-
-	intr_suspend();
-
-	if (suspendctx(susppcbs[0])) {
-#ifdef SMP
-		if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
-			device_printf(sc->acpi_dev, "Failed to suspend APs\n");
-			return (0);	/* couldn't sleep */
-		}
-#endif
-
-		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
-		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
-
-		WAKECODE_FIXUP(wakeup_cr4, register_t, susppcbs[0]->pcb_cr4);
-		WAKECODE_FIXUP(wakeup_pcb, struct pcb *, susppcbs[0]);
-
-		/* Call ACPICA to enter the desired sleep state */
-		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
-			status = AcpiEnterSleepStateS4bios();
-		else
-			status = AcpiEnterSleepState(state, acpi_sleep_flags);
-		if (ACPI_FAILURE(status)) {
-			device_printf(sc->acpi_dev,
-			    "AcpiEnterSleepState failed - %s\n",
-			    AcpiFormatException(status));
-			return (0);	/* couldn't sleep */
-		}
-
-		for (;;)
-			ia32_pause();
-	}
-
-	return (1);	/* wakeup successfully */
-}
-
-int
-acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
-    int intr_enabled)
-{
-
-	if (sleep_result == -1)
-		return (sleep_result);
-
-	if (!intr_enabled) {
-		/* Wakeup MD procedures in interrupt disabled context */
-		if (sleep_result == 1) {
-			pmap_init_pat();
-			load_cr3(susppcbs[0]->pcb_cr3);
-			initializecpu();
-			PCPU_SET(switchtime, 0);
-			PCPU_SET(switchticks, ticks);
-#ifdef SMP
-			if (!CPU_EMPTY(&suspcpus))
-				acpi_wakeup_cpus(sc);
-#endif
-		}
-
-#ifdef SMP
-		if (!CPU_EMPTY(&suspcpus))
-			restart_cpus(suspcpus);
-#endif
-		mca_resume();
-		intr_resume();
-
-		AcpiSetFirmwareWakingVector(0);
-	} else {
-		/* Wakeup MD procedures in interrupt enabled context */
-		if (sleep_result == 1 && mem_range_softc.mr_op != NULL &&
-		    mem_range_softc.mr_op->reinit != NULL)
-			mem_range_softc.mr_op->reinit(&mem_range_softc);
-	}
-
-	return (sleep_result);
-}
-
-static void *
-acpi_alloc_wakeup_handler(void)
-{
-	void		*wakeaddr;
-	int		i;
-
-	/*
-	 * Specify the region for our wakeup code.  We want it in the low 1 MB
-	 * region, excluding real mode IVT (0-0x3ff), BDA (0x400-0x4ff), EBDA
-	 * (less than 128KB, below 0xa0000, must be excluded by SMAP and DSDT),
-	 * and ROM area (0xa0000 and above).  The temporary page tables must be
-	 * page-aligned.
-	 */
-	wakeaddr = contigmalloc((ACPI_PAGETABLES + 1) * PAGE_SIZE, M_DEVBUF,
-	    M_NOWAIT, 0x500, 0xa0000, PAGE_SIZE, 0ul);
-	if (wakeaddr == NULL) {
-		printf("%s: can't alloc wake memory\n", __func__);
-		return (NULL);
-	}
-	if (EVENTHANDLER_REGISTER(power_resume, acpi_stop_beep, NULL,
-	    EVENTHANDLER_PRI_LAST) == NULL) {
-		printf("%s: can't register event handler\n", __func__);
-		contigfree(wakeaddr, (ACPI_PAGETABLES + 1) * PAGE_SIZE, M_DEVBUF);
-		return (NULL);
-	}
-	susppcbs = malloc(mp_ncpus * sizeof(*susppcbs), M_DEVBUF, M_WAITOK);
-	for (i = 0; i < mp_ncpus; i++) {
-		susppcbs[i] = malloc(sizeof(**susppcbs), M_DEVBUF, M_WAITOK);
-	}
-
-	return (wakeaddr);
-}
-
-void
-acpi_install_wakeup_handler(struct acpi_softc *sc)
-{
-	static void	*wakeaddr = NULL;
-
-	if (wakeaddr != NULL)
-		return;
-
-	wakeaddr = acpi_alloc_wakeup_handler();
-	if (wakeaddr == NULL)
-		return;
-
-	sc->acpi_wakeaddr = (vm_offset_t)wakeaddr;
-	sc->acpi_wakephys = vtophys(wakeaddr);
-
-	bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode));
-
-	/* Patch GDT base address, ljmp target. */
-	WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t,
-	    WAKECODE_PADDR(sc) + bootgdt);
-	WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t,
-	    WAKECODE_PADDR(sc) + wakeup_32);
-
-	/* Save pointers to some global data. */
-	WAKECODE_FIXUP(wakeup_ret, void *, resumectx);
-	/*
-	 * Temporarily switch to the kernel pmap because it provides
-	 * an identity mapping (setup at boot) for the low physical
-	 * memory region containing the wakeup code.
-	 */
-#ifdef PAE
-	WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdpt));
-#else
-	WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdir));
-#endif
-
-	if (bootverbose)
-		device_printf(sc->acpi_dev, "wakeup code va %#x pa %#jx\n",
-		    sc->acpi_wakeaddr, (uintmax_t)sc->acpi_wakephys);
-}