From owner-cvs-src@FreeBSD.ORG Mon Jan 22 21:48:44 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5D5A16A402; Mon, 22 Jan 2007 21:48:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C560F13C442; Mon, 22 Jan 2007 21:48:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MLmiE2020577; Mon, 22 Jan 2007 21:48:44 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MLmitD020573; Mon, 22 Jan 2007 21:48:44 GMT (envelope-from jhb) Message-Id: <200701222148.l0MLmitD020573@repoman.freebsd.org> From: John Baldwin Date: Mon, 22 Jan 2007 21:48:44 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/amd64/amd64 mptable_pci.c msi.c nexus.c src/sys/amd64/include intr_machdep.h src/sys/amd64/pci pci_bus.c src/sys/dev/acpica acpi_pcib_acpi.c acpi_pcib_pci.c src/sys/dev/pci pci.c pci_if.m pci_pci.c pci_private.h pcib_if.m ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 22 Jan 2007 21:48:44 -0000 jhb 2007-01-22 21:48:44 UTC FreeBSD src repository Modified files: sys/amd64/amd64 mptable_pci.c msi.c nexus.c sys/amd64/include intr_machdep.h sys/amd64/pci pci_bus.c sys/dev/acpica acpi_pcib_acpi.c acpi_pcib_pci.c sys/dev/pci pci.c pci_if.m pci_pci.c pci_private.h pcib_if.m pcib_private.h pcivar.h sys/i386/i386 mptable_pci.c msi.c nexus.c sys/i386/include intr_machdep.h sys/i386/pci pci_bus.c Log: Expand the MSI/MSI-X API to address some deficiencies in the MSI-X support. - First off, device drivers really do need to know if they are allocating MSI or MSI-X messages. MSI requires allocating powerof2() messages for example where MSI-X does not. To address this, split out the MSI-X support from pci_msi_count() and pci_alloc_msi() into new driver-visible functions pci_msix_count() and pci_alloc_msix(). As a result, pci_msi_count() now just returns a count of the max supported MSI messages for the device, and pci_alloc_msi() only tries to allocate MSI messages. To get a count of the max supported MSI-X messages, use pci_msix_count(). To allocate MSI-X messages, use pci_alloc_msix(). pci_release_msi() still handles both MSI and MSI-X messages, however. As a result of this change, drivers using the existing API will only use MSI messages and will no longer try to use MSI-X messages. - Because MSI-X allows for each message to have its own data and address values (and thus does not require all of the messages to have their MD vectors allocated as a group), some devices allow for "sparse" use of MSI-X message slots. For example, if a device supports 8 messages but the OS is only able to allocate 2 messages, the device may make the best use of 2 IRQs if it enables the messages at slots 1 and 4 rather than default of using the first N slots (or indicies) at 1 and 2. To support this, add a new pci_remap_msix() function that a driver may call after a successful pci_alloc_msix() (but before allocating any of the SYS_RES_IRQ resources) to allow the allocated IRQ resources to be assigned to different message indices. For example, from the earlier example, after pci_alloc_msix() returned a value of 2, the driver would call pci_remap_msix() passing in array of integers { 1, 4 } as the new message indices to use. The rid's for the SYS_RES_IRQ resources will always match the message indices. Thus, after the call to pci_remap_msix() the driver would be able to access the first message in slot 1 at SYS_RES_IRQ rid 1, and the second message at slot 4 at SYS_RES_IRQ rid 4. Note that the message slots/indices are 1-based rather than 0-based so that they will always correspond to the rid values (SYS_RES_IRQ rid 0 is reserved for the legacy INTx interrupt). To support this API, a new PCIB_REMAP_MSIX() method was added to the pcib interface to change the message index for a single IRQ. Tested by: scottl Revision Changes Path 1.7 +2 -0 src/sys/amd64/amd64/mptable_pci.c 1.3 +24 -0 src/sys/amd64/amd64/msi.c 1.72 +9 -0 src/sys/amd64/amd64/nexus.c 1.14 +1 -0 src/sys/amd64/include/intr_machdep.h 1.120 +1 -0 src/sys/amd64/pci/pci_bus.c 1.53 +1 -0 src/sys/dev/acpica/acpi_pcib_acpi.c 1.16 +1 -0 src/sys/dev/acpica/acpi_pcib_pci.c 1.338 +143 -27 src/sys/dev/pci/pci.c 1.11 +17 -0 src/sys/dev/pci/pci_if.m 1.46 +11 -0 src/sys/dev/pci/pci_pci.c 1.22 +4 -0 src/sys/dev/pci/pci_private.h 1.10 +10 -0 src/sys/dev/pci/pcib_if.m 1.11 +1 -0 src/sys/dev/pci/pcib_private.h 1.77 +18 -0 src/sys/dev/pci/pcivar.h 1.7 +2 -0 src/sys/i386/i386/mptable_pci.c 1.3 +24 -0 src/sys/i386/i386/msi.c 1.67 +9 -0 src/sys/i386/i386/nexus.c 1.16 +1 -0 src/sys/i386/include/intr_machdep.h 1.126 +2 -0 src/sys/i386/pci/pci_bus.c