From patchwork Thu Jun 2 13:38:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pekka Enberg X-Patchwork-Id: 843722 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p52DcLJ8005460 for ; Thu, 2 Jun 2011 13:38:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755251Ab1FBNiR (ORCPT ); Thu, 2 Jun 2011 09:38:17 -0400 Received: from filtteri2.pp.htv.fi ([213.243.153.185]:35467 "EHLO filtteri2.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752832Ab1FBNiR (ORCPT ); Thu, 2 Jun 2011 09:38:17 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri2.pp.htv.fi (Postfix) with ESMTP id 51C2B1DF137; Thu, 2 Jun 2011 16:38:16 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp6.welho.com ([213.243.153.40]) by localhost (filtteri2.pp.htv.fi [213.243.153.185]) (amavisd-new, port 10024) with ESMTP id x3AEWxeDB+Xj; Thu, 2 Jun 2011 16:38:16 +0300 (EEST) Received: from localhost.localdomain (cs181148025.pp.htv.fi [82.181.148.25]) by smtp6.welho.com (Postfix) with ESMTP id ED1E55BC007; Thu, 2 Jun 2011 16:38:15 +0300 (EEST) From: Pekka Enberg To: kvm@vger.kernel.org Cc: Pekka Enberg , Ingo Molnar , Sasha Levin Subject: [PATCH] kvm tools, i8042: Fix device init failure Date: Thu, 2 Jun 2011 16:38:15 +0300 Message-Id: <1307021895-20434-1-git-send-email-penberg@kernel.org> X-Mailer: git-send-email 1.7.0.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 02 Jun 2011 13:38:21 +0000 (UTC) This patch fixes the following device init failure: [ 0.945942] usbcore: registered new interface driver sisusb [ 0.947349] i8042: PNP: No PS/2 controller found. Probing ports directly. [ 0.949033] i8042: [0] 20 -> i8042 (command) [ 0.950370] i8042: [57] -- i8042 (timeout) [ 1.521143] i8042: Can't read CTR while initializing i8042 [ 1.522495] i8042: probe of i8042 failed with error -5 The kbd_out() function was taking 32 bits instead of 8 bits for 'outb'. This caused kbd_write_command() to receive bogus 'val' which meant that I8042_CMD_CTL_RCTR case in the switch statement was never executed. Cc: Ingo Molnar Cc: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/hw/i8042.c | 48 +++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-) diff --git a/tools/kvm/hw/i8042.c b/tools/kvm/hw/i8042.c index 934ef4e..42ed4ba 100644 --- a/tools/kvm/hw/i8042.c +++ b/tools/kvm/hw/i8042.c @@ -140,10 +140,7 @@ static void kbd_queue(u8 c) kbd_update_irq(); } -/* - * This function is called when the OS issues a write to port 0x64 - */ -static void kbd_write_command(u32 val) +static void kbd_write_command(u8 val) { switch (val) { case I8042_CMD_CTL_RCTR: @@ -451,27 +448,40 @@ void kbd_handle_ptr(int buttonMask, int x, int y, rfbClientPtr cl) */ static bool kbd_in(struct ioport *ioport, struct kvm *kvm, u16 port, void *data, int size, u32 count) { - u32 result; - - if (port == I8042_COMMAND_REG) { - result = kbd_read_status(); - ioport__write8(data, (char)result); - } else { - result = kbd_read_data(); - ioport__write32(data, result); + switch (port) { + case I8042_COMMAND_REG: { + u8 value = kbd_read_status(); + ioport__write8(data, value); + break; + } + case I8042_DATA_REG: { + u32 value = kbd_read_data(); + ioport__write32(data, value); + break; } + default: + break; + } + return true; } -/* - * Called when the OS attempts to read from a keyboard port (0x60 or 0x64) - */ static bool kbd_out(struct ioport *ioport, struct kvm *kvm, u16 port, void *data, int size, u32 count) { - if (port == I8042_COMMAND_REG) - kbd_write_command(*((u32 *)data)); - else - kbd_write_data(*((u32 *)data)); + switch (port) { + case I8042_COMMAND_REG: { + u8 value = ioport__read8(data); + kbd_write_command(value); + break; + } + case I8042_DATA_REG: { + u32 value = ioport__read32(data); + kbd_write_data(value); + break; + } + default: + break; + } return true; }