From owner-freebsd-bugs Thu May 10 11:10:22 2001 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D02437B422 for ; Thu, 10 May 2001 11:10:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f4AIA3135390; Thu, 10 May 2001 11:10:03 -0700 (PDT) (envelope-from gnats) Date: Thu, 10 May 2001 11:10:03 -0700 (PDT) Message-Id: <200105101810.f4AIA3135390@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org Cc: From: Tony Finch Subject: Re: kern/26920: PCI autoconfiguration of USB, dc ether, and pccard broken on SHARP PC-AR10 Reply-To: Tony Finch Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR kern/26920; it has been noted by GNATS. From: Tony Finch To: freebsd-gnats-submit@FreeBSD.org Cc: Tony Finch , n_hibma@FreeBSD.org Subject: Re: kern/26920: PCI autoconfiguration of USB, dc ether, and pccard broken on SHARP PC-AR10 Date: Thu, 10 May 2001 18:20:13 +0000 Tony Finch wrote: > > The TI PCI 4451 still doesn't work, though, but that's > not unexpected since there's no support for it in the OS at the > moment. I have a copy of the data sheet, so I will try to get it > working based on the info in that. Well adding the support turned out to be trivial since the 4451 is just a 1451 with an added IEEE 1394 OHCI. The real thing that stopped it working was that the BIOS's PnP device table didn't include an entry for a pccard controller. It works OK if I use a non-PnP configuration, but I have to disable the parallel port to get a spare IRQ for the pcic. Sigh. Here's the patch for TI 4451 support: ------------------------------------------------------------------------ --- sys/pci/pcic_p.c.orig Thu May 10 18:33:04 2001 +++ sys/pci/pcic_p.cWed Apr 18 04:36:20 2001 @@ -140,7 +140,7 @@ case 1 : strcpy(buf, "TI113X PCI Config Reg: "); /* - * Defalut card control register setting is + * Default card control register setting is * PCI interrupt. The method of this code * switches PCI INT and ISA IRQ by bit 7 of * Bridge Control Register(Offset:0x3e,0x13e). @@ -269,6 +269,9 @@ case PCI_DEVICE_ID_PCIC_TI1451: desc = "TI PCI-1451 PCI-CardBus Bridge"; break; + case PCI_DEVICE_ID_PCIC_TI4451: + desc = "TI PCI-4451 PCI-CardBus Bridge"; + break; case PCI_DEVICE_ID_TOSHIBA_TOPIC95: desc = "Toshiba ToPIC95 PCI-CardBus Bridge"; break; @@ -351,6 +354,7 @@ case PCI_DEVICE_ID_PCIC_TI1420: case PCI_DEVICE_ID_PCIC_TI1450: case PCI_DEVICE_ID_PCIC_TI1451: + case PCI_DEVICE_ID_PCIC_TI4451: ti1xxx_pci_init(dev); /* FALLTHROUGH */ default: --- sys/pci/pcic_p.h.orig Wed Apr 18 04:33:33 2001 +++ sys/pci/pcic_p.h Wed Apr 18 04:34:14 2001 @@ -48,6 +48,7 @@ #define PCI_DEVICE_ID_PCIC_TI1420 0xac51104cul #define PCI_DEVICE_ID_PCIC_TI1450 0xac1b104cul #define PCI_DEVICE_ID_PCIC_TI1451 0xac52104cul +#define PCI_DEVICE_ID_PCIC_TI4451 0xac42104cul #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a1179ul #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f1179ul #define PCI_DEVICE_ID_RICOH_RL5C465 0x04651180ul ------------------------------------------------------------------------ And to make my BIOS behave slightly better: ------------------------------------------------------------------------ --- sys/i386/conf/LINT.orig Thu May 10 18:51:26 2001 +++ sys/i386/conf/LINT Thu May 10 18:50:52 2001 @@ -1677,6 +1677,7 @@ # PCI options # #options PCI_QUIET #quiets PCI code on chipset settings +#options PCI_ENABLE_IOMODES #use if BIOS doesn't enable devices # The `ahc' device provides support for the Adaptec 29/3940(U)(W) --- sys/conf/options.orig Thu May 10 18:45:33 2001 +++ sys/conf/options Thu May 10 18:55:58 2001 @@ -370,6 +370,7 @@ # PCI related options PCI_QUIET opt_pci.h +PCI_ENABLE_IO_MODES opt_pci.h # NFS options NFS_MINATTRTIMO opt_nfs.h --- sys/pci/pci.c.orig Wed Apr 18 02:48:26 2001 +++ sys/pci/pci.c Thu May 10 18:56:43 2001 @@ -28,7 +28,7 @@ */ #include "opt_bus.h" - +#include "opt_pci.h" #include "opt_simos.h" #include ------------------------------------------------------------------------ These patches are sufficient to close this PR. (there might be some whitespace mangling; if so, my apologies) Tony. -- f.a.n.finch MALIN HEBRIDES: EASTERLY 4 OR 5. FAIR. MODERATE OR GOOD. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message