From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
devel@lists.libvirt.org, "Marek Vasut" <marex@denx.de>,
"Laurent Vivier" <laurent@vivier.eu>,
"Chris Wulff" <crwulff@gmail.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH-for-9.1 v2 3/3] hw/timer: Remove the ALTERA_TIMER model
Date: Wed, 27 Mar 2024 15:48:06 +0100 [thread overview]
Message-ID: <20240327144806.11319-4-philmd@linaro.org> (raw)
In-Reply-To: <20240327144806.11319-1-philmd@linaro.org>
The ALTERA_TIMER was only used by Nios II machines,
which have been removed. Since it has no direct user,
remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/timer/altera_timer.c | 244 ----------------------------------------
hw/timer/Kconfig | 4 -
hw/timer/meson.build | 1 -
3 files changed, 249 deletions(-)
delete mode 100644 hw/timer/altera_timer.c
diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
deleted file mode 100644
index 0f1f54206a..0000000000
--- a/hw/timer/altera_timer.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * QEMU model of the Altera timer.
- *
- * Copyright (c) 2012 Chris Wulff <crwulff@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>
- */
-
-#include "qemu/osdep.h"
-#include "qemu/module.h"
-#include "qapi/error.h"
-
-#include "hw/sysbus.h"
-#include "hw/irq.h"
-#include "hw/ptimer.h"
-#include "hw/qdev-properties.h"
-#include "qom/object.h"
-
-#define R_STATUS 0
-#define R_CONTROL 1
-#define R_PERIODL 2
-#define R_PERIODH 3
-#define R_SNAPL 4
-#define R_SNAPH 5
-#define R_MAX 6
-
-#define STATUS_TO 0x0001
-#define STATUS_RUN 0x0002
-
-#define CONTROL_ITO 0x0001
-#define CONTROL_CONT 0x0002
-#define CONTROL_START 0x0004
-#define CONTROL_STOP 0x0008
-
-#define TYPE_ALTERA_TIMER "ALTR.timer"
-OBJECT_DECLARE_SIMPLE_TYPE(AlteraTimer, ALTERA_TIMER)
-
-struct AlteraTimer {
- SysBusDevice busdev;
- MemoryRegion mmio;
- qemu_irq irq;
- uint32_t freq_hz;
- ptimer_state *ptimer;
- uint32_t regs[R_MAX];
-};
-
-static int timer_irq_state(AlteraTimer *t)
-{
- bool irq = (t->regs[R_STATUS] & STATUS_TO) &&
- (t->regs[R_CONTROL] & CONTROL_ITO);
- return irq;
-}
-
-static uint64_t timer_read(void *opaque, hwaddr addr,
- unsigned int size)
-{
- AlteraTimer *t = opaque;
- uint64_t r = 0;
-
- addr >>= 2;
-
- switch (addr) {
- case R_CONTROL:
- r = t->regs[R_CONTROL] & (CONTROL_ITO | CONTROL_CONT);
- break;
-
- default:
- if (addr < ARRAY_SIZE(t->regs)) {
- r = t->regs[addr];
- }
- break;
- }
-
- return r;
-}
-
-static void timer_write(void *opaque, hwaddr addr,
- uint64_t value, unsigned int size)
-{
- AlteraTimer *t = opaque;
- uint64_t tvalue;
- uint32_t count = 0;
- int irqState = timer_irq_state(t);
-
- addr >>= 2;
-
- switch (addr) {
- case R_STATUS:
- /* The timeout bit is cleared by writing the status register. */
- t->regs[R_STATUS] &= ~STATUS_TO;
- break;
-
- case R_CONTROL:
- ptimer_transaction_begin(t->ptimer);
- t->regs[R_CONTROL] = value & (CONTROL_ITO | CONTROL_CONT);
- if ((value & CONTROL_START) &&
- !(t->regs[R_STATUS] & STATUS_RUN)) {
- ptimer_run(t->ptimer, 1);
- t->regs[R_STATUS] |= STATUS_RUN;
- }
- if ((value & CONTROL_STOP) && (t->regs[R_STATUS] & STATUS_RUN)) {
- ptimer_stop(t->ptimer);
- t->regs[R_STATUS] &= ~STATUS_RUN;
- }
- ptimer_transaction_commit(t->ptimer);
- break;
-
- case R_PERIODL:
- case R_PERIODH:
- ptimer_transaction_begin(t->ptimer);
- t->regs[addr] = value & 0xFFFF;
- if (t->regs[R_STATUS] & STATUS_RUN) {
- ptimer_stop(t->ptimer);
- t->regs[R_STATUS] &= ~STATUS_RUN;
- }
- tvalue = (t->regs[R_PERIODH] << 16) | t->regs[R_PERIODL];
- ptimer_set_limit(t->ptimer, tvalue + 1, 1);
- ptimer_transaction_commit(t->ptimer);
- break;
-
- case R_SNAPL:
- case R_SNAPH:
- count = ptimer_get_count(t->ptimer);
- t->regs[R_SNAPL] = count & 0xFFFF;
- t->regs[R_SNAPH] = count >> 16;
- break;
-
- default:
- break;
- }
-
- if (irqState != timer_irq_state(t)) {
- qemu_set_irq(t->irq, timer_irq_state(t));
- }
-}
-
-static const MemoryRegionOps timer_ops = {
- .read = timer_read,
- .write = timer_write,
- .endianness = DEVICE_NATIVE_ENDIAN,
- .valid = {
- .min_access_size = 1,
- .max_access_size = 4
- }
-};
-
-static void timer_hit(void *opaque)
-{
- AlteraTimer *t = opaque;
- const uint64_t tvalue = (t->regs[R_PERIODH] << 16) | t->regs[R_PERIODL];
-
- t->regs[R_STATUS] |= STATUS_TO;
-
- ptimer_set_limit(t->ptimer, tvalue + 1, 1);
-
- if (!(t->regs[R_CONTROL] & CONTROL_CONT)) {
- t->regs[R_STATUS] &= ~STATUS_RUN;
- ptimer_set_count(t->ptimer, tvalue);
- } else {
- ptimer_run(t->ptimer, 1);
- }
-
- qemu_set_irq(t->irq, timer_irq_state(t));
-}
-
-static void altera_timer_realize(DeviceState *dev, Error **errp)
-{
- AlteraTimer *t = ALTERA_TIMER(dev);
- SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
-
- if (t->freq_hz == 0) {
- error_setg(errp, "\"clock-frequency\" property must be provided.");
- return;
- }
-
- t->ptimer = ptimer_init(timer_hit, t, PTIMER_POLICY_LEGACY);
- ptimer_transaction_begin(t->ptimer);
- ptimer_set_freq(t->ptimer, t->freq_hz);
- ptimer_transaction_commit(t->ptimer);
-
- memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t,
- TYPE_ALTERA_TIMER, R_MAX * sizeof(uint32_t));
- sysbus_init_mmio(sbd, &t->mmio);
-}
-
-static void altera_timer_init(Object *obj)
-{
- AlteraTimer *t = ALTERA_TIMER(obj);
- SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
-
- sysbus_init_irq(sbd, &t->irq);
-}
-
-static void altera_timer_reset(DeviceState *dev)
-{
- AlteraTimer *t = ALTERA_TIMER(dev);
-
- ptimer_transaction_begin(t->ptimer);
- ptimer_stop(t->ptimer);
- ptimer_set_limit(t->ptimer, 0xffffffff, 1);
- ptimer_transaction_commit(t->ptimer);
- memset(t->regs, 0, sizeof(t->regs));
-}
-
-static Property altera_timer_properties[] = {
- DEFINE_PROP_UINT32("clock-frequency", AlteraTimer, freq_hz, 0),
- DEFINE_PROP_END_OF_LIST(),
-};
-
-static void altera_timer_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
-
- dc->realize = altera_timer_realize;
- device_class_set_props(dc, altera_timer_properties);
- dc->reset = altera_timer_reset;
-}
-
-static const TypeInfo altera_timer_info = {
- .name = TYPE_ALTERA_TIMER,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(AlteraTimer),
- .instance_init = altera_timer_init,
- .class_init = altera_timer_class_init,
-};
-
-static void altera_timer_register(void)
-{
- type_register_static(&altera_timer_info);
-}
-
-type_init(altera_timer_register)
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 010be7ed1f..61fbb62b65 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -17,10 +17,6 @@ config I8254
bool
depends on ISA_BUS
-config ALTERA_TIMER
- bool
- select PTIMER
-
config ALLWINNER_A10_PIT
bool
select PTIMER
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index fc632ad445..80427852e0 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -1,6 +1,5 @@
system_ss.add(when: 'CONFIG_A9_GTIMER', if_true: files('a9gtimer.c'))
system_ss.add(when: 'CONFIG_ALLWINNER_A10_PIT', if_true: files('allwinner-a10-pit.c'))
-system_ss.add(when: 'CONFIG_ALTERA_TIMER', if_true: files('altera_timer.c'))
system_ss.add(when: 'CONFIG_ARM_MPTIMER', if_true: files('arm_mptimer.c'))
system_ss.add(when: 'CONFIG_ARM_TIMER', if_true: files('arm_timer.c'))
system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_systick.c'))
--
2.41.0
next prev parent reply other threads:[~2024-03-27 14:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 14:48 [PATCH-for-9.1 v2 0/3] target/nios2: Remove the deprecated Nios II target Philippe Mathieu-Daudé
2024-03-27 14:48 ` [PATCH-for-9.0? v2 1/3] fpu/softfloat: Remove mention of TILE-Gx target Philippe Mathieu-Daudé
2024-03-27 15:41 ` Thomas Huth
2024-03-27 19:41 ` Richard Henderson
2024-03-27 14:48 ` [PATCH-for-9.1 v2 2/3] target/nios2: Remove the deprecated Nios II target Philippe Mathieu-Daudé
2024-03-27 20:26 ` Richard Henderson
2024-04-18 11:10 ` Philippe Mathieu-Daudé
2024-04-18 12:04 ` Marek Vasut
2024-04-24 8:50 ` Philippe Mathieu-Daudé
2024-04-24 11:39 ` Marek Vasut
2024-03-27 14:48 ` Philippe Mathieu-Daudé [this message]
2024-03-27 20:26 ` [PATCH-for-9.1 v2 3/3] hw/timer: Remove the ALTERA_TIMER model Richard Henderson
2024-04-03 9:36 ` [PATCH-for-9.1 v2 0/3] target/nios2: Remove the deprecated Nios II target Philippe Mathieu-Daudé
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=20240327144806.11319-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=crwulff@gmail.com \
--cc=devel@lists.libvirt.org \
--cc=laurent@vivier.eu \
--cc=marcel.apfelbaum@gmail.com \
--cc=marex@denx.de \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.