Skip to content
Snippets Groups Projects
  1. May 26, 2021
    • Volker Rümelin's avatar
      pckbd: remove duplicated keyboard and mouse defines · 314f9064
      Volker Rümelin authored
      
      In 2005 the author of commit daa57963 "PS2 mouse and keyboard
      separation (Paul Brook)" and 0e43e99c "PS2 mouse and keyboard
      separation (Paul Brook)" separated the PS/2 controller code and
      the PS/2 keyboard and mouse code. It seems he forgot to remove
      a few defines. Remove them now.
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-11-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      314f9064
    • Volker Rümelin's avatar
      pckbd: correctly disable PS/2 communication · f6f57a82
      Volker Rümelin authored
      
      Currently the PS/2 controller command KBD_CCMD_MOUSE_DISABLE
      doesn't disable the PS/2 mouse communication at all, and the
      PS/2 controller commands KBD_CCMD_KBD_DISABLE and
      KBD_CCMD_KBD_ENABLE only disable and enable the keyboard
      interrupt, which is very different from what a real PS/2
      controller does. A guest may notice the difference.
      
      Mask out pending data on disabled queues to correctly disable
      the PS/2 controller communication.
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-10-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      f6f57a82
    • Volker Rümelin's avatar
      pckbd: add function kbd_pending() · e4697fab
      Volker Rümelin authored
      
      Replace reads of the variable s->pending with a call to a new
      function kbd_pending() to ease the review of the next patch.
      There is no functional change.
      
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-9-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      e4697fab
    • Volker Rümelin's avatar
      pckbd: add controller response queue · aa67a42f
      Volker Rümelin authored
      
      Add a separate queue for PS/2 controller responses. The
      responses no longer get queued in the keyboard or mouse queues.
      The advantage of this can be seen after the next two patches,
      where the guest can disable the PS/2 communication with keyboard
      and mouse and still talk to the PS/2 controller.
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-8-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      aa67a42f
    • Volker Rümelin's avatar
      pckbd: add state variable for interrupt source · ac9192bd
      Volker Rümelin authored
      
      Currently there is only one flag to distinguish between two
      interrupt sources and there are no available flags for more
      sources. Add an internal state variable to store the interrupt
      source. The next patch will introduce an additional interrupt
      source. There is no functional change.
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-7-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      ac9192bd
    • Volker Rümelin's avatar
      pckbd: PS/2 keyboard throttle · d1e45668
      Volker Rümelin authored
      Limit the keyboard data rate to the serial link speed. Some old
      DOS software relies on being able to read an incoming scan-code
      more than once. After reading keyboard data from the i8042
      controller, the guest software has 1ms to read the same data
      again.
      
      Use -global i8042.kbd-throttle=on to enable this feature.
      
      To see how this patch works, start a FreeDOS 1.2 guest with the
      qemu option -global i8042.kbd-throttle=on and open a text file
      with the vim 7.3 32 bit for DOS executable. Then use the cursor
      keys (not the cursor keys on the numeric keypad) to move through
      the text. Without the kbd-throttle option enabled each keystroke
      will move the cursor two positions.
      
      Buglink: https://bugs.launchpad.net/bugs/1895363
      Buglink: https://bugs.launchpad.net/bugs/1897568
      
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-6-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      d1e45668
    • Volker Rümelin's avatar
      pckbd: don't update OBF flags if KBD_STAT_OBF is set · ff6e1624
      Volker Rümelin authored
      
      Don't update the OBF flags in the status register and the cor-
      responding IRQ lines if KBD_STAT_OBF is set. Otherwise this
      may change the PS/2 event type. If the guest ISR was already
      scheduled, the changed event type will be rather surprising for
      the guest.
      
      This fixes a mouse event stream corruption. To reproduce the
      problem start a FreeDOS 1.2 guest with -machine pc,accel=kvm
      and -display gtk. The KVM in-kernel irqchip has to be enabled.
      Now open a text file with edit.exe in the guest and hold down
      the cursor right key and at the same time move the mouse around.
      You will quickly notice erratic mouse movements and unexpected
      mouse clicks.
      
      A trace file shows the mouse event stream corruption. Guest
      rip 0xce93 (f000:ce93) is the in al,0x60 instruction in the
      seabios mouse ISR, guest rip 0xceca (f000:ceca) is the
      in al,0x60 instruction in the seabios keyboard ISR.
      
      qemu-system-x86-5659  [007] ....   280.971116:
       tracing_mark_write: pckbd_kbd_update_irq kbd=0 aux=1
       # gtk queues a mouse event
      
      qemu-system-x86-5665  [000] ....   280.971121:
       kvm_exit: reason EXTERNAL_INTERRUPT rip 0x22da info 0 800000fd
      qemu-system-x86-5665  [000] d..1   280.971122:
       kvm_entry: vcpu 0, rip 0x22da
      qemu-system-x86-5665  [000] ....   280.971123:
       kvm_exit: reason EXTERNAL_INTERRUPT rip 0x22da info 0 800000fd
      qemu-system-x86-5665  [000] d..1   280.971124:
       kvm_entry: vcpu 0, rip 0x22da
      qemu-system-x86-5665  [000] ....   280.971126:
       kvm_exit: reason IO_INSTRUCTION rip 0x110c8c info 640008 0
      qemu-system-x86-5665  [000] ....   280.971176:
       tracing_mark_write: pckbd_kbd_read_status 0x3d
       # KBD_STAT_OBF and KBD_STAT_MOUSE_OBF set, the mouse ISR will
       # read data from the PS/2 controller.
      
      qemu-system-x86-5665  [000] d..1   280.971180:
       kvm_entry: vcpu 0, rip 0x110c8d
      qemu-system-x86-5665  [000] ....   280.971191:
       kvm_exit: reason EXTERNAL_INTERRUPT rip 0x110c8d info 0 800000f6
      qemu-system-x86-5665  [000] d..1   280.971191:
       kvm_entry: vcpu 0, rip 0x110c8d
      qemu-system-x86-5665  [000] ....   280.971193:
       kvm_exit: reason IO_INSTRUCTION rip 0xce93 info 600048 0
       # the mouse ISR wants to read data from the PS/2 controller
      
      qemu-system-x86-5659  [007] ....   280.971231:
       tracing_mark_write: pckbd_kbd_update_irq kbd=1 aux=0
      qemu-system-x86-5659  [007] ....   280.971238:
       tracing_mark_write: pckbd_kbd_update_irq kbd=1 aux=0
       # gtk queues a keyboard event 0xe0 0x4d (key right)
      
      qemu-system-x86-5665  [000] ....   280.971257:
       tracing_mark_write: pckbd_kbd_update_irq kbd=0 aux=1
      qemu-system-x86-5665  [000] ....   280.971262:
       tracing_mark_write: pckbd_kbd_update_irq kbd=1 aux=0
       # ps2_read_data() deasserts and reasserts the keyboard IRQ
      
      qemu-system-x86-5665  [000] ....   280.971266:
       tracing_mark_write: pckbd_kbd_read_data 0xe0 kbd
       # -> the mouse ISR receives keyboard data
      
      qemu-system-x86-5665  [000] d..1   280.971268:
       kvm_entry: vcpu 0, rip 0xce95
      qemu-system-x86-5665  [000] ....   280.971269:
       kvm_exit: reason IO_INSTRUCTION rip 0xe828 info a00040 0
      qemu-system-x86-5665  [000] ....   280.971270:
       kvm_ack_irq: irqchip PIC slave pin 12
      qemu-system-x86-5665  [000] d..1   280.971270:
       kvm_entry: vcpu 0, rip 0xe82a
      qemu-system-x86-5665  [000] ....   280.971271:
       kvm_exit: reason IO_INSTRUCTION rip 0xe82a info 200040 0
      qemu-system-x86-5665  [000] ....   280.971271:
       kvm_ack_irq: irqchip PIC master pin 2
      qemu-system-x86-5665  [000] d..1   280.971271:
       kvm_entry: vcpu 0, rip 0xe82c
      qemu-system-x86-5665  [000] ....   280.971272:
       kvm_exit: reason PENDING_INTERRUPT rip 0x22da info 0 0
      qemu-system-x86-5665  [000] d..1   280.971273:
       kvm_entry: vcpu 0, rip 0x22da
      qemu-system-x86-5665  [000] ....   280.971274:
       kvm_exit: reason IO_INSTRUCTION rip 0x110c8c info 640008 0
      qemu-system-x86-5665  [000] ....   280.971275:
       tracing_mark_write: pckbd_kbd_read_status 0x1d
      qemu-system-x86-5665  [000] d..1   280.971276:
       kvm_entry: vcpu 0, rip 0x110c8d
      qemu-system-x86-5665  [000] ....   280.971277:
       kvm_exit: reason IO_INSTRUCTION rip 0xceca info 600048 0
       # the keyboard ISR wants to read data from the PS/2 controller
      
      qemu-system-x86-5665  [000] ....   280.971279:
       tracing_mark_write: pckbd_kbd_update_irq kbd=0 aux=1
      qemu-system-x86-5665  [000] ....   280.971282:
       tracing_mark_write: pckbd_kbd_read_data 0x4d kbd
       # the keyboard ISR receives the second byte of the keyboard event
      
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-5-vr_qemu@t-online.de>
      
      [ kraxel: add missing include ]
      
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      ff6e1624
    • Volker Rümelin's avatar
      pckbd: split out interrupt line changing code · c3c4a961
      Volker Rümelin authored
      
      Split out the interrupt line changing code from kbd_update_irq().
      This is a preparation for the next patch. There is no functional
      change.
      
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-4-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      c3c4a961
    • Volker Rümelin's avatar
      ps2: don't deassert irq twice if queue is empty · cec32524
      Volker Rümelin authored
      
      Don't deassert the irq twice if the queue is empty. While the
      second deassertion doesn't do any harm, it's unnecessary.
      
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-3-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      cec32524
    • Volker Rümelin's avatar
      ps2: don't raise an interrupt if queue is full · 7704bb02
      Volker Rümelin authored
      
      ps2_queue() behaves differently than the very similar functions
      ps2_queue_2() to ps2_queue_4(). The first one calls update_irq()
      even if the queue is full, the others don't. Change ps2_queue()
      to be consistent with the others.
      
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-2-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      7704bb02
    • Volker Rümelin's avatar
      ps2: fix mouse stream corruption · 76968101
      Volker Rümelin authored
      
      Commit 7abe7eb2 "ps2: Fix mouse stream corruption due to lost data"
      added code to avoid mouse stream corruptions but the calculation of
      the needed free queue size was wrong. Fix this.
      
      To reproduce, open a text file with the vim 7.3 32 bit for DOS exe-
      cutable in a FreeDOS client started with -display sdl and move the
      mouse around for a few seconds. You will quickly see erratic mouse
      movements and unexpected mouse clicks. CuteMouse (ctmouse.exe) in
      FreeDOS doesn't try to re-sync the mouse stream.
      
      Fixes: 7abe7eb2 ("ps2: Fix mouse stream corruption due to lost data")
      Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
      Message-Id: <20210525181441.27768-1-vr_qemu@t-online.de>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      76968101
    • Daniel P. Berrangé's avatar
      hw/input: expand trace info reported for ps2 device · 644f66bf
      Daniel P. Berrangé authored
      
      It is interesting to know if the PS2 keyboard is in translated mode, and
      which of the three scancode sets are in use.
      
      Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
      Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
      Message-Id: <20210309155804.306051-1-berrange@redhat.com>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      644f66bf
  2. May 25, 2021
Loading