From: Alexandru Elisei <alexandru.elisei@arm.com>
To: Andre Przywara <andre.przywara@arm.com>,
Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org,
Marc Zyngier <maz@kernel.org>
Subject: Re: [PATCH kvmtool 05/21] hw/i8042: Clean up data types
Date: Thu, 11 Feb 2021 16:55:43 +0000 [thread overview]
Message-ID: <04b5f537-1594-61b9-b7ef-4062e732e380@arm.com> (raw)
In-Reply-To: <20201210142908.169597-6-andre.przywara@arm.com>
Hi Andre,
On 12/10/20 2:28 PM, Andre Przywara wrote:
> The i8042 is clearly an 8-bit era device, so there is little room for
> 32-bit registers.
> Clean up the data types used.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
> hw/i8042.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/hw/i8042.c b/hw/i8042.c
> index 37a99a2d..36ee183f 100644
> --- a/hw/i8042.c
> +++ b/hw/i8042.c
> @@ -64,11 +64,11 @@
> struct kbd_state {
> struct kvm *kvm;
>
> - char kq[QUEUE_SIZE]; /* Keyboard queue */
> + u8 kq[QUEUE_SIZE]; /* Keyboard queue */
> int kread, kwrite; /* Indexes into the queue */
> int kcount; /* number of elements in queue */
>
> - char mq[QUEUE_SIZE];
> + u8 mq[QUEUE_SIZE];
> int mread, mwrite;
> int mcount;
I think the write_cmd field further down should also be u8 because it stores the
first byte of a command (and it's set only to an 8 bit value in kbd_write_command()).
Otherwise, it looks ok to me. osdev wiki seems to confirm that the device is
indeed 8 bit only, and all the registers are 8 bit now:
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Thanks,
Alex
>
> @@ -173,9 +173,9 @@ static void kbd_write_command(struct kvm *kvm, u8 val)
> /*
> * Called when the OS reads from port 0x60 (PS/2 data)
> */
> -static u32 kbd_read_data(void)
> +static u8 kbd_read_data(void)
> {
> - u32 ret;
> + u8 ret;
> int i;
>
> if (state.kcount != 0) {
> @@ -202,9 +202,9 @@ static u32 kbd_read_data(void)
> /*
> * Called when the OS read from port 0x64, the command port
> */
> -static u32 kbd_read_status(void)
> +static u8 kbd_read_status(void)
> {
> - return (u32)state.status;
> + return state.status;
> }
>
> /*
> @@ -212,7 +212,7 @@ static u32 kbd_read_status(void)
> * Things written here are generally arguments to commands previously
> * written to port 0x64 and stored in state.write_cmd
> */
> -static void kbd_write_data(u32 val)
> +static void kbd_write_data(u8 val)
> {
> switch (state.write_cmd) {
> case I8042_CMD_CTL_WCTR:
> @@ -304,8 +304,8 @@ static bool kbd_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *
> break;
> }
> case I8042_DATA_REG: {
> - u32 value = kbd_read_data();
> - ioport__write32(data, value);
> + u8 value = kbd_read_data();
> + ioport__write8(data, value);
> break;
> }
> case I8042_PORT_B_REG: {
> @@ -328,7 +328,7 @@ static bool kbd_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void
> break;
> }
> case I8042_DATA_REG: {
> - u32 value = ioport__read32(data);
> + u8 value = ioport__read8(data);
> kbd_write_data(value);
> break;
> }
next prev parent reply other threads:[~2021-02-11 16:58 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 14:28 [PATCH kvmtool 00/21] Unify I/O port and MMIO trap handling Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 01/21] ioport: Remove ioport__setup_arch() Andre Przywara
2021-02-10 17:44 ` Alexandru Elisei
2021-02-11 17:16 ` Andre Przywara
2021-02-11 17:32 ` Alexandru Elisei
2021-02-17 16:46 ` Andre Przywara
2021-02-22 10:23 ` Andre Przywara
2021-02-22 15:01 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 02/21] hw/serial: Use device abstraction for FDT generator function Andre Przywara
2021-02-11 12:05 ` Alexandru Elisei
2021-02-11 17:45 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 03/21] ioport: Retire .generate_fdt_node functionality Andre Przywara
2021-02-11 14:05 ` Alexandru Elisei
2021-02-17 15:54 ` Andre Przywara
2021-02-17 16:06 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 04/21] mmio: Extend handling to include ioport emulation Andre Przywara
2021-02-11 16:10 ` Alexandru Elisei
2021-02-17 17:43 ` Andre Przywara
2021-02-22 15:50 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 05/21] hw/i8042: Clean up data types Andre Przywara
2021-02-11 16:55 ` Alexandru Elisei [this message]
2021-02-17 17:46 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 06/21] hw/i8042: Refactor trap handler Andre Przywara
2021-02-11 17:23 ` Alexandru Elisei
2021-02-18 10:34 ` Andre Przywara
2021-02-18 11:17 ` Alexandru Elisei
2021-02-18 11:48 ` Andre Przywara
2021-02-22 16:03 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 07/21] hw/i8042: Switch to new trap handlers Andre Przywara
2021-02-12 10:41 ` Alexandru Elisei
2021-02-18 12:09 ` Andre Przywara
2021-02-22 16:19 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 08/21] x86/ioport: Refactor " Andre Przywara
2021-02-12 11:14 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 09/21] x86/ioport: Switch to new " Andre Przywara
2021-02-12 11:27 ` Alexandru Elisei
2021-02-18 14:05 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 10/21] hw/rtc: Refactor " Andre Przywara
2021-02-12 11:56 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 11/21] hw/rtc: Switch to new trap handler Andre Przywara
2021-02-12 12:02 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 12/21] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara
2021-02-12 17:50 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 13/21] hw/serial: Refactor trap handler Andre Przywara
2021-02-16 14:22 ` Alexandru Elisei
2021-02-18 14:41 ` Andre Przywara
2021-02-22 17:40 ` Alexandru Elisei
2021-02-24 14:54 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 14/21] hw/serial: Switch to new trap handlers Andre Przywara
2021-02-16 14:31 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 15/21] vfio: Refactor ioport trap handler Andre Przywara
2021-02-16 14:47 ` Alexandru Elisei
2021-02-18 15:51 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 16/21] vfio: Switch to new ioport trap handlers Andre Przywara
2021-02-16 14:52 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 17/21] virtio: Switch trap handling to use MMIO handler Andre Przywara
2021-02-16 17:03 ` Alexandru Elisei
2021-02-18 16:13 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 18/21] pci: " Andre Przywara
2021-02-17 15:14 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 19/21] Remove ioport specific routines Andre Przywara
2021-02-17 15:49 ` Alexandru Elisei
2021-02-17 16:11 ` Alexandru Elisei
2021-02-18 16:34 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 20/21] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara
2021-02-17 16:48 ` Alexandru Elisei
2021-02-18 12:18 ` Alexandru Elisei
2021-02-18 16:38 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 21/21] hw/rtc: " Andre Przywara
2021-02-18 13:33 ` Alexandru Elisei
2021-02-18 16:41 ` Andre Przywara
2021-02-10 17:44 ` [PATCH kvmtool 00/21] Unify I/O port and MMIO trap handling Alexandru Elisei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04b5f537-1594-61b9-b7ef-4062e732e380@arm.com \
--to=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).