[git pull] iommu: Move Intel and AMD drivers to a subdirectory

[git pull] iommu: Move Intel and AMD drivers to a subdirectory

[Joerg Roedel]

[-- Attachment #1: Type: text/plain, Size: 3639 bytes --]

Hi Linus,

I am not sure it is the right time to send this. The patches below have
not been part of the IOMMU updates for v5.8, in the AMD case because it
made the merge conflicts even worse, and in the Intel case because it
was not done yet.

It would be good to have both drivers moved in v5.8-rc1, mostly because
it avoids conflicts between fixes and v5.9 updates later in the cycle.
But it is also no problem to defer these changes, I can put them again
into the IOMMU tree and the end of the v5.8 cycle when you feel this
should have been ready earlier. With that said:

The following changes since commit 431275afdc7155415254aef4bd3816a1b8a2ead0:

  iommu: Check for deferred attach in iommu_group_do_dma_attach() (2020-06-04 11:38:17 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-drivers-move-v5.8

for you to fetch changes up to 672cf6df9b8a3a6d70a6a5c30397f76fa40d3178:

  iommu/vt-d: Move Intel IOMMU driver into subdirectory (2020-06-10 17:46:43 +0200)

----------------------------------------------------------------
IOMMU drivers directory structure cleanup:

	- Move the Intel and AMD IOMMU drivers into their own
	  subdirectory. Both drivers consist of several files by now and
	  giving them their own directory unclutters the IOMMU top-level
	  directory a bit.

----------------------------------------------------------------
Joerg Roedel (2):
      iommu/amd: Move AMD IOMMU driver into subdirectory
      iommu/vt-d: Move Intel IOMMU driver into subdirectory

 MAINTAINERS                                            |  5 ++---
 drivers/iommu/Makefile                                 | 18 +++++++++---------
 drivers/iommu/{ => amd}/amd_iommu.h                    |  0
 drivers/iommu/{ => amd}/amd_iommu_types.h              |  0
 drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c}   |  0
 drivers/iommu/{amd_iommu_init.c => amd/init.c}         |  2 +-
 drivers/iommu/{amd_iommu.c => amd/iommu.c}             |  2 +-
 drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c}       |  0
 drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c}     |  0
 .../iommu/{intel-iommu-debugfs.c => intel/debugfs.c}   |  0
 drivers/iommu/{ => intel}/dmar.c                       |  2 +-
 drivers/iommu/{ => intel}/intel-pasid.h                |  0
 drivers/iommu/{intel-iommu.c => intel/iommu.c}         |  2 +-
 .../{intel_irq_remapping.c => intel/irq_remapping.c}   |  2 +-
 drivers/iommu/{intel-pasid.c => intel/pasid.c}         |  0
 drivers/iommu/{intel-svm.c => intel/svm.c}             |  0
 drivers/iommu/{intel-trace.c => intel/trace.c}         |  0
 17 files changed, 16 insertions(+), 17 deletions(-)
 rename drivers/iommu/{ => amd}/amd_iommu.h (100%)
 rename drivers/iommu/{ => amd}/amd_iommu_types.h (100%)
 rename drivers/iommu/{amd_iommu_debugfs.c => amd/debugfs.c} (100%)
 rename drivers/iommu/{amd_iommu_init.c => amd/init.c} (99%)
 rename drivers/iommu/{amd_iommu.c => amd/iommu.c} (99%)
 rename drivers/iommu/{amd_iommu_v2.c => amd/iommu_v2.c} (100%)
 rename drivers/iommu/{amd_iommu_quirks.c => amd/quirks.c} (100%)
 rename drivers/iommu/{intel-iommu-debugfs.c => intel/debugfs.c} (100%)
 rename drivers/iommu/{ => intel}/dmar.c (99%)
 rename drivers/iommu/{ => intel}/intel-pasid.h (100%)
 rename drivers/iommu/{intel-iommu.c => intel/iommu.c} (99%)
 rename drivers/iommu/{intel_irq_remapping.c => intel/irq_remapping.c} (99%)
 rename drivers/iommu/{intel-pasid.c => intel/pasid.c} (100%)
 rename drivers/iommu/{intel-svm.c => intel/svm.c} (100%)
 rename drivers/iommu/{intel-trace.c => intel/trace.c} (100%)

Please pull.

Thanks,

	Joerg

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [git pull] iommu: Move Intel and AMD drivers to a subdirectory

[Linus Torvalds]

On Fri, Jun 12, 2020 at 8:22 AM Joerg Roedel <joro@8bytes.org> wrote:
>
> I am not sure it is the right time to send this.

Looks good to me. Any time a directory starts to have a lot of
filenames with a particular prefix, moving them deeper like this seems
to make sense. And doing it just before the -rc1 release and avoiding
unnecessary conflicts seems like the right time too.

So pulled.

Looking at it, it might even be worth moving the Kconfig and Makefile
details down to the intel/amd subdirectories, and have them be
included from the main iommu ones? But that's up to you.

Thanks,

            Linus

Re: [git pull] iommu: Move Intel and AMD drivers to a subdirectory

[Joerg Roedel]

On Fri, Jun 12, 2020 at 12:23:49PM -0700, Linus Torvalds wrote:
> Looks good to me. Any time a directory starts to have a lot of
> filenames with a particular prefix, moving them deeper like this seems
> to make sense. And doing it just before the -rc1 release and avoiding
> unnecessary conflicts seems like the right time too.
> 
> So pulled.

Thanks!

> Looking at it, it might even be worth moving the Kconfig and Makefile
> details down to the intel/amd subdirectories, and have them be
> included from the main iommu ones? But that's up to you.

Yeah, right. Its cleaner to move the Kconfig and Makefile stuff a level
deeper too, I'll take care of that for v5.9.


	Joerg

Re: [git pull] iommu: Move Intel and AMD drivers to a subdirectory

[pr-tracker-bot]

The pull request you sent on Fri, 12 Jun 2020 17:22:10 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git tags/iommu-drivers-move-v5.8

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8f02f363f76f99f08117336cfac7f24c76b25be3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker