Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
More fallout from the switch from PAGE_SIZE based IOMMU to the native page
size for the driver. By pure luck it happened to work most of the time, since
we end up invalidating the wrong entries in the TLB.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
authored by
Olof Johansson
and committed by
Paul Mackerras
dfa70f81
1a8f4610
+3
-3
arch/powerpc/platforms/pasemi/iommu.c
+3
-3
arch/powerpc/platforms/pasemi/iommu.c
···
93
94
pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
95
96
-
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
97
98
ip = ((u32 *)tbl->it_base) + index;
99
···
118
119
pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
120
121
-
bus_addr = (tbl->it_offset + index) << PAGE_SHIFT;
122
123
ip = ((u32 *)tbl->it_base) + index;
124
···
137
iommu_table_iobmap.it_busno = 0;
138
iommu_table_iobmap.it_offset = 0;
139
/* it_size is in number of entries */
140
-
iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT;
141
142
/* Initialize the common IOMMU code */
143
iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
···
93
94
pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
95
96
+
bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
97
98
ip = ((u32 *)tbl->it_base) + index;
99
···
118
119
pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
120
121
+
bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
122
123
ip = ((u32 *)tbl->it_base) + index;
124
···
137
iommu_table_iobmap.it_busno = 0;
138
iommu_table_iobmap.it_offset = 0;
139
/* it_size is in number of entries */
140
+
iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
141
142
/* Initialize the common IOMMU code */
143
iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;