* [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
@ 2008-09-08 15:38 Cyrill Gorcunov
2008-09-12 19:55 ` Yinghai Lu
0 siblings, 1 reply; 6+ messages in thread
From: Cyrill Gorcunov @ 2008-09-08 15:38 UTC (permalink / raw)
To: Ingo Molnar; +Cc: LKML, Yinghai Lu, Maciej W. Rozycki
Do not use KERN_DEBUG several times on the same line being printed.
Introduced by mine previous patch, sorry.
Reported-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
Index: linux-2.6.git/arch/x86/kernel/io_apic.c
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/io_apic.c 2008-09-08 19:32:34.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/io_apic.c 2008-09-08 19:34:10.000000000 +0400
@@ -1526,11 +1526,16 @@ static void __init setup_IO_APIC_irqs(vo
idx = find_irq_entry(apic, pin, mp_INT);
if (idx == -1) {
- apic_printk(APIC_VERBOSE,
- KERN_DEBUG " %d-%d",
- mp_ioapics[apic].mp_apicid, pin);
- if (!notcon)
+ if (!notcon) {
notcon = 1;
+ apic_printk(APIC_VERBOSE,
+ KERN_DEBUG " %d-%d",
+ mp_ioapics[apic].mp_apicid,
+ pin);
+ } else
+ apic_printk(APIC_VERBOSE, " %d-%d",
+ mp_ioapics[apic].mp_apicid,
+ pin);
continue;
}
@@ -1546,14 +1551,14 @@ static void __init setup_IO_APIC_irqs(vo
}
if (notcon) {
apic_printk(APIC_VERBOSE,
- KERN_DEBUG " (apicid-pin) not connected\n");
+ " (apicid-pin) not connected\n");
notcon = 0;
}
}
if (notcon)
apic_printk(APIC_VERBOSE,
- KERN_DEBUG " (apicid-pin) not connected\n");
+ " (apicid-pin) not connected\n");
}
/*
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
2008-09-08 15:38 [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much Cyrill Gorcunov
@ 2008-09-12 19:55 ` Yinghai Lu
2008-09-12 19:57 ` Yinghai Lu
0 siblings, 1 reply; 6+ messages in thread
From: Yinghai Lu @ 2008-09-12 19:55 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: Ingo Molnar, LKML, Maciej W. Rozycki
On Mon, Sep 8, 2008 at 8:38 AM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> Do not use KERN_DEBUG several times on the same line being printed.
> Introduced by mine previous patch, sorry.
>
> Reported-by: Yinghai Lu <yhlu.kernel@gmail.com>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
>
> Index: linux-2.6.git/arch/x86/kernel/io_apic.c
> ===================================================================
> --- linux-2.6.git.orig/arch/x86/kernel/io_apic.c 2008-09-08 19:32:34.000000000 +0400
> +++ linux-2.6.git/arch/x86/kernel/io_apic.c 2008-09-08 19:34:10.000000000 +0400
> @@ -1526,11 +1526,16 @@ static void __init setup_IO_APIC_irqs(vo
>
> idx = find_irq_entry(apic, pin, mp_INT);
> if (idx == -1) {
> - apic_printk(APIC_VERBOSE,
> - KERN_DEBUG " %d-%d",
> - mp_ioapics[apic].mp_apicid, pin);
> - if (!notcon)
> + if (!notcon) {
> notcon = 1;
> + apic_printk(APIC_VERBOSE,
> + KERN_DEBUG " %d-%d",
> + mp_ioapics[apic].mp_apicid,
> + pin);
> + } else
> + apic_printk(APIC_VERBOSE, " %d-%d",
> + mp_ioapics[apic].mp_apicid,
> + pin);
> continue;
> }
>
> @@ -1546,14 +1551,14 @@ static void __init setup_IO_APIC_irqs(vo
> }
> if (notcon) {
> apic_printk(APIC_VERBOSE,
> - KERN_DEBUG " (apicid-pin) not connected\n");
> + " (apicid-pin) not connected\n");
> notcon = 0;
> }
> }
>
> if (notcon)
> apic_printk(APIC_VERBOSE,
> - KERN_DEBUG " (apicid-pin) not connected\n");
> + " (apicid-pin) not connected\n");
> }
>
> /*
>
still some wrong
init IO_APIC IRQs
8-0<7> 0 add_pin_to_irq: irq 1 --> apic 0 pin 1
IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0)
0 add_pin_to_irq: irq 0 --> apic 0 pin 2
IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0)
0 add_pin_to_irq: irq 3 --> apic 0 pin 3
IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0)
0 add_pin_to_irq: irq 4 --> apic 0 pin 4
IOAPIC[0]: Set routing entry (8-4 -> 0x34 -> IRQ 4 Mode:0 Active:0)
0 add_pin_to_irq: irq 5 --> apic 0 pin 5
IOAPIC[0]: Set routing entry (8-5 -> 0x35 -> IRQ 5 Mode:0 Active:0)
0 add_pin_to_irq: irq 6 --> apic 0 pin 6
IOAPIC[0]: Set routing entry (8-6 -> 0x36 -> IRQ 6 Mode:0 Active:0)
0 add_pin_to_irq: irq 7 --> apic 0 pin 7
IOAPIC[0]: Set routing entry (8-7 -> 0x37 -> IRQ 7 Mode:0 Active:0)
0 add_pin_to_irq: irq 8 --> apic 0 pin 8
IOAPIC[0]: Set routing entry (8-8 -> 0x38 -> IRQ 8 Mode:0 Active:0)
0 add_pin_to_irq: irq 9 --> apic 0 pin 9
IOAPIC[0]: Set routing entry (8-9 -> 0x39 -> IRQ 9 Mode:1 Active:0)
0 add_pin_to_irq: irq 10 --> apic 0 pin 10
IOAPIC[0]: Set routing entry (8-10 -> 0x3a -> IRQ 10 Mode:0 Active:0)
0 add_pin_to_irq: irq 11 --> apic 0 pin 11
IOAPIC[0]: Set routing entry (8-11 -> 0x3b -> IRQ 11 Mode:0 Active:0)
0 add_pin_to_irq: irq 12 --> apic 0 pin 12
IOAPIC[0]: Set routing entry (8-12 -> 0x3c -> IRQ 12 Mode:0 Active:0)
0 add_pin_to_irq: irq 13 --> apic 0 pin 13
IOAPIC[0]: Set routing entry (8-13 -> 0x3d -> IRQ 13 Mode:0 Active:0)
0 add_pin_to_irq: irq 14 --> apic 0 pin 14
IOAPIC[0]: Set routing entry (8-14 -> 0x3e -> IRQ 14 Mode:0 Active:0)
0 add_pin_to_irq: irq 15 --> apic 0 pin 15
IOAPIC[0]: Set routing entry (8-15 -> 0x3f -> IRQ 15 Mode:0 Active:0)
8-16 8-17 8-18 8-19 8-20 8-21 8-22 8-23 (apicid-pin) not connected
9-0 9-1 9-2 9-3 9-4 9-5 9-6 9-7 9-8 9-9 9-10 9-11 9-12 9-13 9-14 9-15
9-16 9-17 9-18 9-19 9-20 9-21 9-22 9-23 (apicid-pin) not connected
YH
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
2008-09-12 19:55 ` Yinghai Lu
@ 2008-09-12 19:57 ` Yinghai Lu
2008-09-12 20:18 ` Cyrill Gorcunov
2008-09-13 9:11 ` Cyrill Gorcunov
0 siblings, 2 replies; 6+ messages in thread
From: Yinghai Lu @ 2008-09-12 19:57 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: Ingo Molnar, LKML, Maciej W. Rozycki
On Fri, Sep 12, 2008 at 12:55 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> On Mon, Sep 8, 2008 at 8:38 AM, Cyrill Gorcunov <gorcunov@gmail.com> wrote:
>> Do not use KERN_DEBUG several times on the same line being printed.
>> Introduced by mine previous patch, sorry.
>>
>> Reported-by: Yinghai Lu <yhlu.kernel@gmail.com>
>> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
>> ---
>>
>> Index: linux-2.6.git/arch/x86/kernel/io_apic.c
>> ===================================================================
>> --- linux-2.6.git.orig/arch/x86/kernel/io_apic.c 2008-09-08 19:32:34.000000000 +0400
>> +++ linux-2.6.git/arch/x86/kernel/io_apic.c 2008-09-08 19:34:10.000000000 +0400
>> @@ -1526,11 +1526,16 @@ static void __init setup_IO_APIC_irqs(vo
>>
>> idx = find_irq_entry(apic, pin, mp_INT);
>> if (idx == -1) {
>> - apic_printk(APIC_VERBOSE,
>> - KERN_DEBUG " %d-%d",
>> - mp_ioapics[apic].mp_apicid, pin);
>> - if (!notcon)
>> + if (!notcon) {
>> notcon = 1;
>> + apic_printk(APIC_VERBOSE,
>> + KERN_DEBUG " %d-%d",
>> + mp_ioapics[apic].mp_apicid,
>> + pin);
>> + } else
>> + apic_printk(APIC_VERBOSE, " %d-%d",
>> + mp_ioapics[apic].mp_apicid,
>> + pin);
>> continue;
>> }
>>
>> @@ -1546,14 +1551,14 @@ static void __init setup_IO_APIC_irqs(vo
>> }
>> if (notcon) {
>> apic_printk(APIC_VERBOSE,
>> - KERN_DEBUG " (apicid-pin) not connected\n");
>> + " (apicid-pin) not connected\n");
>> notcon = 0;
>> }
>> }
>>
>> if (notcon)
>> apic_printk(APIC_VERBOSE,
>> - KERN_DEBUG " (apicid-pin) not connected\n");
>> + " (apicid-pin) not connected\n");
>> }
>>
>> /*
>>
>
> still some wrong
>
> init IO_APIC IRQs
> 8-0<7> 0 add_pin_to_irq: irq 1 --> apic 0 pin 1
> IOAPIC[0]: Set routing entry (8-1 -> 0x31 -> IRQ 1 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 0 --> apic 0 pin 2
> IOAPIC[0]: Set routing entry (8-2 -> 0x30 -> IRQ 0 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 3 --> apic 0 pin 3
> IOAPIC[0]: Set routing entry (8-3 -> 0x33 -> IRQ 3 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 4 --> apic 0 pin 4
> IOAPIC[0]: Set routing entry (8-4 -> 0x34 -> IRQ 4 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 5 --> apic 0 pin 5
> IOAPIC[0]: Set routing entry (8-5 -> 0x35 -> IRQ 5 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 6 --> apic 0 pin 6
> IOAPIC[0]: Set routing entry (8-6 -> 0x36 -> IRQ 6 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 7 --> apic 0 pin 7
> IOAPIC[0]: Set routing entry (8-7 -> 0x37 -> IRQ 7 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 8 --> apic 0 pin 8
> IOAPIC[0]: Set routing entry (8-8 -> 0x38 -> IRQ 8 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 9 --> apic 0 pin 9
> IOAPIC[0]: Set routing entry (8-9 -> 0x39 -> IRQ 9 Mode:1 Active:0)
> 0 add_pin_to_irq: irq 10 --> apic 0 pin 10
> IOAPIC[0]: Set routing entry (8-10 -> 0x3a -> IRQ 10 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 11 --> apic 0 pin 11
> IOAPIC[0]: Set routing entry (8-11 -> 0x3b -> IRQ 11 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 12 --> apic 0 pin 12
> IOAPIC[0]: Set routing entry (8-12 -> 0x3c -> IRQ 12 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 13 --> apic 0 pin 13
> IOAPIC[0]: Set routing entry (8-13 -> 0x3d -> IRQ 13 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 14 --> apic 0 pin 14
> IOAPIC[0]: Set routing entry (8-14 -> 0x3e -> IRQ 14 Mode:0 Active:0)
> 0 add_pin_to_irq: irq 15 --> apic 0 pin 15
> IOAPIC[0]: Set routing entry (8-15 -> 0x3f -> IRQ 15 Mode:0 Active:0)
> 8-16 8-17 8-18 8-19 8-20 8-21 8-22 8-23 (apicid-pin) not connected
> 9-0 9-1 9-2 9-3 9-4 9-5 9-6 9-7 9-8 9-9 9-10 9-11 9-12 9-13 9-14 9-15
> 9-16 9-17 9-18 9-19 9-20 9-21 9-22 9-23 (apicid-pin) not connected
>
only first one not connected at first, and ...
why not just revert those two patches?
YH
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
2008-09-12 19:57 ` Yinghai Lu
@ 2008-09-12 20:18 ` Cyrill Gorcunov
2008-09-13 0:40 ` Maciej W. Rozycki
2008-09-13 9:11 ` Cyrill Gorcunov
1 sibling, 1 reply; 6+ messages in thread
From: Cyrill Gorcunov @ 2008-09-12 20:18 UTC (permalink / raw)
To: Yinghai Lu; +Cc: Ingo Molnar, LKML, Maciej W. Rozycki
[Yinghai Lu - Fri, Sep 12, 2008 at 12:57:21PM -0700]
...
| > IOAPIC[0]: Set routing entry (8-14 -> 0x3e -> IRQ 14 Mode:0 Active:0)
| > 0 add_pin_to_irq: irq 15 --> apic 0 pin 15
| > IOAPIC[0]: Set routing entry (8-15 -> 0x3f -> IRQ 15 Mode:0 Active:0)
| > 8-16 8-17 8-18 8-19 8-20 8-21 8-22 8-23 (apicid-pin) not connected
| > 9-0 9-1 9-2 9-3 9-4 9-5 9-6 9-7 9-8 9-9 9-10 9-11 9-12 9-13 9-14 9-15
| > 9-16 9-17 9-18 9-19 9-20 9-21 9-22 9-23 (apicid-pin) not connected
| >
|
| only first one not connected at first, and ...
|
| why not just revert those two patches?
|
| YH
|
ok, convinced - Ingo, could you drop them please?
(yes, I've missed one new-line printing, sorry -
but quite frankly - it reveals another problem -
printing between other printing - which means
ideally it would be to _have_ temporary buffer apart
from printk buffer. So we have - either adding additional
new line printout 'cause of printing inbetween or our
own buffer to be able to print in nice-fasion. Anyway
I'm fine to just revert these attempts made. And thanks
Yinghai for comments and testing!)
- Cyrill -
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
2008-09-12 20:18 ` Cyrill Gorcunov
@ 2008-09-13 0:40 ` Maciej W. Rozycki
0 siblings, 0 replies; 6+ messages in thread
From: Maciej W. Rozycki @ 2008-09-13 0:40 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: Yinghai Lu, Ingo Molnar, LKML
On Sat, 13 Sep 2008, Cyrill Gorcunov wrote:
> but quite frankly - it reveals another problem -
> printing between other printing - which means
> ideally it would be to _have_ temporary buffer apart
> from printk buffer. So we have - either adding additional
Exactly what I wrote!
Maciej
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much
2008-09-12 19:57 ` Yinghai Lu
2008-09-12 20:18 ` Cyrill Gorcunov
@ 2008-09-13 9:11 ` Cyrill Gorcunov
1 sibling, 0 replies; 6+ messages in thread
From: Cyrill Gorcunov @ 2008-09-13 9:11 UTC (permalink / raw)
To: Yinghai Lu; +Cc: Ingo Molnar, LKML, Maciej W. Rozycki
[Yinghai Lu - Fri, Sep 12, 2008 at 12:57:21PM -0700]
...
| > 0 add_pin_to_irq: irq 15 --> apic 0 pin 15
| > IOAPIC[0]: Set routing entry (8-15 -> 0x3f -> IRQ 15 Mode:0 Active:0)
| > 8-16 8-17 8-18 8-19 8-20 8-21 8-22 8-23 (apicid-pin) not connected
| > 9-0 9-1 9-2 9-3 9-4 9-5 9-6 9-7 9-8 9-9 9-10 9-11 9-12 9-13 9-14 9-15
| > 9-16 9-17 9-18 9-19 9-20 9-21 9-22 9-23 (apicid-pin) not connected
| >
|
| only first one not connected at first, and ...
|
| why not just revert those two patches?
|
| YH
|
Ingo, Yinghai,
here is a quick fix for this.
Ingo - choose either use this patch or just _revert_ both
previous - i do accept any decision.
- Cyrill -
---
From: Cyrill Gorcunov <gorcunov@gmail.com>
Subject: [PATCH] x86: io-apic - fix misplaced EOL in setup_IO_APIC_irqs
This issue is brought by mine commit
f5143bce9d424bd400da48b1c7a2bc6a24403ada.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
Index: linux-2.6.git/arch/x86/kernel/io_apic.c
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/io_apic.c 2008-09-11 22:37:18.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/io_apic.c 2008-09-13 13:02:20.000000000 +0400
@@ -1541,6 +1541,11 @@ static void __init setup_IO_APIC_irqs(vo
pin);
continue;
}
+ if (notcon) {
+ apic_printk(APIC_VERBOSE,
+ " (apicid-pin) not connected\n");
+ notcon = 0;
+ }
irq = pin_2_irq(idx, apic, pin);
#ifdef CONFIG_X86_32
@@ -1552,11 +1557,6 @@ static void __init setup_IO_APIC_irqs(vo
setup_IO_APIC_irq(apic, pin, irq,
irq_trigger(idx), irq_polarity(idx));
}
- if (notcon) {
- apic_printk(APIC_VERBOSE,
- " (apicid-pin) not connected\n");
- notcon = 0;
- }
}
if (notcon)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-09-13 9:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-08 15:38 [PATCH] x86: io-apic - do not use KERN_DEBUG marker too much Cyrill Gorcunov
2008-09-12 19:55 ` Yinghai Lu
2008-09-12 19:57 ` Yinghai Lu
2008-09-12 20:18 ` Cyrill Gorcunov
2008-09-13 0:40 ` Maciej W. Rozycki
2008-09-13 9:11 ` Cyrill Gorcunov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox