From 900e7c295df4b2ceeb962eed75c09dcd513e8474 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 1 Jul 2004 07:46:29 +0000 Subject: [PATCH] Trim a few things from the dmesg output and stick them under bootverbose to cut down on the clutter including PCI interrupt routing, MTRR, pcibios, etc. Discussed with: USENIX Cabal --- sys/dev/acpica/acpi_pcib.c | 21 ++++++++++++--------- sys/dev/firewire/fwohci_pci.c | 5 +++-- sys/dev/pci/pci_pci.c | 2 +- sys/dev/random/randomdev.c | 4 +++- sys/i386/i386/i686_mem.c | 3 ++- sys/i386/i386/mptable.c | 5 +++-- sys/i386/isa/vesa.c | 28 ++++++++++++++++------------ sys/i386/pci/pci_cfgreg.c | 4 ++-- sys/i386/pci/pci_pir.c | 5 +++-- sys/kern/kern_linker.c | 5 +++-- 10 files changed, 48 insertions(+), 34 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 8eeda8e3d623..93926899f8d5 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -275,8 +275,9 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * XXX check ASL examples to see if this is an acceptable set of tests */ if (NumberOfInterrupts == 1 && Interrupts[0] != 0) { - device_printf(pcib, "slot %d INT%c is routed to irq %d\n", - pci_get_slot(dev), 'A' + pin, Interrupts[0]); + if (bootverbose) + device_printf(pcib, "slot %d INT%c is routed to irq %d\n", + pci_get_slot(dev), 'A' + pin, Interrupts[0]); interrupt = Interrupts[0]; goto out; } @@ -338,10 +339,12 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, * Build a resource buffer and pass it to AcpiSetCurrentResources to * route the new interrupt. */ - device_printf(pcib, "possible interrupts:"); - for (i = 0; i < NumberOfInterrupts; i++) - printf(" %d", Interrupts[i]); - printf("\n"); + if (bootverbose) { + device_printf(pcib, "possible interrupts:"); + for (i = 0; i < NumberOfInterrupts; i++) + printf(" %d", Interrupts[i]); + printf("\n"); + } /* This should never happen. */ if (crsbuf.Pointer != NULL) @@ -383,9 +386,9 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, crsres = &resbuf; /* Return the interrupt we just routed. */ - device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", - pci_get_slot(dev), 'A' + pin, Interrupts[0], - acpi_name(lnkdev)); + if (bootverbose) + device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", + pci_get_slot(dev), 'A' + pin, Interrupts[0], acpi_name(lnkdev)); interrupt = Interrupts[0]; out: diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index b1ee33d1ee9b..5331629b97b3 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -187,8 +187,9 @@ fwohci_pci_probe( device_t dev ) if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_FW && pci_get_progif(dev) == PCI_INTERFACE_OHCI) { - device_printf(dev, "vendor=%x, dev=%x\n", pci_get_vendor(dev), - pci_get_device(dev)); + if (bootverbose) + device_printf(dev, "vendor=%x, dev=%x\n", + pci_get_vendor(dev), pci_get_device(dev)); device_set_desc(dev, "1394 Open Host Controller Interface"); return 0; } diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 40e1934029a6..43114d774199 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -475,7 +475,7 @@ pcib_route_interrupt(device_t pcib, device_t dev, int pin) */ bus = device_get_parent(pcib); intnum = PCIB_ROUTE_INTERRUPT(device_get_parent(bus), pcib, parent_intpin + 1); - if (PCI_INTERRUPT_VALID(intnum)) { + if (PCI_INTERRUPT_VALID(intnum) && bootverbose) { device_printf(pcib, "slot %d INT%c is routed to irq %d\n", pci_get_slot(dev), 'A' + pin - 1, intnum); } diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index a88e4a913b91..7c5434e44626 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -200,7 +200,9 @@ random_modevent(module_t mod __unused, int type, void *data __unused) random_ident_hardware(&random_systat); (*random_systat.init)(); - printf("random: \n", random_systat.ident); + if (bootverbose) + printf("random: \n", + random_systat.ident); random_dev = make_dev(&random_cdevsw, RANDOM_MINOR, UID_ROOT, GID_WHEEL, 0666, "random"); diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c index ce8737a7bf7e..453932969e06 100644 --- a/sys/i386/i386/i686_mem.c +++ b/sys/i386/i386/i686_mem.c @@ -548,7 +548,8 @@ i686_mrinit(struct mem_range_softc *sc) return; } nmdesc = mtrrcap & 0xff; - printf("Pentium Pro MTRR support enabled\n"); + if (bootverbose) + printf("Pentium Pro MTRR support enabled\n"); /* If fixed MTRRs supported and enabled */ if ((mtrrcap & 0x100) && (mtrrdef & 0x400)) { diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 262d336e261d..b4e309f2f530 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -965,7 +965,8 @@ mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin) 'A' + pin); return (PCI_INVALID_IRQ); } - device_printf(pcib, "slot %d INT%c routed to irq %d\n", slot, 'A' + pin, - args.vector); + if (bootverbose) + device_printf(pcib, "slot %d INT%c routed to irq %d\n", slot, + 'A' + pin, args.vector); return (args.vector); } diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c index 80f9055f530a..65739aa8de17 100644 --- a/sys/i386/isa/vesa.c +++ b/sys/i386/isa/vesa.c @@ -1513,22 +1513,26 @@ vesa_bios_info(int level) int i; #endif - /* general adapter information */ - printf("VESA: v%d.%d, %dk memory, flags:0x%x, mode table:%p (%x)\n", - ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 - + ((vesa_adp_info->v_version & 0x0f00) >> 8), - ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 - + (vesa_adp_info->v_version & 0x000f), - vesa_adp_info->v_memsize * 64, vesa_adp_info->v_flags, - vesa_vmodetab, vesa_adp_info->v_modetable); - /* OEM string */ - if (vesa_oemstr != NULL) - printf("VESA: %s\n", vesa_oemstr); + if (bootverbose) { + /* general adapter information */ + printf( + "VESA: v%d.%d, %dk memory, flags:0x%x, mode table:%p (%x)\n", + ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 + + ((vesa_adp_info->v_version & 0x0f00) >> 8), + ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 + + (vesa_adp_info->v_version & 0x000f), + vesa_adp_info->v_memsize * 64, vesa_adp_info->v_flags, + vesa_vmodetab, vesa_adp_info->v_modetable); + + /* OEM string */ + if (vesa_oemstr != NULL) + printf("VESA: %s\n", vesa_oemstr); + } if (level <= 0) return 0; - if (vesa_adp_info->v_version >= 0x0200) { + if (vesa_adp_info->v_version >= 0x0200 && bootverbose) { /* vender name, product name, product revision */ printf("VESA: %s %s %s\n", (vesa_venderstr != NULL) ? vesa_venderstr : "unknown", diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index bd3d5a6990b7..5cde7d266b8b 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -106,8 +106,8 @@ pci_cfgregopen(void) v = pcibios_get_version(); if (v > 0) - printf("pcibios: BIOS version %x.%02x\n", (v & 0xff00) >> 8, - v & 0xff); + PRVERB(("pcibios: BIOS version %x.%02x\n", (v & 0xff00) >> 8, + v & 0xff)); mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN); opened = 1; diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index 99b8749ee9b5..9577c955a30a 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -525,8 +525,9 @@ pci_pir_route_interrupt(int bus, int device, int func, int pin) BUS_CONFIG_INTR(pir_device, pci_link->pl_irq, INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW); } - printf("$PIR: %d:%d INT%c routed to irq %d\n", bus, device, - pin - 1 + 'A', pci_link->pl_irq); + if (bootverbose) + printf("$PIR: %d:%d INT%c routed to irq %d\n", bus, device, + pin - 1 + 'A', pci_link->pl_irq); return (pci_link->pl_irq); } diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index fe339dd7270e..4ad549eec183 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -1171,8 +1171,9 @@ linker_preload(void *arg) modptr); continue; } - printf("Preloaded %s \"%s\" at %p.\n", modtype, modname, - modptr); + if (bootverbose) + printf("Preloaded %s \"%s\" at %p.\n", modtype, modname, + modptr); lf = NULL; TAILQ_FOREACH(lc, &classes, link) { error = LINKER_LINK_PRELOAD(lc, modname, &lf);