Date: Mon, 22 Jan 2007 21:48:44 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org 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 ... Message-ID: <200701222148.l0MLmitD020573@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701222148.l0MLmitD020573>