git: c4530dfff495 - main - aw_timer: rename driver from a10_timer
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Jan 2025 20:06:59 UTC
The branch main has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=c4530dfff495c588cc9ba4faaf0fa8fddfd57441
commit c4530dfff495c588cc9ba4faaf0fa8fddfd57441
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2025-01-27 19:59:51 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2025-01-27 20:04:09 +0000
aw_timer: rename driver from a10_timer
This reflects its expanded support for platforms other than the A10.
Functions specific to A10/A13 retain the a10 prefix, but the majority of
names in the driver are changed, e.g. a10_timer_softc becomes
aw_timer_softc.
Reviewed by: manu, ganbold
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48671
---
UPDATING | 6 ++
sys/arm/allwinner/{a10_timer.c => aw_timer.c} | 110 +++++++++++++-------------
sys/arm/allwinner/files.allwinner_up | 2 +-
sys/arm64/conf/NOTES | 2 +-
sys/arm64/conf/std.allwinner | 2 +-
sys/conf/files.arm64 | 2 +-
6 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/UPDATING b/UPDATING
index 7329837c48ee..dfc73f7d4db5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20250127:
+ The Allwinner a10_timer driver has been renamed to aw_driver. If you
+ have a custom kernel configuration including the line 'device
+ a10_timer', it must be adjusted to 'device aw_timer'. The same applies
+ for device exclusions with 'nodevice'.
+
20250106:
A new SOC_ROCKCHIP options appeared, so if you have a custom kernel configuration
targetting Rockchip SoC you need to add it so shared and mandatory drivers for
diff --git a/sys/arm/allwinner/a10_timer.c b/sys/arm/allwinner/aw_timer.c
similarity index 81%
rename from sys/arm/allwinner/a10_timer.c
rename to sys/arm/allwinner/aw_timer.c
index 80315914949b..a7317e299871 100644
--- a/sys/arm/allwinner/a10_timer.c
+++ b/sys/arm/allwinner/aw_timer.c
@@ -85,51 +85,51 @@
#define SYS_TIMER_CLKSRC 24000000 /* clock source */
-enum a10_timer_type {
+enum aw_timer_type {
A10_TIMER = 1,
A23_TIMER,
};
-struct a10_timer_softc {
+struct aw_timer_softc {
device_t sc_dev;
struct resource *res[2];
void *sc_ih; /* interrupt handler */
uint32_t sc_period;
uint64_t timer0_freq;
struct eventtimer et;
- enum a10_timer_type type;
+ enum aw_timer_type type;
};
#define timer_read_4(sc, reg) \
- bus_read_4(sc->res[A10_TIMER_MEMRES], reg)
+ bus_read_4(sc->res[AW_TIMER_MEMRES], reg)
#define timer_write_4(sc, reg, val) \
- bus_write_4(sc->res[A10_TIMER_MEMRES], reg, val)
+ bus_write_4(sc->res[AW_TIMER_MEMRES], reg, val)
#if defined(__arm__)
static u_int a10_timer_get_timecount(struct timecounter *);
-static uint64_t a10_timer_read_counter64(struct a10_timer_softc *sc);
-static void a10_timer_timecounter_setup(struct a10_timer_softc *sc);
+static uint64_t a10_timer_read_counter64(struct aw_timer_softc *sc);
+static void a10_timer_timecounter_setup(struct aw_timer_softc *sc);
-static void a10_timer_eventtimer_setup(struct a10_timer_softc *sc);
-static int a10_timer_timer_start(struct eventtimer *,
- sbintime_t first, sbintime_t period);
-static int a10_timer_timer_stop(struct eventtimer *);
+static void aw_timer_eventtimer_setup(struct aw_timer_softc *sc);
+static int aw_timer_eventtimer_start(struct eventtimer *, sbintime_t first,
+ sbintime_t period);
+static int aw_timer_eventtimer_stop(struct eventtimer *);
#endif
#if defined(__aarch64__)
-static void a23_timer_timecounter_setup(struct a10_timer_softc *sc);
+static void a23_timer_timecounter_setup(struct aw_timer_softc *sc);
static u_int a23_timer_get_timecount(struct timecounter *tc);
#endif
-static int a10_timer_irq(void *);
-static int a10_timer_probe(device_t);
-static int a10_timer_attach(device_t);
+static int aw_timer_irq(void *);
+static int aw_timer_probe(device_t);
+static int aw_timer_attach(device_t);
#if defined(__arm__)
static delay_func a10_timer_delay;
static struct timecounter a10_timer_timecounter = {
- .tc_name = "a10_timer timer0",
+ .tc_name = "aw_timer timer0",
.tc_get_timecount = a10_timer_get_timecount,
.tc_counter_mask = ~0u,
.tc_frequency = 0,
@@ -139,7 +139,7 @@ static struct timecounter a10_timer_timecounter = {
#if defined(__aarch64__)
static struct timecounter a23_timer_timecounter = {
- .tc_name = "a10_timer timer0",
+ .tc_name = "aw_timer timer0",
.tc_get_timecount = a23_timer_get_timecount,
.tc_counter_mask = ~0u,
.tc_frequency = 0,
@@ -148,10 +148,10 @@ static struct timecounter a23_timer_timecounter = {
};
#endif
-#define A10_TIMER_MEMRES 0
-#define A10_TIMER_IRQRES 1
+#define AW_TIMER_MEMRES 0
+#define AW_TIMER_IRQRES 1
-static struct resource_spec a10_timer_spec[] = {
+static struct resource_spec aw_timer_spec[] = {
{ SYS_RES_MEMORY, 0, RF_ACTIVE },
{ SYS_RES_IRQ, 0, RF_ACTIVE },
{ -1, 0 }
@@ -166,7 +166,7 @@ static struct ofw_compat_data compat_data[] = {
};
static int
-a10_timer_probe(device_t dev)
+aw_timer_probe(device_t dev)
{
if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
return (ENXIO);
@@ -184,16 +184,16 @@ a10_timer_probe(device_t dev)
}
static int
-a10_timer_attach(device_t dev)
+aw_timer_attach(device_t dev)
{
- struct a10_timer_softc *sc;
+ struct aw_timer_softc *sc;
clk_t clk;
int err;
sc = device_get_softc(dev);
sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
- if (bus_alloc_resources(dev, a10_timer_spec, sc->res)) {
+ if (bus_alloc_resources(dev, aw_timer_spec, sc->res)) {
device_printf(dev, "could not allocate resources\n");
return (ENXIO);
}
@@ -201,10 +201,10 @@ a10_timer_attach(device_t dev)
sc->sc_dev = dev;
/* Setup and enable the timer interrupt */
- err = bus_setup_intr(dev, sc->res[A10_TIMER_IRQRES], INTR_TYPE_CLK,
- a10_timer_irq, NULL, sc, &sc->sc_ih);
+ err = bus_setup_intr(dev, sc->res[AW_TIMER_IRQRES], INTR_TYPE_CLK,
+ aw_timer_irq, NULL, sc, &sc->sc_ih);
if (err != 0) {
- bus_release_resources(dev, a10_timer_spec, sc->res);
+ bus_release_resources(dev, aw_timer_spec, sc->res);
device_printf(dev, "Unable to setup the clock irq handler, "
"err = %d\n", err);
return (ENXIO);
@@ -225,7 +225,7 @@ a10_timer_attach(device_t dev)
}
#if defined(__arm__)
- a10_timer_eventtimer_setup(sc);
+ aw_timer_eventtimer_setup(sc);
a10_timer_timecounter_setup(sc);
#elif defined(__aarch64__)
a23_timer_timecounter_setup(sc);
@@ -235,12 +235,12 @@ a10_timer_attach(device_t dev)
}
static int
-a10_timer_irq(void *arg)
+aw_timer_irq(void *arg)
{
- struct a10_timer_softc *sc;
+ struct aw_timer_softc *sc;
uint32_t val;
- sc = (struct a10_timer_softc *)arg;
+ sc = (struct aw_timer_softc *)arg;
/* Clear interrupt pending bit. */
timer_write_4(sc, TIMER_IRQ_STA_REG, TIMER_IRQ_PENDING(0));
@@ -274,7 +274,7 @@ a10_timer_irq(void *arg)
#if defined(__arm__)
static void
-a10_timer_eventtimer_setup(struct a10_timer_softc *sc)
+aw_timer_eventtimer_setup(struct aw_timer_softc *sc)
{
uint32_t val;
@@ -291,13 +291,13 @@ a10_timer_eventtimer_setup(struct a10_timer_softc *sc)
/* Set desired frequency in event timer and timecounter */
sc->et.et_frequency = sc->timer0_freq;
- sc->et.et_name = "a10_timer Eventtimer";
+ sc->et.et_name = "aw_timer Eventtimer";
sc->et.et_flags = ET_FLAGS_ONESHOT | ET_FLAGS_PERIODIC;
sc->et.et_quality = 1000;
sc->et.et_min_period = (0x00000005LLU << 32) / sc->et.et_frequency;
sc->et.et_max_period = (0xfffffffeLLU << 32) / sc->et.et_frequency;
- sc->et.et_start = a10_timer_timer_start;
- sc->et.et_stop = a10_timer_timer_stop;
+ sc->et.et_start = aw_timer_eventtimer_start;
+ sc->et.et_stop = aw_timer_eventtimer_stop;
sc->et.et_priv = sc;
et_register(&sc->et);
@@ -308,14 +308,14 @@ a10_timer_eventtimer_setup(struct a10_timer_softc *sc)
}
static int
-a10_timer_timer_start(struct eventtimer *et, sbintime_t first,
+aw_timer_eventtimer_start(struct eventtimer *et, sbintime_t first,
sbintime_t period)
{
- struct a10_timer_softc *sc;
+ struct aw_timer_softc *sc;
uint32_t count;
uint32_t val;
- sc = (struct a10_timer_softc *)et->et_priv;
+ sc = (struct aw_timer_softc *)et->et_priv;
if (period != 0)
sc->sc_period = ((uint32_t)et->et_frequency * period) >> 32;
@@ -346,12 +346,12 @@ a10_timer_timer_start(struct eventtimer *et, sbintime_t first,
}
static int
-a10_timer_timer_stop(struct eventtimer *et)
+aw_timer_eventtimer_stop(struct eventtimer *et)
{
- struct a10_timer_softc *sc;
+ struct aw_timer_softc *sc;
uint32_t val;
- sc = (struct a10_timer_softc *)et->et_priv;
+ sc = (struct aw_timer_softc *)et->et_priv;
/* Disable timer0 */
val = timer_read_4(sc, TIMER_CTRL_REG(0));
@@ -370,7 +370,7 @@ a10_timer_timer_stop(struct eventtimer *et)
#if defined(__aarch64__)
static void
-a23_timer_timecounter_setup(struct a10_timer_softc *sc)
+a23_timer_timecounter_setup(struct aw_timer_softc *sc)
{
uint32_t val;
@@ -404,10 +404,10 @@ a23_timer_timecounter_setup(struct a10_timer_softc *sc)
static u_int
a23_timer_get_timecount(struct timecounter *tc)
{
- struct a10_timer_softc *sc;
+ struct aw_timer_softc *sc;
uint32_t val;
- sc = (struct a10_timer_softc *)tc->tc_priv;
+ sc = (struct aw_timer_softc *)tc->tc_priv;
if (sc == NULL)
return (0);
@@ -423,7 +423,7 @@ a23_timer_get_timecount(struct timecounter *tc)
#if defined(__arm__)
static uint64_t
-a10_timer_read_counter64(struct a10_timer_softc *sc)
+a10_timer_read_counter64(struct aw_timer_softc *sc)
{
uint32_t lo, hi;
@@ -441,7 +441,7 @@ a10_timer_read_counter64(struct a10_timer_softc *sc)
static void
a10_timer_delay(int usec, void *arg)
{
- struct a10_timer_softc *sc = arg;
+ struct aw_timer_softc *sc = arg;
uint64_t end, now;
now = a10_timer_read_counter64(sc);
@@ -461,7 +461,7 @@ a10_timer_get_timecount(struct timecounter *tc)
}
static void
-a10_timer_timecounter_setup(struct a10_timer_softc *sc)
+a10_timer_timecounter_setup(struct aw_timer_softc *sc)
{
arm_set_delay(a10_timer_delay, sc);
a10_timer_timecounter.tc_priv = sc;
@@ -475,18 +475,18 @@ a10_timer_timecounter_setup(struct a10_timer_softc *sc)
}
#endif /* __arm__ */
-static device_method_t a10_timer_methods[] = {
- DEVMETHOD(device_probe, a10_timer_probe),
- DEVMETHOD(device_attach, a10_timer_attach),
+static device_method_t aw_timer_methods[] = {
+ DEVMETHOD(device_probe, aw_timer_probe),
+ DEVMETHOD(device_attach, aw_timer_attach),
DEVMETHOD_END
};
-static driver_t a10_timer_driver = {
- "a10_timer",
- a10_timer_methods,
- sizeof(struct a10_timer_softc),
+static driver_t aw_timer_driver = {
+ "aw_timer",
+ aw_timer_methods,
+ sizeof(struct aw_timer_softc),
};
-EARLY_DRIVER_MODULE(a10_timer, simplebus, a10_timer_driver, 0, 0,
+EARLY_DRIVER_MODULE(aw_timer, simplebus, aw_timer_driver, 0, 0,
BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
diff --git a/sys/arm/allwinner/files.allwinner_up b/sys/arm/allwinner/files.allwinner_up
index 3fcc600ad6cc..9944b5893dd5 100644
--- a/sys/arm/allwinner/files.allwinner_up
+++ b/sys/arm/allwinner/files.allwinner_up
@@ -1,2 +1,2 @@
-arm/allwinner/a10_timer.c standard
+arm/allwinner/aw_timer.c standard
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index 54bc7dcf1f09..c3e1930836b9 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -50,7 +50,7 @@ options SOC_ROCKCHIP_RK3568
options SOC_XILINX_ZYNQ
# Timer drivers
-device a10_timer
+device aw_timer
# Annapurna Alpine drivers
device al_ccu # Alpine Cache Coherency Unit
diff --git a/sys/arm64/conf/std.allwinner b/sys/arm64/conf/std.allwinner
index 2bcbdc32e111..345322cebb0f 100644
--- a/sys/arm64/conf/std.allwinner
+++ b/sys/arm64/conf/std.allwinner
@@ -8,7 +8,7 @@ options SOC_ALLWINNER_H5
options SOC_ALLWINNER_H6
# Timer drivers
-device a10_timer
+device aw_timer
# DMA controller
device a31_dmac
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 64c8acfcdb9a..4b73ebd1e6db 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -478,7 +478,6 @@ dev/vnic/lmac_if.m optional inet | inet6 | vnic
##
# Allwinner common files
-arm/allwinner/a10_timer.c optional a10_timer fdt
arm/allwinner/a10_codec.c optional sound a10_codec fdt
arm/allwinner/a31_dmac.c optional a31_dmac fdt
arm/allwinner/a33_codec.c optional fdt sound a33_codec
@@ -495,6 +494,7 @@ arm/allwinner/aw_rsb.c optional aw_rsb fdt
arm/allwinner/aw_rtc.c optional aw_rtc fdt
arm/allwinner/aw_sid.c optional aw_sid nvmem fdt
arm/allwinner/aw_syscon.c optional aw_syscon syscon fdt
+arm/allwinner/aw_timer.c optional aw_timer fdt
arm/allwinner/aw_thermal.c optional aw_thermal nvmem fdt
arm/allwinner/aw_usbphy.c optional ehci aw_usbphy fdt
arm/allwinner/aw_usb3phy.c optional xhci aw_usbphy fdt