Skip to contentSkip to conversation

iommu: Two minor cleanups for v5.16

PATCH In review Joerg Roedel 2 participants 4 messages Nov 23, 2021

Subsystems (4)
Stable branch x86 IOMMU AMD IOMMU (AMD-Vi)
lore
Share & tools
lore

Joerg Roedel

author maintainer
#0 lore raw

cover iommu: Two minor cleanups for v5.16

From: Joerg Roedel <[email protected]>

Hi,

here are two minor cleanups in the IOMMU code for v5.16. If there are no objections I will sent them upstream this week.

Regards,

Joerg

Joerg Roedel (2):
iommu/vt-d: Remove unused PASID_DISABLED iommu/amd: Clarify AMD IOMMUv2 initialization messages

 arch/x86/include/asm/fpu/api.h | 6 ------
 drivers/iommu/amd/iommu_v2.c   | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)
Signature · 1 line
2.33.1
author maintainer
#1 lore raw

PATCH 1/2 iommu/vt-d: Remove unused PASID_DISABLED

From: Joerg Roedel <[email protected]>

The macro is unused after commit 00ecd5401349a so it can be removed.

Reported-by Linus Torvalds <[email protected]>
Fixes 00ecd5401349a ("iommu/vt-d: Clean up unused PASID updating functions")
Signed-off-by Joerg Roedel <[email protected]>
---
 arch/x86/include/asm/fpu/api.h | 6 ------
 1 file changed, 6 deletions(-)
arch/x86/include/asm/fpu/api.h +0 -6
index 6053674f9132..c2767a6a387e 100644
@@ -102,12 +102,6 @@ extern void switch_fpu_return(void);
  */
 extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name);
 
-/*
- * Tasks that are not using SVA have mm->pasid set to zero to note that they
- * will not have the valid bit set in MSR_IA32_PASID while they are running.
- */
-#define PASID_DISABLED	0
-
 /* Trap handling */
 extern int  fpu__exception_code(struct fpu *fpu, int trap_nr);
 extern void fpu_sync_fpstate(struct fpu *fpu);
Signature · 1 line
2.33.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] iommu/vt-d: Remove unused PASID_DISABLED

Quoted 6 lines · Joerg Roedel

From: Joerg Roedel <[email protected]>

The macro is unused after commit 00ecd5401349a so it can be removed.

Reported-by Linus Torvalds <[email protected]>
Fixes 00ecd5401349a ("iommu/vt-d: Clean up unused PASID updating functions")
Reviewed-by Lu Baolu <[email protected]>

Best regards,
baolu

Quoted 23 lines
Signed-off-by Joerg Roedel <[email protected]>
---
  arch/x86/include/asm/fpu/api.h | 6 ------
  1 file changed, 6 deletions(-)
arch/x86/include/asm/fpu/api.h +0 -6
index 6053674f9132..c2767a6a387e 100644
@@ -102,12 +102,6 @@ extern void switch_fpu_return(void);
   */
  extern int cpu_has_xfeatures(u64 xfeatures_mask, const char **feature_name);
 
-/*
- * Tasks that are not using SVA have mm->pasid set to zero to note that they
- * will not have the valid bit set in MSR_IA32_PASID while they are running.
- */
-#define PASID_DISABLED	0
-
  /* Trap handling */
  extern int  fpu__exception_code(struct fpu *fpu, int trap_nr);
  extern void fpu_sync_fpstate(struct fpu *fpu);
author maintainer
#3 lore raw

PATCH 2/2 iommu/amd: Clarify AMD IOMMUv2 initialization messages

In reply to Joerg Roedel

From: Joerg Roedel <[email protected]>

The messages printed on the initialization of the AMD IOMMUv2 driver have caused some confusion in the past. Clarify the messages to lower the confusion in the future.

Cc [email protected]
Signed-off-by Joerg Roedel <[email protected]>
---
 drivers/iommu/amd/iommu_v2.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/amd/iommu_v2.c +3 -3
index 13cbeb997cc1..58da08cc3d01 100644
@@ -929,10 +929,8 @@ static int __init amd_iommu_v2_init(void)
 {
 	int ret;
 
-	pr_info("AMD IOMMUv2 driver by Joerg Roedel <[email protected]>\n");
-
 	if (!amd_iommu_v2_supported()) {
-		pr_info("AMD IOMMUv2 functionality not available on this system\n");
+		pr_info("AMD IOMMUv2 functionality not available on this system - This is not a bug.\n");
 		/*
 		 * Load anyway to provide the symbols to other modules
 		 * which may use AMD IOMMUv2 optionally.

@@ -947,6 +945,8 @@ static int __init amd_iommu_v2_init(void)
 
 	amd_iommu_register_ppr_notifier(&ppr_nb);
 
+	pr_info("AMD IOMMUv2 loaded and initialized\n");
+
 	return 0;
 
 out:
Signature · 6 lines
2.33.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu