dma-mapping: Fix filename references
Subsystems (3)
PATCH v2 1/1 dma-mapping: Fix filename references
After the commit cf65a0f6f6ff
("dma-mapping: move all DMA mapping code to kernel/dma")
some of the files are referring to outdated information, i.e. old file names of DMA mapping sources.
Fix it here.
Note, the lines with "Glue code for..." have been removed completely.
---
- address Bjorn's comments
Documentation/x86/x86_64/boot-options.rst | 2 +- arch/ia64/kernel/setup.c | 2 +- arch/x86/kernel/pci-swiotlb.c | 1 - arch/x86/kernel/setup.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 4 +--- 5 files changed, 4 insertions(+), 7 deletions(-)
Documentation/x86/x86_64/boot-options.rst +1 -1
@@ -230,7 +230,7 @@ IOMMU (input/output memory management unit) =========================================== Multiple x86-64 PCI-DMA mapping implementations exist, for example: - 1. <lib/dma-direct.c>: use no hardware/software IOMMU at all + 1. <kernel/dma/direct.c>: use no hardware/software IOMMU at all (e.g. because you have < 3 GB memory). Kernel boot message: "PCI-DMA: Disabling IOMMU"
arch/ia64/kernel/setup.c +1 -1
@@ -256,7 +256,7 @@ __initcall(register_memory);* This function checks if the reserved crashkernel is allowed on the specific * IA64 machine flavour. Machines without an IO TLB use swiotlb and require * some memory below 4 GB (i.e. in 32 bit area), see the implementation of -* lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that +* kernel/dma/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that * in kdump case. See the comment in sba_init() in sba_iommu.c. * * So, the only machvec that really supports loading the kdump kernel
arch/x86/kernel/pci-swiotlb.c +0 -1
@@ -1,5 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -/* Glue code to lib/swiotlb.c */ #include <linux/pci.h> #include <linux/cache.h>
arch/x86/kernel/setup.c +1 -1
@@ -477,7 +477,7 @@ static int __init reserve_crashkernel_low(void) ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret) {/* -* two parts from lib/swiotlb.c: +* two parts from kernel/dma/swiotlb.c: * -swiotlb size: user-specified with swiotlb= or default. * * -swiotlb overflow buffer: now hardcoded to 32k. We round it
arch/x86/pci/sta2x11-fixup.c +1 -3
@@ -1,8 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* arch/x86/pci/sta2x11-fixup.c -* glue code for lib/swiotlb.c and DMA translation between STA2x11 -* AMBA memory mapping and the X86 memory mapping +* DMA translation between STA2x11 AMBA memory mapping and the x86 memory mapping * * ST Microelectronics ConneXt (STA2X11/STA2X10) *
Signature · 1 line
2.20.1
Quoted 10 lines · Andy Shevchenko
After the commit
cf65a0f6f6ff("dma-mapping: move all DMA mapping code to kernel/dma")
some of the files are referring to outdated information, i.e. old file names of DMA mapping sources.
Fix it here.
Note, the lines with "Glue code for..." have been removed completely.
Any comment on this?
Quoted 78 lines
Cc Christoph Hellwig <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>---
- address Bjorn's commentsDocumentation/x86/x86_64/boot-options.rst | 2 +- arch/ia64/kernel/setup.c | 2 +- arch/x86/kernel/pci-swiotlb.c | 1 - arch/x86/kernel/setup.c | 2 +- arch/x86/pci/sta2x11-fixup.c | 4 +--- 5 files changed, 4 insertions(+), 7 deletions(-)Documentation/x86/x86_64/boot-options.rst +1
-1@@ -230,7 +230,7 @@ IOMMU (input/output memory management unit) =========================================== Multiple x86-64 PCI-DMA mapping implementations exist, for example: - 1. <lib/dma-direct.c>: use no hardware/software IOMMU at all + 1. <kernel/dma/direct.c>: use no hardware/software IOMMU at all (e.g. because you have < 3 GB memory). Kernel boot message: "PCI-DMA: Disabling IOMMU"arch/ia64/kernel/setup.c +1
-1@@ -256,7 +256,7 @@ __initcall(register_memory);* This function checks if the reserved crashkernel is allowed on the specific * IA64 machine flavour. Machines without an IO TLB use swiotlb and require * some memory below 4 GB (i.e. in 32 bit area), see the implementation of -* lib/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that +* kernel/dma/swiotlb.c. The hpzx1 architecture has an IO TLB but cannot use that * in kdump case. See the comment in sba_init() in sba_iommu.c. * * So, the only machvec that really supports loading the kdump kernel arch/x86/kernel/pci-swiotlb.c +0
-1@@ -1,5 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -/* Glue code to lib/swiotlb.c */ #include <linux/pci.h> #include <linux/cache.h> arch/x86/kernel/setup.c +1
-1@@ -477,7 +477,7 @@ static int __init reserve_crashkernel_low(void) ret =parse_crashkernel_low (boot_command_line, total_low_mem, &low_size, &base);if (ret) {/* -* two parts from lib/swiotlb.c: +* two parts from kernel/dma/swiotlb.c: * -swiotlb size: user-specified with swiotlb= or default. * * -swiotlb overflow buffer: now hardcoded to 32k. We round it arch/x86/pci/sta2x11-fixup.c +1
-3@@ -1,8 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* arch/x86/pci/sta2x11-fixup.c -* glue code for lib/swiotlb.c and DMA translation between STA2x11 -* AMBA memory mapping and the X86 memory mapping +* DMA translation between STA2x11 AMBA memory mapping and the x86 memory mapping * * ST Microelectronics ConneXt (STA2X11/STA2X10) * Signature · 1 line
2.20.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Andy Shevchenko
After the commit
cf65a0f6f6ff("dma-mapping: move all DMA mapping code to kernel/dma")
Quoted 8 lines
Quoted 6 lines
some of the files are referring to outdated information, i.e. old file names of DMA mapping sources.
Fix it here.
Note, the lines with "Glue code for..." have been removed completely.
Any comment on this?
Fine with me, and I also agree with the glue code comment.
Quoted 9 lines · Christoph Hellwig
Quoted 8 lines · Andy Shevchenko
Quoted 7 lines · Andy Shevchenko
After the commit
cf65a0f6f6ff("dma-mapping: move all DMA mapping code to kernel/dma")
some of the files are referring to outdated information, i.e. old file names of DMA mapping sources.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Fix it here.
Note, the lines with "Glue code for..." have been removed completely.
Any comment on this?
Fine with me, and I also agree with the glue code comment.
Are you going to apply this?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Christoph Hellwig
AppliedQuoted 5 lines · Andy Shevchenko
Quoted 3 lines
Quoted 1 line
Any comment on this?
Fine with me, and I also agree with the glue code comment.
Are you going to apply this?
Thanks, applied to the dma-mapping tree for 5.4.