From owner-cvs-src@FreeBSD.ORG Tue Jul 1 07:52:49 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAF7C37B401; Tue, 1 Jul 2003 07:52:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CE9C43FA3; Tue, 1 Jul 2003 07:52:48 -0700 (PDT) (envelope-from tmm@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h61Eqm0U011138; Tue, 1 Jul 2003 07:52:48 -0700 (PDT) (envelope-from tmm@repoman.freebsd.org) Received: (from tmm@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h61Eqlj2011134; Tue, 1 Jul 2003 07:52:47 -0700 (PDT) Message-Id: <200307011452.h61Eqlj2011134@repoman.freebsd.org> From: Thomas Moestl Date: Tue, 1 Jul 2003 07:52:47 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/conf files.sparc64 options.sparc64 src/sys/sparc64/ebus ebus.c src/sys/sparc64/include ofw_bus.h src/sys/sparc64/isa isa.c ofw_isa.c ofw_isa.h src/sys/sparc64/pci... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2003 14:52:49 -0000 tmm 2003/07/01 07:52:47 PDT FreeBSD src repository Modified files: sys/conf files.sparc64 options.sparc64 sys/sparc64/ebus ebus.c sys/sparc64/include ofw_bus.h sys/sparc64/isa isa.c ofw_isa.c ofw_isa.h sys/sparc64/pci apb.c ofw_pci.c ofw_pci.h ofw_pci_if.m psycho.c psychovar.h sys/sparc64/sparc64 ofw_bus.c Added files: sys/sparc64/pci ofw_pcib.c ofw_pcib_subr.c ofw_pcib_subr.h ofw_pcibus.c Removed files: sys/sparc64/sparc64 sparcbus_if.m Log: Add the new sparc64 OFW PCI framework, conditional on options OFW_NEWPCI for now. It introduces a OFW PCI bus driver and a generic OFW PCI-PCI bridge driver. By utilizing these, the PCI handling is much more elegant now. The advantages of the new approach are: - Device enumeration should hopefully be more like on Solaris now, so unit numbers should match what's printed on the box more closely. - Real interrupt routing is implemented now, so cardbus bridges etc. have at least a chance to work. - The quirk tables are gone and have been replaced by (hopefully sufficient) heuristics. - Much cleaner code. There was also a report that previously bogus interrupt assignments are fixed now, which can be attributed to the new heuristics. A pitfall, and the reason why this is not the default yet, is that it changes device enumeration, as mentioned above, which can make it necessary to change the system configuration if more than one unit of a device type is present (on a system with two hme cars, for example, it is possible that hme0 becomes hme1 and vice versa after enabling the option). Systems with multiple disk controllers may need to be booted into single user (and require manual specification of the root file system on boot) to adjust the fstab. Nevertheless, I would like to encourage users to use this option, so that it can be made the default soon. In detail, the changes are: - Introduce an OFW PCI bus driver; it inherits most methods from the generic PCI bus driver, but uses the firmware for enumeration, performs additional initialization for devices and firmware-specific interrupt routing. It also implements an OFW-specific method to allow child devices to get their firmware nodes. - Introduce an OFW PCI-PCI bridge driver; again, it inherits most of the generic PCI-PCI bridge driver; it has it's own method for interrupt routing, as well as some sparc64-specific methods (one to get the node again, and one to adjust the bridge bus range, since we need to reenumerate all PCI buses). - Convert the apb driver to the new way of handling things. - Provide a common framework for OFW bridge drivers, used be the two drivers above. - Provide a small common framework for interrupt routing (for all bridge types). - Convert the psycho driver to the new framework; this gets rid of a bunch of old kludges in pci_read_config(), and the whole preinitialization (ofw_pci_init()). - Convert the ISA MD part and the EBus driver to the new way interrupts and nodes are handled. - Introduce types for firmware interrupt properties. - Rename the old sparcbus_if to ofw_pci_if by repo copy (it is only required for PCI), and move it to a more correct location (new support methodsx were also added, and an old one was deprecated). - Fix a bunch of minor bugs, perform some cleanups. In some cases, I introduced some minor code duplication to keep the new code clean, in hopes that the old code will be unifdef'ed soon. Reviewed in part by: imp Tested by: jake, Marius Strobl , Sergey Mokryshev , Chris Jackman Info on u30 firmware provided by: kris Revision Changes Path 1.44 +4 -1 src/sys/conf/files.sparc64 1.7 +1 -0 src/sys/conf/options.sparc64 1.9 +27 -10 src/sys/sparc64/ebus/ebus.c 1.5 +26 -1 src/sys/sparc64/include/ofw_bus.h 1.8 +42 -20 src/sys/sparc64/isa/isa.c 1.4 +31 -2 src/sys/sparc64/isa/ofw_isa.c 1.2 +11 -7 src/sys/sparc64/isa/ofw_isa.h 1.6 +66 -116 src/sys/sparc64/pci/apb.c 1.12 +21 -16 src/sys/sparc64/pci/ofw_pci.c 1.6 +24 -7 src/sys/sparc64/pci/ofw_pci.h 1.3 +54 -22 src/sys/sparc64/pci/ofw_pci_if.m 1.1 +122 -0 src/sys/sparc64/pci/ofw_pcib.c (new) 1.1 +134 -0 src/sys/sparc64/pci/ofw_pcib_subr.c (new) 1.1 +49 -0 src/sys/sparc64/pci/ofw_pcib_subr.h (new) 1.1 +264 -0 src/sys/sparc64/pci/ofw_pcibus.c (new) 1.40 +159 -69 src/sys/sparc64/pci/psycho.c 1.9 +6 -1 src/sys/sparc64/pci/psychovar.h 1.7 +119 -7 src/sys/sparc64/sparc64/ofw_bus.c 1.3 +0 -93 src/sys/sparc64/sparc64/sparcbus_if.m (dead)