| Message ID | 20211126115349.2737605-17-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/pnv: Extend the powernv10 machine | expand |
On 11/26/21 08:53, Cédric Le Goater wrote: > Add GEN1 config even if we don't use it yet in the core framework. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > include/hw/ppc/xive2.h | 8 ++++++++ > hw/intc/pnv_xive2.c | 13 +++++++++++++ > hw/intc/xive2.c | 7 +++++++ > 3 files changed, 28 insertions(+) > > diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h > index cf6211a0ecb9..b08600cbd5ee 100644 > --- a/include/hw/ppc/xive2.h > +++ b/include/hw/ppc/xive2.h > @@ -25,6 +25,12 @@ typedef struct Xive2Router { > #define TYPE_XIVE2_ROUTER "xive2-router" > OBJECT_DECLARE_TYPE(Xive2Router, Xive2RouterClass, XIVE2_ROUTER); > > +/* > + * Configuration flags > + */ > + > +#define XIVE2_GEN1_TIMA_OS 0x00000001 > + > typedef struct Xive2RouterClass { > SysBusDeviceClass parent; > > @@ -44,6 +50,7 @@ typedef struct Xive2RouterClass { > int (*write_nvp)(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, > Xive2Nvp *nvp, uint8_t word_number); > uint8_t (*get_block_id)(Xive2Router *xrtr); > + uint32_t (*get_config)(Xive2Router *xrtr); > } Xive2RouterClass; > > int xive2_router_get_eas(Xive2Router *xrtr, uint8_t eas_blk, uint32_t eas_idx, > @@ -56,6 +63,7 @@ int xive2_router_get_nvp(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, > Xive2Nvp *nvp); > int xive2_router_write_nvp(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, > Xive2Nvp *nvp, uint8_t word_number); > +uint32_t xive2_router_get_config(Xive2Router *xrtr); > > void xive2_router_notify(XiveNotifier *xn, uint32_t lisn, bool pq_checked); > > diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c > index b364ee3b306b..2b7d6ccbd097 100644 > --- a/hw/intc/pnv_xive2.c > +++ b/hw/intc/pnv_xive2.c > @@ -425,6 +425,18 @@ static int pnv_xive2_get_eas(Xive2Router *xrtr, uint8_t blk, uint32_t idx, > return pnv_xive2_vst_read(xive, VST_EAS, blk, idx, eas); > } > > +static uint32_t pnv_xive2_get_config(Xive2Router *xrtr) > +{ > + PnvXive2 *xive = PNV_XIVE2(xrtr); > + uint32_t cfg = 0; > + > + if (xive->cq_regs[CQ_XIVE_CFG >> 3] & CQ_XIVE_CFG_GEN1_TIMA_OS) { > + cfg |= XIVE2_GEN1_TIMA_OS; > + } > + > + return cfg; > +} > + > static bool pnv_xive2_is_cpu_enabled(PnvXive2 *xive, PowerPCCPU *cpu) > { > int pir = ppc_cpu_pir(cpu); > @@ -1949,6 +1961,7 @@ static void pnv_xive2_class_init(ObjectClass *klass, void *data) > xrc->write_end = pnv_xive2_write_end; > xrc->get_nvp = pnv_xive2_get_nvp; > xrc->write_nvp = pnv_xive2_write_nvp; > + xrc->get_config = pnv_xive2_get_config; > xrc->get_block_id = pnv_xive2_get_block_id; > > xnc->notify = pnv_xive2_notify; > diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c > index e31037e1f030..71086c7fbd01 100644 > --- a/hw/intc/xive2.c > +++ b/hw/intc/xive2.c > @@ -20,6 +20,13 @@ > #include "hw/ppc/xive2.h" > #include "hw/ppc/xive2_regs.h" > > +uint32_t xive2_router_get_config(Xive2Router *xrtr) > +{ > + Xive2RouterClass *xrc = XIVE2_ROUTER_GET_CLASS(xrtr); > + > + return xrc->get_config(xrtr); > +} > + > void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, Monitor *mon) > { > if (!xive2_eas_is_valid(eas)) {
diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h index cf6211a0ecb9..b08600cbd5ee 100644 --- a/include/hw/ppc/xive2.h +++ b/include/hw/ppc/xive2.h @@ -25,6 +25,12 @@ typedef struct Xive2Router { #define TYPE_XIVE2_ROUTER "xive2-router" OBJECT_DECLARE_TYPE(Xive2Router, Xive2RouterClass, XIVE2_ROUTER); +/* + * Configuration flags + */ + +#define XIVE2_GEN1_TIMA_OS 0x00000001 + typedef struct Xive2RouterClass { SysBusDeviceClass parent; @@ -44,6 +50,7 @@ typedef struct Xive2RouterClass { int (*write_nvp)(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, Xive2Nvp *nvp, uint8_t word_number); uint8_t (*get_block_id)(Xive2Router *xrtr); + uint32_t (*get_config)(Xive2Router *xrtr); } Xive2RouterClass; int xive2_router_get_eas(Xive2Router *xrtr, uint8_t eas_blk, uint32_t eas_idx, @@ -56,6 +63,7 @@ int xive2_router_get_nvp(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, Xive2Nvp *nvp); int xive2_router_write_nvp(Xive2Router *xrtr, uint8_t nvp_blk, uint32_t nvp_idx, Xive2Nvp *nvp, uint8_t word_number); +uint32_t xive2_router_get_config(Xive2Router *xrtr); void xive2_router_notify(XiveNotifier *xn, uint32_t lisn, bool pq_checked); diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c index b364ee3b306b..2b7d6ccbd097 100644 --- a/hw/intc/pnv_xive2.c +++ b/hw/intc/pnv_xive2.c @@ -425,6 +425,18 @@ static int pnv_xive2_get_eas(Xive2Router *xrtr, uint8_t blk, uint32_t idx, return pnv_xive2_vst_read(xive, VST_EAS, blk, idx, eas); } +static uint32_t pnv_xive2_get_config(Xive2Router *xrtr) +{ + PnvXive2 *xive = PNV_XIVE2(xrtr); + uint32_t cfg = 0; + + if (xive->cq_regs[CQ_XIVE_CFG >> 3] & CQ_XIVE_CFG_GEN1_TIMA_OS) { + cfg |= XIVE2_GEN1_TIMA_OS; + } + + return cfg; +} + static bool pnv_xive2_is_cpu_enabled(PnvXive2 *xive, PowerPCCPU *cpu) { int pir = ppc_cpu_pir(cpu); @@ -1949,6 +1961,7 @@ static void pnv_xive2_class_init(ObjectClass *klass, void *data) xrc->write_end = pnv_xive2_write_end; xrc->get_nvp = pnv_xive2_get_nvp; xrc->write_nvp = pnv_xive2_write_nvp; + xrc->get_config = pnv_xive2_get_config; xrc->get_block_id = pnv_xive2_get_block_id; xnc->notify = pnv_xive2_notify; diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index e31037e1f030..71086c7fbd01 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -20,6 +20,13 @@ #include "hw/ppc/xive2.h" #include "hw/ppc/xive2_regs.h" +uint32_t xive2_router_get_config(Xive2Router *xrtr) +{ + Xive2RouterClass *xrc = XIVE2_ROUTER_GET_CLASS(xrtr); + + return xrc->get_config(xrtr); +} + void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, Monitor *mon) { if (!xive2_eas_is_valid(eas)) {
Add GEN1 config even if we don't use it yet in the core framework. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive2.h | 8 ++++++++ hw/intc/pnv_xive2.c | 13 +++++++++++++ hw/intc/xive2.c | 7 +++++++ 3 files changed, 28 insertions(+)