* [PATCH qemu v2] aspeed: Register all watchdogs
@ 2017-06-28 4:56 Joel Stanley
2017-06-28 8:12 ` Cédric Le Goater
0 siblings, 1 reply; 3+ messages in thread
From: Joel Stanley @ 2017-06-28 4:56 UTC (permalink / raw)
To: Cédric Le Goater; +Cc: Andrew Jeffery, openbmc
The ast2400 contains two and the ast2500 contains three watchdogs.
Add this information to the AspeedSoCInfo and realise the correct number
of watchdogs for that each SoC type.
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
v2:
- Add number of watchdogs to AspeedSoCInfo so we can register the
correcet number of devices on each platform
- Drop debugging printf
- Fix long line and remove tabs
- Update commit message
hw/arm/aspeed_soc.c | 29 +++++++++++++++++++----------
include/hw/arm/aspeed_soc.h | 4 +++-
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index 77b95e8e8092..d1c57e1fd6a4 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -65,6 +65,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
.spi_bases = aspeed_soc_ast2400_spi_bases,
.fmc_typename = "aspeed.smc.fmc",
.spi_typename = aspeed_soc_ast2400_typenames,
+ .wdts_num = 2,
}, {
.name = "ast2400-a1",
.cpu_model = "arm926",
@@ -75,6 +76,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
.spi_bases = aspeed_soc_ast2400_spi_bases,
.fmc_typename = "aspeed.smc.fmc",
.spi_typename = aspeed_soc_ast2400_typenames,
+ .wdts_num = 2,
}, {
.name = "ast2400",
.cpu_model = "arm926",
@@ -85,6 +87,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
.spi_bases = aspeed_soc_ast2400_spi_bases,
.fmc_typename = "aspeed.smc.fmc",
.spi_typename = aspeed_soc_ast2400_typenames,
+ .wdts_num = 2,
}, {
.name = "ast2500-a1",
.cpu_model = "arm1176",
@@ -95,6 +98,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
.spi_bases = aspeed_soc_ast2500_spi_bases,
.fmc_typename = "aspeed.smc.ast2500-fmc",
.spi_typename = aspeed_soc_ast2500_typenames,
+ .wdts_num = 3,
},
};
@@ -178,11 +182,13 @@ static void aspeed_soc_init(Object *obj)
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
"ram-size", &error_abort);
- object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
- object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
- qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
- object_property_add_const_link(OBJECT(&s->wdt), "scu", OBJECT(&s->scu),
- NULL);
+ for (i = 0; i < sc->info->wdts_num; i++) {
+ object_initialize(&s->wdt[i], sizeof(s->wdt[i]), TYPE_ASPEED_WDT);
+ object_property_add_child(obj, "wdt", OBJECT(&s->wdt[i]), NULL);
+ qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());
+ object_property_add_const_link(OBJECT(&s->wdt[i]), "scu",
+ OBJECT(&s->scu), NULL);
+ }
object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
@@ -340,12 +346,15 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
/* Watch dog */
- object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err);
- if (err) {
- error_propagate(errp, err);
- return;
+ for (i = 0; i < ARRAY_SIZE(s->wdt); i++) {
+ object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
+ ASPEED_SOC_WDT_BASE + i * 0x20);
}
- sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
/* Net */
qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index d16205c66b5f..fedb7b51a002 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -24,6 +24,7 @@
#include "hw/misc/aspeed_ibt.h"
#define ASPEED_SPIS_NUM 2
+#define ASPEED_WDTS_NUM 3
typedef struct AspeedSoCState {
/*< private >*/
@@ -40,7 +41,7 @@ typedef struct AspeedSoCState {
AspeedSMCState fmc;
AspeedSMCState spi[ASPEED_SPIS_NUM];
AspeedSDMCState sdmc;
- AspeedWDTState wdt;
+ AspeedWDTState wdt[ASPEED_WDTS_NUM];
FTGMAC100State ftgmac100;
AspeedIBTState ibt;
} AspeedSoCState;
@@ -58,6 +59,7 @@ typedef struct AspeedSoCInfo {
const hwaddr *spi_bases;
const char *fmc_typename;
const char **spi_typename;
+ int wdts_num;
} AspeedSoCInfo;
typedef struct AspeedSoCClass {
--
2.13.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH qemu v2] aspeed: Register all watchdogs
2017-06-28 4:56 [PATCH qemu v2] aspeed: Register all watchdogs Joel Stanley
@ 2017-06-28 8:12 ` Cédric Le Goater
2017-06-28 11:36 ` Joel Stanley
0 siblings, 1 reply; 3+ messages in thread
From: Cédric Le Goater @ 2017-06-28 8:12 UTC (permalink / raw)
To: Joel Stanley; +Cc: Andrew Jeffery, openbmc
On 06/28/2017 06:56 AM, Joel Stanley wrote:
> The ast2400 contains two and the ast2500 contains three watchdogs.
> Add this information to the AspeedSoCInfo and realise the correct number
> of watchdogs for that each SoC type.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
looks good. one minor problem below, then you can send to mainline
I think.
Thanks,
C.
> ---
> v2:
> - Add number of watchdogs to AspeedSoCInfo so we can register the
> correcet number of devices on each platform
> - Drop debugging printf
> - Fix long line and remove tabs
> - Update commit message
>
> hw/arm/aspeed_soc.c | 29 +++++++++++++++++++----------
> include/hw/arm/aspeed_soc.h | 4 +++-
> 2 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
> index 77b95e8e8092..d1c57e1fd6a4 100644
> --- a/hw/arm/aspeed_soc.c
> +++ b/hw/arm/aspeed_soc.c
> @@ -65,6 +65,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spi_bases = aspeed_soc_ast2400_spi_bases,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .wdts_num = 2,
> }, {
> .name = "ast2400-a1",
> .cpu_model = "arm926",
> @@ -75,6 +76,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spi_bases = aspeed_soc_ast2400_spi_bases,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .wdts_num = 2,
> }, {
> .name = "ast2400",
> .cpu_model = "arm926",
> @@ -85,6 +87,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spi_bases = aspeed_soc_ast2400_spi_bases,
> .fmc_typename = "aspeed.smc.fmc",
> .spi_typename = aspeed_soc_ast2400_typenames,
> + .wdts_num = 2,
> }, {
> .name = "ast2500-a1",
> .cpu_model = "arm1176",
> @@ -95,6 +98,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
> .spi_bases = aspeed_soc_ast2500_spi_bases,
> .fmc_typename = "aspeed.smc.ast2500-fmc",
> .spi_typename = aspeed_soc_ast2500_typenames,
> + .wdts_num = 3,
> },
> };
>
> @@ -178,11 +182,13 @@ static void aspeed_soc_init(Object *obj)
> object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
> "ram-size", &error_abort);
>
> - object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
> - object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
> - qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
> - object_property_add_const_link(OBJECT(&s->wdt), "scu", OBJECT(&s->scu),
> - NULL);
> + for (i = 0; i < sc->info->wdts_num; i++) {
> + object_initialize(&s->wdt[i], sizeof(s->wdt[i]), TYPE_ASPEED_WDT);
> + object_property_add_child(obj, "wdt", OBJECT(&s->wdt[i]), NULL);
may be use "wdt[*]" to have different child names.
> + qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());
> + object_property_add_const_link(OBJECT(&s->wdt[i]), "scu",
> + OBJECT(&s->scu), NULL);
> + }
>
> object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
> object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
> @@ -340,12 +346,15 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
>
> /* Watch dog */
> - object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err);
> - if (err) {
> - error_propagate(errp, err);
> - return;
> + for (i = 0; i < ARRAY_SIZE(s->wdt); i++) {
we should be using :
sc->info->wdts_num
Thanks,
C.
> + object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &err);
> + if (err) {
> + error_propagate(errp, err);
> + return;
> + }
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
> + ASPEED_SOC_WDT_BASE + i * 0x20);
> }
> - sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
>
> /* Net */
> qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index d16205c66b5f..fedb7b51a002 100644
> --- a/include/hw/arm/aspeed_soc.h
> +++ b/include/hw/arm/aspeed_soc.h
> @@ -24,6 +24,7 @@
> #include "hw/misc/aspeed_ibt.h"
>
> #define ASPEED_SPIS_NUM 2
> +#define ASPEED_WDTS_NUM 3
>
> typedef struct AspeedSoCState {
> /*< private >*/
> @@ -40,7 +41,7 @@ typedef struct AspeedSoCState {
> AspeedSMCState fmc;
> AspeedSMCState spi[ASPEED_SPIS_NUM];
> AspeedSDMCState sdmc;
> - AspeedWDTState wdt;
> + AspeedWDTState wdt[ASPEED_WDTS_NUM];
> FTGMAC100State ftgmac100;
> AspeedIBTState ibt;
> } AspeedSoCState;
> @@ -58,6 +59,7 @@ typedef struct AspeedSoCInfo {
> const hwaddr *spi_bases;
> const char *fmc_typename;
> const char **spi_typename;
> + int wdts_num;
> } AspeedSoCInfo;
>
> typedef struct AspeedSoCClass {
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH qemu v2] aspeed: Register all watchdogs
2017-06-28 8:12 ` Cédric Le Goater
@ 2017-06-28 11:36 ` Joel Stanley
0 siblings, 0 replies; 3+ messages in thread
From: Joel Stanley @ 2017-06-28 11:36 UTC (permalink / raw)
To: Cédric Le Goater; +Cc: Andrew Jeffery, OpenBMC Maillist
On Wed, Jun 28, 2017 at 5:42 PM, Cédric Le Goater <clg@kaod.org> wrote:
> On 06/28/2017 06:56 AM, Joel Stanley wrote:
>> The ast2400 contains two and the ast2500 contains three watchdogs.
>> Add this information to the AspeedSoCInfo and realise the correct number
>> of watchdogs for that each SoC type.
>>
>> Signed-off-by: Joel Stanley <joel@jms.id.au>
>
> looks good. one minor problem below, then you can send to mainline
> I think.
Sweet, thanks for the review.
>
> Thanks,
>
> C.
>
>
>> ---
>> v2:
>> - Add number of watchdogs to AspeedSoCInfo so we can register the
>> correcet number of devices on each platform
>> - Drop debugging printf
>> - Fix long line and remove tabs
>> - Update commit message
>>
>> hw/arm/aspeed_soc.c | 29 +++++++++++++++++++----------
>> include/hw/arm/aspeed_soc.h | 4 +++-
>> 2 files changed, 22 insertions(+), 11 deletions(-)
>>
>> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
>> index 77b95e8e8092..d1c57e1fd6a4 100644
>> --- a/hw/arm/aspeed_soc.c
>> +++ b/hw/arm/aspeed_soc.c
>> @@ -65,6 +65,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>> .spi_bases = aspeed_soc_ast2400_spi_bases,
>> .fmc_typename = "aspeed.smc.fmc",
>> .spi_typename = aspeed_soc_ast2400_typenames,
>> + .wdts_num = 2,
>> }, {
>> .name = "ast2400-a1",
>> .cpu_model = "arm926",
>> @@ -75,6 +76,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>> .spi_bases = aspeed_soc_ast2400_spi_bases,
>> .fmc_typename = "aspeed.smc.fmc",
>> .spi_typename = aspeed_soc_ast2400_typenames,
>> + .wdts_num = 2,
>> }, {
>> .name = "ast2400",
>> .cpu_model = "arm926",
>> @@ -85,6 +87,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>> .spi_bases = aspeed_soc_ast2400_spi_bases,
>> .fmc_typename = "aspeed.smc.fmc",
>> .spi_typename = aspeed_soc_ast2400_typenames,
>> + .wdts_num = 2,
>> }, {
>> .name = "ast2500-a1",
>> .cpu_model = "arm1176",
>> @@ -95,6 +98,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>> .spi_bases = aspeed_soc_ast2500_spi_bases,
>> .fmc_typename = "aspeed.smc.ast2500-fmc",
>> .spi_typename = aspeed_soc_ast2500_typenames,
>> + .wdts_num = 3,
>> },
>> };
>>
>> @@ -178,11 +182,13 @@ static void aspeed_soc_init(Object *obj)
>> object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
>> "ram-size", &error_abort);
>>
>> - object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
>> - object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
>> - qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
>> - object_property_add_const_link(OBJECT(&s->wdt), "scu", OBJECT(&s->scu),
>> - NULL);
>> + for (i = 0; i < sc->info->wdts_num; i++) {
>> + object_initialize(&s->wdt[i], sizeof(s->wdt[i]), TYPE_ASPEED_WDT);
>> + object_property_add_child(obj, "wdt", OBJECT(&s->wdt[i]), NULL);
>
> may be use "wdt[*]" to have different child names.
>
>> + qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());
>> + object_property_add_const_link(OBJECT(&s->wdt[i]), "scu",
>> + OBJECT(&s->scu), NULL);
>> + }
>>
>> object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
>> object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
>> @@ -340,12 +346,15 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
>> sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
>>
>> /* Watch dog */
>> - object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err);
>> - if (err) {
>> - error_propagate(errp, err);
>> - return;
>> + for (i = 0; i < ARRAY_SIZE(s->wdt); i++) {
>
> we should be using :
>
> sc->info->wdts_num
>
> Thanks,
>
> C.
>
>> + object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &err);
>> + if (err) {
>> + error_propagate(errp, err);
>> + return;
>> + }
>> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
>> + ASPEED_SOC_WDT_BASE + i * 0x20);
>> }
>> - sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
>>
>> /* Net */
>> qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
>> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
>> index d16205c66b5f..fedb7b51a002 100644
>> --- a/include/hw/arm/aspeed_soc.h
>> +++ b/include/hw/arm/aspeed_soc.h
>> @@ -24,6 +24,7 @@
>> #include "hw/misc/aspeed_ibt.h"
>>
>> #define ASPEED_SPIS_NUM 2
>> +#define ASPEED_WDTS_NUM 3
>>
>> typedef struct AspeedSoCState {
>> /*< private >*/
>> @@ -40,7 +41,7 @@ typedef struct AspeedSoCState {
>> AspeedSMCState fmc;
>> AspeedSMCState spi[ASPEED_SPIS_NUM];
>> AspeedSDMCState sdmc;
>> - AspeedWDTState wdt;
>> + AspeedWDTState wdt[ASPEED_WDTS_NUM];
>> FTGMAC100State ftgmac100;
>> AspeedIBTState ibt;
>> } AspeedSoCState;
>> @@ -58,6 +59,7 @@ typedef struct AspeedSoCInfo {
>> const hwaddr *spi_bases;
>> const char *fmc_typename;
>> const char **spi_typename;
>> + int wdts_num;
>> } AspeedSoCInfo;
>>
>> typedef struct AspeedSoCClass {
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-28 11:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-28 4:56 [PATCH qemu v2] aspeed: Register all watchdogs Joel Stanley
2017-06-28 8:12 ` Cédric Le Goater
2017-06-28 11:36 ` Joel Stanley
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.