svn commit: r189882 - head/sys/pci

[Andriy Gapon]

Author: avg
Date: Mon Mar 16 16:15:14 2009
New Revision: 189882
URL: http://svn.freebsd.org/changeset/base/189882

Log:
  intpm: minor enhancements
  
  1. fix nointr check in intsmb_start, matters only if ENABLE_ALART is
     defined (by default, it is not);
  2. drop unnecessary inspection/reporting of power-management io registers
     base address;
  3. in verbose mode report errors from SMBus host controller and their
     mapping to smbus(4) errors;
  
  Approved by:  jhb (mentor)

Modified:
  head/sys/pci/intpm.c

Modified: head/sys/pci/intpm.c
==============================================================================
--- head/sys/pci/intpm.c        Mon Mar 16 16:14:26 2009        (r189881)
+++ head/sys/pci/intpm.c        Mon Mar 16 16:15:14 2009        (r189882)
@@ -167,10 +167,6 @@ intsmb_attach(device_t dev)
                goto fail;
        }
 
-       value = pci_read_config(dev, PCI_BASE_ADDR_PM, 4);
-       device_printf(dev, "PM %s %x\n", (value & 1) ? "I/O mapped" : "Memory",
-           value & 0xfffe);
-
        sc->isbusy = 0;
        sc->smbus = device_add_child(dev, "smbus", -1);
        if (sc->smbus == NULL) {
@@ -365,13 +361,13 @@ intsmb_start(struct intsmb_softc *sc, un
        tmp |= PIIX4_SMBHSTCNT_START;
 
        /* While not in autoconfiguration enable interrupts. */
-       if (!cold || !nointr)
+       if (!cold && !nointr)
                tmp |= PIIX4_SMBHSTCNT_INTREN;
        bus_write_1(sc->io_res, PIIX4_SMBHSTCNT, tmp);
 }
 
 static int
-intsmb_error(int status)
+intsmb_error(device_t dev, int status)
 {
        int error = 0;
 
@@ -381,6 +377,10 @@ intsmb_error(int status)
                error |= SMB_ECOLLI;
        if (status & PIIX4_SMBHSTSTAT_FAIL)
                error |= SMB_ENOACK;
+
+       if (error != 0 && bootverbose)
+               device_printf(dev, "error = %d, status = %#x\n", error, status);
+
        return (error);
 }
 
@@ -410,7 +410,7 @@ intsmb_stop_poll(struct intsmb_softc *sc
                status = bus_read_1(sc->io_res, PIIX4_SMBHSTSTS);
                if (!(status & PIIX4_SMBHSTSTAT_BUSY)) {
                        sc->isbusy = 0;
-                       error = intsmb_error(status);
+                       error = intsmb_error(sc->dev, status);
                        if (error == 0 && !(status & PIIX4_SMBHSTSTAT_INTR))
                                device_printf(sc->dev, "unknown cause why?\n");
                        return (error);
@@ -442,7 +442,7 @@ intsmb_stop(struct intsmb_softc *sc)
        if (error == 0) {
                status = bus_read_1(sc->io_res, PIIX4_SMBHSTSTS);
                if (!(status & PIIX4_SMBHSTSTAT_BUSY)) {
-                       error = intsmb_error(status);
+                       error = intsmb_error(sc->dev, status);
                        if (error == 0 && !(status & PIIX4_SMBHSTSTAT_INTR))
                                device_printf(sc->dev, "unknown cause why?\n");
 #ifdef ENABLE_ALART
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"