a122cca953
to build the kernel. It doesn't affect the operation if gcc. Most of the changes are just adding __INTEL_COMPILER to #ifdef's, as icc v8 may define __GNUC__ some parts may look strange but are necessary. Additional changes: - in_cksum.[ch]: * use a generic C version instead of the assembly version in the !gcc case (ASM code breaks with the optimizations icc does) -> no bad checksums with an icc compiled kernel Help from: andre, grehan, das Stolen from: alpha version via ppc version The entire checksum code should IMHO be replaced with the DragonFly version (because it isn't guaranteed future revisions of gcc will include similar optimizations) as in: ---snip--- Revision Changes Path 1.12 +1 -0 src/sys/conf/files.i386 1.4 +142 -558 src/sys/i386/i386/in_cksum.c 1.5 +33 -69 src/sys/i386/include/in_cksum.h 1.5 +2 -0 src/sys/netinet/igmp.c 1.6 +0 -1 src/sys/netinet/in.h 1.6 +2 -0 src/sys/netinet/ip_icmp.c 1.4 +3 -4 src/contrib/ipfilter/ip_compat.h 1.3 +1 -2 src/sbin/natd/icmp.c 1.4 +0 -1 src/sbin/natd/natd.c 1.48 +1 -0 src/sys/conf/files 1.2 +0 -1 src/sys/conf/files.amd64 1.13 +0 -1 src/sys/conf/files.i386 1.5 +0 -1 src/sys/conf/files.pc98 1.7 +1 -1 src/sys/contrib/ipfilter/netinet/fil.c 1.10 +2 -3 src/sys/contrib/ipfilter/netinet/ip_compat.h 1.10 +1 -1 src/sys/contrib/ipfilter/netinet/ip_fil.c 1.7 +1 -1 src/sys/dev/netif/txp/if_txp.c 1.7 +1 -1 src/sys/net/ip_mroute/ip_mroute.c 1.7 +1 -2 src/sys/net/ipfw/ip_fw2.c 1.6 +1 -2 src/sys/netinet/igmp.c 1.4 +158 -116 src/sys/netinet/in_cksum.c 1.6 +1 -1 src/sys/netinet/ip_gre.c 1.7 +1 -2 src/sys/netinet/ip_icmp.c 1.10 +1 -1 src/sys/netinet/ip_input.c 1.10 +1 -2 src/sys/netinet/ip_output.c 1.13 +1 -2 src/sys/netinet/tcp_input.c 1.9 +1 -2 src/sys/netinet/tcp_output.c 1.10 +1 -1 src/sys/netinet/tcp_subr.c 1.10 +1 -1 src/sys/netinet/tcp_syncache.c 1.9 +1 -2 src/sys/netinet/udp_usrreq.c 1.5 +1 -2 src/sys/netinet6/ipsec.c 1.5 +1 -2 src/sys/netproto/ipsec/ipsec.c 1.5 +1 -1 src/sys/netproto/ipsec/ipsec_input.c 1.4 +1 -2 src/sys/netproto/ipsec/ipsec_output.c and finally remove sys/i386/i386 in_cksum.c sys/i386/include in_cksum.h ---snip--- - endian.h: * DTRT in C++ mode - quad.h: * we don't use gcc v1 anymore, remove support for it Suggested by: bde (long ago) - assym.h: * avoid zero-length arrays (remove dependency on a gcc specific feature) This change changes the contents of the object file, but as it's only used to generate some values for a header, and the generator knows how to handle this, there's no impact in the gcc case. Explained by: bde Submitted by: Marius Strobl <marius@alchemy.franken.de> - aicasm.c: * minor change to teach it about the way icc spells "-nostdinc" Not approved by: gibbs (no reply to my mail) - bump __FreeBSD_version (lang/icc needs to know about the changes) Incarnations of this patch survive gcc compiles since a loooong time, I use it on my desktop. An icc compiled kernel works since Nov. 2003 (exceptions: snd_* if used as modules), it survives a build of the entire ports collection with icc. Parts of this commit contains suggestions or submissions from Marius Strobl <marius@alchemy.franken.de>. Reviewed by: -arch Submitted by: netchild
353 lines
9.0 KiB
C
353 lines
9.0 KiB
C
/*-
|
|
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
|
|
* Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.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/systm.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/proc.h>
|
|
#include <sys/sysctl.h>
|
|
|
|
#include <vm/vm.h>
|
|
#include <vm/vm_param.h>
|
|
#include <vm/pmap.h>
|
|
#include <vm/vm_object.h>
|
|
#include <vm/vm_page.h>
|
|
#include <vm/vm_map.h>
|
|
#include <vm/vm_kern.h>
|
|
#include <vm/vm_extern.h>
|
|
|
|
#include <machine/bus.h>
|
|
#include <machine/cpufunc.h>
|
|
#include <machine/intr_machdep.h>
|
|
#include <machine/segments.h>
|
|
|
|
#include "acpi.h"
|
|
#include <dev/acpica/acpivar.h>
|
|
|
|
#include "acpi_wakecode.h"
|
|
|
|
#if __FreeBSD_version < 500000
|
|
#define vm_page_lock_queues()
|
|
#define vm_page_unlock_queues()
|
|
#endif
|
|
|
|
extern uint32_t acpi_reset_video;
|
|
extern void initializecpu(void);
|
|
|
|
static struct region_descriptor r_idt, r_gdt, *p_gdt;
|
|
static u_int16_t r_ldt;
|
|
|
|
static u_int32_t r_eax, r_ebx, r_ecx, r_edx, r_ebp, r_esi, r_edi,
|
|
r_efl, r_cr0, r_cr2, r_cr3, r_cr4, ret_addr;
|
|
|
|
static u_int16_t r_cs, r_ds, r_es, r_fs, r_gs, r_ss, r_tr;
|
|
static u_int32_t r_esp = 0;
|
|
|
|
static void acpi_printcpu(void);
|
|
static void acpi_realmodeinst(void *arg, bus_dma_segment_t *segs,
|
|
int nsegs, int error);
|
|
static void acpi_alloc_wakeup_handler(void);
|
|
|
|
/* XXX shut gcc up */
|
|
extern int acpi_savecpu(void);
|
|
extern int acpi_restorecpu(void);
|
|
|
|
#if defined(__GNUC__) || defined(__INTEL_COMPILER)
|
|
__asm__(" \n\
|
|
.text \n\
|
|
.p2align 2, 0x90 \n\
|
|
.type acpi_restorecpu, @function\n\
|
|
acpi_restorecpu: \n\
|
|
.align 4 \n\
|
|
movl r_eax,%eax \n\
|
|
movl r_ebx,%ebx \n\
|
|
movl r_ecx,%ecx \n\
|
|
movl r_edx,%edx \n\
|
|
movl r_ebp,%ebp \n\
|
|
movl r_esi,%esi \n\
|
|
movl r_edi,%edi \n\
|
|
movl r_esp,%esp \n\
|
|
\n\
|
|
pushl r_efl \n\
|
|
popfl \n\
|
|
\n\
|
|
movl ret_addr,%eax \n\
|
|
movl %eax,(%esp) \n\
|
|
xorl %eax,%eax \n\
|
|
ret \n\
|
|
\n\
|
|
.text \n\
|
|
.p2align 2, 0x90 \n\
|
|
.type acpi_savecpu, @function \n\
|
|
acpi_savecpu: \n\
|
|
movw %cs,r_cs \n\
|
|
movw %ds,r_ds \n\
|
|
movw %es,r_es \n\
|
|
movw %fs,r_fs \n\
|
|
movw %gs,r_gs \n\
|
|
movw %ss,r_ss \n\
|
|
\n\
|
|
movl %eax,r_eax \n\
|
|
movl %ebx,r_ebx \n\
|
|
movl %ecx,r_ecx \n\
|
|
movl %edx,r_edx \n\
|
|
movl %ebp,r_ebp \n\
|
|
movl %esi,r_esi \n\
|
|
movl %edi,r_edi \n\
|
|
\n\
|
|
movl %cr0,%eax \n\
|
|
movl %eax,r_cr0 \n\
|
|
movl %cr2,%eax \n\
|
|
movl %eax,r_cr2 \n\
|
|
movl %cr3,%eax \n\
|
|
movl %eax,r_cr3 \n\
|
|
movl %cr4,%eax \n\
|
|
movl %eax,r_cr4 \n\
|
|
\n\
|
|
pushfl \n\
|
|
popl r_efl \n\
|
|
\n\
|
|
movl %esp,r_esp \n\
|
|
\n\
|
|
sgdt r_gdt \n\
|
|
sidt r_idt \n\
|
|
sldt r_ldt \n\
|
|
str r_tr \n\
|
|
\n\
|
|
movl (%esp),%eax \n\
|
|
movl %eax,ret_addr \n\
|
|
movl $1,%eax \n\
|
|
ret \n\
|
|
");
|
|
#endif /* __GNUC__ || __INTEL_COMPILER */
|
|
|
|
static void
|
|
acpi_printcpu(void)
|
|
{
|
|
printf("======== acpi_printcpu() debug dump ========\n");
|
|
printf("gdt[%04x:%08x] idt[%04x:%08x] ldt[%04x] tr[%04x] efl[%08x]\n",
|
|
r_gdt.rd_limit, r_gdt.rd_base, r_idt.rd_limit, r_idt.rd_base,
|
|
r_ldt, r_tr, r_efl);
|
|
printf("eax[%08x] ebx[%08x] ecx[%08x] edx[%08x]\n",
|
|
r_eax, r_ebx, r_ecx, r_edx);
|
|
printf("esi[%08x] edi[%08x] ebp[%08x] esp[%08x]\n",
|
|
r_esi, r_edi, r_ebp, r_esp);
|
|
printf("cr0[%08x] cr2[%08x] cr3[%08x] cr4[%08x]\n",
|
|
r_cr0, r_cr2, r_cr3, r_cr4);
|
|
printf("cs[%04x] ds[%04x] es[%04x] fs[%04x] gs[%04x] ss[%04x]\n",
|
|
r_cs, r_ds, r_es, r_fs, r_gs, r_ss);
|
|
}
|
|
|
|
#define WAKECODE_FIXUP(offset, type, val) do { \
|
|
void **addr; \
|
|
addr = (void **)(sc->acpi_wakeaddr + offset); \
|
|
(type *)*addr = val; \
|
|
} while (0)
|
|
|
|
#define WAKECODE_BCOPY(offset, type, val) do { \
|
|
void **addr; \
|
|
addr = (void **)(sc->acpi_wakeaddr + offset); \
|
|
bcopy(&(val), addr, sizeof(type)); \
|
|
} while (0)
|
|
|
|
int
|
|
acpi_sleep_machdep(struct acpi_softc *sc, int state)
|
|
{
|
|
ACPI_STATUS status;
|
|
vm_paddr_t oldphys;
|
|
struct pmap *pm;
|
|
vm_page_t page;
|
|
static vm_page_t opage = NULL;
|
|
int ret = 0;
|
|
u_int32_t cr3;
|
|
u_long ef;
|
|
struct proc *p;
|
|
|
|
if (sc->acpi_wakeaddr == 0)
|
|
return (0);
|
|
|
|
AcpiSetFirmwareWakingVector(sc->acpi_wakephys);
|
|
|
|
ef = read_eflags();
|
|
ACPI_DISABLE_IRQS();
|
|
|
|
/* Create Identity Mapping */
|
|
if ((p = curproc) == NULL)
|
|
p = &proc0;
|
|
pm = vmspace_pmap(p->p_vmspace);
|
|
cr3 = rcr3();
|
|
#ifdef PAE
|
|
load_cr3(vtophys(pm->pm_pdpt));
|
|
#else
|
|
load_cr3(vtophys(pm->pm_pdir));
|
|
#endif
|
|
|
|
oldphys = pmap_extract(pm, sc->acpi_wakephys);
|
|
if (oldphys)
|
|
opage = PHYS_TO_VM_PAGE(oldphys);
|
|
page = PHYS_TO_VM_PAGE(sc->acpi_wakephys);
|
|
pmap_enter(pm, sc->acpi_wakephys, page,
|
|
VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE, 1);
|
|
|
|
ret_addr = 0;
|
|
if (acpi_savecpu()) {
|
|
/* Execute Sleep */
|
|
intr_suspend();
|
|
|
|
p_gdt = (struct region_descriptor *)
|
|
(sc->acpi_wakeaddr + physical_gdt);
|
|
p_gdt->rd_limit = r_gdt.rd_limit;
|
|
p_gdt->rd_base = vtophys(r_gdt.rd_base);
|
|
|
|
WAKECODE_FIXUP(physical_esp, u_int32_t, vtophys(r_esp));
|
|
WAKECODE_FIXUP(previous_cr0, u_int32_t, r_cr0);
|
|
WAKECODE_FIXUP(previous_cr2, u_int32_t, r_cr2);
|
|
WAKECODE_FIXUP(previous_cr3, u_int32_t, r_cr3);
|
|
WAKECODE_FIXUP(previous_cr4, u_int32_t, r_cr4);
|
|
|
|
WAKECODE_FIXUP(reset_video, uint32_t, acpi_reset_video);
|
|
|
|
WAKECODE_FIXUP(previous_tr, u_int16_t, r_tr);
|
|
WAKECODE_BCOPY(previous_gdt, struct region_descriptor, r_gdt);
|
|
WAKECODE_FIXUP(previous_ldt, u_int16_t, r_ldt);
|
|
WAKECODE_BCOPY(previous_idt, struct region_descriptor, r_idt);
|
|
|
|
WAKECODE_FIXUP(where_to_recover, void, acpi_restorecpu);
|
|
|
|
WAKECODE_FIXUP(previous_ds, u_int16_t, r_ds);
|
|
WAKECODE_FIXUP(previous_es, u_int16_t, r_es);
|
|
WAKECODE_FIXUP(previous_fs, u_int16_t, r_fs);
|
|
WAKECODE_FIXUP(previous_gs, u_int16_t, r_gs);
|
|
WAKECODE_FIXUP(previous_ss, u_int16_t, r_ss);
|
|
|
|
if (acpi_get_verbose(sc))
|
|
acpi_printcpu();
|
|
|
|
/* Call ACPICA to enter the desired sleep state */
|
|
if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
|
|
status = AcpiEnterSleepStateS4bios();
|
|
else
|
|
status = AcpiEnterSleepState(state);
|
|
|
|
if (status != AE_OK) {
|
|
device_printf(sc->acpi_dev,
|
|
"AcpiEnterSleepState failed - %s\n",
|
|
AcpiFormatException(status));
|
|
ret = -1;
|
|
goto out;
|
|
}
|
|
|
|
for (;;) ;
|
|
} else {
|
|
/* Execute Wakeup */
|
|
#if 0
|
|
initializecpu();
|
|
#endif
|
|
intr_resume();
|
|
|
|
if (acpi_get_verbose(sc)) {
|
|
acpi_savecpu();
|
|
acpi_printcpu();
|
|
}
|
|
}
|
|
|
|
out:
|
|
vm_page_lock_queues();
|
|
pmap_remove(pm, sc->acpi_wakephys, sc->acpi_wakephys + PAGE_SIZE);
|
|
vm_page_unlock_queues();
|
|
if (opage) {
|
|
pmap_enter(pm, sc->acpi_wakephys, page,
|
|
VM_PROT_READ | VM_PROT_WRITE, 0);
|
|
}
|
|
|
|
load_cr3(cr3);
|
|
|
|
write_eflags(ef);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
static bus_dma_tag_t acpi_waketag;
|
|
static bus_dmamap_t acpi_wakemap;
|
|
static vm_offset_t acpi_wakeaddr = 0;
|
|
|
|
static void
|
|
acpi_alloc_wakeup_handler(void)
|
|
{
|
|
if (!cold)
|
|
return;
|
|
|
|
if (bus_dma_tag_create(/* parent */ NULL, /* alignment */ 2, 0,
|
|
/* lowaddr below 1MB */ 0x9ffff,
|
|
/* highaddr */ BUS_SPACE_MAXADDR, NULL, NULL,
|
|
PAGE_SIZE, 1, PAGE_SIZE, 0, busdma_lock_mutex,
|
|
&Giant, &acpi_waketag) != 0) {
|
|
printf("acpi_alloc_wakeup_handler: can't create wake tag\n");
|
|
return;
|
|
}
|
|
|
|
if (bus_dmamem_alloc(acpi_waketag, (void **)&acpi_wakeaddr,
|
|
BUS_DMA_NOWAIT, &acpi_wakemap)) {
|
|
printf("acpi_alloc_wakeup_handler: can't alloc wake memory\n");
|
|
return;
|
|
}
|
|
}
|
|
|
|
SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0)
|
|
|
|
static void
|
|
acpi_realmodeinst(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
|
|
{
|
|
struct acpi_softc *sc = arg;
|
|
u_int32_t *addr;
|
|
|
|
addr = (u_int32_t *)&wakecode[wakeup_sw32 + 2];
|
|
*addr = segs[0].ds_addr + wakeup_32;
|
|
bcopy(wakecode, (void *)sc->acpi_wakeaddr, sizeof(wakecode));
|
|
sc->acpi_wakephys = segs[0].ds_addr;
|
|
}
|
|
|
|
void
|
|
acpi_install_wakeup_handler(struct acpi_softc *sc)
|
|
{
|
|
if (acpi_wakeaddr == 0)
|
|
return;
|
|
|
|
sc->acpi_waketag = acpi_waketag;
|
|
sc->acpi_wakeaddr = acpi_wakeaddr;
|
|
sc->acpi_wakemap = acpi_wakemap;
|
|
|
|
bus_dmamap_load(sc->acpi_waketag, sc->acpi_wakemap,
|
|
(void *)sc->acpi_wakeaddr, PAGE_SIZE,
|
|
acpi_realmodeinst, sc, 0);
|
|
}
|