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

Commit 1b1e942e authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Add new init-state IOMMU_CMDLINE_DISABLED 



This will be used when during initialization we detect that
the iommu should be disabled.

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

drivers/iommu/amd_iommu_init.c

+5 −2
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ enum iommu_init_state { 
	IOMMU_INITIALIZED,

	IOMMU_NOT_FOUND,

	IOMMU_INIT_ERROR,

	IOMMU_CMDLINE_DISABLED,

};



/* Early ioapic and hpet maps from kernel command line */
@@ -2452,6 +2453,7 @@ static int __init state_next(void) 
		break;

	case IOMMU_NOT_FOUND:

	case IOMMU_INIT_ERROR:

	case IOMMU_CMDLINE_DISABLED:

		/* Error states => do nothing */

		ret = -EINVAL;

		break;
@@ -2470,7 +2472,8 @@ static int __init iommu_go_to_state(enum iommu_init_state state) 
	while (init_state != state) {

		ret = state_next();

		if (init_state == IOMMU_NOT_FOUND         ||

		    init_state == IOMMU_INIT_ERROR)

		    init_state == IOMMU_INIT_ERROR        ||

		    init_state == IOMMU_CMDLINE_DISABLED)

			break;

	}