drivers: parisc: Update sba_iommu driver with proper printks
PATCH 1/1 drivers: parisc: Update sba_iommu driver with proper printks
The code from the old SBA IOMMU manager is outdated when it comes to printks. Fix applying proper indentation and using dev_dbg() instead of printk on debugging blocks. Also add a KERN_<LEVEL> where it is missing.
--- drivers/parisc/sba_iommu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/parisc/sba_iommu.c +7 -6
@@ -16,6 +16,7 @@** FIXME: add DMA hint support programming in both sba and lba modules. */ +#include <linux/dev_printk.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/spinlock.h>
@@ -65,26 +66,26 @@#undef DEBUG_DMB_TRAP#ifdef DEBUG_SBA_INIT -#define DBG_INIT(x...) printk(x) +#define DBG_INIT(x...) dev_dbg(x)#else #define DBG_INIT(x...)#endif #ifdef DEBUG_SBA_RUN -#define DBG_RUN(x...) printk(x) +#define DBG_RUN(x...) dev_dbg(x)#else #define DBG_RUN(x...)#endif #ifdef DEBUG_SBA_RUN_SG -#define DBG_RUN_SG(x...) printk(x) +#define DBG_RUN_SG(x...) dev_dbg(x)#else #define DBG_RUN_SG(x...)#endif #ifdef DEBUG_SBA_RESOURCE -#define DBG_RES(x...) printk(x) +#define DBG_RES(x...) dev_dbg(x)#else #define DBG_RES(x...)#endif
@@ -1276,7 +1277,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) iova_space_size = ~(READ_REG (ioc->ioc_hpa +IOC_IMASK ) &0xFFFFFFFFUL ) +1 ;if ((ioc->ibase <0xfed00000UL ) && ((ioc->ibase + iova_space_size) >0xfee00000UL )) { -printk ("WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); +printk (KERN_WARNING "WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); iova_space_size /=2 ; }
@@ -1550,7 +1551,7 @@ static void sba_hw_init(struct sba_device *sba_dev)#if 0 -printk ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa, +dev_dbg ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa,PAGE0 ->mem_boot.spa,PAGE0 ->mem_boot.pad,PAGE0 ->mem_boot.cl_class);/*
Signature · 1 line
2.25.1
PATCH 1/1 drivers: parisc: Update sba_iommu driver with proper printks
The code from the old SBA IOMMU manager is outdated when it comes to printks. Fix applying proper indentation and using pr_debug() instead of printk on debugging blocks. Also add a KERN_<LEVEL> where it is missing.
---
Changelog: Replace dev_dbg() for pr_debug()
---
From 2b7df19bca628a1c7dd5bbb92dda1b3c26cd9757 Mon Sep 17 00:00:00 2001
From: Carlos Bilbao <[email protected]>
Date: Fri, 9 Jul 2021 13:18:53 -0400
Subject: [PATCH] sba_iommu
--- drivers/parisc/sba_iommu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/parisc/sba_iommu.c +7 -6
@@ -25,6 +25,7 @@#include <linux/mm.h> #include <linux/string.h> #include <linux/pci.h> +#include <linux/printk.h> #include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/iommu-helper.h>
@@ -65,26 +66,26 @@#undef DEBUG_DMB_TRAP#ifdef DEBUG_SBA_INIT -#define DBG_INIT(x...) printk(x) +#define DBG_INIT(x...) pr_debug(x)#else #define DBG_INIT(x...)#endif #ifdef DEBUG_SBA_RUN -#define DBG_RUN(x...) printk(x) +#define DBG_RUN(x...) pr_debug(x)#else #define DBG_RUN(x...)#endif #ifdef DEBUG_SBA_RUN_SG -#define DBG_RUN_SG(x...) printk(x) +#define DBG_RUN_SG(x...) pr_debug(x)#else #define DBG_RUN_SG(x...)#endif #ifdef DEBUG_SBA_RESOURCE -#define DBG_RES(x...) printk(x) +#define DBG_RES(x...) pr_debug(x)#else #define DBG_RES(x...)#endif
@@ -1276,7 +1277,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) iova_space_size = ~(READ_REG (ioc->ioc_hpa +IOC_IMASK ) &0xFFFFFFFFUL ) +1 ;if ((ioc->ibase <0xfed00000UL ) && ((ioc->ibase + iova_space_size) >0xfee00000UL )) { -printk ("WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); +printk (KERN_WARNING "WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); iova_space_size /=2 ; }
@@ -1550,7 +1551,7 @@ static void sba_hw_init(struct sba_device *sba_dev)#if 0 -printk ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa, +dev_dbg ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa,PAGE0 ->mem_boot.spa,PAGE0 ->mem_boot.pad,PAGE0 ->mem_boot.cl_class);/*
Signature · 1 line
2.25.1
PATCH 1/1 drivers: parisc: Update sba_iommu driver with proper printks
The code from the old SBA IOMMU manager is outdated when it comes to printks. Fix applying proper indentation and using pr_debug() instead of printk on debugging blocks. Also add a KERN_<LEVEL> where it is missing.
---
Changelog: Replace dev_dbg() for pr_debug()
--- drivers/parisc/sba_iommu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/parisc/sba_iommu.c +7 -6
@@ -25,6 +25,7 @@#include <linux/mm.h> #include <linux/string.h> #include <linux/pci.h> +#include <linux/printk.h> #include <linux/dma-map-ops.h> #include <linux/scatterlist.h> #include <linux/iommu-helper.h>
@@ -65,26 +66,26 @@#undef DEBUG_DMB_TRAP#ifdef DEBUG_SBA_INIT -#define DBG_INIT(x...) printk(x) +#define DBG_INIT(x...) pr_debug(x)#else #define DBG_INIT(x...)#endif #ifdef DEBUG_SBA_RUN -#define DBG_RUN(x...) printk(x) +#define DBG_RUN(x...) pr_debug(x)#else #define DBG_RUN(x...)#endif #ifdef DEBUG_SBA_RUN_SG -#define DBG_RUN_SG(x...) printk(x) +#define DBG_RUN_SG(x...) pr_debug(x)#else #define DBG_RUN_SG(x...)#endif #ifdef DEBUG_SBA_RESOURCE -#define DBG_RES(x...) printk(x) +#define DBG_RES(x...) pr_debug(x)#else #define DBG_RES(x...)#endif
@@ -1276,7 +1277,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num) iova_space_size = ~(READ_REG (ioc->ioc_hpa +IOC_IMASK ) &0xFFFFFFFFUL ) +1 ;if ((ioc->ibase <0xfed00000UL ) && ((ioc->ibase + iova_space_size) >0xfee00000UL )) { -printk ("WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); +printk (KERN_WARNING "WARNING: IOV space overlaps local config and interrupt message, truncating\n" ); iova_space_size /=2 ; }
@@ -1550,7 +1551,7 @@ static void sba_hw_init(struct sba_device *sba_dev)#if 0 -printk ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa, +dev_dbg ("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n" ,PAGE0 ->mem_boot.hpa,PAGE0 ->mem_boot.spa,PAGE0 ->mem_boot.pad,PAGE0 ->mem_boot.cl_class);/*
Signature · 1 line
2.25.1