Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc: Remove some Cell leftovers
Now that CONFIG_PPC_CELL_NATIVE is removed, iommu_fixed_is_weak will
always be false, so remove it entirely.
Also remove a hack/quirk in the HTAB code that was only used on Cell.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-2-mpe@ellerman.id.au
authored by
Michael Ellerman
and committed by
Madhavan Srinivasan
8e4f1a34
05bf59fb
+1
-19
-6
arch/powerpc/include/asm/iommu.h
-6
arch/powerpc/include/asm/iommu.h
···
317
317
extern enum dma_data_direction iommu_tce_direction(unsigned long tce);
318
318
extern unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir);
319
319
320
-
#ifdef CONFIG_PPC_CELL_NATIVE
321
-
extern bool iommu_fixed_is_weak;
322
-
#else
323
-
#define iommu_fixed_is_weak false
324
-
#endif
325
-
326
320
extern const struct dma_map_ops dma_iommu_ops;
327
321
328
322
#endif /* __KERNEL__ */
+1
-1
arch/powerpc/kernel/dma-iommu.c
+1
-1
arch/powerpc/kernel/dma-iommu.c
···
136
136
struct pci_dev *pdev = to_pci_dev(dev);
137
137
struct pci_controller *phb = pci_bus_to_host(pdev->bus);
138
138
139
-
if (iommu_fixed_is_weak || !phb->controller_ops.iommu_bypass_supported)
139
+
if (!phb->controller_ops.iommu_bypass_supported)
140
140
return false;
141
141
return phb->controller_ops.iommu_bypass_supported(pdev, mask);
142
142
}
-12
arch/powerpc/mm/book3s64/hash_utils.c
-12
arch/powerpc/mm/book3s64/hash_utils.c
···
1358
1358
} else {
1359
1359
unsigned long limit = MEMBLOCK_ALLOC_ANYWHERE;
1360
1360
1361
-
#ifdef CONFIG_PPC_CELL
1362
-
/*
1363
-
* Cell may require the hash table down low when using the
1364
-
* Axon IOMMU in order to fit the dynamic region over it, see
1365
-
* comments in cell/iommu.c
1366
-
*/
1367
-
if (fdt_subnode_offset(initial_boot_params, 0, "axon") > 0) {
1368
-
limit = 0x80000000;
1369
-
pr_info("Hash table forced below 2G for Axon IOMMU\n");
1370
-
}
1371
-
#endif /* CONFIG_PPC_CELL */
1372
-
1373
1361
table = memblock_phys_alloc_range(htab_size_bytes,
1374
1362
htab_size_bytes,
1375
1363
0, limit);