riscv: iommu: Add shutdown callback for kexec
Subsystems (3)
cover riscv: iommu: Add shutdown callback for kexec
After kexec, the newly booted kernel can not initialize iommu driver successfully as no one resets iommu state before kexec.
This patch series supplies shutdown callback for iommu pmu driver. The shutdown callback resets necessary registers so that newly booted kernel can pass riscv_iommu_init_check() after kexec.
Xu Lu (2):
iommu/riscv: Empty iommu queue before enabling it iommu/riscv: Add shutdown function for iommu driver
drivers/iommu/riscv/iommu-pci.c | 8 ++++++++ drivers/iommu/riscv/iommu-platform.c | 6 ++++++ drivers/iommu/riscv/iommu.c | 12 ++++++++++-- drivers/iommu/riscv/iommu.h | 1 + 4 files changed, 25 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 iommu/riscv: Empty iommu queue before enabling it
Changing cqen/fqen/pqen from 0 to 1 sets the cqh/fqt/pqt registers to 0. But the cqt/fqh/pqh registers are left unmodified. This commit resets cqt/fqh/pqh registers to ensure corresponding queues are empty before being enabled during initialization.
--- drivers/iommu/riscv/iommu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iommu/riscv/iommu.c +6 -0
@@ -240,6 +240,12 @@ static int riscv_iommu_queue_enable(struct riscv_iommu_device *iommu,return rc; } +/* Empty queue before enabling it */ +if (queue->qid ==RISCV_IOMMU_INTR_CQ ) +riscv_iommu_writel (queue->iommu,Q_TAIL (queue),0 ); +else +riscv_iommu_writel (queue->iommu,Q_HEAD (queue),0 ); +/* * Enable queue with interrupts, clear any memory fault if any. * Wait for the hardware to acknowledge request and activate queue
Signature · 1 line
2.20.1
PATCH 2/2 iommu/riscv: Add shutdown function for iommu driver
In reply to Xu LuThis commit supplies shutdown callback for iommu pmu driver. The shutdown callback resets necessary registers so that newly booted kernel can pass riscv_iommu_init_check() after kexec. Also, the shutdown callback resets iommu mode to bare instead of off so that new kernel can still use PCIE devices even when CONFIG_RISCV_IOMMU is not enabled.
--- drivers/iommu/riscv/iommu-pci.c | 8 ++++++++ drivers/iommu/riscv/iommu-platform.c | 6 ++++++ drivers/iommu/riscv/iommu.c | 6 ++++-- drivers/iommu/riscv/iommu.h | 1 + 4 files changed, 19 insertions(+), 2 deletions(-)
drivers/iommu/riscv/iommu-pci.c +8 -0
@@ -101,6 +101,13 @@ static void riscv_iommu_pci_remove(struct pci_dev *pdev)riscv_iommu_remove (iommu); } +static void riscv_iommu_pci_shutdown (struct pci_dev *pdev) +{ +struct riscv_iommu_device *iommu =dev_get_drvdata (&pdev->dev); + +riscv_iommu_disable (iommu); +} +static const struct pci_device_id riscv_iommu_pci_tbl[] = { {PCI_VDEVICE (REDHAT ,PCI_DEVICE_ID_REDHAT_RISCV_IOMMU ),0 }, {PCI_VDEVICE (RIVOS ,PCI_DEVICE_ID_RIVOS_RISCV_IOMMU_GA ),0 },
@@ -112,6 +119,7 @@ static struct pci_driver riscv_iommu_pci_driver = { .id_table = riscv_iommu_pci_tbl, .probe = riscv_iommu_pci_probe, .remove = riscv_iommu_pci_remove, + .shutdown = riscv_iommu_pci_shutdown, .driver = { .suppress_bind_attrs = true, },
drivers/iommu/riscv/iommu-platform.c +6 -0
@@ -74,6 +74,11 @@ static void riscv_iommu_platform_remove(struct platform_device *pdev)riscv_iommu_remove (dev_get_drvdata (&pdev->dev)); }; +static void riscv_iommu_platform_shutdown (struct platform_device *pdev) +{ +riscv_iommu_disable (dev_get_drvdata (&pdev->dev)); +}; +static const struct of_device_id riscv_iommu_of_match[] = { {.compatible ="riscv,iommu" ,}, {},
@@ -82,6 +87,7 @@ static const struct of_device_id riscv_iommu_of_match[] = {static struct platform_driver riscv_iommu_platform_driver = { .probe = riscv_iommu_platform_probe, .remove = riscv_iommu_platform_remove, + .shutdown = riscv_iommu_platform_shutdown, .driver = { .name ="riscv,iommu" , .of_match_table = riscv_iommu_of_match,
drivers/iommu/riscv/iommu.c +4 -2
@@ -651,9 +651,11 @@ static struct riscv_iommu_dc *riscv_iommu_get_dc(struct riscv_iommu_device *iomm* This is best effort IOMMU translation shutdown flow. * Disable IOMMU without waiting for hardware response. */ -static void riscv_iommu_disable (struct riscv_iommu_device *iommu) +void riscv_iommu_disable (struct riscv_iommu_device *iommu) { -riscv_iommu_writeq (iommu,RISCV_IOMMU_REG_DDTP ,0 ); +riscv_iommu_writeq (iommu,RISCV_IOMMU_REG_DDTP , +FIELD_PREP (RISCV_IOMMU_DDTP_IOMMU_MODE , +RISCV_IOMMU_DDTP_IOMMU_MODE_BARE ));riscv_iommu_writel (iommu,RISCV_IOMMU_REG_CQCSR ,0 );riscv_iommu_writel (iommu,RISCV_IOMMU_REG_FQCSR ,0 );riscv_iommu_writel (iommu,RISCV_IOMMU_REG_PQCSR ,0 );
drivers/iommu/riscv/iommu.h +1 -0
@@ -64,6 +64,7 @@ struct riscv_iommu_device {int riscv_iommu_init (struct riscv_iommu_device *iommu);void riscv_iommu_remove (struct riscv_iommu_device *iommu); +void riscv_iommu_disable (struct riscv_iommu_device *iommu);#define riscv_iommu_readl (iommu, addr) \ readl_relaxed((iommu)->reg + (addr))
Signature · 1 line
2.20.1