Message ID | 20190916154847.28936-3-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw: Split RTC devices from hw/timer/ to hw/rtc/ | expand |
On Mon, Sep 16, 2019 at 9:06 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > The PL031 is a Real Time Clock, not a timer. > Move it under the hw/rtc/ subdirectory. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > MAINTAINERS | 4 ++-- > Makefile.objs | 1 + > hw/Kconfig | 1 + > hw/Makefile.objs | 1 + > hw/arm/musca.c | 2 +- > hw/rtc/Kconfig | 2 ++ > hw/rtc/Makefile.objs | 1 + > hw/{timer => rtc}/pl031.c | 2 +- > hw/rtc/trace-events | 8 ++++++++ > hw/timer/Kconfig | 3 --- > hw/timer/Makefile.objs | 1 - > hw/timer/trace-events | 7 ------- > include/hw/{timer => rtc}/pl031.h | 5 +++-- > 13 files changed, 21 insertions(+), 17 deletions(-) > create mode 100644 hw/rtc/Kconfig > create mode 100644 hw/rtc/Makefile.objs > rename hw/{timer => rtc}/pl031.c (99%) > create mode 100644 hw/rtc/trace-events > rename include/hw/{timer => rtc}/pl031.h (93%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index f0e30b5248..5562d2c6d0 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -495,8 +495,8 @@ F: hw/intc/pl190.c > F: hw/sd/pl181.c > F: hw/ssi/pl022.c > F: include/hw/ssi/pl022.h > -F: hw/timer/pl031.c > -F: include/hw/timer/pl031.h > +F: hw/rtc/pl031.c > +F: include/hw/rtc/pl031.h > F: include/hw/arm/primecell.h > F: hw/timer/cmsdk-apb-timer.c > F: include/hw/timer/cmsdk-apb-timer.h > diff --git a/Makefile.objs b/Makefile.objs > index 6a143dcd57..1bcde315f7 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -173,6 +173,7 @@ trace-events-subdirs += hw/pci-host > trace-events-subdirs += hw/ppc > trace-events-subdirs += hw/rdma > trace-events-subdirs += hw/rdma/vmw > +trace-events-subdirs += hw/rtc > trace-events-subdirs += hw/s390x > trace-events-subdirs += hw/scsi > trace-events-subdirs += hw/sd > diff --git a/hw/Kconfig b/hw/Kconfig > index b45db3c813..4b53fee4d0 100644 > --- a/hw/Kconfig > +++ b/hw/Kconfig > @@ -27,6 +27,7 @@ source pci-host/Kconfig > source pcmcia/Kconfig > source pci/Kconfig > source rdma/Kconfig > +source rtc/Kconfig > source scsi/Kconfig > source sd/Kconfig > source semihosting/Kconfig > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index ece6cc3755..fd9750e5f2 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -26,6 +26,7 @@ devices-dirs-y += nvram/ > devices-dirs-y += pci/ > devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ > devices-dirs-y += pcmcia/ > +devices-dirs-y += rtc/ > devices-dirs-$(CONFIG_SCSI) += scsi/ > devices-dirs-y += sd/ > devices-dirs-y += ssi/ > diff --git a/hw/arm/musca.c b/hw/arm/musca.c > index 68db4b5b38..ba99dd1941 100644 > --- a/hw/arm/musca.c > +++ b/hw/arm/musca.c > @@ -32,7 +32,7 @@ > #include "hw/misc/tz-mpc.h" > #include "hw/misc/tz-ppc.h" > #include "hw/misc/unimp.h" > -#include "hw/timer/pl031.h" > +#include "hw/rtc/pl031.h" > > #define MUSCA_NUMIRQ_MAX 96 > #define MUSCA_PPC_MAX 3 > diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig > new file mode 100644 > index 0000000000..8a4383bca9 > --- /dev/null > +++ b/hw/rtc/Kconfig > @@ -0,0 +1,2 @@ > +config PL031 > + bool > diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs > new file mode 100644 > index 0000000000..3e1eb42563 > --- /dev/null > +++ b/hw/rtc/Makefile.objs > @@ -0,0 +1 @@ > +common-obj-$(CONFIG_PL031) += pl031.o > diff --git a/hw/timer/pl031.c b/hw/rtc/pl031.c > similarity index 99% > rename from hw/timer/pl031.c > rename to hw/rtc/pl031.c > index 2b3e261006..3a982752a2 100644 > --- a/hw/timer/pl031.c > +++ b/hw/rtc/pl031.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "qemu-common.h" > -#include "hw/timer/pl031.h" > +#include "hw/rtc/pl031.h" > #include "migration/vmstate.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events > new file mode 100644 > index 0000000000..54c94ac557 > --- /dev/null > +++ b/hw/rtc/trace-events > @@ -0,0 +1,8 @@ > +# See docs/devel/tracing.txt for syntax documentation. > + > +# pl031.c > +pl031_irq_state(int level) "irq state %d" > +pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" > +pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" > +pl031_alarm_raised(void) "alarm raised" > +pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" > diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig > index eefc95f35e..27c5dce09e 100644 > --- a/hw/timer/Kconfig > +++ b/hw/timer/Kconfig > @@ -27,9 +27,6 @@ config M41T80 > config M48T59 > bool > > -config PL031 > - bool > - > config TWL92230 > bool > depends on I2C > diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs > index f407523aa4..9f64f6e11e 100644 > --- a/hw/timer/Makefile.objs > +++ b/hw/timer/Makefile.objs > @@ -11,7 +11,6 @@ common-obj-$(CONFIG_M48T59) += m48t59.o > ifeq ($(CONFIG_ISA_BUS),y) > common-obj-$(CONFIG_M48T59) += m48t59-isa.o > endif > -common-obj-$(CONFIG_PL031) += pl031.o > common-obj-$(CONFIG_PUV3) += puv3_ost.o > common-obj-$(CONFIG_TWL92230) += twl92230.o > common-obj-$(CONFIG_XILINX) += xilinx_timer.o > diff --git a/hw/timer/trace-events b/hw/timer/trace-events > index db02a9142c..6936fe8573 100644 > --- a/hw/timer/trace-events > +++ b/hw/timer/trace-events > @@ -80,10 +80,3 @@ xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec > # nrf51_timer.c > nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" > nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" > - > -# pl031.c > -pl031_irq_state(int level) "irq state %d" > -pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" > -pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" > -pl031_alarm_raised(void) "alarm raised" > -pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" > diff --git a/include/hw/timer/pl031.h b/include/hw/rtc/pl031.h > similarity index 93% > rename from include/hw/timer/pl031.h > rename to include/hw/rtc/pl031.h > index 8c3f555ee2..e3cb1d646f 100644 > --- a/include/hw/timer/pl031.h > +++ b/include/hw/rtc/pl031.h > @@ -11,10 +11,11 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#ifndef HW_TIMER_PL031_H > -#define HW_TIMER_PL031_H > +#ifndef HW_RTC_PL031_H > +#define HW_RTC_PL031_H > > #include "hw/sysbus.h" > +#include "qemu/timer.h" > > #define TYPE_PL031 "pl031" > #define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031) > -- > 2.20.1 > >
diff --git a/MAINTAINERS b/MAINTAINERS index f0e30b5248..5562d2c6d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -495,8 +495,8 @@ F: hw/intc/pl190.c F: hw/sd/pl181.c F: hw/ssi/pl022.c F: include/hw/ssi/pl022.h -F: hw/timer/pl031.c -F: include/hw/timer/pl031.h +F: hw/rtc/pl031.c +F: include/hw/rtc/pl031.h F: include/hw/arm/primecell.h F: hw/timer/cmsdk-apb-timer.c F: include/hw/timer/cmsdk-apb-timer.h diff --git a/Makefile.objs b/Makefile.objs index 6a143dcd57..1bcde315f7 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -173,6 +173,7 @@ trace-events-subdirs += hw/pci-host trace-events-subdirs += hw/ppc trace-events-subdirs += hw/rdma trace-events-subdirs += hw/rdma/vmw +trace-events-subdirs += hw/rtc trace-events-subdirs += hw/s390x trace-events-subdirs += hw/scsi trace-events-subdirs += hw/sd diff --git a/hw/Kconfig b/hw/Kconfig index b45db3c813..4b53fee4d0 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -27,6 +27,7 @@ source pci-host/Kconfig source pcmcia/Kconfig source pci/Kconfig source rdma/Kconfig +source rtc/Kconfig source scsi/Kconfig source sd/Kconfig source semihosting/Kconfig diff --git a/hw/Makefile.objs b/hw/Makefile.objs index ece6cc3755..fd9750e5f2 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -26,6 +26,7 @@ devices-dirs-y += nvram/ devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ +devices-dirs-y += rtc/ devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-y += sd/ devices-dirs-y += ssi/ diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 68db4b5b38..ba99dd1941 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -32,7 +32,7 @@ #include "hw/misc/tz-mpc.h" #include "hw/misc/tz-ppc.h" #include "hw/misc/unimp.h" -#include "hw/timer/pl031.h" +#include "hw/rtc/pl031.h" #define MUSCA_NUMIRQ_MAX 96 #define MUSCA_PPC_MAX 3 diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig new file mode 100644 index 0000000000..8a4383bca9 --- /dev/null +++ b/hw/rtc/Kconfig @@ -0,0 +1,2 @@ +config PL031 + bool diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs new file mode 100644 index 0000000000..3e1eb42563 --- /dev/null +++ b/hw/rtc/Makefile.objs @@ -0,0 +1 @@ +common-obj-$(CONFIG_PL031) += pl031.o diff --git a/hw/timer/pl031.c b/hw/rtc/pl031.c similarity index 99% rename from hw/timer/pl031.c rename to hw/rtc/pl031.c index 2b3e261006..3a982752a2 100644 --- a/hw/timer/pl031.c +++ b/hw/rtc/pl031.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/timer/pl031.h" +#include "hw/rtc/pl031.h" #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/qdev-properties.h" diff --git a/hw/rtc/trace-events b/hw/rtc/trace-events new file mode 100644 index 0000000000..54c94ac557 --- /dev/null +++ b/hw/rtc/trace-events @@ -0,0 +1,8 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# pl031.c +pl031_irq_state(int level) "irq state %d" +pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +pl031_alarm_raised(void) "alarm raised" +pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index eefc95f35e..27c5dce09e 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -27,9 +27,6 @@ config M41T80 config M48T59 bool -config PL031 - bool - config TWL92230 bool depends on I2C diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index f407523aa4..9f64f6e11e 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -11,7 +11,6 @@ common-obj-$(CONFIG_M48T59) += m48t59.o ifeq ($(CONFIG_ISA_BUS),y) common-obj-$(CONFIG_M48T59) += m48t59-isa.o endif -common-obj-$(CONFIG_PL031) += pl031.o common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_XILINX) += xilinx_timer.o diff --git a/hw/timer/trace-events b/hw/timer/trace-events index db02a9142c..6936fe8573 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -80,10 +80,3 @@ xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec # nrf51_timer.c nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" - -# pl031.c -pl031_irq_state(int level) "irq state %d" -pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" -pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" -pl031_alarm_raised(void) "alarm raised" -pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks" diff --git a/include/hw/timer/pl031.h b/include/hw/rtc/pl031.h similarity index 93% rename from include/hw/timer/pl031.h rename to include/hw/rtc/pl031.h index 8c3f555ee2..e3cb1d646f 100644 --- a/include/hw/timer/pl031.h +++ b/include/hw/rtc/pl031.h @@ -11,10 +11,11 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#ifndef HW_TIMER_PL031_H -#define HW_TIMER_PL031_H +#ifndef HW_RTC_PL031_H +#define HW_RTC_PL031_H #include "hw/sysbus.h" +#include "qemu/timer.h" #define TYPE_PL031 "pl031" #define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031)
The PL031 is a Real Time Clock, not a timer. Move it under the hw/rtc/ subdirectory. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- MAINTAINERS | 4 ++-- Makefile.objs | 1 + hw/Kconfig | 1 + hw/Makefile.objs | 1 + hw/arm/musca.c | 2 +- hw/rtc/Kconfig | 2 ++ hw/rtc/Makefile.objs | 1 + hw/{timer => rtc}/pl031.c | 2 +- hw/rtc/trace-events | 8 ++++++++ hw/timer/Kconfig | 3 --- hw/timer/Makefile.objs | 1 - hw/timer/trace-events | 7 ------- include/hw/{timer => rtc}/pl031.h | 5 +++-- 13 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 hw/rtc/Kconfig create mode 100644 hw/rtc/Makefile.objs rename hw/{timer => rtc}/pl031.c (99%) create mode 100644 hw/rtc/trace-events rename include/hw/{timer => rtc}/pl031.h (93%)