Skip to content

Commit 9a295ff

Browse files
paulmenzeljoergroedel
authored andcommitted
iommu/amd: Print extended features in one line to fix divergent log levels
Currently, Linux logs the two messages below. [ 0.979142] pci 0000:00:00.2: AMD-Vi: Extended features (0xf77ef22294ada): [ 0.979546] PPR NX GT IA GA PC GA_vAPIC The log level of these lines differs though. The first one has level *info*, while the second has level *warn*, which is confusing. $ dmesg -T --level=info | grep "Extended features" [Tue Jun 16 21:46:58 2020] pci 0000:00:00.2: AMD-Vi: Extended features (0xf77ef22294ada): $ dmesg -T --level=warn | grep "PPR" [Tue Jun 16 21:46:58 2020] PPR NX GT IA GA PC GA_vAPIC The problem is, that commit 3928aa3 ("iommu/amd: Detect and enable guest vAPIC support") introduced a newline, causing `pr_cont()`, used to print the features, to default back to the default log level. /** * pr_cont - Continues a previous log message in the same line. * @fmt: format string * @...: arguments for the format string * * This macro expands to a printk with KERN_CONT loglevel. It should only be * used when continuing a log message with no newline ('\n') enclosed. Otherwise * it defaults back to KERN_DEFAULT loglevel. */ #define pr_cont(fmt, ...) \ printk(KERN_CONT fmt, ##__VA_ARGS__) So, remove the line break, so only one line is logged. Fixes: 3928aa3 ("iommu/amd: Detect and enable guest vAPIC support") Signed-off-by: Paul Menzel <[email protected]> Reviewed-by: Suravee Suthikulpanit <[email protected]> Cc: Suravee Suthikulpanit <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 9ebcfad commit 9a295ff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/iommu/amd/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ static void print_iommu_info(void)
18421842
pci_info(pdev, "Found IOMMU cap 0x%hx\n", iommu->cap_ptr);
18431843

18441844
if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
1845-
pci_info(pdev, "Extended features (%#llx):\n",
1845+
pci_info(pdev, "Extended features (%#llx):",
18461846
iommu->features);
18471847
for (i = 0; i < ARRAY_SIZE(feat_str); ++i) {
18481848
if (iommu_feature(iommu, (1ULL << i)))

0 commit comments

Comments
 (0)