I mean... my alc0 still works...
On Sun, May 1, 2011 at 2:49 PM, Abel Abraham Camarillo Ojeda <acam...@verlet.org> wrote: > On Sun, May 1, 2011 at 2:10 PM, Stuart Henderson <s...@spacehopper.org> wrote: >> On 2011/05/01 18:35, Edd Barrett wrote: >>> I have acquired a netboot (packard bell dot s), which I think uses this NIC. Is >>> there an updated diff? >> >> Yes I just took the 2 minutes it took to apply it and fix >> the minor conflicts and linewrapping issue with the diff. >> Untested beyond "it builds". >> >> Test reports and dmesg lines from existing working alc(4) L1C and >> L2C wanted. If it makes new chips work that's a bonus, but the >> important thing is making sure it doesn't break something that >> already works. >> >> Doesn't seem any point disabling interrupts in the ISR though. >> I haven't touched that in this diff but that should probably be >> done too. >> >> .... > > Tested here on amd64.mp: > > No relevant changes in dmesg (i guess)... > > Old dmesg: > > OpenBSD 4.9-current (kobj) #0: Tue Apr 26 18:02:56 CDT 2011 > B B root@maetel.00z:/usr/kobj > real mem = 1608056832 (1533MB) > avail mem = 1551200256 (1479MB) > mainbus0 at root > bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xfd400 (50 entries) > bios0: vendor American Megatrends Inc. version "V1.3" date 11/15/2010 > bios0: MSI MS-7623 > acpi0 at bios0: rev 0 > acpi0: sleep states S0 S3 S4 S5 > acpi0: tables DSDT FACP APIC MCFG OEMB SRAT HPET SSDT > acpi0: wakeup devices PCE2(S4) PCE3(S4) PCE4(S4) PCE5(S4) PCE6(S4) > PCE7(S4) PCE9(S4) PCEA(S4) PCEB(S4) PCEC(S4) SBAZ(S4) PSKE(S4) > PSMS(S4) ECIR(S4) PS2K(S3) PS2M(S3) P0PC(S4) UHC1(S4) UHC2(S4) > UHC3(S4) USB4(S4) UHC5(S4) UHC6(S4) UHC7(S4) PWRB(S3) > acpitimer0 at acpi0: 3579545 Hz, 32 bits > acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat > cpu0 at mainbus0: apid 0 (boot processor) > cpu0: AMD Phenom(tm) II X4 955 Processor, 3200.65 MHz > cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative > cpu0: apic clock running at 200MHz > cpu1 at mainbus0: apid 1 (application processor) > cpu1: AMD Phenom(tm) II X4 955 Processor, 3200.16 MHz > cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > cpu1: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative > cpu2 at mainbus0: apid 2 (application processor) > cpu2: AMD Phenom(tm) II X4 955 Processor, 3200.15 MHz > cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > cpu2: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > cpu2: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > cpu2: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative > cpu3 at mainbus0: apid 3 (application processor) > cpu3: AMD Phenom(tm) II X4 955 Processor, 3200.15 MHz > cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > cpu3: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > cpu3: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > cpu3: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative > ioapic0 at mainbus0: apid 4 pa 0xfec00000, version 21, 24 pins > acpimcfg0 at acpi0 addr 0xe0000000, bus 0-255 > acpihpet0 at acpi0: 14318180 Hz > acpiprt0 at acpi0: bus 0 (PCI0) > acpiprt1 at acpi0: bus 1 (P0P1) > acpiprt2 at acpi0: bus -1 (PCE2) > acpiprt3 at acpi0: bus -1 (PCE3) > acpiprt4 at acpi0: bus -1 (PCE4) > acpiprt5 at acpi0: bus 2 (PCE5) > acpiprt6 at acpi0: bus -1 (PCE6) > acpiprt7 at acpi0: bus -1 (PCE7) > acpiprt8 at acpi0: bus -1 (PCE9) > acpiprt9 at acpi0: bus -1 (PCEA) > acpiprt10 at acpi0: bus -1 (PCEB) > acpiprt11 at acpi0: bus -1 (PCEC) > acpiprt12 at acpi0: bus 3 (P0PC) > acpicpu0 at acpi0: PSS > acpicpu1 at acpi0: PSS > acpicpu2 at acpi0: PSS > acpicpu3 at acpi0: PSS > acpibtn0 at acpi0: PWRB > pci0 at mainbus0 bus 0 > pchb0 at pci0 dev 0 function 0 "AMD RS780 Host" rev 0x00 > ppb0 at pci0 dev 1 function 0 "AMD RS780 PCIE" rev 0x00 > pci1 at ppb0 bus 1 > vga1 at pci1 dev 5 function 0 vendor "ATI", unknown product 0x9616 rev 0x00 > wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation) > wsdisplay0: screen 1-5 added (80x25, vt100 emulation) > ppb1 at pci0 dev 5 function 0 "AMD RS780 PCIE" rev 0x00: apic 4 int 17 > pci2 at ppb1 bus 2 > alc0 at pci2 dev 0 function 0 "Attansic Technology L1C" rev 0xc0: apic > 4 int 17, address 6c:62:6d:de:03:76 > atphy0 at alc0 phy 0: F1 10/100/1000 PHY, rev. 11 > ahci0 at pci0 dev 17 function 0 "ATI SBx00 SATA" rev 0x00: apic 4 int > 22, AHCI 1.1 > scsibus0 at ahci0: 32 targets > sd0 at scsibus0 targ 0 lun 0: <ATA, WDC WD5000AAJS-2, 01.0> SCSI3 > 0/direct fixed naa.50014ee10176d64c > sd0: 476940MB, 512 bytes/sec, 976773168 sec total > sd1 at scsibus0 targ 1 lun 0: <ATA, WDC WD10EARS-00Y, 80.0> SCSI3 > 0/direct fixed naa.50014ee05735bde1 > sd1: 953869MB, 512 bytes/sec, 1953525168 sec total > ohci0 at pci0 dev 18 function 0 "ATI SB700 USB" rev 0x00: apic 4 int > 16, version 1.0, legacy support > ohci1 at pci0 dev 18 function 1 "ATI SB700 USB" rev 0x00: apic 4 int > 16, version 1.0, legacy support > ehci0 at pci0 dev 18 function 2 "ATI SB700 USB2" rev 0x00: apic 4 int 17 > usb0 at ehci0: USB revision 2.0 > uhub0 at usb0 "ATI EHCI root hub" rev 2.00/1.00 addr 1 > ohci2 at pci0 dev 19 function 0 "ATI SB700 USB" rev 0x00: apic 4 int > 18, version 1.0, legacy support > ohci3 at pci0 dev 19 function 1 "ATI SB700 USB" rev 0x00: apic 4 int > 18, version 1.0, legacy support > ehci1 at pci0 dev 19 function 2 "ATI SB700 USB2" rev 0x00: apic 4 int 19 > usb1 at ehci1: USB revision 2.0 > uhub1 at usb1 "ATI EHCI root hub" rev 2.00/1.00 addr 1 > piixpm0 at pci0 dev 20 function 0 "ATI SBx00 SMBus" rev 0x3c: SMI > iic0 at piixpm0 > spdmem0 at iic0 addr 0x50: 2GB DDR3 SDRAM PC3-10600 > pciide0 at pci0 dev 20 function 1 "ATI SB700 IDE" rev 0x00: DMA, > channel 0 configured to compatibility, channel 1 configured to > compatibility > atapiscsi0 at pciide0 channel 0 drive 1 > scsibus1 at atapiscsi0: 2 targets > cd0 at scsibus1 targ 0 lun 0: <PIONEER, DVD-RW DVR-116D, 1.08> ATAPI > 5/cdrom removable > cd0(pciide0:0:1): using PIO mode 4, DMA mode 2, Ultra-DMA mode 4 > azalia0 at pci0 dev 20 function 2 "ATI SBx00 HD Audio" rev 0x00: apic 4 int 16 > azalia0: codecs: VIA/0x0397 > audio0 at azalia0 > pcib0 at pci0 dev 20 function 3 "ATI SB700 ISA" rev 0x00 > ppb2 at pci0 dev 20 function 4 "ATI SB600 PCI" rev 0x00 > pci3 at ppb2 bus 3 > re0 at pci3 dev 2 function 0 "Realtek 8169" rev 0x10: RTL8169/8110SB > (0x1000), apic 4 int 20, address 00:08:54:a6:be:f6 > rgephy0 at re0 phy 7: RTL8169S/8110S PHY, rev. 3 > ohci4 at pci0 dev 20 function 5 "ATI SB700 USB" rev 0x00: apic 4 int > 18, version 1.0, legacy support > pchb1 at pci0 dev 24 function 0 "AMD AMD64 10h HyperTransport" rev 0x00 > pchb2 at pci0 dev 24 function 1 "AMD AMD64 10h Address Map" rev 0x00 > pchb3 at pci0 dev 24 function 2 "AMD AMD64 10h DRAM Cfg" rev 0x00 > km0 at pci0 dev 24 function 3 "AMD AMD64 10h Misc Cfg" rev 0x00 > pchb4 at pci0 dev 24 function 4 "AMD AMD64 10h Link Cfg" rev 0x00 > usb2 at ohci0: USB revision 1.0 > uhub2 at usb2 "ATI OHCI root hub" rev 1.00/1.00 addr 1 > usb3 at ohci1: USB revision 1.0 > uhub3 at usb3 "ATI OHCI root hub" rev 1.00/1.00 addr 1 > usb4 at ohci2: USB revision 1.0 > uhub4 at usb4 "ATI OHCI root hub" rev 1.00/1.00 addr 1 > usb5 at ohci3: USB revision 1.0 > uhub5 at usb5 "ATI OHCI root hub" rev 1.00/1.00 addr 1 > isa0 at pcib0 > isadma0 at isa0 > com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo > com0: probed fifo depth: 15 bytes > com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo > com1: probed fifo depth: 15 bytes > 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 > pcppi0 at isa0 port 0x61 > spkr0 at pcppi0 > lpt0 at isa0 port 0x378/4 irq 7 > usb6 at ohci4: USB revision 1.0 > uhub6 at usb6 "ATI OHCI root hub" rev 1.00/1.00 addr 1 > mtrr: Pentium Pro MTRR support > uhidev0 at uhub3 port 2 configuration 1 interface 0 "Microsoft Basic > Optical Mouse" rev 1.10/0.00 addr 2 > uhidev0: iclass 3/1 > ums0 at uhidev0: 3 buttons, Z dir > wsmouse0 at ums0 mux 0 > uhidev1 at uhub3 port 3 configuration 1 interface 0 "Logitech Logitech > USB Keyboard" rev 2.00/60.00 addr 3 > uhidev1: iclass 3/1 > ukbd0 at uhidev1: 8 modifier keys, 6 key codes > wskbd1 at ukbd0 mux 1 > wskbd1: connecting to wsdisplay0 > uhidev2 at uhub3 port 3 configuration 1 interface 1 "Logitech Logitech > USB Keyboard" rev 2.00/60.00 addr 3 > uhidev2: iclass 3/0, 4 report ids > uhid0 at uhidev2 reportid 3: input=4, output=0, feature=0 > uhid1 at uhidev2 reportid 4: input=1, output=0, feature=0 > vscsi0 at root > scsibus2 at vscsi0: 256 targets > softraid0 at root > root on sd0a swap on sd0b dump on sd0b > > --- /home/the00z/diff/alc.dmesgold B B B Sun May B 1 14:46:33 2011 > +++ /home/the00z/diff/alc.dmesg Sun May B 1 14:45:43 2011 > @@ -1,7 +1,7 @@ > -OpenBSD 4.9-current (kobj) #0: Tue Apr 26 18:02:56 CDT 2011 > +OpenBSD 4.9-current (kobj) #0: Sun May B 1 14:32:33 CDT 2011 > B B root@maetel.00z:/usr/kobj > B real mem = 1608056832 (1533MB) > -avail mem = 1551200256 (1479MB) > +avail mem = 1551196160 (1479MB) > B mainbus0 at root > B bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xfd400 (50 entries) > B bios0: vendor American Megatrends Inc. version "V1.3" date 11/15/2010 > @@ -13,14 +13,14 @@ > B acpitimer0 at acpi0: 3579545 Hz, 32 bits > B acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat > B cpu0 at mainbus0: apid 0 (boot processor) > -cpu0: AMD Phenom(tm) II X4 955 Processor, 3200.65 MHz > +cpu0: AMD Phenom(tm) II X4 955 Processor, 3200.55 MHz > B cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > B cpu0: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > B cpu0: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative > B cpu0: DTLB 48 4KB entries fully associative, 48 4MB entries fully associative > B cpu0: apic clock running at 200MHz > B cpu1 at mainbus0: apid 1 (application processor) > -cpu1: AMD Phenom(tm) II X4 955 Processor, 3200.16 MHz > +cpu1: AMD Phenom(tm) II X4 955 Processor, 3200.15 MHz > B cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS H,MMX,FXSR,SSE,SSE2,HTT,SSE3,MWAIT,CX16,POPCNT,NXE,MMXX,FFXSR,LONG,3DNOW2,3DN OW > B cpu1: 64KB 64b/line 2-way I-cache, 64KB 64b/line 2-way D-cache, 512KB > 64b/line 16-way L2 cache > B cpu1: ITLB 32 4KB entries fully associative, 16 4MB entries fully associative
