From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC2FAC433DB for ; Thu, 18 Feb 2021 13:35:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FF0C60231 for ; Thu, 18 Feb 2021 13:35:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FF0C60231 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XLOrnkfXn9vucUifwvc7DovRO8PEt7C8+aGmHeY5OD4=; b=fTPylfXqy4/B8V4Afbs9GeJkq YyFArd6UFV4Ivcv5eHQTS5Nn8S7BkUOCJuMONNE+ye6HofH58LYKT+jstDU6qLD2u3AOqeNXCSpdK s9sC1ADuWXT80BqwpQJ3tSh0z92GE3REKgUhPp9QVPk8LLx3qxomLBmTnpTUafD4hqsYYKl7+iaHO SC9gYS3fmTsbTk72OH17vXp35rkuGr6n2EOhUHuB6iD2omu73k7Guka06Zhgx69wBFdqwRDM9N62G 2pdN2hUbtTtAa1CBICXRHeGI6dChp3MkqC5oHv7Eipc1iUmMjF5Z9ANBfawrio5q0fUM3MA6DD266 zi/Cl1fDA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCjQd-0002fz-O1; Thu, 18 Feb 2021 13:33:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCjQa-0002fU-Th for linux-arm-kernel@lists.infradead.org; Thu, 18 Feb 2021 13:33:09 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 88D411FB; Thu, 18 Feb 2021 05:33:02 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8D4773F73B; Thu, 18 Feb 2021 05:33:01 -0800 (PST) Subject: Re: [PATCH kvmtool 21/21] hw/rtc: ARM/arm64: Use MMIO at higher addresses To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-22-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <102807a0-812f-d4bf-b8b4-560f999c6e6c@arm.com> Date: Thu, 18 Feb 2021 13:33:15 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-22-andre.przywara@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210218_083309_143574_F1A9EB16 X-CRM114-Status: GOOD ( 26.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Andre, On 12/10/20 2:29 PM, Andre Przywara wrote: > Using the RTC device at its legacy I/O address as set by IBM in 1981 > was a kludge we used for simplicity on ARM platforms as well. > However this imposes problems due to their missing alignment and overlap > with the PCI I/O address space. > > Now that we can switch a device easily between using ioports and > MMIO, let's move the RTC out of the first 4K of memory on ARM platforms. > > That should be transparent for well behaved guests, since the change is > naturally reflected in the device tree. > > Signed-off-by: Andre Przywara > --- > hw/rtc.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/hw/rtc.c b/hw/rtc.c > index ee4c9102..bdb88f0f 100644 > --- a/hw/rtc.c > +++ b/hw/rtc.c > @@ -5,6 +5,15 @@ > > #include > > +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) > +#define RTC_BUS_TYPE DEVICE_BUS_MMIO > +#define RTC_BASE_ADDRESS 0x1010000 This looks correct, the base address is the serial base address + 64k, so they don't overlap, and it doesn't overlap with the flash memory either. Same comment as for the serial, I think the reason for choosing this address should be mentioned, and the region should be put in the arch memory layout file. Other than that, the patch looks good. Thanks, Alex > +#else > +/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > +#define RTC_BUS_TYPE DEVICE_BUS_IOPORT > +#define RTC_BASE_ADDRESS 0x70 > +#endif > + > /* > * MC146818 RTC registers > */ > @@ -49,7 +58,7 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, > time_t ti; > > if (is_write) { > - if (addr == 0x70) { /* index register */ > + if (addr == RTC_BASE_ADDRESS) { /* index register */ > u8 value = ioport__read8(data); > > vcpu->kvm->nmi_disabled = value & (1UL << 7); > @@ -70,7 +79,7 @@ static void cmos_ram_io(struct kvm_cpu *vcpu, u64 addr, u8 *data, > return; > } > > - if (addr == 0x70) > + if (addr == RTC_BASE_ADDRESS) /* index register is write-only */ > return; > > time(&ti); > @@ -127,7 +136,7 @@ static void generate_rtc_fdt_node(void *fdt, > u8 irq, > enum irq_type)) > { > - u64 reg_prop[2] = { cpu_to_fdt64(0x70), cpu_to_fdt64(2) }; > + u64 reg_prop[2] = { cpu_to_fdt64(RTC_BASE_ADDRESS), cpu_to_fdt64(2) }; > > _FDT(fdt_begin_node(fdt, "rtc")); > _FDT(fdt_property_string(fdt, "compatible", "motorola,mc146818")); > @@ -139,7 +148,7 @@ static void generate_rtc_fdt_node(void *fdt, > #endif > > struct device_header rtc_dev_hdr = { > - .bus_type = DEVICE_BUS_IOPORT, > + .bus_type = RTC_BUS_TYPE, > .data = generate_rtc_fdt_node, > }; > > @@ -151,8 +160,8 @@ int rtc__init(struct kvm *kvm) > if (r < 0) > return r; > > - /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - r = kvm__register_pio(kvm, 0x0070, 2, cmos_ram_io, NULL); > + r = kvm__register_iotrap(kvm, RTC_BASE_ADDRESS, 2, cmos_ram_io, NULL, > + RTC_BUS_TYPE); > if (r < 0) > goto out_device; > > @@ -170,8 +179,7 @@ dev_init(rtc__init); > > int rtc__exit(struct kvm *kvm) > { > - /* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */ > - kvm__deregister_pio(kvm, 0x0070); > + kvm__deregister_iotrap(kvm, RTC_BASE_ADDRESS, RTC_BUS_TYPE); > > return 0; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel