Re: Can't boot -curent in qemu

[Paul Goyette <paul%whooppee.com@localhost>]

I think I have a solution for this problem.  Please see the attached 
patches.

With the patches applied:

1. A Generic kernel boots successfully, with amdtemp builtin
2. My custom kernel boots successfully, with no builtin amdtemp device

There are still a couple minor oddities with this patch:

A. When I try to 'modload amdtemp' it tries to attach two different 
instances:

# dmesg | grep 'pchb[34]' 
pchb3 at pci0 dev 24 function 2: vendor 0x1022 product 0x1202 (rev. 0x00)
pchb4 at pci0 dev 24 function 3: vendor 0x1022 product 0x1203 (rev. 0x00)
amdtemp0 at pchb3: AMD CPU Temperature Sensors, family 0x5 not supported
amdtemp1 at pchb4: AMD CPU Temperature Sensors (Family10h)

B. envstat reports a sensor value of zero degC.






On Sat, 14 Apr 2012, Paul Goyette wrote:

> On Sat, 14 Apr 2012, Paul Goyette wrote:
>
> > On Sat, 14 Apr 2012, Christoph Egger wrote:
> >
> > > Ah, there we go why it doesn't attach.
> > > You need a kernel with these committs applied:
> > >
> > > http://mail-index.netbsd.org/source-changes/2012/04/13/msg033678.html
> > > http://mail-index.netbsd.org/source-changes/2012/04/13/msg033679.html
> > > http://mail-index.netbsd.org/source-changes/2012/04/13/msg033680.html
> >
> > OK,  First, I am going to rebuild amdtemp module after reverting the 
> > amdtemp.ioconf file as well as the other reverts!  And I'll see if this 
> > allows the amdtemp to attach on that older 1090T.
>
> No luck.
>
> > Then I'll check to see if that also attaches on the FX-8150.
>
> Still no luck.
>
>
> Both of these tests were with -current sources, except for
>
>         arch/x86/pci/pchb.c             with 1.27 and 1.32 backed out
>         arch/x86/pci/pchbvar.h          with 1.8 backed out
>         modules/amdtemp/amdtemp.ioconf  with 1.2 1.3 and 1.4 backed out
>
> I'm going to get my sources all back to -current now, before I lose track of 
> what is changed!
>
>
> -------------------------------------------------------------------------
> | Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
> | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
> | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
> | Kernel Developer |                          | pgoyette at netbsd.org  |
> -------------------------------------------------------------------------
>
> !DSPAM:4f89cdcf1981492884965!

-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------

Index: files.pci
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/files.pci,v
retrieving revision 1.14
diff -u -p -r1.14 files.pci
--- files.pci   13 Apr 2012 13:11:17 -0000      1.14
+++ files.pci   15 Apr 2012 14:47:29 -0000
@@ -9,7 +9,7 @@ file    arch/x86/pci/agp_machdep.c      agp
 define amdnb_miscbus {}
 
 # PCI-Host bridge chipsets
-device pchb:   pcibus, agpbus,
+device pchb:   pcibus, agpbus, amdnb_miscbus,
                agp_ali, agp_amd, agp_amd64, agp_i810,
                agp_intel, agp_sis, agp_via
 attach pchb at pci
Index: pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pchb.c,v
retrieving revision 1.33
diff -u -p -r1.33 pchb.c
--- pchb.c      30 Jan 2012 19:41:18 -0000      1.33
+++ pchb.c      15 Apr 2012 14:47:29 -0000
@@ -78,7 +78,7 @@ static void   pchbchilddet(device_t, devic
 static bool    pchb_resume(device_t, const pmf_qual_t *);
 static bool    pchb_suspend(device_t, const pmf_qual_t *);
 
-static void    pchb_amdtempbus_configure(struct pchb_softc *);
+static void    pchb_amdnb_miscbus_configure(struct pchb_softc *);
 
 CFATTACH_DECL3_NEW(pchb, sizeof(struct pchb_softc),
     pchbmatch, pchbattach, pchbdetach, NULL, pchbrescan, pchbchilddet, 
DVF_DETACH_SHUTDOWN);
@@ -438,7 +438,7 @@ pchbattach(device_t parent, device_t sel
                config_found_ia(self, "pcibus", &pba, pcibusprint);
        }
 
-       pchb_amdtempbus_configure(sc);
+       pchb_amdnb_miscbus_configure(sc);
 }
 
 static int
@@ -459,8 +459,8 @@ pchbrescan(device_t self, const char *if
 {
        struct pchb_softc *sc = device_private(self);
 
-       if (ifattr_match(ifattr, "amdtempbus"))
-               pchb_amdtempbus_configure(sc);
+       if (ifattr_match(ifattr, "amdnb_miscbus"))
+               pchb_amdnb_miscbus_configure(sc);
 
        return 0;
 }
@@ -470,8 +470,8 @@ pchbchilddet(device_t self, device_t chi
 {
        struct pchb_softc *sc = device_private(self);
 
-       if (sc->sc_amdtempbus == child) {
-               sc->sc_amdtempbus = NULL;
+       if (sc->sc_amdnb_miscbus == child) {
+               sc->sc_amdnb_miscbus = NULL;
                return;
        }
 }
@@ -511,10 +511,10 @@ pchb_resume(device_t dv, const pmf_qual_
 }
 
 static void
-pchb_amdtempbus_configure(struct pchb_softc *sc)
+pchb_amdnb_miscbus_configure(struct pchb_softc *sc)
 {
-       if (sc->sc_amdtempbus != NULL)
+       if (sc->sc_amdnb_miscbus != NULL)
                return;
 
-       sc->sc_amdtempbus = config_found_ia(sc->sc_dev, "amdtempbus", 
&sc->sc_pa, NULL);
+       sc->sc_amdnb_miscbus = config_found_ia(sc->sc_dev, "amdnb_miscbus", 
&sc->sc_pa, NULL);
 }
Index: pchbvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pchbvar.h,v
retrieving revision 1.8
diff -u -p -r1.8 pchbvar.h
--- pchbvar.h   20 Aug 2011 20:01:08 -0000      1.8
+++ pchbvar.h   15 Apr 2012 14:47:29 -0000
@@ -34,7 +34,7 @@
 
 struct pchb_softc {
        device_t sc_dev;
-       device_t sc_amdtempbus;
+       device_t sc_amdnb_miscbus;
 
        struct pci_attach_args sc_pa;