On Thu, 26 May 2011, Paul Irofti wrote:
>Please test this diff on your assus laptops and get back to me with
>the results. It should make your booting problems go away.
>
>Index: acpi.c
>===================================================================
>RCS file: /cvs/src/sys/dev/acpi/acpi.c,v
>retrieving revision 1.224
>diff -u -p -r1.224 acpi.c
>--- acpi.c 27 Apr 2011 20:55:42 -0000 1.224
>+++ acpi.c 26 May 2011 08:55:38 -0000
>@@ -92,6 +92,7 @@ void acpi_pbtn_task(void *, int);
>
> #ifndef SMALL_KERNEL
>
>+int acpi_asus_enabled;
> int acpi_thinkpad_enabled;
> int acpi_saved_spl;
> int acpi_enabled;
>@@ -114,6 +115,7 @@ int acpi_foundtmp(struct aml_node *, voi
> int acpi_foundprw(struct aml_node *, void *);
> int acpi_foundvideo(struct aml_node *, void *);
> int acpi_foundsony(struct aml_node *node, void *arg);
>+int acpi_foundasus(struct aml_node *node, void *arg);
>
> int acpi_foundide(struct aml_node *node, void *arg);
> int acpiide_notify(struct aml_node *, int, void *);
>@@ -781,8 +783,13 @@ acpi_attach(struct device *parent, struc
> /* check if we're running on a sony */
> aml_find_node(&aml_root, "GBRT", acpi_foundsony, sc);
>
>- /* attach video only if this is not a stinkpad */
>- if (!acpi_thinkpad_enabled)
>+ /* check if we're running on an asus */
>+ aml_find_node(&aml_root, "SDSP", acpi_foundasus, sc);
>+ if (!acpi_asus_enabled) /* some models don't have SDSP */
>+ aml_find_node(&aml_root, "SPLV", acpi_foundasus, sc);
>+
>+ /* attach video only if this is not a stinkpad or an assus */
>+ if (!acpi_thinkpad_enabled && !acpi_asus_enabled)
> aml_find_node(&aml_root, "_DOS", acpi_foundvideo, sc);
>
> /* create list of devices we want to query when APM come in */
>@@ -2395,6 +2402,16 @@ acpi_foundsony(struct aml_node *node, vo
> aaa.aaa_name = "acpisony";
>
> config_found(self, &aaa, acpi_print);
>+
>+ return 0;
>+}
>+
>+int
>+acpi_foundasus(struct aml_node *node, void *arg)
>+{
>+ acpi_asus_enabled = 1;
>+
>+ /* XXX: write a driver for it */
>
> return 0;
> }
>
It boots OK using this patch applied to current-as-of-yesterday.
Dave
OpenBSD 4.9-current (ASUSTEST) #0: Fri May 27 09:18:06 EDT 2011
r...@test.daveanderson.com:/usr/src/sys/arch/i386/compile/ASUSTEST
cpu0: Intel(R) Core(TM) i5-2410M CPU @ 2.30GHz ("GenuineIntel" 686-class) 2.30
GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,PCLMUL,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,SSE4.1,SSE4.2,x2APIC,POPCNT,XSAVE,AVX
real mem = 2996772864 (2857MB)
avail mem = 2936971264 (2800MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 12/03/10, SMBIOS rev. 2.6 @ 0xeb9b0 (79
entries)
bios0: vendor American Megatrends Inc. version "K53E.206" date 02/22/2011
bios0: ASUSTeK Computer Inc. K53E
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC DBGP ECDT SLIC HPET MCFG SSDT SSDT ASF!
acpi0: wakeup devices PEG0(S4) PEG1(S4) PEG2(S4) PEG3(S4) B0D4(S4) P0P1(S4)
HDEF(S4) GLAN(S4) EHC1(S3) USB1(S3) USB2(S3) USB3(S3) USB4(S3) EHC2(S3)
USB5(S3) USB6(S3) USB7(S3) RP01(S4) RP02(S4) WLAN(S3) RP03(S4) RP04(S4)
XHCI(S3) RP05(S4) RP06(S4) GLAN(S4) RP07(S4) RP08(S4) SLPB(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: apic clock running at 99MHz
cpu at mainbus0: not configured
cpu at mainbus0: not configured
cpu at mainbus0: not configured
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 24 pins
acpiec0 at acpi0
acpihpet0 at acpi0: 14318179 Hz
acpimcfg0 at acpi0 addr 0xe0000000, bus 0-63
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (PEG0)
acpiprt2 at acpi0: bus -1 (PEG1)
acpiprt3 at acpi0: bus -1 (PEG2)
acpiprt4 at acpi0: bus -1 (PEG3)
acpiprt5 at acpi0: bus -1 (P0P1)
acpiprt6 at acpi0: bus 1 (RP01)
acpiprt7 at acpi0: bus 2 (RP02)
acpiprt8 at acpi0: bus -1 (RP03)
acpiprt9 at acpi0: bus -1 (RP04)
acpiprt10 at acpi0: bus -1 (RP05)
acpiprt11 at acpi0: bus 3 (RP06)
acpiprt12 at acpi0: bus -1 (RP07)
acpiprt13 at acpi0: bus -1 (RP08)
acpicpu0 at acpi0: C3, C1, PSS
acpitz0 at acpi0acpitz0: THRM: failed to read _CRT
: no critical temperature defined
acpiac0 at acpi0: AC unit in unknown state
acpibat0 at acpi0: BAT0 not present
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: SLPB
bios0: ROM list: 0xc0000/0xf000
cpu0: Enhanced SpeedStep 2295 MHz: speeds: 2301, 2300, 1800, 1600, 1400, 1200,
1000, 800 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 "Intel Core 2G Host" rev 0x09
vga1 at pci0 dev 2 function 0 "Intel GT2 Video" rev 0x09
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
intagp at vga1 not configured
"Intel 6 Series MEI" rev 0x04 at pci0 dev 22 function 0 not configured
ehci0 at pci0 dev 26 function 0 "Intel 6 Series USB" rev 0x05: apic 2 int 16
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
azalia0 at pci0 dev 27 function 0 "Intel 6 Series HD Audio" rev 0x05: apic 2
int 22
azalia0: codecs: Realtek ALC269, Intel/0x2805, using Realtek ALC269
audio0 at azalia0
ppb0 at pci0 dev 28 function 0 "Intel 6 Series PCIE" rev 0xb5: apic 2 int 16
pci1 at ppb0 bus 1
ppb1 at pci0 dev 28 function 1 "Intel 6 Series PCIE" rev 0xb5: apic 2 int 17
pci2 at ppb1 bus 2
athn0 at pci2 dev 0 function 0 "Atheros AR9285" rev 0x01: apic 2 int 17
athn0: AR9285 rev 2 (1T1R), ROM rev 14, address e0:b9:a5:20:4a:d3
ppb2 at pci0 dev 28 function 5 "Intel 6 Series PCIE" rev 0xb5: apic 2 int 17
pci3 at ppb2 bus 3
alc0 at pci3 dev 0 function 0 "Attansic Technology L1D" rev 0xc0: apic 2 int
17, address f4:6d:04:0b:f9:ec
atphy0 at alc0 phy 0: F1 10/100/1000 PHY, rev. 0
ehci1 at pci0 dev 29 function 0 "Intel 6 Series USB" rev 0x05: apic 2 int 23
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 "Intel EHCI root hub" rev 2.00/1.00 addr 1
pcib0 at pci0 dev 31 function 0 "Intel HM65 LPC" rev 0x05
ahci0 at pci0 dev 31 function 2 "Intel 6 Series AHCI" rev 0x05: apic 2 int 19,
AHCI 1.3
scsibus0 at ahci0: 32 targets
sd0 at scsibus0 targ 0 lun 0: <ATA, WDC WD5000BEVT-8, 01.0> SCSI3 0/direct
fixed naa.50014ee600fdfd52
sd0: 476940MB, 512 bytes/sec, 976773168 sec total
cd0 at scsibus0 targ 2 lun 0: <MATSHITA, DVD-RAM UJ8A0ASW, 1.01> ATAPI 5/cdrom
removable
ichiic0 at pci0 dev 31 function 3 "Intel 6 Series SMBus" rev 0x05: apic 2 int 18
iic0 at ichiic0
spdmem0 at iic0 addr 0x50: 4GB DDR3 SDRAM PC3-10600 SO-DIMM
spdmem1 at iic0 addr 0x52: 2GB DDR3 SDRAM PC3-10600 SO-DIMM
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
spkr0 at pcppi0
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
mtrr: Pentium Pro MTRR support
uhub2 at uhub0 port 1 "Intel product 0x0024" rev 2.00/0.00 addr 2
uvideo0 at uhub2 port 2 configuration 1 interface 0 "Azurewave USB 2.0 UVC VGA
WebCam" rev 2.00/11.30 addr 3
video0 at uvideo0
uhub3 at uhub1 port 1 "Intel product 0x0024" rev 2.00/0.00 addr 2
umass0 at uhub3 port 3 configuration 1 interface 0 "HP v125w" rev 2.00/40.96
addr 3
umass0: using SCSI over Bulk-Only
scsibus1 at umass0: 2 targets, initiator 0
sd1 at scsibus1 targ 1 lun 0: <hp, v125w, 4096> SCSI0 0/direct removable
serial.03f03307104A00000902
sd1: 3864MB, 512 bytes/sec, 7913472 sec total
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
root on sd1a (e0166bb8f33fc15d.a) swap on sd1b dump on sd1b
--
Dave Anderson
<d...@daveanderson.com>
