Date: Tue, 26 Nov 2002 08:30:26 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21534 for review Message-ID: <200211261630.gAQGUQT6085769@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21534 Change 21534 by jhb@jhb_laptop on 2002/11/26 08:30:09 Incorporate some cleanups that were sitting on my laptop. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#30 edit .. //depot/projects/smpng/sys/i386/i386/mpapic.c#11 edit .. //depot/projects/smpng/sys/i386/include/apic.h#4 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#30 (text+ko) ==== @@ -2156,7 +2156,7 @@ lapic.icr_hi = icr_hi; /* do an INIT IPI: assert RESET */ - icr_lo = lapic.icr_lo & 0xfff00000; + icr_lo = lapic.icr_lo & APIC_ICRLO_RESV_MASK; #if 0 lapic.icr_lo = icr_lo | 0x0000c500; @@ -2165,7 +2165,7 @@ /* spin */ ; /* do an INIT IPI: deassert RESET */ - lapic.icr_lo = icr_lo | 0x00008500; + lapic.icr_lo = icr_lo | 0x00028500; /* wait for pending status end */ u_sleep(10000); /* wait ~10mS */ ==== //depot/projects/smpng/sys/i386/i386/mpapic.c#11 (text+ko) ==== @@ -508,7 +508,7 @@ #endif /* DETECT_DEADLOCK */ /* build IRC_LOW */ - icr_lo = (lapic.icr_lo & APIC_RESV2_MASK) + icr_lo = (lapic.icr_lo & APIC_ICRLO_RESV_MASK) | dest_type | delivery_mode | vector; /* write APIC ICR */ @@ -574,7 +574,7 @@ lapic.icr_hi = icr_hi; /* build IRC_LOW */ - icr_lo = (lapic.icr_lo & APIC_RESV2_MASK) + icr_lo = (lapic.icr_lo & APIC_ICRLO_RESV_MASK) | APIC_DEST_DESTFLD | delivery_mode | vector; /* write APIC ICR */ ==== //depot/projects/smpng/sys/i386/include/apic.h#4 (text+ko) ==== @@ -305,6 +305,7 @@ #define APIC_RESV2_MASK 0xfff00000 +#define APIC_ICRLO_RESV_MASK (APIC_RESV1_MASK | APIC_RESV2_MASK) /* fields in ICR_HIGH */ #define APIC_ID_MASK 0x0f000000 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211261630.gAQGUQT6085769>