soc/add_pcie: Add msi_type parameter to select MSI, MSI-Multi-Vector or MSI-X.

This commit is contained in:
Florent Kermarrec 2023-06-19 09:44:37 +02:00
parent 6e5651b320
commit a9cbb16785
2 changed files with 18 additions and 10 deletions

View File

@ -29,6 +29,7 @@
- software/liblitespi : Added read_id support. - software/liblitespi : Added read_id support.
- litex_boards : Added QMtech XC7K325T, VCU128, SITLINV_STVL7325_V2, Enclustra XU8/PE3 support. - litex_boards : Added QMtech XC7K325T, VCU128, SITLINV_STVL7325_V2, Enclustra XU8/PE3 support.
- liteeth : Added Ultrascale+ GTY/GTH SGMII/1000BaseX PHYs. - liteeth : Added Ultrascale+ GTY/GTH SGMII/1000BaseX PHYs.
- soc/add_pcie : Added msi_type parameter to select MSI, MSI-Multi-Vector or MSI-X.
[> Changed [> Changed
---------- ----------

View File

@ -1976,12 +1976,12 @@ class LiteXSoC(SoC):
with_dma_synchronizer = False, with_dma_synchronizer = False,
with_dma_monitor = False, with_dma_monitor = False,
with_dma_status = False, with_dma_status = False,
with_msi = True, with_msi = True, msi_type="msi",
): ):
# Imports # Imports
from litepcie.phy.uspciephy import USPCIEPHY from litepcie.phy.uspciephy import USPCIEPHY
from litepcie.phy.usppciephy import USPPCIEPHY from litepcie.phy.usppciephy import USPPCIEPHY
from litepcie.core import LitePCIeEndpoint, LitePCIeMSI from litepcie.core import LitePCIeEndpoint, LitePCIeMSI, LitePCIeMSIMultiVector, LitePCIeMSIX
from litepcie.frontend.dma import LitePCIeDMA from litepcie.frontend.dma import LitePCIeDMA
from litepcie.frontend.wishbone import LitePCIeWishboneMaster from litepcie.frontend.wishbone import LitePCIeWishboneMaster
@ -2005,11 +2005,18 @@ class LiteXSoC(SoC):
# MSI. # MSI.
if with_msi: if with_msi:
assert msi_type in ["msi", "msi-multi-vector", "msi-x"]
self.check_if_exists(f"{name}_msi") self.check_if_exists(f"{name}_msi")
if msi_type == "msi":
msi = LitePCIeMSI() msi = LitePCIeMSI()
if msi_type == "msi-multi-vector":
msi = LitePCIeMSIMultiVector()
if msi_type == "msi-x":
msi = LitePCIeMSIX(endpoint=self.pcie_endpoint)
self.add_module(name=f"{name}_msi", module=msi) self.add_module(name=f"{name}_msi", module=msi)
# FIXME: On Ultrascale/Ultrascale+ limit rate of IRQs to 1MHz (to prevent issue with # FIXME: On Ultrascale/Ultrascale+ limit rate of IRQs to 1MHz (to prevent issue with
# IRQs stalled). # IRQs stalled).
if msi_type in ["msi", "msi-multi-vector"]:
if isinstance(phy, (USPCIEPHY, USPPCIEPHY)): if isinstance(phy, (USPCIEPHY, USPPCIEPHY)):
msi_timer = WaitTimer(int(self.sys_clk_freq/1e6)) msi_timer = WaitTimer(int(self.sys_clk_freq/1e6))
self.add_module(name=f"{name}_msi_timer", module=msi_timer) self.add_module(name=f"{name}_msi_timer", module=msi_timer)