Re: [PATCH 07/32] x86: Use pr_warn instead of pr_warning

2019-09-25 Thread Kefeng Wang 


On 2019/9/20 23:28, Joe Perches wrote:
> On Fri, 2019-09-20 at 19:57 +0800, Kefeng Wang wrote:
>> On 2019/9/20 17:28, Robert Richter wrote:
>>> On 20.09.19 14:25:19, Kefeng Wang wrote:
 As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
 pr_warning"), removing pr_warning so all logging messages use a
 consistent _warn style. Let's do it.
> []
 diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
> []
 @@ -665,7 +664,7 @@ static __init int init_amd_gatt(struct agp_kern_info 
 *info)
  
   nommu:
/* Should not happen anymore */
 -  pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
 +  pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
   "falling back to iommu=soft.\n");
>>> This indentation should be fixed too, while at it.
>> Will update later, thanks.
> trivia:
>
> likely better as a single line output:
>
>   pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU - falling back to 
> iommu=soft\n");

ok, will resend all patches after rc1 with this change and other comment fixes, 
thanks.

>
>
>
> .
>

Re: [PATCH 07/32] x86: Use pr_warn instead of pr_warning

2019-09-20 Thread Joe Perches 
On Fri, 2019-09-20 at 19:57 +0800, Kefeng Wang wrote:
> On 2019/9/20 17:28, Robert Richter wrote:
> > On 20.09.19 14:25:19, Kefeng Wang wrote:
> > > As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
> > > pr_warning"), removing pr_warning so all logging messages use a
> > > consistent _warn style. Let's do it.
[]
> > > diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
[]
> > > @@ -665,7 +664,7 @@ static __init int init_amd_gatt(struct agp_kern_info 
> > > *info)
> > >  
> > >   nommu:
> > >   /* Should not happen anymore */
> > > - pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
> > > + pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
> > >  "falling back to iommu=soft.\n");
> > This indentation should be fixed too, while at it.
> Will update later, thanks.

trivia:

likely better as a single line output:

pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU - falling back to 
iommu=soft\n");

Re: [PATCH 07/32] x86: Use pr_warn instead of pr_warning

2019-09-20 Thread Kefeng Wang 


On 2019/9/20 17:28, Robert Richter wrote:
> On 20.09.19 14:25:19, Kefeng Wang wrote:
>> As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
>> pr_warning"), removing pr_warning so all logging messages use a
>> consistent _warn style. Let's do it.
>>
>> Cc: Ingo Molnar 
>> Cc: Borislav Petkov 
>> Cc: "H. Peter Anvin" 
>> Cc: Robert Richter 
>> Cc: Darren Hart 
>> Cc: Andy Shevchenko 
>> Signed-off-by: Kefeng Wang 
>> ---
>>  arch/x86/kernel/amd_gart_64.c  | 11 ---
>>  arch/x86/kernel/apic/apic.c| 41 --
>>  arch/x86/kernel/setup_percpu.c |  4 +--
>>  arch/x86/kernel/tboot.c| 15 +-
>>  arch/x86/kernel/tsc_sync.c |  8 ++---
>>  arch/x86/kernel/umip.c |  6 ++--
>>  arch/x86/mm/kmmio.c|  7 ++---
>>  arch/x86/mm/mmio-mod.c |  6 ++--
>>  arch/x86/mm/numa_emulation.c   |  4 +--
>>  arch/x86/mm/testmmiotrace.c|  6 ++--
>>  arch/x86/oprofile/op_x86_model.h   |  6 ++--
> For oprofile:
>
> Acked-by: Robert Richter 
>
> But see below:
>
>>  arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
>>  arch/x86/platform/sfi/sfi.c|  3 +-
>>  arch/x86/xen/setup.c   |  2 +-
>>  14 files changed, 57 insertions(+), 64 deletions(-)
>>
>> diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
>> index a585ea6f686a..53545c9c7cad 100644
>> --- a/arch/x86/kernel/amd_gart_64.c
>> +++ b/arch/x86/kernel/amd_gart_64.c
>> @@ -665,7 +664,7 @@ static __init int init_amd_gatt(struct agp_kern_info 
>> *info)
>>  
>>   nommu:
>>  /* Should not happen anymore */
>> -pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
>> +pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
>> "falling back to iommu=soft.\n");
> This indentation should be fixed too, while at it.
Will update later, thanks.
>
>>  return -1;
>>  }
> -Robert
>
> .
>

Re: [PATCH 07/32] x86: Use pr_warn instead of pr_warning

2019-09-20 Thread Robert Richter 
On 20.09.19 14:25:19, Kefeng Wang wrote:
> As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
> pr_warning"), removing pr_warning so all logging messages use a
> consistent _warn style. Let's do it.
> 
> Cc: Ingo Molnar 
> Cc: Borislav Petkov 
> Cc: "H. Peter Anvin" 
> Cc: Robert Richter 
> Cc: Darren Hart 
> Cc: Andy Shevchenko 
> Signed-off-by: Kefeng Wang 
> ---
>  arch/x86/kernel/amd_gart_64.c  | 11 ---
>  arch/x86/kernel/apic/apic.c| 41 --
>  arch/x86/kernel/setup_percpu.c |  4 +--
>  arch/x86/kernel/tboot.c| 15 +-
>  arch/x86/kernel/tsc_sync.c |  8 ++---
>  arch/x86/kernel/umip.c |  6 ++--
>  arch/x86/mm/kmmio.c|  7 ++---
>  arch/x86/mm/mmio-mod.c |  6 ++--
>  arch/x86/mm/numa_emulation.c   |  4 +--
>  arch/x86/mm/testmmiotrace.c|  6 ++--
>  arch/x86/oprofile/op_x86_model.h   |  6 ++--

For oprofile:

Acked-by: Robert Richter 

But see below:

>  arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
>  arch/x86/platform/sfi/sfi.c|  3 +-
>  arch/x86/xen/setup.c   |  2 +-
>  14 files changed, 57 insertions(+), 64 deletions(-)
> 
> diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
> index a585ea6f686a..53545c9c7cad 100644
> --- a/arch/x86/kernel/amd_gart_64.c
> +++ b/arch/x86/kernel/amd_gart_64.c

> @@ -665,7 +664,7 @@ static __init int init_amd_gatt(struct agp_kern_info 
> *info)
>  
>   nommu:
>   /* Should not happen anymore */
> - pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
> + pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
>  "falling back to iommu=soft.\n");

This indentation should be fixed too, while at it.

>   return -1;
>  }

-Robert

[PATCH 07/32] x86: Use pr_warn instead of pr_warning

2019-09-19 Thread Kefeng Wang 
As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent _warn style. Let's do it.

Cc: Ingo Molnar 
Cc: Borislav Petkov 
Cc: "H. Peter Anvin" 
Cc: Robert Richter 
Cc: Darren Hart 
Cc: Andy Shevchenko 
Signed-off-by: Kefeng Wang 
---
 arch/x86/kernel/amd_gart_64.c  | 11 ---
 arch/x86/kernel/apic/apic.c| 41 --
 arch/x86/kernel/setup_percpu.c |  4 +--
 arch/x86/kernel/tboot.c| 15 +-
 arch/x86/kernel/tsc_sync.c |  8 ++---
 arch/x86/kernel/umip.c |  6 ++--
 arch/x86/mm/kmmio.c|  7 ++---
 arch/x86/mm/mmio-mod.c |  6 ++--
 arch/x86/mm/numa_emulation.c   |  4 +--
 arch/x86/mm/testmmiotrace.c|  6 ++--
 arch/x86/oprofile/op_x86_model.h   |  6 ++--
 arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
 arch/x86/platform/sfi/sfi.c|  3 +-
 arch/x86/xen/setup.c   |  2 +-
 14 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index a585ea6f686a..53545c9c7cad 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -510,10 +510,9 @@ static __init unsigned long check_iommu_size(unsigned long 
aper, u64 aper_size)
iommu_size -= round_up(a, PMD_PAGE_SIZE) - a;
 
if (iommu_size < 64*1024*1024) {
-   pr_warning(
-   "PCI-DMA: Warning: Small IOMMU %luMB."
+   pr_warn("PCI-DMA: Warning: Small IOMMU %luMB."
" Consider increasing the AGP aperture in BIOS\n",
-   iommu_size >> 20);
+   iommu_size >> 20);
}
 
return iommu_size;
@@ -665,7 +664,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info)
 
  nommu:
/* Should not happen anymore */
-   pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
+   pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
   "falling back to iommu=soft.\n");
return -1;
 }
@@ -730,8 +729,8 @@ int __init gart_iommu_init(void)
!gart_iommu_aperture ||
(no_agp && init_amd_gatt(&info) < 0)) {
if (max_pfn > MAX_DMA32_PFN) {
-   pr_warning("More than 4GB of memory but GART IOMMU not 
available.\n");
-   pr_warning("falling back to iommu=soft.\n");
+   pr_warn("More than 4GB of memory but GART IOMMU not 
available.\n");
+   pr_warn("falling back to iommu=soft.\n");
}
return 0;
}
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 9e2dd2b296cd..3570864b8329 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -780,8 +780,8 @@ calibrate_by_pmtimer(long deltapm, long *delta, long 
*deltatsc)
 
res = (((u64)deltapm) *  mult) >> 22;
do_div(res, 100);
-   pr_warning("APIC calibration not consistent "
-  "with PM-Timer: %ldms instead of 100ms\n",(long)res);
+   pr_warn("APIC calibration not consistent "
+   "with PM-Timer: %ldms instead of 100ms\n", (long)res);
 
/* Correct the lapic counter value */
res = (((u64)(*delta)) * pm_100ms);
@@ -977,7 +977,7 @@ static int __init calibrate_APIC_clock(void)
 */
if (lapic_timer_period < (100 / HZ)) {
local_irq_enable();
-   pr_warning("APIC frequency too slow, disabling apic timer\n");
+   pr_warn("APIC frequency too slow, disabling apic timer\n");
return -1;
}
 
@@ -1021,7 +1021,7 @@ static int __init calibrate_APIC_clock(void)
local_irq_enable();
 
if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
-   pr_warning("APIC timer disabled due to verification failure\n");
+   pr_warn("APIC timer disabled due to verification failure\n");
return -1;
}
 
@@ -1095,8 +1095,8 @@ static void local_apic_timer_interrupt(void)
 * spurious.
 */
if (!evt->event_handler) {
-   pr_warning("Spurious LAPIC timer interrupt on cpu %d\n",
-  smp_processor_id());
+   pr_warn("Spurious LAPIC timer interrupt on cpu %d\n",
+   smp_processor_id());
/* Switch it off */
lapic_timer_shutdown(evt);
return;
@@ -1809,11 +1809,11 @@ static int __init setup_nox2apic(char *str)
int apicid = native_apic_msr_read(APIC_ID);
 
if (apicid >= 255) {
-   pr_warning("Apicid: %08x, cannot enforce nox2apic\n",
-  apicid);
+   pr_warn("Apicid: %08x, cannot enforce nox2apic\n",
+