Skip to content

Commit

Permalink
x86, AMD IOMMU: replace self made size parsing with memparse call
Browse files Browse the repository at this point in the history
This patch replaces the self-made parsing of the amd_iommu_size option with the
generic memparse function call.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: robert.richter@amd.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Joerg Roedel authored and Ingo Molnar committed Jul 11, 2008
1 parent 5dc8bff commit 0906372
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions arch/x86/kernel/amd_iommu_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1042,20 +1042,10 @@ static int __init parse_amd_iommu_options(char *str)

static int __init parse_amd_iommu_size_options(char *str)
{
for (; *str; ++str) {
if (strcmp(str, "32M") == 0)
amd_iommu_aperture_order = 25;
if (strcmp(str, "64M") == 0)
amd_iommu_aperture_order = 26;
if (strcmp(str, "128M") == 0)
amd_iommu_aperture_order = 27;
if (strcmp(str, "256M") == 0)
amd_iommu_aperture_order = 28;
if (strcmp(str, "512M") == 0)
amd_iommu_aperture_order = 29;
if (strcmp(str, "1G") == 0)
amd_iommu_aperture_order = 30;
}
unsigned order = PAGE_SHIFT + get_order(memparse(str, &str));

if ((order > 24) && (order < 31))
amd_iommu_aperture_order = order;

return 1;
}
Expand Down

0 comments on commit 0906372

Please sign in to comment.