From owner-cvs-all Mon Feb 18 10:45:59 2002 Delivered-To: cvs-all@freebsd.org Received: from hal-5.inet.it (hal-5.inet.it [213.92.5.24]) by hub.freebsd.org (Postfix) with ESMTP id E1CCD37B416 for ; Mon, 18 Feb 2002 10:45:35 -0800 (PST) Received: (from root@localhost) by hal-5.inet.it (8.11.1/8.11.1) id g1IIjYT254702 for ; Mon, 18 Feb 2002 19:45:34 +0100 Received: from acampi.inet.it(213.92.1.165) by hal-5.inet.it via I-SMTP-4.0.5-100 id s-213.92.1.165-3scemS; Mon Feb 18 19:45:34 2002 Received: from webcom.it (brian.inet.it [213.92.1.190]) by acampi.inet.it (Postfix) with SMTP id EECAC15538 for ; Mon, 18 Feb 2002 19:45:33 +0100 (CET) Received: (qmail 322 invoked by uid 1000); 18 Feb 2002 18:42:55 -0000 Date: Mon, 18 Feb 2002 19:42:55 +0100 From: Andrea Campi To: Warner Losh Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/pccbb pccbb.c pccbbreg.h pccbbvar.h Message-ID: <20020218184255.GA294@webcom.it> References: <200202170311.g1H3BCr16669@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <200202170311.g1H3BCr16669@freefall.freebsd.org> User-Agent: Mutt/1.3.27i X-Echelon: BND CIA NSA Mossad KGB MI6 IRA detonator nuclear assault strike Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Feb 16, 2002 at 07:11:12PM -0800, Warner Losh wrote: > imp 2002/02/16 19:11:12 PST > > Modified files: > sys/dev/pccbb pccbb.c pccbbreg.h pccbbvar.h > Log: > Bulk changes made during the BSDcon kernel summit and travel afterwards. > Appologies for making this one bulk commit, but I have tested all these > changes together and don't want to break anything by trying to disentangle > it. I think this, or another change just a little before this one, broke detection of my pccard at startup, which was working before. However ejecting and reinserting it causes it to be recognized, so this is just to let you know. This is an IBM Thinkpad 570E, TI1450 PCI-CardBus Bridge, 3Com 3c589 10Mbps Ethernet, -CURRENT as of a few minutes ago. I am attaching a diff of dmesg before and after. If this commit can't be possibly to blame, tell me if you have any suspect or I'll binary search the last commits... Bye, Andrea > > o Make debugging a sysctl/tunable > o Remove flags word from yenta chip info, it is unused > o Make 16-bit card I/O range and 32-bit card I/O range tunables > o Start the rename of pccbb to cbb to match NetBSD by misc renames. > o Kill the now bogus list of softcs to create kthread. Instead, just > create the kthread in the attach routine. > o Remove sc_ from some structure names. It isn't needed. > o Refine chipset lookup code. > o Match generic PCI <-> CardBus bridges. We specifically don't generically > match PCI PCMCIA bridges because they are not, with one exception, yenta > devices. > o Add some comments about the why we need to have a function table ala > OLDCARD > o The PCI interrupt routing by using the ExCA registers is needed for > for all bridges, per the spec, not just TI ones. > o Collapse TOPIC95 and TOPIC95B. > o Using the ToPIC 97 and 100 datasheets, try to support these bridges better, > but more work is needed. > o Generally clarify some XXX comments and add them in a few places where > things didn't look right to me. > o Move interrupt generating register access until after we establish an ISR. > o Add support for YV and XV cards. X and Y are numbers to be determined > later (but maybe never). > o factor powerup code for 16-bit and 32-bit cards. > o When a card supports more than one voltage, prefer the lowest supported > volage. Windows does this, and MS's design guides imply this is the > right thing to do. > o Document race between kthread_exit(0) and kldunload's unmapping of pages > that John Baldwin and I discovered. > o Debounce the CSC interrupt a little better. > o When a 16-bit card is inserted when we don't have a pccard child, > warn about it better. Ditto for 32-bit card. > o Ack ALL the interrupt bits that we get, not just 0x1. > o maybe a couple minor style nits corrected. > > Revision Changes Path > 1.40 +517 -444 src/sys/dev/pccbb/pccbb.c > 1.9 +134 -118 src/sys/dev/pccbb/pccbbreg.h > 1.10 +16 -18 src/sys/dev/pccbb/pccbbvar.h > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe cvs-all" in the body of the message -- If Bill Gates had a dime for every time a Windows box crashed... ...Oh, wait a minute, he already does. --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dmesg.diff" --- dmesg.before Mon Feb 18 19:30:44 2002 +++ dmesg.after Mon Feb 18 19:31:01 2002 @@ -1,20 +1,20 @@ Copyright (c) 1992-2002 The FreeBSD Project. Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved. -FreeBSD 5.0-CURRENT #38: Thu Feb 14 16:44:10 CET 2002 +FreeBSD 5.0-CURRENT #40: Mon Feb 18 18:32:45 CET 2002 root@brian:/usr/src/sys/i386/compile/THINKPAD -Preloaded elf kernel "/boot/kernel/kernel" at 0xc03ff000. -Preloaded acpi_dsdt "/boot/acpi_dsdt.aml" at 0xc03ff0a8. -Preloaded elf module "/boot/kernel/acpi.ko" at 0xc03ff0f0. -Timecounter "i8254" frequency 1193161 Hz -Timecounter "TSC" frequency 448044423 Hz -CPU: Pentium III/Pentium III Xeon/Celeron (448.04-MHz 686-class CPU) +Preloaded elf kernel "/boot/kernel/kernel" at 0xc0401000. +Preloaded acpi_dsdt "/boot/acpi_dsdt.aml" at 0xc04010a8. +Preloaded elf module "/boot/kernel/acpi.ko" at 0xc04010f0. +Timecounter "i8254" frequency 1193173 Hz +Timecounter "TSC" frequency 448049331 Hz +CPU: Pentium III/Pentium III Xeon/Celeron (448.05-MHz 686-class CPU) Origin = "GenuineIntel" Id = 0x681 Stepping = 1 Features=0x383f9ff real memory = 201261056 (196544K bytes) -avail memory = 191504384 (187016K bytes) +avail memory = 191496192 (187008K bytes) Pentium Pro MTRR support enabled -VESA: v2.0, 2496k memory, flags:0x0, mode table:0xc034f502 (1000022) +VESA: v2.0, 2496k memory, flags:0x0, mode table:0xc0350642 (1000022) VESA: MagicMedia 256AV 48K Using $PIR table, 10 entries at 0xc00fdef0 ACPI: DSDT was overridden. @@ -36,13 +36,13 @@ pci1: on pcib1 pci1: at device 0.0 (no driver attached) pccbb0: mem 0x50000000-0x50000fff at device 2.0 on pci0 -acpi_pcib0: device is routed to IRQ 11 cardbus0: on pccbb0 pccard0: <16-bit PCCard bus> on pccbb0 -pccbb1: mem 0x50100000-0x50100fff at device 2.1 on pci0 acpi_pcib0: device is routed to IRQ 11 +pccbb1: mem 0x50100000-0x50100fff at device 2.1 on pci0 cardbus1: on pccbb1 pccard1: <16-bit PCCard bus> on pccbb1 +acpi_pcib0: device is routed to IRQ 11 csa0: mem 0xf4000000-0xf40fffff,0xf4100000-0xf4100fff irq 11 at device 5.0 on pci0 csa: card is Thinkpad 570 pcm0: on csa0 @@ -81,7 +81,3 @@ ad0: 5729MB [12416/15/63] at ata0-master UDMA33 ad2: 19077MB [38760/16/63] at ata1-master UDMA33 Mounting root from ufs:/dev/ad2s2a -ep0: <3Com 3c589 10Mbps Ethernet> at port 0x100-0x10f irq 11 function 0 config 1 on pccard0 -ep0: Ethernet address 00:60:08:94:d3:98 -ep0: promiscuous mode enabled -ep0: promiscuous mode disabled --SLDf9lqlvOQaIe6s-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message