From nobody Sat May 4 01:04:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569333143360229.40324396097833; Tue, 24 Sep 2019 06:52:23 -0700 (PDT) Received: from localhost ([::1]:45910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClEr-0005Z9-6M for importer@patchew.org; Tue, 24 Sep 2019 09:52:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56038) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCkc5-0000Xx-1s for qemu-devel@nongnu.org; Tue, 24 Sep 2019 09:12:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCkc3-0002v8-1Z for qemu-devel@nongnu.org; Tue, 24 Sep 2019 09:12:16 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:42652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCkbv-0002of-Qu; Tue, 24 Sep 2019 09:12:08 -0400 Received: from mail-by2nam03lp2050.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.50]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2019 21:12:04 +0800 Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6318.namprd04.prod.outlook.com (52.132.168.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20; Tue, 24 Sep 2019 13:12:03 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0%7]) with mapi id 15.20.2284.023; Tue, 24 Sep 2019 13:12:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1569330728; x=1600866728; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=GvEpSctGXUnDYvqPL5rNFLzx2V79D/KEfxKLeAg0VqY=; b=Ua5gTN8Q0Ffef5DEG0Dkhc8Zn+SWvT2QoIMg+pc8aHRQw3BQ43HCFRSb fp4Dijzp2PT5uZSzRM95lc77mkzJEqsmpy7gK9kX2ULDrEuiPi9+Sn3X3 rtUP2bZ9uwMuaHKCKBovlfiK4BTlnEdGJQofj8e8DOUUnxp5W8I+GFttT DPkuLJJ0L0F/bMHNFzEJu2MHwDinGlmKqXciS32pGAYNCiT4afC3iLgwD PTLfSY8QqKCo1CznrXp5OIRxs2Y9+gfbU46kBABvbMDNRQQUp1vOkPb0a plsp01160wMK0ewq9epdiA/JhQtbefOmxQYIkphGpO89Tr5jwtWggAP/y w==; IronPort-SDR: VWOYrlBbaJQ3ZWRpjcYHdUc/+J8emK7IoScBesGdmb4xSgoED21JxyeWxcK8PSTUMKqWyDkZ94 hb0NSqFf29QkOmsQ9zTbuvcY42RAGjN4USd3a0gEoiyQMfHlHjGnoOVi3/JiNCR0v6K71qgx7U a/pcw8NaaGNJEU8qS5bXA9WHunVgcFg/u+S/CqLCg9ktQQxurckiCQdVBYaVqq8LUgRtNbxhqO iRWFu/N69Zmda0uyc544BUIFgAiAQUXwytSEcPEAajSN85lV66/m9k20hbTsxDroaHOdQGAWGI qcg= X-IronPort-AV: E=Sophos;i="5.64,544,1559491200"; d="scan'208";a="118970951" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gmJvzKEPLPMqzy3J/8Zn6clvnMP7YccDKBEqFmsh3EBw/IsSaRjm19aNueBGzq6ggDctQ5SzFLc3uzWD20Uoi3Lf5w9TVFeF13iGzlC6sMPMOht3XSCSOcQtXzxWKrL2JtvA/tAA5BLqO8RKAsC4BH+/X6qyDFs9UWDTpUbxuPsDuBSylna0Bst9ZI5yCrSZxOX8wl8S6Wfi979eGYvGCtnuAYAR/1qy+539V9ihhcHc1oIfXRffeE1MjjB01KUNlf3OUKFqHQlRrM0SM7WwXR5Laeg9pMDXV/n/5zcSCz3TdteEY9sqPJr8eMriQrGBo8vhT6FUmWx2MGp7umoZnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N6YtIbj7YgkN+WbX5sNtsPkhG2fEqT7XjGwgC7WQQAw=; b=m+4i+txGw1LlJrPnZSwvDrGZSdMZNaOOq8h1Ic9VgzpthS7favclxsCDQROid9XRcCwXRCoc6DFL+Eb8hZDzgq71XtwXQ3dwNGCyB3XUrnvdpbUAgCUeCzABSZ6ls1e6YfNUFHPuE4/fcn55NXdWdIZz2e1Uo56GeZK6C7+x7EFsLXvbYO3wSFgvSyT45aekW28NcpDy/BMfwVTgJDc7LcNoVZVV/NmVZEsRGlSe2zmrvUnLrANSvpgadkayvE3xi/iml9c3v7ve6sHYlSn9YI0x1ldNuJGEm4SmL3pDZIh4fOwaVIKdhnzGmxkVnxCacwUF1foYE0iE7v7OGS6b8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N6YtIbj7YgkN+WbX5sNtsPkhG2fEqT7XjGwgC7WQQAw=; b=WEpfAH/z6CKze8t2uzQP/xkA/QLegsWWq7U+2JnLoTjjhTV5oQNZl0Un6b7j+N4WTZ+MocIRmR3gRveqXGCI17sBzhQQPcoUJZBEJlYQ0XhcuM+Y4pM1KBLevvyDvqftCm7L8wi/KwGp86T5NGwixhmzZAOu+YoYlHjjiU5hfsE= From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , Bastian Koppelmann Subject: [PATCH v2 1/2] hw: timer: Add Goldfish RTC device Thread-Topic: [PATCH v2 1/2] hw: timer: Add Goldfish RTC device Thread-Index: AQHVctmnZsqCfyFEDEKNZLG9WEX7cA== Date: Tue, 24 Sep 2019 13:12:02 +0000 Message-ID: <20190924131131.118155-2-anup.patel@wdc.com> References: <20190924131131.118155-1-anup.patel@wdc.com> In-Reply-To: <20190924131131.118155-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0148.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::18) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.51.80] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: dbc125b5-437f-402c-84a2-08d740f0ca65 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600167)(711020)(4605104)(1401327)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:MN2PR04MB6318; x-ms-traffictypediagnostic: MN2PR04MB6318: x-ms-exchange-purlcount: 2 x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:473; x-forefront-prvs: 0170DAF08C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(346002)(376002)(366004)(396003)(39860400002)(136003)(199004)(189003)(8676002)(25786009)(476003)(305945005)(8936002)(81156014)(81166006)(6512007)(36756003)(3846002)(6116002)(6306002)(6436002)(5660300002)(110136005)(54906003)(44832011)(71190400001)(71200400001)(2616005)(486006)(316002)(256004)(66066001)(7736002)(14444005)(6486002)(11346002)(50226002)(446003)(6506007)(66946007)(1076003)(30864003)(14454004)(64756008)(2906002)(186003)(99286004)(102836004)(966005)(2171002)(386003)(52116002)(26005)(478600001)(66476007)(76176011)(66556008)(86362001)(55236004)(66446008)(4326008)(2004002); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6318; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: WNQm9UETlJYxzp+ChfAkxhSWF7SSnA3op20BTHP+/ZMXaso4OVPE7RM56YkUXzVfuMFSxBvZ9JcwmyIgfGELcdo2QqU9Dni+Zo3oSVXmTNdS2p1GQgUpy5lMRAlzhbyrox86lZmDaPpUl5/I6FWYhbDgzUim3pa84nrK1XRL00XCPqRpsY06npw+xW/IQs7cvchdAit2aPGwOvFZFTMXL+ZLZmDHDWjdb8Exbgfb7n7OXC2SmYxPd2UImRb2T569CpwdswDj5VD3gjkbleD+vd6qI7DStFZyEL5VxD+QMa48MDk2OscqdYdMrAFpx9SjQQ3h9r/J0jnMlzZ2Rw7Fg/Q1IL2Ah21vEpklYuGDSgIase7ZqUbSbLnWIGXqK0VV+X7DRkmxR0pcgDlxEwkUpAv+LRmKjO9ZiWjZyJEVKIaQYtBFxUktKywIoGCa9TL8cmdgAA5fnO+ZveK3e6rXYw== Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbc125b5-437f-402c-84a2-08d740f0ca65 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2019 13:12:02.9703 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lke/v7EPXbHqas1mbCsWUj2rO5aLevoRT8xQXCyUnZAlbyhVgEvAwIwNBk4TDj9D44IhNPxPVrGxe2xrEa1myw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6318 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 216.71.154.42 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Anup Patel , "qemu-riscv@nongnu.org" , "qemu-devel@nongnu.org" , Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" This patch adds model for Google Goldfish virtual platform RTC device. We will be adding Goldfish RTC device to the QEMU RISC-V virt machine for providing real date-time to Guest Linux. The corresponding Linux driver for Goldfish RTC device is already available in upstream Linux. For now, VM migration support is not available for Goldfish RTC device but it will be added later when we implement VM migration for KVM RISC-V. Signed-off-by: Anup Patel --- hw/timer/Kconfig | 3 + hw/timer/Makefile.objs | 1 + hw/timer/goldfish_rtc.c | 278 ++++++++++++++++++++++++++++++++ include/hw/timer/goldfish_rtc.h | 46 ++++++ 4 files changed, 328 insertions(+) create mode 100644 hw/timer/goldfish_rtc.c create mode 100644 include/hw/timer/goldfish_rtc.h diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index eefc95f35e..bd1831fbe8 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -58,3 +58,6 @@ config CMSDK_APB_TIMER config CMSDK_APB_DUALTIMER bool select PTIMER + +config GOLDFISH_RTC + bool diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 123d92c969..5dc6f880af 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -47,3 +47,4 @@ common-obj-$(CONFIG_SUN4V_RTC) +=3D sun4v-rtc.o common-obj-$(CONFIG_CMSDK_APB_TIMER) +=3D cmsdk-apb-timer.o common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) +=3D cmsdk-apb-dualtimer.o common-obj-$(CONFIG_MSF2) +=3D mss-timer.o +common-obj-$(CONFIG_GOLDFISH_RTC) +=3D goldfish_rtc.o diff --git a/hw/timer/goldfish_rtc.c b/hw/timer/goldfish_rtc.c new file mode 100644 index 0000000000..223616ed75 --- /dev/null +++ b/hw/timer/goldfish_rtc.c @@ -0,0 +1,278 @@ +/* + * Goldfish virtual platform RTC + * + * Copyright (C) 2019 Western Digital Corporation or its affiliates. + * + * For more details on Google Goldfish virtual platform refer: + * https://android.googlesource.com/platform/external/qemu/+/master/docs/G= OLDFISH-VIRTUAL-HARDWARE.TXT + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/timer/goldfish_rtc.h" +#include "migration/vmstate.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" +#include "qemu/cutils.h" +#include "qemu/log.h" + +#define RTC_TIME_LOW 0x00 +#define RTC_TIME_HIGH 0x04 +#define RTC_ALARM_LOW 0x08 +#define RTC_ALARM_HIGH 0x0c +#define RTC_IRQ_ENABLED 0x10 +#define RTC_CLEAR_ALARM 0x14 +#define RTC_ALARM_STATUS 0x18 +#define RTC_CLEAR_INTERRUPT 0x1c + +static void goldfish_rtc_update(GoldfishRTCState *s) +{ + qemu_set_irq(s->irq, (s->irq_pending & s->irq_enabled) ? 1 : 0); +} + +static void goldfish_rtc_interrupt(void *opaque) +{ + GoldfishRTCState *s =3D (GoldfishRTCState *)opaque; + + s->alarm_running =3D 0; + s->irq_pending =3D 1; + goldfish_rtc_update(s); +} + +static uint64_t goldfish_rtc_get_count(GoldfishRTCState *s) +{ + return s->tick_offset + (uint64_t)qemu_clock_get_ns(rtc_clock); +} + +static void goldfish_rtc_clear_alarm(GoldfishRTCState *s) +{ + timer_del(s->timer); + s->alarm_running =3D 0; +} + +static void goldfish_rtc_set_alarm(GoldfishRTCState *s) +{ + uint64_t ticks =3D goldfish_rtc_get_count(s); + uint64_t event =3D s->alarm_next; + + if (event <=3D ticks) { + goldfish_rtc_clear_alarm(s); + goldfish_rtc_interrupt(s); + } else { + int64_t now =3D qemu_clock_get_ns(rtc_clock); + timer_mod(s->timer, now + (event - ticks)); + s->alarm_running =3D 1; + } +} + +static uint64_t goldfish_rtc_read(void *opaque, hwaddr offset, + unsigned size) +{ + GoldfishRTCState *s =3D (GoldfishRTCState *)opaque; + uint64_t r; + + switch (offset) { + case RTC_TIME_LOW: + r =3D goldfish_rtc_get_count(s) & 0xffffffff; + break; + case RTC_TIME_HIGH: + r =3D goldfish_rtc_get_count(s) >> 32; + break; + case RTC_ALARM_LOW: + r =3D s->alarm_next & 0xffffffff; + break; + case RTC_ALARM_HIGH: + r =3D s->alarm_next >> 32; + break; + case RTC_IRQ_ENABLED: + r =3D s->irq_enabled; + break; + case RTC_ALARM_STATUS: + r =3D s->alarm_running; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "goldfish_rtc_read: Bad offset 0x%x\n", (int)offset); + r =3D 0; + break; + } + + return r; +} + +static void goldfish_rtc_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + uint64_t current_tick, new_tick; + GoldfishRTCState *s =3D (GoldfishRTCState *)opaque; + + switch (offset) { + case RTC_TIME_LOW: + current_tick =3D goldfish_rtc_get_count(s); + new_tick =3D current_tick & (0xffffffffULL << 32); + new_tick |=3D value; + s->tick_offset +=3D new_tick - current_tick; + break; + case RTC_TIME_HIGH: + current_tick =3D goldfish_rtc_get_count(s); + new_tick =3D current_tick & 0xffffffffULL; + new_tick |=3D (value << 32); + s->tick_offset +=3D new_tick - current_tick; + break; + case RTC_ALARM_LOW: + s->alarm_next &=3D (0xffffffffULL << 32); + s->alarm_next |=3D value; + goldfish_rtc_set_alarm(s); + break; + case RTC_ALARM_HIGH: + s->alarm_next &=3D 0xffffffffULL; + s->alarm_next |=3D (value << 32); + break; + case RTC_IRQ_ENABLED: + s->irq_enabled =3D (uint32_t)(value & 0x1); + goldfish_rtc_update(s); + break; + case RTC_CLEAR_ALARM: + goldfish_rtc_clear_alarm(s); + break; + case RTC_CLEAR_INTERRUPT: + s->irq_pending =3D 0; + goldfish_rtc_update(s); + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "goldfish_rtc_write: Bad offset 0x%x\n", (int)offset= ); + break; + } +} + +static int goldfish_rtc_pre_save(void *opaque) +{ + uint64_t delta; + GoldfishRTCState *s =3D opaque; + + /* + * We want to migrate this offset, which sounds straightforward. + * Unfortunately, we cannot directly pass tick_offset because + * rtc_clock on destinetion Host might not be same source Host. + * + * To tackle, this we pass tick_offset relative to vm_clock from + * source Host and make it relative to rtc_clock at destinetion Host. + */ + delta =3D qemu_clock_get_ns(rtc_clock) - + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + s->tick_offset_vmstate =3D s->tick_offset + delta; + + return 0; +} + +static int goldfish_rtc_post_load(void *opaque, int version_id) +{ + uint64_t delta; + GoldfishRTCState *s =3D opaque; + + /* + * We extract tick_offset from tick_offset_vmstate by doing + * reverse math compared to pre_save() function. + */ + delta =3D qemu_clock_get_ns(rtc_clock) - + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + s->tick_offset =3D s->tick_offset_vmstate - delta; + + return 0; +} + +static const MemoryRegionOps goldfish_rtc_ops =3D { + .read =3D goldfish_rtc_read, + .write =3D goldfish_rtc_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4 + } +}; + +static const VMStateDescription goldfish_rtc_vmstate =3D { + .name =3D TYPE_GOLDFISH_RTC, + .version_id =3D 1, + .pre_save =3D goldfish_rtc_pre_save, + .post_load =3D goldfish_rtc_post_load, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64(tick_offset_vmstate, GoldfishRTCState), + VMSTATE_UINT64(alarm_next, GoldfishRTCState), + VMSTATE_UINT32(alarm_running, GoldfishRTCState), + VMSTATE_UINT32(irq_pending, GoldfishRTCState), + VMSTATE_UINT32(irq_enabled, GoldfishRTCState), + VMSTATE_END_OF_LIST() + } +}; + +static void goldfish_rtc_reset(DeviceState *dev) +{ + GoldfishRTCState *s =3D GOLDFISH_RTC(dev); + struct tm tm; + + timer_del(s->timer); + + qemu_get_timedate(&tm, 0); + s->tick_offset =3D mktimegm(&tm); + s->tick_offset *=3D NANOSECONDS_PER_SECOND; + s->tick_offset -=3D qemu_clock_get_ns(rtc_clock); + s->tick_offset_vmstate =3D 0; + s->alarm_next =3D 0; + s->alarm_running =3D 0; + s->irq_pending =3D 0; + s->irq_enabled =3D 0; +} + +static void goldfish_rtc_realize(DeviceState *d, Error **errp) +{ + SysBusDevice *dev =3D SYS_BUS_DEVICE(d); + GoldfishRTCState *s =3D GOLDFISH_RTC(d); + + memory_region_init_io(&s->iomem, OBJECT(s), &goldfish_rtc_ops, s, + "goldfish_rtc", 0x1000); + sysbus_init_mmio(dev, &s->iomem); + + sysbus_init_irq(dev, &s->irq); + + s->timer =3D timer_new_ns(rtc_clock, goldfish_rtc_interrupt, s); +} + +static void goldfish_rtc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D goldfish_rtc_realize; + dc->reset =3D goldfish_rtc_reset; + dc->vmsd =3D &goldfish_rtc_vmstate; +} + +static const TypeInfo goldfish_rtc_info =3D { + .name =3D TYPE_GOLDFISH_RTC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(GoldfishRTCState), + .class_init =3D goldfish_rtc_class_init, +}; + +static void goldfish_rtc_register_types(void) +{ + type_register_static(&goldfish_rtc_info); +} + +type_init(goldfish_rtc_register_types) diff --git a/include/hw/timer/goldfish_rtc.h b/include/hw/timer/goldfish_rt= c.h new file mode 100644 index 0000000000..dfb6d70b86 --- /dev/null +++ b/include/hw/timer/goldfish_rtc.h @@ -0,0 +1,46 @@ +/* + * Goldfish virtual platform RTC + * + * Copyright (C) 2019 Western Digital Corporation or its affiliates. + * + * For more details on Google Goldfish virtual platform refer: + * https://android.googlesource.com/platform/external/qemu/+/master/docs/G= OLDFISH-VIRTUAL-HARDWARE.TXT + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program. If not, see . + */ + +#ifndef HW_TIMER_GOLDFISH_RTC_H +#define HW_TIMER_GOLDFISH_RTC_H + +#include "hw/sysbus.h" + +#define TYPE_GOLDFISH_RTC "goldfish_rtc" +#define GOLDFISH_RTC(obj) \ +OBJECT_CHECK(GoldfishRTCState, (obj), TYPE_GOLDFISH_RTC) + +typedef struct GoldfishRTCState { + SysBusDevice parent_obj; + + MemoryRegion iomem; + QEMUTimer *timer; + qemu_irq irq; + + uint64_t tick_offset; + uint64_t tick_offset_vmstate; + uint64_t alarm_next; + uint32_t alarm_running; + uint32_t irq_pending; + uint32_t irq_enabled; +} GoldfishRTCState; + +#endif --=20 2.17.1 From nobody Sat May 4 01:04:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=fail (Bad Signature); dmarc=fail(p=none dis=none) header.from=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569333907102806.3141434934397; Tue, 24 Sep 2019 07:05:07 -0700 (PDT) Received: from localhost ([::1]:46060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClRB-00083R-LR for importer@patchew.org; Tue, 24 Sep 2019 10:05:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCkc6-0000Zj-CG for qemu-devel@nongnu.org; Tue, 24 Sep 2019 09:12:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCkc5-0002wU-0l for qemu-devel@nongnu.org; Tue, 24 Sep 2019 09:12:18 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:59729) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCkbz-0002rk-EJ; Tue, 24 Sep 2019 09:12:12 -0400 Received: from mail-by2nam03lp2056.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.56]) by ob1.hgst.iphmx.com with ESMTP; 24 Sep 2019 21:12:40 +0800 Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6318.namprd04.prod.outlook.com (52.132.168.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2284.20; Tue, 24 Sep 2019 13:12:07 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::e1a5:8de2:c3b1:3fb0%7]) with mapi id 15.20.2284.023; Tue, 24 Sep 2019 13:12:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1569330765; x=1600866765; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YjRlnmJ8YkdtsmNOvvOzVJi1LZ55WMensqP3Mc6kIk8=; b=V14XvdUTWBB3+xHbs0env0kV1ks+H7ez6J380kjgkhDQgLMeAMR0YQHh qgRDOXwWOZbQUtt2n1VoxZwgtc7d2Ts0aNy8WhSbjm6yE1xwRxxApjncm ogwhOweNRQcnodXeymTP5JSVDY9BVsJZBuFwjtFkr03fwEdGwH9VSOjVk Q7Mia3h513wRmQkSf4Jz0KyNCLhw1bQwaGeF9LVccWFu05ulYgER1Zil9 mkXEDDCGFhfRdp2vam6XH09UYJ0MBrvN35fAeyTlk3EYRClC8mqpLpzka aaE7Ebn8+G68mvZprznIL4ftSmwGiKiZsjY8dY8gky7phtBB1y3JP3sTk g==; IronPort-SDR: qg7vqfWNM10mICx27KvVsP2FqOA1IZItjbIESsw5V3+56LdpK+xvVzsDYlOPHg7oLQcR0u1zff 9PBv6+l+lxsNfRzOdC2Y4vkvvRnM7T12h2FpL+BPMrW01hmwZB2Wr+QPKP8WOHLb7Uvpvso1p2 oWRZVC4cr4OswPagVZ/z2fn3GfgzaM0LV6jbfZERTcMjN5NHu4dsyMIoo3oAMX9w4mciJro7p5 s7QivoDY9qM6yYS7rwLRl5WS31GxWUdaIqGCOErwOo/1/AKNSROb/p1UTRj7yP6sIf3IYBvAob u2I= X-IronPort-AV: E=Sophos;i="5.64,544,1559491200"; d="scan'208";a="219807936" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FqQF9WME8UebDcDddN1ChEPrqZhFC4cDB51/fRIcFDXnyPDXzgYFy6LZVsD+bTRxlTn/b2Wv8pj5a3bsqt0YXN356mrvrwPkzmEWrEjnUdt5OypU8ORBCXH/Fb4V91MYZ46YRupWS2sCM6BiFlrHGIyqWPDPgv3mgpBZiBOSxMknJGVkq8hqUpWXy5KK54zGDMbyj7cPkj/6yGCE4QnObOYYrbNAo4RY29XBw0bvwsDFABaOiWka6Fgm5vpqsRxlUz82GdNKjzQBLTFlUf2lfctVghb2h22ONK5DS1hNVe9oG2IHNgUhtPSVW/l9EupSx9SV9+VQ/i+B6mKWRcv0bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9QFalQcva71sTGAhg6PdUkHuKxqhy6hkayNCFUhn99w=; b=XyuNjcvN3I6IYAW6pM5B5VE4HisV6XZMauCsnYulWV0DfVPypEVTsljGUQig9upusxsA8D8aniAbm+EcYCOC9Z3BjusQCDIuIa696ORC71HSL8dZrkuYCiWFf3WHr6ndaONL67/WHjkv4/5v41yTwGeqXKuFni3WcwbM0au1Yq/CyEteuuHXdXn3G7RPO/3zngrS367d21W7Rqm6GlubutevaMiKn98e2Lwae5NTrTeX0QRSkBGju8np14DdVO26hPdk11iUWyTS8qCfcWZivYEE73Y2fHCVdZ44xMX4ecXgkfZS/eV2HxuygwsU+rP4+dAWltp34RLgWFLuHzDptQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9QFalQcva71sTGAhg6PdUkHuKxqhy6hkayNCFUhn99w=; b=tICtW9ogUJkNnltUAgoLsw8Xk1iP3B9oRSC8UYlXfTBre2KWpgKNfpF/ftFCNOKeDdOobHy85CFOCl64K/nAaqcIZLZ4FhCrI1w0Z9rMjUaKWoffBOjrEqC4djdl83iKQnUpdHS3v9bKc1+DG7tL2HqxV4+mvuuNTeU/HFg8kBs= From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , Bastian Koppelmann Subject: [PATCH v2 2/2] riscv: virt: Use Goldfish RTC device Thread-Topic: [PATCH v2 2/2] riscv: virt: Use Goldfish RTC device Thread-Index: AQHVctmqoY2WGh0s9UytwrGPM+rJ5g== Date: Tue, 24 Sep 2019 13:12:07 +0000 Message-ID: <20190924131131.118155-3-anup.patel@wdc.com> References: <20190924131131.118155-1-anup.patel@wdc.com> In-Reply-To: <20190924131131.118155-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0148.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::18) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.51.80] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 49b4d693-1c5c-48da-b059-08d740f0cd1f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600167)(711020)(4605104)(1401327)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:MN2PR04MB6318; x-ms-traffictypediagnostic: MN2PR04MB6318: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:131; x-forefront-prvs: 0170DAF08C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(346002)(376002)(366004)(396003)(39860400002)(136003)(199004)(189003)(8676002)(25786009)(476003)(305945005)(8936002)(81156014)(81166006)(6512007)(36756003)(3846002)(6116002)(6436002)(5660300002)(110136005)(54906003)(44832011)(71190400001)(71200400001)(2616005)(486006)(316002)(256004)(66066001)(7736002)(6486002)(11346002)(50226002)(446003)(6506007)(66946007)(1076003)(14454004)(64756008)(2906002)(186003)(99286004)(102836004)(2171002)(386003)(52116002)(26005)(478600001)(66476007)(76176011)(66556008)(86362001)(55236004)(66446008)(4326008); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6318; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: s5A/bhsJTGu73adFdjsOABdc1CXMM1e6h4fqz3odkzAKfNNmR4g1cvLTZCCUUjhciLU7cNv4bdYO+GQ7LLAB55BOc3k20SWsMMLIIedmbFJ5JMuY50d+HaWFgTxTaiz0aVj+IX9H9sjrshn8r+JJtt0Jvl3RyDamJozbFSaCAolnR64eWPPfRZD2sLMz9Q4aW9aH2AivhwoJOhGjopa4cGbyLXAcd1AhBtqZE6Hd+utFRL3FOl8p7DgeLSzvWKyYuMI+ZQD/odYyNYtWgANHK50H6YDSLX2lp2kZ67b/6btV3brb7Nak5TQpm9gMOAPyBg1wGlX+1KS9N5tXY45frIMI+SlVKQ2WA5Yy7kDA55ojHpCCMxoVx6MHHgf6Y16eYtGkXZ2qmL9vQW8SlIrytbtKKkrBvSp6lZykm4ON8XM= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49b4d693-1c5c-48da-b059-08d740f0cd1f X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2019 13:12:07.5628 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 43XNRYKuCe6tK0qcbAjPkCi6EwQ8tU49knAaMrhf2xMZJr4KvFzk5Fz48O/N92+3c1lm0ziIjgW02aSYnNpstQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6318 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 68.232.143.124 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Anup Patel , "qemu-riscv@nongnu.org" , "qemu-devel@nongnu.org" , Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" We extend QEMU RISC-V virt machine by adding Goldfish RTC device to it. This will allow Guest Linux to sync it's local date/time with Host date/time via RTC device. Signed-off-by: Anup Patel --- hw/riscv/Kconfig | 1 + hw/riscv/virt.c | 15 +++++++++++++++ include/hw/riscv/virt.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index fb19b2df3a..b33753c780 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -34,6 +34,7 @@ config RISCV_VIRT select PCI select HART select SERIAL + select GOLDFISH_RTC select VIRTIO_MMIO select PCI_EXPRESS_GENERIC_BRIDGE select SIFIVE diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d36f5625ec..95c42ab993 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -57,6 +57,7 @@ static const struct MemmapEntry { [VIRT_DEBUG] =3D { 0x0, 0x100 }, [VIRT_MROM] =3D { 0x1000, 0x11000 }, [VIRT_TEST] =3D { 0x100000, 0x1000 }, + [VIRT_RTC] =3D { 0x101000, 0x1000 }, [VIRT_CLINT] =3D { 0x2000000, 0x10000 }, [VIRT_PLIC] =3D { 0xc000000, 0x4000000 }, [VIRT_UART0] =3D { 0x10000000, 0x100 }, @@ -310,6 +311,17 @@ static void create_fdt(RISCVVirtState *s, const struct= MemmapEntry *memmap, qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle); qemu_fdt_setprop_cell(fdt, nodename, "interrupts", UART0_IRQ); =20 + nodename =3D g_strdup_printf("/rtc@%lx", + (long)memmap[VIRT_RTC].base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "google,goldfish-rtc"); + qemu_fdt_setprop_cells(fdt, nodename, "reg", + 0x0, memmap[VIRT_RTC].base, + 0x0, memmap[VIRT_RTC].size); + qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle); + qemu_fdt_setprop_cell(fdt, nodename, "interrupts", RTC_IRQ); + qemu_fdt_add_subnode(fdt, "/chosen"); qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename); if (cmdline) { @@ -496,6 +508,9 @@ static void riscv_virt_board_init(MachineState *machine) 0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193, serial_hd(0), DEVICE_LITTLE_ENDIAN); =20 + sysbus_create_simple("goldfish_rtc", memmap[VIRT_RTC].base, + qdev_get_gpio_in(DEVICE(s->plic), RTC_IRQ)); + g_free(plic_hart_config); } =20 diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 6e5fbe5d3b..e6423258d3 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -37,6 +37,7 @@ enum { VIRT_DEBUG, VIRT_MROM, VIRT_TEST, + VIRT_RTC, VIRT_CLINT, VIRT_PLIC, VIRT_UART0, @@ -49,6 +50,7 @@ enum { =20 enum { UART0_IRQ =3D 10, + RTC_IRQ =3D 11, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, PCIE_IRQ =3D 0x20, /* 32 to 35 */ --=20 2.17.1