Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7cc9554 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86/amd-iommu: Fix passthrough mode 



The data structure changes to use dev->archdata.iommu field
broke the iommu=pt mode because in this case the
dev->archdata.iommu was left uninitialized. This moves the
inititalization of the devices into the main init function
and fixes the problem.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 4528752f

arch/x86/include/asm/amd_iommu_proto.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ extern void amd_iommu_flush_all_domains(void); 
extern void amd_iommu_flush_all_devices(void);

extern void amd_iommu_apply_erratum_63(u16 devid);

extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);



extern int amd_iommu_init_devices(void);

extern void amd_iommu_uninit_devices(void);

#ifndef CONFIG_AMD_IOMMU_STATS



static inline void amd_iommu_stats_init(void) { }

arch/x86/kernel/amd_iommu.c

+37 −2
Original line number Diff line number Diff line
@@ -166,6 +166,43 @@ static void iommu_uninit_device(struct device *dev) 
{

	kfree(dev->archdata.iommu);

}



void __init amd_iommu_uninit_devices(void)

{

	struct pci_dev *pdev = NULL;



	for_each_pci_dev(pdev) {



		if (!check_device(&pdev->dev))

			continue;



		iommu_uninit_device(&pdev->dev);

	}

}



int __init amd_iommu_init_devices(void)

{

	struct pci_dev *pdev = NULL;

	int ret = 0;



	for_each_pci_dev(pdev) {



		if (!check_device(&pdev->dev))

			continue;



		ret = iommu_init_device(&pdev->dev);

		if (ret)

			goto out_free;

	}



	return 0;



out_free:



	amd_iommu_uninit_devices();



	return ret;

}

#ifdef CONFIG_AMD_IOMMU_STATS



/*
@@ -2145,8 +2182,6 @@ static void prealloc_protection_domains(void) 
		if (!check_device(&dev->dev))

			continue;



		iommu_init_device(&dev->dev);



		/* Is there already any domain for it? */

		if (domain_for_device(&dev->dev))

			continue;

arch/x86/kernel/amd_iommu_init.c

+7 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void) 
	if (ret)

		goto free;



	ret = amd_iommu_init_devices();

	if (ret)

		goto free;



	if (iommu_pass_through)

		ret = amd_iommu_init_passthrough();

	else
@@ -1296,6 +1300,9 @@ static int __init amd_iommu_init(void) 
	return ret;



free:



	amd_iommu_uninit_devices();



	free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,

		   get_order(MAX_DOMAIN_ID/8));