mirror of
https://github.com/qemu/qemu.git
synced 2025-08-24 20:08:19 +00:00
pnv/xive2: Add a get_config() method on the presenter class
The presenters for xive on P9 and P10 are mostly similar but the behavior can be tuned through a few CQ registers. This patch adds a "get_config" method, which will allow to access that config from the presenter in a later patch. For now, just define the config for the TIMA version. Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
242e8b4dca
commit
2a24e6e394
@ -479,6 +479,16 @@ static int pnv_xive_match_nvt(XivePresenter *xptr, uint8_t format,
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint32_t pnv_xive_presenter_get_config(XivePresenter *xptr)
|
||||||
|
{
|
||||||
|
uint32_t cfg = 0;
|
||||||
|
|
||||||
|
/* TIMA GEN1 is all P9 knows */
|
||||||
|
cfg |= XIVE_PRESENTER_GEN1_TIMA_OS;
|
||||||
|
|
||||||
|
return cfg;
|
||||||
|
}
|
||||||
|
|
||||||
static uint8_t pnv_xive_get_block_id(XiveRouter *xrtr)
|
static uint8_t pnv_xive_get_block_id(XiveRouter *xrtr)
|
||||||
{
|
{
|
||||||
return pnv_xive_block_id(PNV_XIVE(xrtr));
|
return pnv_xive_block_id(PNV_XIVE(xrtr));
|
||||||
@ -1991,6 +2001,7 @@ static void pnv_xive_class_init(ObjectClass *klass, void *data)
|
|||||||
|
|
||||||
xnc->notify = pnv_xive_notify;
|
xnc->notify = pnv_xive_notify;
|
||||||
xpc->match_nvt = pnv_xive_match_nvt;
|
xpc->match_nvt = pnv_xive_match_nvt;
|
||||||
|
xpc->get_config = pnv_xive_presenter_get_config;
|
||||||
};
|
};
|
||||||
|
|
||||||
static const TypeInfo pnv_xive_info = {
|
static const TypeInfo pnv_xive_info = {
|
||||||
|
@ -501,6 +501,17 @@ static int pnv_xive2_match_nvt(XivePresenter *xptr, uint8_t format,
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint32_t pnv_xive2_presenter_get_config(XivePresenter *xptr)
|
||||||
|
{
|
||||||
|
PnvXive2 *xive = PNV_XIVE2(xptr);
|
||||||
|
uint32_t cfg = 0;
|
||||||
|
|
||||||
|
if (xive->cq_regs[CQ_XIVE_CFG >> 3] & CQ_XIVE_CFG_GEN1_TIMA_OS) {
|
||||||
|
cfg |= XIVE_PRESENTER_GEN1_TIMA_OS;
|
||||||
|
}
|
||||||
|
return cfg;
|
||||||
|
}
|
||||||
|
|
||||||
static uint8_t pnv_xive2_get_block_id(Xive2Router *xrtr)
|
static uint8_t pnv_xive2_get_block_id(Xive2Router *xrtr)
|
||||||
{
|
{
|
||||||
return pnv_xive2_block_id(PNV_XIVE2(xrtr));
|
return pnv_xive2_block_id(PNV_XIVE2(xrtr));
|
||||||
@ -1987,6 +1998,7 @@ static void pnv_xive2_class_init(ObjectClass *klass, void *data)
|
|||||||
xnc->notify = pnv_xive2_notify;
|
xnc->notify = pnv_xive2_notify;
|
||||||
|
|
||||||
xpc->match_nvt = pnv_xive2_match_nvt;
|
xpc->match_nvt = pnv_xive2_match_nvt;
|
||||||
|
xpc->get_config = pnv_xive2_presenter_get_config;
|
||||||
};
|
};
|
||||||
|
|
||||||
static const TypeInfo pnv_xive2_info = {
|
static const TypeInfo pnv_xive2_info = {
|
||||||
|
@ -475,6 +475,21 @@ static int spapr_xive_match_nvt(XivePresenter *xptr, uint8_t format,
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint32_t spapr_xive_presenter_get_config(XivePresenter *xptr)
|
||||||
|
{
|
||||||
|
uint32_t cfg = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Let's claim GEN1 TIMA format. If running with KVM on P10, the
|
||||||
|
* correct answer is deep in the hardware and not accessible to
|
||||||
|
* us. But it shouldn't matter as it only affects the presenter
|
||||||
|
* as seen by a guest OS.
|
||||||
|
*/
|
||||||
|
cfg |= XIVE_PRESENTER_GEN1_TIMA_OS;
|
||||||
|
|
||||||
|
return cfg;
|
||||||
|
}
|
||||||
|
|
||||||
static uint8_t spapr_xive_get_block_id(XiveRouter *xrtr)
|
static uint8_t spapr_xive_get_block_id(XiveRouter *xrtr)
|
||||||
{
|
{
|
||||||
return SPAPR_XIVE_BLOCK_ID;
|
return SPAPR_XIVE_BLOCK_ID;
|
||||||
@ -832,6 +847,7 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data)
|
|||||||
sicc->post_load = spapr_xive_post_load;
|
sicc->post_load = spapr_xive_post_load;
|
||||||
|
|
||||||
xpc->match_nvt = spapr_xive_match_nvt;
|
xpc->match_nvt = spapr_xive_match_nvt;
|
||||||
|
xpc->get_config = spapr_xive_presenter_get_config;
|
||||||
xpc->in_kernel = spapr_xive_in_kernel_xptr;
|
xpc->in_kernel = spapr_xive_in_kernel_xptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -461,6 +461,13 @@ static void xive_tm_push_os_ctx(XivePresenter *xptr, XiveTCTX *tctx,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static __attribute__((unused)) uint32_t xive_presenter_get_config(XivePresenter *xptr)
|
||||||
|
{
|
||||||
|
XivePresenterClass *xpc = XIVE_PRESENTER_GET_CLASS(xptr);
|
||||||
|
|
||||||
|
return xpc->get_config(xptr);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Define a mapping of "special" operations depending on the TIMA page
|
* Define a mapping of "special" operations depending on the TIMA page
|
||||||
* offset and the size of the operation.
|
* offset and the size of the operation.
|
||||||
|
@ -430,6 +430,8 @@ typedef struct XivePresenterClass XivePresenterClass;
|
|||||||
DECLARE_CLASS_CHECKERS(XivePresenterClass, XIVE_PRESENTER,
|
DECLARE_CLASS_CHECKERS(XivePresenterClass, XIVE_PRESENTER,
|
||||||
TYPE_XIVE_PRESENTER)
|
TYPE_XIVE_PRESENTER)
|
||||||
|
|
||||||
|
#define XIVE_PRESENTER_GEN1_TIMA_OS 0x1
|
||||||
|
|
||||||
struct XivePresenterClass {
|
struct XivePresenterClass {
|
||||||
InterfaceClass parent;
|
InterfaceClass parent;
|
||||||
int (*match_nvt)(XivePresenter *xptr, uint8_t format,
|
int (*match_nvt)(XivePresenter *xptr, uint8_t format,
|
||||||
@ -437,6 +439,7 @@ struct XivePresenterClass {
|
|||||||
bool cam_ignore, uint8_t priority,
|
bool cam_ignore, uint8_t priority,
|
||||||
uint32_t logic_serv, XiveTCTXMatch *match);
|
uint32_t logic_serv, XiveTCTXMatch *match);
|
||||||
bool (*in_kernel)(const XivePresenter *xptr);
|
bool (*in_kernel)(const XivePresenter *xptr);
|
||||||
|
uint32_t (*get_config)(XivePresenter *xptr);
|
||||||
};
|
};
|
||||||
|
|
||||||
int xive_presenter_tctx_match(XivePresenter *xptr, XiveTCTX *tctx,
|
int xive_presenter_tctx_match(XivePresenter *xptr, XiveTCTX *tctx,
|
||||||
|
Loading…
Reference in New Issue
Block a user