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

Commit 3a18404c authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Propagate errors from amd_iommu_init_api 



This function can fail. Propagate any errors back to the
initialization state machine.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 2870b0a4

drivers/iommu/amd_iommu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2840,9 +2840,9 @@ static struct dma_map_ops amd_iommu_dma_ops = { 
	.dma_supported = amd_iommu_dma_supported,

	.dma_supported = amd_iommu_dma_supported,

};

};





void __init amd_iommu_init_api(void)

int __init amd_iommu_init_api(void)

{

{

	bus_set_iommu(&pci_bus_type, &amd_iommu_ops);

	return bus_set_iommu(&pci_bus_type, &amd_iommu_ops);

}

}





int __init amd_iommu_init_dma_ops(void)

int __init amd_iommu_init_dma_ops(void)

drivers/iommu/amd_iommu_init.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1391,8 +1391,9 @@ static int __init amd_iommu_init_pci(void) 
	for_each_iommu(iommu)

	for_each_iommu(iommu)

		iommu_flush_all_caches(iommu);

		iommu_flush_all_caches(iommu);





	amd_iommu_init_api();

	ret = amd_iommu_init_api();





	if (!ret)

		print_iommu_info();

		print_iommu_info();





	return ret;

	return ret;

drivers/iommu/amd_iommu_proto.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu); 
extern int amd_iommu_init_devices(void);

extern int amd_iommu_init_devices(void);

extern void amd_iommu_uninit_devices(void);

extern void amd_iommu_uninit_devices(void);

extern void amd_iommu_init_notifier(void);

extern void amd_iommu_init_notifier(void);

extern void amd_iommu_init_api(void);

extern int amd_iommu_init_api(void);





/* Needed for interrupt remapping */

/* Needed for interrupt remapping */

extern int amd_iommu_prepare(void);

extern int amd_iommu_prepare(void);