Patch "iommu/vt-d: Do not falsely log intel_iommu is unsupported kernel option" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    iommu/vt-d: Do not falsely log intel_iommu is unsupported kernel option

to the 5.15-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-vt-d-do-not-falsely-log-intel_iommu-is-unsuppo.patch
and it can be found in the queue-5.15 subdirectory.

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



commit efce2b081658362d261ea4bc2b8440832b120d8d
Author: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Date:   Thu Oct 14 13:38:31 2021 +0800

    iommu/vt-d: Do not falsely log intel_iommu is unsupported kernel option
    
    [ Upstream commit 5240aed2cd2594fb392239f11b9681e5e1591619 ]
    
    Handling of intel_iommu kernel command line option should return "true" to
    indicate option is valid and so avoid logging it as unknown by the core
    parsing code.
    
    Also log unknown sub-options at the notice level to let user know of
    potential typos or similar.
    
    Reported-by: Eero Tamminen <eero.t.tamminen@xxxxxxxxx>
    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20210831112947.310080-1-tvrtko.ursulin@xxxxxxxxxxxxxxx
    Signed-off-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20211014053839.727419-2-baolu.lu@xxxxxxxxxxxxxxx
    Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index d75f59ae28e6e..9a356075d3450 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -412,6 +412,7 @@ static int __init intel_iommu_setup(char *str)
 {
 	if (!str)
 		return -EINVAL;
+
 	while (*str) {
 		if (!strncmp(str, "on", 2)) {
 			dmar_disabled = 0;
@@ -441,13 +442,16 @@ static int __init intel_iommu_setup(char *str)
 		} else if (!strncmp(str, "tboot_noforce", 13)) {
 			pr_info("Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n");
 			intel_iommu_tboot_noforce = 1;
+		} else {
+			pr_notice("Unknown option - '%s'\n", str);
 		}
 
 		str += strcspn(str, ",");
 		while (*str == ',')
 			str++;
 	}
-	return 0;
+
+	return 1;
 }
 __setup("intel_iommu=", intel_iommu_setup);