mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory

Browse Source 
Move RTC devices under the hw/rtc/ subdirectory.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Message-Id: <20191003230404.19384-7-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2019-10-04 01:03:56 +02:00 committed by Laurent Vivier
parent de04c31d31
commit 2811ac3059
11 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -1163,8 +1163,8 @@ Sun4v
M: Artyom Tarasenko <atar4qemu@gmail.com> M: Artyom Tarasenko <atar4qemu@gmail.com>
S: Maintained S: Maintained
F: hw/sparc64/niagara.c F: hw/sparc64/niagara.c
F: hw/timer/sun4v-rtc.c F: hw/rtc/sun4v-rtc.c
F: include/hw/timer/sun4v-rtc.h F: include/hw/rtc/sun4v-rtc.h
Leon3 Leon3
M: Fabien Chouteau <chouteau@adacore.com> M: Fabien Chouteau <chouteau@adacore.com>

3
hw/rtc/Kconfig
View File

@ -10,3 +10,6 @@ config PL031
config MC146818RTC config MC146818RTC
bool bool
config SUN4V_RTC
bool

1
hw/rtc/Makefile.objs
View File

@ -5,3 +5,4 @@ common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif endif
common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_PL031) += pl031.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o

2
hw/timer/sun4v-rtc.c → hw/rtc/sun4v-rtc.c
View File

@ -13,7 +13,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/timer/sun4v-rtc.h" #include "hw/rtc/sun4v-rtc.h"
#include "trace.h" #include "trace.h"

4
hw/rtc/trace-events
View File

@ -1,5 +1,9 @@
# See docs/devel/tracing.txt for syntax documentation. # See docs/devel/tracing.txt for syntax documentation.
# sun4v-rtc.c
sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64
sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64
# pl031.c # pl031.c
pl031_irq_state(int level) "irq state %d" pl031_irq_state(int level) "irq state %d"
pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"

2
hw/sparc64/niagara.c
View File

@ -30,7 +30,7 @@
#include "hw/misc/unimp.h" #include "hw/misc/unimp.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/sparc/sparc64.h" #include "hw/sparc/sparc64.h"
#include "hw/timer/sun4v-rtc.h" #include "hw/rtc/sun4v-rtc.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

3
hw/timer/Kconfig
View File

@ -35,9 +35,6 @@ config ALLWINNER_A10_PIT
config STM32F2XX_TIMER config STM32F2XX_TIMER
bool bool
config SUN4V_RTC
bool
config CMSDK_APB_TIMER config CMSDK_APB_TIMER
bool bool
select PTIMER select PTIMER

1
hw/timer/Makefile.objs
View File

@ -35,7 +35,6 @@ common-obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o
common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o common-obj-$(CONFIG_ASPEED_SOC) += aspeed_timer.o aspeed_rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o
common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o
common-obj-$(CONFIG_MSF2) += mss-timer.o common-obj-$(CONFIG_MSF2) += mss-timer.o

4
hw/timer/trace-events
View File

@ -70,10 +70,6 @@ cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset"
aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64
# sun4v-rtc.c
sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64
sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64
# xlnx-zynqmp-rtc.c # xlnx-zynqmp-rtc.c
xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d" xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d"

19
include/hw/rtc/sun4v-rtc.h Normal file
View File

@ -0,0 +1,19 @@
/*
* QEMU sun4v Real Time Clock device
*
* The sun4v_rtc device (sun4v tod clock)
*
* Copyright (c) 2016 Artyom Tarasenko
*
* This code is licensed under the GNU GPL v3 or (at your option) any later
* version.
*/
#ifndef HW_RTC_SUN4V
#define HW_RTC_SUN4V
#include "exec/hwaddr.h"
void sun4v_rtc_init(hwaddr addr);
#endif

1
include/hw/timer/sun4v-rtc.h
View File

@ -1 +0,0 @@
void sun4v_rtc_init(hwaddr addr);