On Wed, Sep 30, 2015 at 05:13:31PM +0200, Martijn van Duren wrote: > On 09/30/15 14:15, Joerg Jung wrote: > >CVSROOT: /cvs > >Module name: src > >Changes by: j...@cvs.openbsd.org 2015/09/30 06:15:12 > > > >Modified files: > > share/man/man4 : isa.4 > > sys/arch/amd64/conf: GENERIC > > sys/arch/i386/conf: GENERIC > > sys/dev/isa : files.isa > >Added files: > > share/man/man4 : asmc.4 > > sys/dev/isa : asmc.c > > > >Log message: > >add a (disabled) driver for the Apple System Management Controller (SMC) as > >found in Apple Intel based devices > > > >"go at it" deraadt@ > > > Just backported this driver to my 5.7-stable system at work (yes, I like to > live dangerous from time to time) and the driver seems to work properly.
:) > Thanks! Although it does add about 5-10 seconds to my boot-time, waiting > primarily for the temperature sensors. Yes, they are probed during startup. That probing is slow, as the SMC is slow. This needs some rethinking/polishing, moving the probing to a later point. > See sysctl and dmesg output below. > > What I find somewhat strange is that although the dmesg says it has "2 > lights", it only shows one illuminance sensor in my sysctl. This is expected. In newer models the SMC shows up with two sensor keys, but only *one* provides useful/valid values (with 10bit instead of 6bit in older models). I probably should remove the number from the initial message to avoid confusion. > This does > somewhat seems to fit with the right side of my screen being marginally > darker then the left side of my screen. Although this is something that > doesn't bother me in the least it seem like something that might be worth > mentioning. > > $ sysctl | grep asmc > hw.sensors.asmc0.temp0=30.00 degC (TA0P Ambient) > hw.sensors.asmc0.temp1=51.00 degC (TC0H CPU0 Heatsink) > hw.sensors.asmc0.temp2=58.00 degC (TC0P CPU0 Proximity) > hw.sensors.asmc0.temp3=78.00 degC (TG0D GPU0 Diode) > hw.sensors.asmc0.temp4=73.00 degC (TG0H GPU0 Heatsink) > hw.sensors.asmc0.temp5=49.00 degC (TL0P LCD Proximity) > hw.sensors.asmc0.temp6=51.00 degC (TO0P Optical Drive) > hw.sensors.asmc0.temp7=67.00 degC (Tm0P Memory Controller) > hw.sensors.asmc0.fan0=997 RPM (ODD) > hw.sensors.asmc0.fan1=1099 RPM (HDD) > hw.sensors.asmc0.fan2=1198 RPM (CPU) > hw.sensors.asmc0.illuminance0=4078.00 lx (left) > $ > > OpenBSD 5.7-stable (ASMC) #1: Wed Sep 30 16:46:45 CEST 2015 > mart...@martijn.office.rootnet.nl:/usr/src/sys/arch/amd64/compile/ASMC > RTC BIOS diagnostic error d1<clock_battery,ROM_cksum,memory_size> > real mem = 4253237248 (4056MB) > avail mem = 4136079360 (3944MB) > mpath0 at root > scsibus0 at mpath0: 256 targets > mainbus0 at root > bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0000 (61 entries) > bios0: vendor Apple Inc. version "IM121.88Z.0047.B1F.1201241648" date > 01/24/12 > bios0: Apple Inc. iMac12,1 > acpi0 at bios0: rev 2 > acpi0: sleep states S0 S3 S4 S5 > acpi0: tables DSDT FACP HPET APIC SBST ECDT SSDT SSDT SSDT SSDT SSDT SSDT > SSDT SSDT MCFG SSDT SSDT SSDT > acpi0: wakeup devices P0P2(S4) GFX0(S4) EC__(S4) HDEF(S4) GIGE(S4) RP01(S4) > ARPT(S4) RP02(S4) RP03(S4) RP05(S4) EHC1(S3) EHC2(S3) > acpitimer0 at acpi0: 3579545 Hz, 24 bits > acpihpet0 at acpi0: 14318179 Hz > acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat > cpu0 at mainbus0: apid 0 (boot processor) > cpu0: Intel(R) Core(TM) i5-2400S CPU @ 2.50GHz, 2500.36 MHz > cpu0: > FPU,VME,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,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC > cpu0: 256KB 64b/line 8-way L2 cache > cpu0: smt 0, core 0, package 0 > mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges > cpu0: apic clock running at 100MHz > cpu0: mwait min=64, max=64, C-substates=0.2.1.1.0, IBE > cpu1 at mainbus0: apid 2 (application processor) > cpu1: Intel(R) Core(TM) i5-2400S CPU @ 2.50GHz, 2500.03 MHz > cpu1: > FPU,VME,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,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC > cpu1: 256KB 64b/line 8-way L2 cache > cpu1: smt 0, core 1, package 0 > cpu2 at mainbus0: apid 4 (application processor) > cpu2: Intel(R) Core(TM) i5-2400S CPU @ 2.50GHz, 2500.03 MHz > cpu2: > FPU,VME,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,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC > cpu2: 256KB 64b/line 8-way L2 cache > cpu2: smt 0, core 2, package 0 > cpu3 at mainbus0: apid 6 (application processor) > cpu3: Intel(R) Core(TM) i5-2400S CPU @ 2.50GHz, 2500.03 MHz > cpu3: > FPU,VME,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,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC > cpu3: 256KB 64b/line 8-way L2 cache > cpu3: smt 0, core 3, package 0 > ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 24 pins > ioapic0: misconfigured as apic 0, remapped to apid 2 > acpiec0 at acpi0 > acpimcfg0 at acpi0 addr 0xe0000000, bus 0-155 > acpiprt0 at acpi0: bus 0 (PCI0) > acpiprt1 at acpi0: bus 1 (P0P2) > acpiprt2 at acpi0: bus 2 (RP01) > acpiprt3 at acpi0: bus 3 (RP02) > acpiprt4 at acpi0: bus 4 (RP03) > acpiprt5 at acpi0: bus 5 (RP05) > acpicpu0 at acpi0: C3, C2, C1, PSS > acpicpu1 at acpi0: C3, C2, C1, PSS > acpicpu2 at acpi0: C3, C2, C1, PSS > acpicpu3 at acpi0: C3, C2, C1, PSS > acpibtn0 at acpi0: PWRB > acpibtn1 at acpi0: SLPB > cpu0: Enhanced SpeedStep 2500 MHz: speeds: 2501, 2500, 2400, 2300, 2200, > 2100, 2000, 1900, 1800, 1700, 1600 MHz > memory map conflict 0xe00f8000/0x1000 > memory map conflict 0xfed1c000/0x4000 > memory map conflict 0xffed8000/0x28000 > pci0 at mainbus0 bus 0 > pchb0 at pci0 dev 0 function 0 "Intel Core 2G Host" rev 0x09 > ppb0 at pci0 dev 1 function 0 "Intel Core 2G PCIE" rev 0x09: msi > pci1 at ppb0 bus 1 > radeondrm0 at pci1 dev 0 function 0 "ATI Radeon HD 6600M" rev 0x00 > drm0 at radeondrm0 > radeondrm0: msi > azalia0 at pci1 dev 0 function 1 "ATI Radeon HD 6670 Audio" rev 0x00: msi > azalia0: no supported codecs > "Intel 6 Series MEI" rev 0x04 at pci0 dev 22 function 0 not configured > uhci0 at pci0 dev 26 function 0 "Intel 6 Series USB" rev 0x05: apic 2 int 21 > ehci0 at pci0 dev 26 function 7 "Intel 6 Series USB" rev 0x05: apic 2 int 23 > usb0 at ehci0: USB revision 2.0 > uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1 > azalia1 at pci0 dev 27 function 0 "Intel 6 Series HD Audio" rev 0x05: msi > azalia1: codecs: Cirrus Logic CS4206 > audio0 at azalia1 > ppb1 at pci0 dev 28 function 0 "Intel 6 Series PCIE" rev 0xb5: msi > pci2 at ppb1 bus 2 > bge0 at pci2 dev 0 function 0 "Broadcom BCM57765" rev 0x10, BCM57765 B0 > (0x57785100): msi, address c8:2a:14:1e:02:68 > brgphy0 at bge0 phy 1: BCM57765 10/100/1000baseT PHY, rev. 4 > ppb2 at pci0 dev 28 function 1 "Intel 6 Series PCIE" rev 0xb5: msi > pci3 at ppb2 bus 3 > "Atheros AR9300" rev 0x01 at pci3 dev 0 function 0 not configured > ppb3 at pci0 dev 28 function 2 "Intel 6 Series PCIE" rev 0xb5: msi > pci4 at ppb3 bus 4 > "AT&T/Lucent FW643 1394" rev 0x08 at pci4 dev 0 function 0 not configured > ppb4 at pci0 dev 28 function 4 "Intel 6 Series PCIE" rev 0xb5: msi > pci5 at ppb4 bus 5 > ppb5 at pci5 dev 0 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00 > pci6 at ppb5 bus 6 > ppb6 at pci6 dev 0 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00: msi > pci7 at ppb6 bus 7 > vendor "Intel", unknown product 0x1513 (class system subclass miscellaneous, > rev 0x00) at pci7 dev 0 function 0 not configured > ppb7 at pci6 dev 3 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00: msi > pci8 at ppb7 bus 8 > ppb8 at pci6 dev 4 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00: msi > pci9 at ppb8 bus 9 > ppb9 at pci6 dev 5 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00: msi > pci10 at ppb9 bus 58 > ppb10 at pci6 dev 6 function 0 vendor "Intel", unknown product 0x1513 rev > 0x00: msi > pci11 at ppb10 bus 107 > uhci1 at pci0 dev 29 function 0 "Intel 6 Series USB" rev 0x05: apic 2 int 19 > ehci1 at pci0 dev 29 function 7 "Intel 6 Series USB" rev 0x05: apic 2 int 22 > 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 Z68 LPC" rev 0x05 > pciide0 at pci0 dev 31 function 2 "Intel 6 Series SATA" rev 0x05: DMA, > channel 0 configured to native-PCI, channel 1 configured to native-PCI > pciide0: using apic 2 int 19 for native-PCI interrupt > wd0 at pciide0 channel 0 drive 0: <ST3500418AS> > wd0: 16-sector PIO, LBA48, 476940MB, 976773168 sectors > atapiscsi0 at pciide0 channel 0 drive 1 > scsibus1 at atapiscsi0: 2 targets > cd0 at scsibus1 targ 0 lun 0: <OPTIARC, DVD RW AD-5680H, 3AHF> ATAPI 5/cdrom > removable > wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 6 > cd0(pciide0:0:1): using PIO mode 4, Ultra-DMA mode 5 > ichiic0 at pci0 dev 31 function 3 "Intel 6 Series SMBus" rev 0x05: apic 2 > int 18 > iic0 at ichiic0 > iic0: addr 0x4a 01=20 05=d1 0a=08 10=0a 11=04 12=02 13=02 14=02 15=02 20=f2 > 21=01 23=88 words 00=0020 01=2000 02=0000 03=0000 04=00d1 05=d100 06=0000 > 07=0000 > spdmem0 at iic0 addr 0x50: 2GB DDR3 SDRAM PC3-10600 SO-DIMM > spdmem1 at iic0 addr 0x52: 2GB DDR3 SDRAM PC3-10600 SO-DIMM > usb2 at uhci0: USB revision 1.0 > uhub2 at usb2 "Intel UHCI root hub" rev 1.00/1.00 addr 1 > usb3 at uhci1: USB revision 1.0 > uhub3 at usb3 "Intel UHCI root hub" rev 1.00/1.00 addr 1 > isa0 at pcib0 > isadma0 at isa0 > pcppi0 at isa0 port 0x61 > spkr0 at pcppi0 > asmc0 at isa0 port 0x300/32 > asmc0: rev 1.71f571, 332 keys, 8 temperatures, 3 fans, 2 lights, kbdled > nvram: invalid checksum > uhub4 at uhub0 port 1 "Standard Microsystems product 0x2514" rev 2.00/0.03 > addr 2 > uhub5 at uhub4 port 1 "Apple Inc. BRCM2046 Hub" rev 2.00/1.00 addr 3 > ugen0 at uhub5 port 1 "Apple Inc. Bluetooth USB Host Controller" rev > 2.00/2.07 addr 4 > uhidev0 at uhub5 port 2 configuration 1 interface 0 "Apple Computer product > 0x820a" rev 2.00/1.00 addr 5 > uhidev0: iclass 3/1, 1 report id > ukbd0 at uhidev0 reportid 1: 8 variable keys, 6 key codes > wskbd0 at ukbd0: console keyboard > uhidev1 at uhub5 port 3 configuration 1 interface 0 "Apple Computer product > 0x820b" rev 2.00/1.00 addr 6 > uhidev1: iclass 3/1, 2 report ids > ums0 at uhidev1 reportid 2: 3 buttons > wsmouse0 at ums0 mux 0 > uhidev2 at uhub4 port 3 configuration 1 interface 0 "Sunplus USB Optical > Mouse" rev 2.00/0.10 addr 7 > uhidev2: iclass 3/1, 2 report ids > ums1 at uhidev2 reportid 1: 3 buttons, Z dir > wsmouse1 at ums1 mux 0 > uhid0 at uhidev2 reportid 2: input=1, output=0, feature=0 > uvideo0 at uhub0 port 2 configuration 1 interface 0 "Apple Inc. FaceTime HD > Camera (Built-in)" rev 2.00/7.55 addr 8 > video0 at uvideo0 > ugen1 at uhub0 port 2 configuration 1 "Apple Inc. FaceTime HD Camera > (Built-in)" rev 2.00/7.55 addr 8 > uhub6 at uhub1 port 1 "Standard Microsystems product 0x2514" rev 2.00/0.03 > addr 2 > umass0 at uhub6 port 1 configuration 1 interface 0 "Apple Card Reader" rev > 2.00/98.33 addr 3 > umass0: using SCSI over Bulk-Only > scsibus2 at umass0: 2 targets, initiator 0 > sd0 at scsibus2 targ 1 lun 0: <APPLE, SD Card Reader, 1.00> SCSI0 0/direct > removable serial.05ac8403000000009833 > uhidev3 at uhub6 port 2 configuration 1 interface 0 "Apple Computer, Inc. IR > Receiver" rev 2.00/0.16 addr 4 > uhidev3: iclass 3/0, 38 report ids > uhid1 at uhidev3 reportid 36: input=4, output=0, feature=0 > uhid2 at uhidev3 reportid 37: input=4, output=0, feature=0 > uhid3 at uhidev3 reportid 38: input=4, output=0, feature=0 > uhidev4 at uhub6 port 4 configuration 1 interface 0 " USB Keyboard" rev > 1.10/1.01 addr 5 > uhidev4: iclass 3/1 > ukbd1 at uhidev4: 8 variable keys, 6 key codes > wskbd1 at ukbd1 mux 1 > uhidev5 at uhub6 port 4 configuration 1 interface 1 " USB Keyboard" rev > 1.10/1.01 addr 5 > uhidev5: iclass 3/0, 2 report ids > uhid4 at uhidev5 reportid 1: input=1, output=0, feature=0 > uhid5 at uhidev5 reportid 2: input=3, output=0, feature=0 > vscsi0 at root > scsibus3 at vscsi0: 256 targets > softraid0 at root > scsibus4 at softraid0: 256 targets > sd1 at scsibus4 targ 1 lun 0: <OPENBSD, SR CRYPTO, 005> SCSI2 0/direct fixed > sd1: 425057MB, 512 bytes/sector, 870518697 sectors > root on sd1a (6bb75aae4f92eb77.a) swap on sd1b dump on sd1b > clock: unknown CMOS layout > radeondrm0: 1920x1080 > wsdisplay0 at radeondrm0 mux 1: console (std, vt100 emulation), using wskbd0 > wskbd1: connecting to wsdisplay0 > wsdisplay0: screen 1-5 added (std, vt100 emulation) >
