d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source 
Pass string arg to apic_dump.
Moved bootverbose printing of SMP enabled INTs from clock.c to autoconf.c
This commit is contained in:
fsmp 1997-07-20 18:05:20 +00:00
parent de88b06b3a
commit 8fe3123e94
10 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
* $Id: autoconf.c,v 1.3 1997/07/20 17:06:24 smp Exp smp $
*/
/*
@ -220,6 +220,15 @@ configure(dummy)
cninit_finish();
if (bootverbose) {
#ifdef APIC_IO
printf("SMP: enabled INTs: ");
for (i = 0; i < 24; ++i)
if ((imen & (1 << i)) == 0)
printf("%d, ", i);
printf("imen: 0x%08x\n", imen);
#endif /* APIC_IO */
/*
* Print out the BIOS's idea of the disk geometries.
*/

6
sys/amd64/amd64/mp_machdep.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

6
sys/amd64/amd64/mptable.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

6
sys/amd64/include/mptable.h
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

11
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
* $Id: autoconf.c,v 1.3 1997/07/20 17:06:24 smp Exp smp $
*/
/*
@ -220,6 +220,15 @@ configure(dummy)
cninit_finish();
if (bootverbose) {
#ifdef APIC_IO
printf("SMP: enabled INTs: ");
for (i = 0; i < 24; ++i)
if ((imen & (1 << i)) == 0)
printf("%d, ", i);
printf("imen: 0x%08x\n", imen);
#endif /* APIC_IO */
/*
* Print out the BIOS's idea of the disk geometries.
*/

6
sys/i386/i386/mp_machdep.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

10
sys/i386/i386/mpapic.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mpapic.c,v 1.14 1997/07/18 21:27:53 fsmp Exp $
* $Id: mpapic.c,v 1.14 1997/07/20 17:40:39 smp Exp smp $
*/
#include "opt_smp.h"
@ -103,7 +103,7 @@ apic_initialize(void)
lapic.svr = temp;
if (bootverbose)
apic_dump();
apic_dump("apic_initialize()");
}
@ -111,10 +111,10 @@ apic_initialize(void)
* dump contents of local APIC registers
*/
void
apic_dump(void)
apic_dump(char* str)
{
printf("SMP: CPU%02d bsp_apic_configure() lint0: 0x%08x\n",
cpuid, lapic.lvt_lint0);
printf("SMP: CPU%02d %s lint0: 0x%08x\n",
cpuid, str, lapic.lvt_lint0);
printf(" lint1: 0x%08x\n",
lapic.lvt_lint1);
printf(" TPR: 0x%08x\n", lapic.tpr);

6
sys/i386/i386/mptable.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

6
sys/i386/include/mptable.h
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */

6
sys/kern/subr_smp.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
* $Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
*/
#include "opt_smp.h"
@ -349,7 +349,7 @@ mp_announce(void)
printf(", version: 0x%08x", cpu_apic_versions[0]);
printf(", at 0x%08x\n", cpu_apic_address);
for (x = 1; x <= mp_naps; ++x) {
printf(" cpu%d (AP): apic id: %d", x, CPU_TO_ID(x));
printf(" cpu%d (AP): apic id: %2d", x, CPU_TO_ID(x));
printf(", version: 0x%08x", cpu_apic_versions[x]);
printf(", at 0x%08x\n", cpu_apic_address);
}
@ -428,7 +428,7 @@ bsp_apic_configure(void)
lapic.lvt_lint1 = temp;
if (bootverbose)
apic_dump();
apic_dump("bsp_apic_configure()");
}
#endif /* APIC_IO */