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: linux-arm-kernel@lists.infradead.org,
Marc Zyngier <maz@kernel.org>,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Subject: Re: [PATCH kvmtool 10/21] hw/rtc: Refactor trap handlers
Date: Fri, 12 Feb 2021 11:56:19 +0000 [thread overview]
Message-ID: <cc9f2ae6-5a4d-c4d8-59d5-40d9cb770831@arm.com> (raw)
In-Reply-To: <20201210142908.169597-11-andre.przywara@arm.com>
Hi Andre,
On 12/10/20 2:28 PM, Andre Przywara wrote:
> With the planned retirement of the special ioport emulation code, we
> need to provide emulation functions compatible with the MMIO prototype.
>
> Merge the two different trap handlers into one function, checking for
> read/write and data/index register inside.
> Adjust the trap handlers to use that new function, and provide shims to
> implement the old ioport interface, for now.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> ---
> hw/rtc.c | 70 ++++++++++++++++++++++++++++----------------------------
> 1 file changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/hw/rtc.c b/hw/rtc.c
> index 5483879f..664d4cb0 100644
> --- a/hw/rtc.c
> +++ b/hw/rtc.c
> @@ -42,11 +42,37 @@ static inline unsigned char bin2bcd(unsigned val)
> return ((val / 10) << 4) + val % 10;
> }
>
> -static bool cmos_ram_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> +static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data,
> + u32 len, u8 is_write, void *ptr)
> {
> struct tm *tm;
> time_t ti;
>
> + if (is_write) {
> + if (addr == 0x70) { /* index register */
> + u8 value = ioport__read8(data);
> +
> + vcpu->kvm->nmi_disabled = value & (1UL << 7);
> + rtc.cmos_idx = value & ~(1UL << 7);
> +
> + return;
> + }
> +
> + switch (rtc.cmos_idx) {
> + case RTC_REG_C:
> + case RTC_REG_D:
> + /* Read-only */
> + break;
> + default:
> + rtc.cmos_data[rtc.cmos_idx] = ioport__read8(data);
> + break;
> + }
> + return;
> + }
> +
> + if (addr == 0x70)
> + return;
> +
> time(&ti);
>
> tm = gmtime(&ti);
> @@ -92,42 +118,23 @@ static bool cmos_ram_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 po
> ioport__write8(data, rtc.cmos_data[rtc.cmos_idx]);
> break;
> }
> -
> - return true;
> }
>
> -static bool cmos_ram_data_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> +static bool cmos_ram_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> {
> - switch (rtc.cmos_idx) {
> - case RTC_REG_C:
> - case RTC_REG_D:
> - /* Read-only */
> - break;
> - default:
> - rtc.cmos_data[rtc.cmos_idx] = ioport__read8(data);
> - break;
> - }
> -
> + cmos_ram_io(vcpu, port, data, size, false, NULL);
> return true;
> }
>
> -static struct ioport_operations cmos_ram_data_ioport_ops = {
> - .io_out = cmos_ram_data_out,
> - .io_in = cmos_ram_data_in,
> -};
> -
> -static bool cmos_ram_index_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> +static bool cmos_ram_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> {
> - u8 value = ioport__read8(data);
> -
> - vcpu->kvm->nmi_disabled = value & (1UL << 7);
> - rtc.cmos_idx = value & ~(1UL << 7);
> -
> + cmos_ram_io(vcpu, port, data, size, true, NULL);
> return true;
> }
>
> -static struct ioport_operations cmos_ram_index_ioport_ops = {
> - .io_out = cmos_ram_index_out,
> +static struct ioport_operations cmos_ram_ioport_ops = {
> + .io_out = cmos_ram_out,
> + .io_in = cmos_ram_in,
> };
>
> #ifdef CONFIG_HAS_LIBFDT
> @@ -162,21 +169,15 @@ int rtc__init(struct kvm *kvm)
> return r;
>
> /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */
> - r = ioport__register(kvm, 0x0070, &cmos_ram_index_ioport_ops, 1, NULL);
> + r = ioport__register(kvm, 0x0070, &cmos_ram_ioport_ops, 2, NULL);
> if (r < 0)
> goto out_device;
>
> - r = ioport__register(kvm, 0x0071, &cmos_ram_data_ioport_ops, 1, NULL);
> - if (r < 0)
> - goto out_ioport;
> -
> /* Set the VRT bit in Register D to indicate valid RAM and time */
> rtc.cmos_data[RTC_REG_D] = RTC_REG_D_VRT;
>
> return r;
>
> -out_ioport:
> - ioport__unregister(kvm, 0x0070);
> out_device:
> device__unregister(&rtc_dev_hdr);
>
> @@ -188,7 +189,6 @@ int rtc__exit(struct kvm *kvm)
> {
> /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */
> ioport__unregister(kvm, 0x0070);
> - ioport__unregister(kvm, 0x0071);
>
> return 0;
> }
The behaviour is preserved with this patch, and it compiles, so:
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Thanks,
Alex
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-12 11:57 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
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 [this message]
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=cc9f2ae6-5a4d-c4d8-59d5-40d9cb770831@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).