x86/vpic: minor fixes
cover x86/vpic: minor fixes
Hello,
This series contains one non-functional change and one small fix for pci-passthrough when using the 8259A PIC. I very much doubt anyone has done pci-passthrough on guests using the legacy PIC, but nonetheless let's aim for it to be correct.
Thanks, Roger.
Roger Pau Monne (2):
x86/vpic: rename irq to pin in vpic_ioport_write x86/vpic: also execute dpci callback for non-specific EOI
xen/arch/x86/hvm/vpic.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/2 x86/vpic: rename irq to pin in vpic_ioport_write
The irq variable is wrongly named, as it's used to store the pin on the 8259 chip, but not the global irq value. While renaming reduce it's scope and make it unsigned.
No functional change intended.
--- xen/arch/x86/hvm/vpic.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
xen/arch/x86/hvm/vpic.c +10 -8
@@ -184,7 +184,7 @@ static int vpic_intack(struct hvm_hw_vpic *vpic)static void vpic_ioport_write (struct hvm_hw_vpic *vpic,uint32_t addr,uint32_t val) { -int priority, cmd, irq; +int priority, cmd;uint8_t mask, unmasked =0 ;vpic_lock (vpic);
@@ -230,6 +230,8 @@ static void vpic_ioport_write( }else { +unsigned int pin; +/* OCW2 */ cmd = val >>5 ; switch ( cmd )
@@ -246,22 +248,22 @@ static void vpic_ioport_write( priority =vpic_get_priority (vpic, mask);if ( priority ==VPIC_PRIO_NONE )break ; - irq = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << irq); + pin = (priority + vpic->priority_add) &7 ; + vpic->isr &= ~(1 << pin);if ( cmd ==5 ) - vpic->priority_add = (irq +1 ) &7 ; + vpic->priority_add = (pin +1 ) &7 ;break ;case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ - irq = val &7 ; - vpic->isr &= ~(1 << irq); + pin = val &7 ; + vpic->isr &= ~(1 << pin);if ( cmd ==7 ) - vpic->priority_add = (irq +1 ) &7 ; + vpic->priority_add = (pin +1 ) &7 ;/* Release lock and EOI the physical interrupt (if any). */ vpic_update_int_output (vpic);vpic_unlock (vpic);hvm_dpci_eoi (current->domain, -hvm_isa_irq_to_gsi ((addr >>7 ) ? (irq|8 ) : irq), +hvm_isa_irq_to_gsi ((addr >>7 ) ? (pin |8 ) : pin),NULL );return ;/* bail immediately */ case 6 :/* Set Priority */
Signature · 1 line
2.28.0
Re: [PATCH 1/2] x86/vpic: rename irq to pin in vpic_ioport_write
Quoted 7 lines · Roger Pau Monne
The irq variable is wrongly named, as it's used to store the pin on the 8259 chip, but not the global irq value. While renaming reduce it's scope and make it unsigned.
No functional change intended.
Signed-off-by Roger Pau Monné <[email protected]>
PATCH 2/2 x86/vpic: also execute dpci callback for non-specific EOI
In reply to Roger Pau MonneCurrently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
xen/arch/x86/hvm/vpic.c +5 -5
@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ; -break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ; + + common_eoi: vpic->isr &= ~(1 << pin); -if ( cmd ==7 ) +if ( cmd ==7 || cmd ==5 ) vpic->priority_add = (pin +1 ) &7 ;/* Release lock and EOI the physical interrupt (if any). */ vpic_update_int_output (vpic);
Signature · 1 line
2.28.0
Re: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 17 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-0@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ;
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 10 lines
xen/arch/x86/hvm/vpic.c +2
-4pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ; -break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;
You'll need a /* Fallthrough */ here to keep various things happy.
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 8 lines
xen/arch/x86/hvm/vpic.c +3
-1+ + common_eoi: vpic->isr &= ~(1 << pin); -if ( cmd ==7 ) +if ( cmd ==7 || cmd ==5 ) vpic->priority_add = (pin +1 ) &7 ;/* Release lock and EOI the physical interrupt (if any). */ vpic_update_int_output (vpic);
Re: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 31 lines · Andrew Cooper
Quoted 17 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-0@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ;xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 10 lines
xen/arch/x86/hvm/vpic.c +2
-4pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ; -break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Quoted 3 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Sure, I was borderline to add it but somehow assumed that /* Fallthrough */ was required for cases but not labels.
Thanks, Roger.
Re: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
In reply to Andrew CooperQuoted 22 lines · Andrew Cooper
Quoted 21 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-3@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ;
Quoted 8 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 6 lines
xen/arch/x86/hvm/vpic.c +2
-1-break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Are you sure? There's ...
Quoted 6 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 2 lines
xen/arch/x86/hvm/vpic.c +2
-0+ + common_eoi:
... an ordinary label here, not a case one.
Jan
Ping: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 34 lines · Jan Beulich
Quoted 22 lines · Andrew Cooper
Quoted 21 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-3@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ;Quoted 8 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 6 lines
xen/arch/x86/hvm/vpic.c +2
-1-break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Are you sure? There's ...
Quoted 8 lines
Quoted 6 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 2 lines
xen/arch/x86/hvm/vpic.c +2
-0+ + common_eoi:... an ordinary label here, not a case one.
I would have wanted to commit this, but it's still not clear to me whether the adjustment you ask for is really needed.
Thanks for following up,
Jan
Re: Ping: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 39 lines · Jan Beulich
Quoted 38 lines · Jan Beulich
Quoted 22 lines · Andrew Cooper
Quoted 21 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-3@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ;Quoted 8 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 6 lines
xen/arch/x86/hvm/vpic.c +2
-1-break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Are you sure? There's ...
Quoted 4 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 258
Quoted 2 lines
xen/arch/x86/hvm/vpic.c +2
-0+ + common_eoi:... an ordinary label here, not a case one.
I would have wanted to commit this, but it's still not clear to me whether the adjustment you ask for is really needed.
Hello,
Was about to send a further series I have on top of this and saw this is still on my patch queue. I'm happy with either way, but I would like to get this committed if possible (as I think from a technical PoV we all agree it's correct).
Thanks, Roger.
Re: Ping: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 45 lines · Roger Pau Monné
Quoted 44 lines · Jan Beulich
Quoted 42 lines · Jan Beulich
Quoted 22 lines · Andrew Cooper
Quoted 21 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-3@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ;Quoted 8 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 6 lines
xen/arch/x86/hvm/vpic.c +2
-1-break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Are you sure? There's ...
Quoted 6 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 2 lines
xen/arch/x86/hvm/vpic.c +2
-0+ + common_eoi:... an ordinary label here, not a case one.
Quoted 7 lines
Quoted 2 lines
I would have wanted to commit this, but it's still not clear to me whether the adjustment you ask for is really needed.
Was about to send a further series I have on top of this and saw this is still on my patch queue. I'm happy with either way, but I would like to get this committed if possible (as I think from a technical PoV we all agree it's correct).
Hmm, did you mean to send this _to_ Andrew, with me on _cc_? There's nothing I can do without his further input.
Jan
Re: Ping: [PATCH 2/2] x86/vpic: also execute dpci callback for non-specific EOI
Quoted 49 lines · Jan Beulich
Quoted 48 lines · Roger Pau Monné
Quoted 46 lines · Jan Beulich
Quoted 34 lines · Jan Beulich
Quoted 22 lines · Andrew Cooper
Quoted 21 lines · Roger Pau Monne
Currently the dpci EOI callback is only executed for specific EOIs. This is wrong as non-specific EOIs will also clear the ISR bit and thus end the interrupt. Re-arrange the code a bit so that the common EOI handling path can be shared between all EOI modes.
Signed-off-by Roger Pau Monné <[email protected]>--- xen/arch/x86/hvm/vpic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)xen/arch/x86/hvm/vpic.c +0
-3@@ -249,15 +249,15 @@ static void vpic_ioport_write(if ( priority ==VPIC_PRIO_NONE )break ; pin = (priority + vpic->priority_add) &7 ; - vpic->isr &= ~(1 << pin); -if ( cmd ==5 ) - vpic->priority_add = (pin +1 ) &7 ;Quoted 8 lines
xen/arch/x86/hvm/vpic.c static void vpic_ioport_write( · line 256
Quoted 6 lines
xen/arch/x86/hvm/vpic.c +2
-1-break ; + goto common_eoi; +case 3 :/* Specific EOI */ case 7 :/* Specific EOI & Rotate */ pin = val &7 ;You'll need a /* Fallthrough */ here to keep various things happy.
Are you sure? There's ...
Quoted 8 lines
Quoted 6 lines
Otherwise, Acked-by: Andrew Cooper <[email protected]>
Can fix on commit if you're happy.
Quoted 2 lines
xen/arch/x86/hvm/vpic.c +2
-0+ + common_eoi:... an ordinary label here, not a case one.
I would have wanted to commit this, but it's still not clear to me whether the adjustment you ask for is really needed.
Quoted 7 lines
Quoted 4 lines
Was about to send a further series I have on top of this and saw this is still on my patch queue. I'm happy with either way, but I would like to get this committed if possible (as I think from a technical PoV we all agree it's correct).
Hmm, did you mean to send this _to_ Andrew, with me on _cc_? There's nothing I can do without his further input.
Yes, it's fixed now.
Please see above Andrew.
Roger.