[PATCH 1/3] iommu/amd: Adding amd_iommu_log cmdline option

From: suravee.suthikulpanit
Date: Wed May 22 2013 - 15:16:45 EST


From: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>

Adding amd_iommu_log command line option to allow "default", "verbose" and "debug"
IOMMU error logging level in kernel log.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>
---
Documentation/kernel-parameters.txt | 10 ++++++++++
drivers/iommu/amd_iommu_init.c | 17 +++++++++++++++++
drivers/iommu/amd_iommu_types.h | 6 ++++++
3 files changed, 33 insertions(+)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c3bfacb..752f0f9 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -350,6 +350,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
driver will print ACPI tables for AMD IOMMU during
IOMMU initialization.

+ amd_iommu_log= [HW,X86-64]
+ Specify parametes to choose the logging level. By default
+ the AMD IOMMU minimizes the logging detail, filters
+ duplicate log entries and suppress logging when encounters
+ storm of interrupts from a particular device.
+ Available options are:
+ default - Default log level.
+ verbose - Output detail log messages.
+ debug - Output detail log messages and no filter/suppress.
+
amijoy.map= [HW,JOY] Amiga joystick support
Map of devices attached to JOY0DAT and JOY1DAT
Format: <a>,<b>
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index bf51abb..66e3722 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -157,6 +157,8 @@ bool amd_iommu_v2_present __read_mostly;

bool amd_iommu_force_isolation __read_mostly;

+int amd_iommu_log_level __read_mostly = AMD_IOMMU_LOG_DEFAULT;
+
/*
* List of protection domains - used during resume
*/
@@ -2157,6 +2159,20 @@ static int __init parse_amd_iommu_options(char *str)
return 1;
}

+static int __init parse_amd_iommu_log(char *str)
+{
+ for (; *str; ++str) {
+ if (strncmp(str, "default", 7) == 0)
+ amd_iommu_log_level = AMD_IOMMU_LOG_DEFAULT;
+ else if (strncmp(str, "verbose", 7) == 0)
+ amd_iommu_log_level = AMD_IOMMU_LOG_VERBOSE;
+ else if (strncmp(str, "debug", 5) == 0)
+ amd_iommu_log_level = AMD_IOMMU_LOG_DEBUG;
+ }
+
+ return 1;
+}
+
static int __init parse_ivrs_ioapic(char *str)
{
unsigned int bus, dev, fn;
@@ -2219,6 +2235,7 @@ static int __init parse_ivrs_hpet(char *str)

__setup("amd_iommu_dump", parse_amd_iommu_dump);
__setup("amd_iommu=", parse_amd_iommu_options);
+__setup("amd_iommu_log=", parse_amd_iommu_log);
__setup("ivrs_ioapic", parse_ivrs_ioapic);
__setup("ivrs_hpet", parse_ivrs_hpet);

diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 0285a21..85b7a65 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -694,6 +694,12 @@ extern bool amd_iommu_v2_present;

extern bool amd_iommu_force_isolation;

+#define AMD_IOMMU_LOG_DEFAULT 0
+#define AMD_IOMMU_LOG_VERBOSE 1
+#define AMD_IOMMU_LOG_DEBUG 2
+
+extern int amd_iommu_log_level;
+
/* Max levels of glxval supported */
extern int amd_iommu_max_glx_val;

--
1.7.10.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/