This is a note to let you know that I've just added the patch titled
Revert "powerpc/pseries/iommu: Fix iommu initialisation during DLPAR add"
to the 6.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-powerpc-pseries-iommu-fix-iommu-initialisation-during-dlpar-add.patch
and it can be found in the queue-6.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1fba2bf8e9d5a27b7394856181b6200de7260b79 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Date: Wed, 14 Feb 2024 11:00:41 +1100
Subject: Revert "powerpc/pseries/iommu: Fix iommu initialisation during DLPAR add"
From: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
commit 1fba2bf8e9d5a27b7394856181b6200de7260b79 upstream.
This reverts commit ed8b94f6e0acd652ce69bd69d678a0c769172df8.
Gaurav reported that there are still problems with the patch and it
should be reverted pending a fuller fix.
Link: https://lore.kernel.org/all/4f6fc1ac-7a76-4447-9d0e-f55c0be373f8@xxxxxxxxxxxxx/
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/include/asm/ppc-pci.h | 3 ---
arch/powerpc/kernel/iommu.c | 21 +++++----------------
arch/powerpc/platforms/pseries/pci_dlpar.c | 4 ----
3 files changed, 5 insertions(+), 23 deletions(-)
--- a/arch/powerpc/include/asm/ppc-pci.h
+++ b/arch/powerpc/include/asm/ppc-pci.h
@@ -29,9 +29,6 @@ void *pci_traverse_device_nodes(struct d
void *(*fn)(struct device_node *, void *),
void *data);
extern void pci_devs_phb_init_dynamic(struct pci_controller *phb);
-extern void ppc_iommu_register_device(struct pci_controller *phb);
-extern void ppc_iommu_unregister_device(struct pci_controller *phb);
-
/* From rtas_pci.h */
extern void init_pci_config_tokens (void);
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -1390,21 +1390,6 @@ static const struct attribute_group *spa
NULL,
};
-void ppc_iommu_register_device(struct pci_controller *phb)
-{
- iommu_device_sysfs_add(&phb->iommu, phb->parent,
- spapr_tce_iommu_groups, "iommu-phb%04x",
- phb->global_number);
- iommu_device_register(&phb->iommu, &spapr_tce_iommu_ops,
- phb->parent);
-}
-
-void ppc_iommu_unregister_device(struct pci_controller *phb)
-{
- iommu_device_unregister(&phb->iommu);
- iommu_device_sysfs_remove(&phb->iommu);
-}
-
/*
* This registers IOMMU devices of PHBs. This needs to happen
* after core_initcall(iommu_init) + postcore_initcall(pci_driver_init) and
@@ -1415,7 +1400,11 @@ static int __init spapr_tce_setup_phb_io
struct pci_controller *hose;
list_for_each_entry(hose, &hose_list, list_node) {
- ppc_iommu_register_device(hose);
+ iommu_device_sysfs_add(&hose->iommu, hose->parent,
+ spapr_tce_iommu_groups, "iommu-phb%04x",
+ hose->global_number);
+ iommu_device_register(&hose->iommu, &spapr_tce_iommu_ops,
+ hose->parent);
}
return 0;
}
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -35,8 +35,6 @@ struct pci_controller *init_phb_dynamic(
pseries_msi_allocate_domains(phb);
- ppc_iommu_register_device(phb);
-
/* Create EEH devices for the PHB */
eeh_phb_pe_create(phb);
@@ -78,8 +76,6 @@ int remove_phb_dynamic(struct pci_contro
}
}
- ppc_iommu_unregister_device(phb);
-
pseries_msi_free_domains(phb);
/* Keep a reference so phb isn't freed yet */
Patches currently in stable-queue which might be from mpe@xxxxxxxxxxxxxx are
queue-6.7/powerpc-pseries-iommu-fix-iommu-initialisation-durin.patch
queue-6.7/powerpc-kasan-fix-addr-error-caused-by-page-alignmen.patch
queue-6.7/powerpc-iommu-fix-the-missing-iommu_group_put-during.patch
queue-6.7/revert-powerpc-pseries-iommu-fix-iommu-initialisation-during-dlpar-add.patch
queue-6.7/powerpc-6xx-set-high-bat-enable-flag-on-g2_le-cores.patch
queue-6.7/selftests-mm-fix-map_hugetlb-failure-on-64k-page-size-systems.patch
queue-6.7/powerpc-kasan-limit-kasan-thread-size-increase-to-32.patch
