Patch "iommu/amd: Fix extended features logging" has been added to the 5.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    iommu/amd: Fix extended features logging

to the 5.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iommu-amd-fix-extended-features-logging.patch
and it can be found in the queue-5.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3678066dbe7ddd8f941231d88ebeafce540309ea
Author: Alexander Monakov <amonakov@xxxxxxxxx>
Date:   Tue May 4 13:22:20 2021 +0300

    iommu/amd: Fix extended features logging
    
    [ Upstream commit 4b21a503adf597773e4b37db05db0e9b16a81d53 ]
    
    print_iommu_info prints the EFR register and then the decoded list of
    features on a separate line:
    
    pci 0000:00:00.2: AMD-Vi: Extended features (0x206d73ef22254ade):
     PPR X2APIC NX GT IA GA PC GA_vAPIC
    
    The second line is emitted via 'pr_cont', which causes it to have a
    different ('warn') loglevel compared to the previous line ('info').
    
    Commit 9a295ff0ffc9 attempted to rectify this by removing the newline
    from the pci_info format string, but this doesn't work, as pci_info
    calls implicitly append a newline anyway.
    
    Printing the decoded features on the same line would make it quite long.
    Instead, change pci_info() to pr_info() to omit PCI bus location info,
    which is also shown in the preceding message. This results in:
    
    pci 0000:00:00.2: AMD-Vi: Found IOMMU cap 0x40
    AMD-Vi: Extended features (0x206d73ef22254ade): PPR X2APIC NX GT IA GA PC GA_vAPIC
    AMD-Vi: Interrupt remapping enabled
    
    Fixes: 9a295ff0ffc9 ("iommu/amd: Print extended features in one line to fix divergent log levels")
    Link: https://lore.kernel.org/lkml/alpine.LNX.2.20.13.2104112326460.11104@xxxxxxxxxxxxxxxxxxxxxxx
    Signed-off-by: Alexander Monakov <amonakov@xxxxxxxxx>
    Cc: Paul Menzel <pmenzel@xxxxxxxxxxxxx>
    Cc: Joerg Roedel <jroedel@xxxxxxx>
    Cc: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>
    Cc: iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx
    Reviewed-by: Paul Menzel <pmenzel@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20210504102220.1793-1-amonakov@xxxxxxxxx
    Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index d006724f4dc2..1ded8a69c246 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1908,8 +1908,8 @@ static void print_iommu_info(void)
 		pci_info(pdev, "Found IOMMU cap 0x%x\n", iommu->cap_ptr);
 
 		if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
-			pci_info(pdev, "Extended features (%#llx):",
-				 iommu->features);
+			pr_info("Extended features (%#llx):", iommu->features);
+
 			for (i = 0; i < ARRAY_SIZE(feat_str); ++i) {
 				if (iommu_feature(iommu, (1ULL << i)))
 					pr_cont(" %s", feat_str[i]);