SEO

On 04/09/07 00:23 gwk@gwk.ca wrote:
> Hello, appologies for the delay in replying, comments inline.
>
> On Thu, Aug 09, 2007 at 01:16:05PM -0400, Devin Smith wrote:
> > I believe there is something wrong with the recently committed patch.
> There was I goofed, for some reason I can't get your diffs to apply
> cleanly so I hand merged it, and thats where the mistake crept in.
>
> >I think something we may have to consider doing is checking the BIOS
> > first, then checking ACPI second.
> Agreed I actually wrote a diff to precisely this while I didn't have
> internet access, however you had already posted an updated diff and it
> had been tested so...
>
> The diff I have attached at the end is yours as well as checking ACPI
> last, unfortunately it seems that machines with the mobile K7s are of
> the right vintage to have busted ACPI.
>
> If both of you could test the following (and of course anyone else with
> one of these machines) and it comes back with a clean bill of health I
> will commit it.
>
> gwk

Hi,

tried this yesterday in really recent current.
I see no regress, working fine.

dmesg below

regards
tilo
>
> Index: sys/arch/i386/i386/powernow-k7.c
> ================================================== =================
> RCS file: /cvs/src/sys/arch/i386/i386/powernow-k7.c,v
> retrieving revision 1.32
> diff -u -p -u -p -r1.32 powernow-k7.c
> --- sys/arch/i386/i386/powernow-k7.c 2007/07/27 03:03:37 1.32
> +++ sys/arch/i386/i386/powernow-k7.c 2007/09/04 06:08:05
> @@ -311,6 +311,10 @@ k7pnow_acpi_states(struct k7pnow_cpu_sta
> state.fid = PN7_ACPI_CTRL_TO_FID(ctrl);
> state.vid = PN7_ACPI_CTRL_TO_VID(ctrl);
>
> + if ((cstate->flags & PN7_FLAG_ERRATA_A0) &&
> + (k7pnow_fid_to_mult[state.fid] % 10) == 5)
> + continue;
> +
> state.freq = pss[n].pss_core_freq;
> j = n;
> while (j > 0 && cstate->state_table[j - 1].freq > state.freq) {
> @@ -354,6 +358,7 @@ k7pnow_acpi_init(struct k7pnow_cpu_state
> if (cstate->n_states == 0)
> return 0;
>
> + curs = k7pnow_acpi_states(cstate, pss, cstate->n_states, status);
> /*
> * XXX: Some BIOS supplied _PSS implementations have the wrong
> * maximum frequency, if we encounter one of these punt and
> @@ -363,7 +368,6 @@ k7pnow_acpi_init(struct k7pnow_cpu_state
> if (mfid != cstate->state_table[cstate->n_states - 1].fid) {
> return 0;
> }
> - curs = k7pnow_acpi_states(cstate, pss, cstate->n_states, status);
>
> acpicpu_set_notify(k7pnow_acpi_pss_changed);
> ctrl = pss[curs].pss_ctrl;
> @@ -417,14 +421,12 @@ k7_powernow_init(void)
>
> cstate->fsb = cpuspeed / (k7pnow_fid_to_mult[currentfid]/10);
>
> + if (!k7pnow_states(cstate, ci->ci_signature, maxfid, startvid))
> + if (!k7pnow_states(cstate, regs[0], maxfid, startvid)) {
> #if NACPICPU > 0
> - /* If we have it try ACPI */
> - if (!k7pnow_acpi_init(cstate, status))
> + /* If we have it try ACPI */
> + k7pnow_acpi_init(cstate, status);
> #endif
> - {
> - /* if the base CPUID signature fails to match try, the extended one */
> - if (!k7pnow_states(cstate, ci->ci_signature, maxfid, startvid))
> - k7pnow_states(cstate, regs[0], maxfid, startvid);
> }
>
> if (cstate->n_states) {

OpenBSD 4.2-current (ACPI) #0: Tue Sep 4 22:51:25 CEST 2007
tst@kuli.berlin.teles.de:/usr/src/sys/arch/i386/compile/ACPI
cpu0: mobile AMD Athlon(tm) XP 2200+ ("AuthenticAMD" 686-class, 256KB L2 cache) 1.79 GHz
cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MC A,CMOV,PAT,PSE36,MMX,FXSR,SSE
real mem = 468217856 (446MB)
avail mem = 444944384 (424MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 12/17/02, BIOS32 rev. 0 @ 0xfd730, SMBIOS rev. 2.3 @ 0xdf010 (44 entries)
bios0: vendor Phoenix Technologies Ltd. version "KA.M1.34 " date 12/17/2002
bios0: Hewlett-Packard Pavilion ze4200
pcibios0 at bios0: rev 2.1 @ 0xfd730/0x8d0
pcibios0: PCI IRQ Routing Table rev 1.0 @ 0xfdf10/208 (11 entries)
pcibios0: PCI Interrupt Router at 000:07:0 ("Acer Labs M1533 ISA" rev 0x00)
pcibios0: PCI bus #2 is the last bus
bios0: ROM list: 0xc0000/0xf000 0xcf000/0x800 0xdf000/0x1000! 0xe0000/0x4000!
acpi0 at mainbus0: rev 0
acpi0: tables DSDT FACP BOOT SSDT
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpi device at acpi0 from table DSDT not configured
acpi device at acpi0 from table FACP not configured
acpi device at acpi0 from table BOOT not configured
acpi device at acpi0 from table SSDT not configured
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (AGPB)
acpiec0 at acpi0: EC0_
acpicpu0 at acpi0 C2, PSS
acpitz0 at acpi0, critical temperature: 100 degC
acpibtn0 at acpi0: PWRB
acpibtn1 at acpi0: LID_
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT1: not present
cpu0 at mainbus0
cpu0: PowerNow! K7 1790 MHz: speeds: 1781 1644 1507 1370 1096 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 "ATI RS100 AGP" rev 0x13
ppb0 at pci0 dev 1 function 0 "ATI RS100 PCI" rev 0x01
pci1 at ppb0 bus 1
vga1 at pci1 dev 5 function 0 "ATI Radeon IGP 320M" rev 0x00
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
ohci0 at pci0 dev 2 function 0 "Acer Labs M5237 USB" rev 0x03: irq 9, version 1.0, legacy support
autri0 at pci0 dev 6 function 0 "Acer Labs M5451 Audio" rev 0x02: irq 5
ac97: codec id 0x43585429 (Conexant CX20468 rev 1)
ac97: codec features reserved, headphone, 18 bit DAC, 18 bit ADC, No 3D Stereo
audio0 at autri0
midi0 at autri0: <4DWAVE MIDI UART>
pcib0 at pci0 dev 7 function 0 "Acer Labs M1533 ISA" rev 0x00
"Acer Labs M5457 Modem" rev 0x00 at pci0 dev 8 function 0 not configured
cbb0 at pci0 dev 10 function 0 "O2 Micro OZ69[17]2 CardBus" rev 0x00: irq 11
"TI TSB43AB21 FireWire" rev 0x00 at pci0 dev 12 function 0 not configured
pciide0 at pci0 dev 16 function 0 "Acer Labs M5229 UDMA IDE" rev 0xc4: DMA, channel 0 wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: <IC25N030ATCS04-0>
wd0: 16-sector PIO, LBA, 28615MB, 58605120 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 5
atapiscsi0 at pciide0 channel 1 drive 0
scsibus0 at atapiscsi0: 2 targets
cd0 at scsibus0 targ 0 lun 0: <TOSHIBA, DVD-ROM SD-R2312, 1905> SCSI0 5/cdrom removable
cd0(pciide0:1:0): using PIO mode 4, DMA mode 2
alipm0 at pci0 dev 17 function 0 "Acer Labs M7101 Power" rev 0x00: 74KHz clock
iic0 at alipm0
sis0 at pci0 dev 18 function 0 "NS DP83815 10/100" rev 0x00, DP83816A: irq 11, address 00:0b:cd:34:69:2f
nsphyter0 at sis0 phy 0: DP83815 10/100 PHY, rev. 1
usb0 at ohci0: USB revision 1.0
uhub0 at usb0: Acer Labs OHCI root hub, rev 1.00/1.00, addr 1
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
pckbc0: using irq 12 for aux slot
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
midi1 at pcppi0: <PC speaker>
spkr0 at pcppi0
lpt0 at isa0 port 0x378/4 irq 7
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
pccom0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
cardslot0 at cbb0 slot 0 flags 0
cardbus0 at cardslot0: bus 2 device 0 cacheline 0x0, lattimer 0x20
pcmcia0 at cardslot0
biomask ef4d netmask ef4d ttymask ffcf
pctr: user-level cycle counter enabled
mtrr: Pentium Pro MTRR support
dkcsum: wd0 matches BIOS drive 0x80
root on wd0a swap on wd0b dump on wd0b