[PATCH v2] dma-mapping: Fix filename references

[PATCH v2] dma-mapping: Fix filename references

[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.

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
- 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(-)

diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
index 6a4285a3c7a4..2b98efb5ba7f 100644
--- a/Documentation/x86/x86_64/boot-options.rst
+++ b/Documentation/x86/x86_64/boot-options.rst
@@ -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"
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c9cfa760cd57..ab8d25d3e358 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -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
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 5f5302028a9a..c2cfa5e7c152 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Glue code to lib/swiotlb.c */
 
 #include <linux/pci.h>
 #include <linux/cache.h>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 08a5f4a131f5..8655bf374893 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -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
diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
index 97bbc12dd6b2..6269a175385d 100644
--- a/arch/x86/pci/sta2x11-fixup.c
+++ b/arch/x86/pci/sta2x11-fixup.c
@@ -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)
  *
-- 
2.20.1

Re: [PATCH v2] dma-mapping: Fix filename references

[Andy Shevchenko]

On Wed, Jun 19, 2019 at 05:19:55PM +0300, Andy Shevchenko wrote:
> 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?

> 
> Cc: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> - 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(-)
> 
> diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
> index 6a4285a3c7a4..2b98efb5ba7f 100644
> --- a/Documentation/x86/x86_64/boot-options.rst
> +++ b/Documentation/x86/x86_64/boot-options.rst
> @@ -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"
>  
> diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
> index c9cfa760cd57..ab8d25d3e358 100644
> --- a/arch/ia64/kernel/setup.c
> +++ b/arch/ia64/kernel/setup.c
> @@ -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
> diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
> index 5f5302028a9a..c2cfa5e7c152 100644
> --- a/arch/x86/kernel/pci-swiotlb.c
> +++ b/arch/x86/kernel/pci-swiotlb.c
> @@ -1,5 +1,4 @@
>  // SPDX-License-Identifier: GPL-2.0
> -/* Glue code to lib/swiotlb.c */
>  
>  #include <linux/pci.h>
>  #include <linux/cache.h>
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 08a5f4a131f5..8655bf374893 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -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
> diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
> index 97bbc12dd6b2..6269a175385d 100644
> --- a/arch/x86/pci/sta2x11-fixup.c
> +++ b/arch/x86/pci/sta2x11-fixup.c
> @@ -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)
>   *
> -- 
> 2.20.1
> 

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2] dma-mapping: Fix filename references

[Christoph Hellwig]

On Tue, Aug 13, 2019 at 05:42:22PM +0300, Andy Shevchenko wrote:
> On Wed, Jun 19, 2019 at 05:19:55PM +0300, Andy Shevchenko wrote:
> > 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?

Fine with me, and I also agree with the glue code comment.

Re: [PATCH v2] dma-mapping: Fix filename references

[Andy Shevchenko]

On Tue, Aug 13, 2019 at 04:45:36PM +0200, Christoph Hellwig wrote:
> On Tue, Aug 13, 2019 at 05:42:22PM +0300, Andy Shevchenko wrote:
> > On Wed, Jun 19, 2019 at 05:19:55PM +0300, Andy Shevchenko wrote:
> > > 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?
> 
> Fine with me, and I also agree with the glue code comment.

Are you going to apply this?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2] dma-mapping: Fix filename references

[Christoph Hellwig]

On Mon, Sep 02, 2019 at 04:22:50PM +0300, Andy Shevchenko wrote:
> > > 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.