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

Commit 0906372e authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86, AMD IOMMU: replace self made size parsing with memparse call 



This patch replaces the self-made parsing of the amd_iommu_size option with the
generic memparse function call.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: robert.richter@amd.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5dc8bff0

arch/x86/kernel/amd_iommu_init.c

+4 −14
Original line number Diff line number Diff line
@@ -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;

}