mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2017-06-16 16:09:56 +02:00
parent 90b3eb03e1
commit 1b1e942e34
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iommu/amd_iommu_init.c
View File

@ -237,6 +237,7 @@ enum iommu_init_state {
IOMMU_INITIALIZED, IOMMU_INITIALIZED,
IOMMU_NOT_FOUND, IOMMU_NOT_FOUND,
IOMMU_INIT_ERROR, IOMMU_INIT_ERROR,
IOMMU_CMDLINE_DISABLED,
}; };
/* Early ioapic and hpet maps from kernel command line */ /* Early ioapic and hpet maps from kernel command line */
@ -2452,6 +2453,7 @@ static int __init state_next(void)
break; break;
case IOMMU_NOT_FOUND: case IOMMU_NOT_FOUND:
case IOMMU_INIT_ERROR: case IOMMU_INIT_ERROR:
case IOMMU_CMDLINE_DISABLED:
/* Error states => do nothing */ /* Error states => do nothing */
ret = -EINVAL; ret = -EINVAL;
break; break;
@ -2469,8 +2471,9 @@ static int __init iommu_go_to_state(enum iommu_init_state state)
while (init_state != state) { while (init_state != state) {
ret = state_next(); ret = state_next();
if (init_state == IOMMU_NOT_FOUND || if (init_state == IOMMU_NOT_FOUND ||
init_state == IOMMU_INIT_ERROR) init_state == IOMMU_INIT_ERROR ||
init_state == IOMMU_CMDLINE_DISABLED)
break; break;
} }