* [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 2:33 ` Alexey Kardashevskiy
2013-12-05 1:19 ` [Qemu-devel] [PATCH 02/14] spapr_pci: add get/set-power-level RTAS interfaces Michael Roth
` (12 subsequent siblings)
13 siblings, 1 reply; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Mike Day <ncmike@ncultra.org>
Signed-off-by: Mike Day <ncmike@ncultra.org>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/ppc/spapr.h | 30 +++++++++++++++++
2 files changed, 113 insertions(+)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 7763149..3117390 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -404,6 +404,80 @@ static void rtas_ibm_query_interrupt_source_number(PowerPCCPU *cpu,
rtas_st(rets, 2, 1);/* 0 == level; 1 == edge */
}
+static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args, uint32_t nret,
+ target_ulong rets)
+{
+ uint32_t indicator = rtas_ld(args, 0);
+ uint32_t drc_index = rtas_ld(args, 1);
+ uint32_t indicator_state = rtas_ld(args, 2);
+ uint32_t encoded = 0, shift = 0, mask = 0;
+ uint32_t *pind;
+ DrcEntry *drc_entry = NULL;
+
+ if (drc_index == 0) { /* platform indicator */
+ pind = &spapr->state;
+ } else {
+ drc_entry = spapr_find_drc_entry(drc_index);
+ if (!drc_entry) {
+ g_warning("rtas_set_indicator: unable to find drc_entry for %x",
+ drc_index);
+ rtas_st(rets, 0, NO_SUCH_INDICATOR);
+ return;
+ }
+ pind = &drc_entry->state;
+ }
+
+ switch (indicator) {
+ case 9: /* EPOW */
+ shift = INDICATOR_EPOW_SHIFT;
+ mask = INDICATOR_EPOW_MASK;
+ break;
+ case 9001: /* Isolation state */
+ /* encode the new value into the correct bit field */
+ shift = INDICATOR_ISOLATION_SHIFT;
+ mask = INDICATOR_ISOLATION_MASK;
+ break;
+ case 9002: /* DR */
+ shift = INDICATOR_DR_SHIFT;
+ mask = INDICATOR_DR_MASK;
+ break;
+ case 9003: /* Allocation State */
+ shift = INDICATOR_ALLOCATION_SHIFT;
+ mask = INDICATOR_ALLOCATION_MASK;
+ break;
+ case 9005: /* global interrupt */
+ shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
+ mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
+ break;
+ case 9006: /* error log */
+ shift = INDICATOR_ERROR_LOG_SHIFT;
+ mask = INDICATOR_ERROR_LOG_MASK;
+ break;
+ case 9007: /* identify */
+ shift = INDICATOR_IDENTIFY_SHIFT;
+ mask = INDICATOR_IDENTIFY_MASK;
+ break;
+ case 9009: /* reset */
+ shift = INDICATOR_RESET_SHIFT;
+ mask = INDICATOR_RESET_MASK;
+ break;
+ default:
+ g_warning("rtas_set_indicator: indicator not implemented: %d",
+ indicator);
+ rtas_st(rets, 0, NO_SUCH_INDICATOR);
+ return;
+ }
+
+ encoded = ENCODE_DRC_STATE(indicator_state, mask, shift);
+ /* clear the current indicator value */
+ *pind &= ~mask;
+ /* set the new value */
+ *pind |= encoded;
+ rtas_st(rets, 0, 0);
+}
+
static int pci_spapr_swizzle(int slot, int pin)
{
return (slot + pin) % PCI_NUM_PINS;
@@ -637,6 +711,14 @@ static int spapr_phb_init(SysBusDevice *s)
sphb->lsi_table[i].irq = irq;
}
+ /* make sure the platform EPOW sensor is initialized - the
+ * guest will probe it when there is a hotplug event.
+ */
+ spapr->state &= ~(uint32_t)INDICATOR_EPOW_MASK;
+ spapr->state |= ENCODE_DRC_STATE(0,
+ INDICATOR_EPOW_MASK,
+ INDICATOR_EPOW_SHIFT);
+
return 0;
}
@@ -856,6 +938,7 @@ void spapr_pci_rtas_init(void)
rtas_ibm_query_interrupt_source_number);
spapr_rtas_register("ibm,change-msi", rtas_ibm_change_msi);
}
+ spapr_rtas_register("set-indicator", rtas_set_indicator);
}
static void spapr_pci_register_types(void)
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index b2f11e9..d8c7de4 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -38,6 +38,9 @@ typedef struct sPAPREnvironment {
int htab_save_index;
bool htab_first_pass;
int htab_fd;
+
+ /* platform state - sensors and indicators */
+ uint32_t state;
} sPAPREnvironment;
#define H_SUCCESS 0
@@ -299,6 +302,33 @@ typedef struct sPAPREnvironment {
#define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
#define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
+/* For set-indicator RTAS interface */
+#define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
+#define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
+#define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
+#define INDICATOR_IDENTIFY_MASK 0x0008 /* 9007 one bit */
+#define INDICATOR_RESET_MASK 0x0010 /* 9009 one bit */
+#define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
+#define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
+#define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
+
+#define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
+#define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
+#define INDICATOR_ERROR_LOG_SHIFT 0x02 /* bit 2 */
+#define INDICATOR_IDENTIFY_SHIFT 0x03 /* bit 3 */
+#define INDICATOR_RESET_SHIFT 0x04 /* bit 4 */
+#define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
+#define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
+#define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
+
+#define NO_SUCH_INDICATOR -3
+
+#define DECODE_DRC_STATE(state, m, s) \
+ ((((uint32_t)(state) & (uint32_t)(m))) >> (s))
+
+#define ENCODE_DRC_STATE(val, m, s) \
+ (((uint32_t)(val) << (s)) & (uint32_t)(m))
+
extern sPAPREnvironment *spapr;
/*#define DEBUG_SPAPR_HCALLS*/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface
2013-12-05 1:19 ` [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface Michael Roth
@ 2013-12-05 2:33 ` Alexey Kardashevskiy
2013-12-05 17:05 ` Michael Roth
0 siblings, 1 reply; 21+ messages in thread
From: Alexey Kardashevskiy @ 2013-12-05 2:33 UTC (permalink / raw)
To: Michael Roth, qemu-devel; +Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
On 12/05/2013 12:19 PM, Michael Roth wrote:
> From: Mike Day <ncmike@ncultra.org>
>
> Signed-off-by: Mike Day <ncmike@ncultra.org>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> hw/ppc/spapr_pci.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 30 +++++++++++++++++
> 2 files changed, 113 insertions(+)
>
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 7763149..3117390 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -404,6 +404,80 @@ static void rtas_ibm_query_interrupt_source_number(PowerPCCPU *cpu,
> rtas_st(rets, 2, 1);/* 0 == level; 1 == edge */
> }
>
> +static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> + uint32_t token, uint32_t nargs,
> + target_ulong args, uint32_t nret,
> + target_ulong rets)
> +{
> + uint32_t indicator = rtas_ld(args, 0);
> + uint32_t drc_index = rtas_ld(args, 1);
> + uint32_t indicator_state = rtas_ld(args, 2);
> + uint32_t encoded = 0, shift = 0, mask = 0;
> + uint32_t *pind;
> + DrcEntry *drc_entry = NULL;
> +
> + if (drc_index == 0) { /* platform indicator */
> + pind = &spapr->state;
> + } else {
> + drc_entry = spapr_find_drc_entry(drc_index);
> + if (!drc_entry) {
> + g_warning("rtas_set_indicator: unable to find drc_entry for %x",
> + drc_index);
> + rtas_st(rets, 0, NO_SUCH_INDICATOR);
> + return;
> + }
> + pind = &drc_entry->state;
> + }
> +
> + switch (indicator) {
> + case 9: /* EPOW */
> + shift = INDICATOR_EPOW_SHIFT;
> + mask = INDICATOR_EPOW_MASK;
> + break;
> + case 9001: /* Isolation state */
> + /* encode the new value into the correct bit field */
> + shift = INDICATOR_ISOLATION_SHIFT;
> + mask = INDICATOR_ISOLATION_MASK;
> + break;
> + case 9002: /* DR */
> + shift = INDICATOR_DR_SHIFT;
> + mask = INDICATOR_DR_MASK;
> + break;
> + case 9003: /* Allocation State */
> + shift = INDICATOR_ALLOCATION_SHIFT;
> + mask = INDICATOR_ALLOCATION_MASK;
> + break;
> + case 9005: /* global interrupt */
> + shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
> + mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
> + break;
> + case 9006: /* error log */
> + shift = INDICATOR_ERROR_LOG_SHIFT;
> + mask = INDICATOR_ERROR_LOG_MASK;
> + break;
> + case 9007: /* identify */
> + shift = INDICATOR_IDENTIFY_SHIFT;
> + mask = INDICATOR_IDENTIFY_MASK;
> + break;
> + case 9009: /* reset */
> + shift = INDICATOR_RESET_SHIFT;
> + mask = INDICATOR_RESET_MASK;
> + break;
> + default:
> + g_warning("rtas_set_indicator: indicator not implemented: %d",
> + indicator);
> + rtas_st(rets, 0, NO_SUCH_INDICATOR);
> + return;
> + }
> +
> + encoded = ENCODE_DRC_STATE(indicator_state, mask, shift);
> + /* clear the current indicator value */
> + *pind &= ~mask;
> + /* set the new value */
> + *pind |= encoded;
> + rtas_st(rets, 0, 0);
> +}
> +
> static int pci_spapr_swizzle(int slot, int pin)
> {
> return (slot + pin) % PCI_NUM_PINS;
> @@ -637,6 +711,14 @@ static int spapr_phb_init(SysBusDevice *s)
> sphb->lsi_table[i].irq = irq;
> }
>
> + /* make sure the platform EPOW sensor is initialized - the
> + * guest will probe it when there is a hotplug event.
> + */
> + spapr->state &= ~(uint32_t)INDICATOR_EPOW_MASK;
> + spapr->state |= ENCODE_DRC_STATE(0,
> + INDICATOR_EPOW_MASK,
> + INDICATOR_EPOW_SHIFT);
> +
> return 0;
> }
>
> @@ -856,6 +938,7 @@ void spapr_pci_rtas_init(void)
> rtas_ibm_query_interrupt_source_number);
> spapr_rtas_register("ibm,change-msi", rtas_ibm_change_msi);
> }
> + spapr_rtas_register("set-indicator", rtas_set_indicator);
> }
>
> static void spapr_pci_register_types(void)
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index b2f11e9..d8c7de4 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -38,6 +38,9 @@ typedef struct sPAPREnvironment {
> int htab_save_index;
> bool htab_first_pass;
> int htab_fd;
> +
> + /* platform state - sensors and indicators */
> + uint32_t state;
> } sPAPREnvironment;
>
> #define H_SUCCESS 0
> @@ -299,6 +302,33 @@ typedef struct sPAPREnvironment {
> #define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
> #define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
>
> +/* For set-indicator RTAS interface */
> +#define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
> +#define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
> +#define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
> +#define INDICATOR_IDENTIFY_MASK 0x0008 /* 9007 one bit */
> +#define INDICATOR_RESET_MASK 0x0010 /* 9009 one bit */
> +#define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
> +#define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
> +#define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
> +
> +#define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
> +#define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
> +#define INDICATOR_ERROR_LOG_SHIFT 0x02 /* bit 2 */
> +#define INDICATOR_IDENTIFY_SHIFT 0x03 /* bit 3 */
> +#define INDICATOR_RESET_SHIFT 0x04 /* bit 4 */
> +#define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
> +#define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
> +#define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
> +
> +#define NO_SUCH_INDICATOR -3
The ppc-next tree has these for RTAS returns, recently added:
#define RTAS_OUT_SUCCESS 0
#define RTAS_OUT_NO_ERRORS_FOUND 1
#define RTAS_OUT_HW_ERROR -1
#define RTAS_OUT_BUSY -2
#define RTAS_OUT_PARAM_ERROR -3
--
Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface
2013-12-05 2:33 ` Alexey Kardashevskiy
@ 2013-12-05 17:05 ` Michael Roth
0 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 17:05 UTC (permalink / raw)
To: Alexey Kardashevskiy, qemu-devel
Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Quoting Alexey Kardashevskiy (2013-12-04 20:33:55)
> On 12/05/2013 12:19 PM, Michael Roth wrote:
> > From: Mike Day <ncmike@ncultra.org>
> >
> > Signed-off-by: Mike Day <ncmike@ncultra.org>
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> > ---
> > hw/ppc/spapr_pci.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
> > include/hw/ppc/spapr.h | 30 +++++++++++++++++
> > 2 files changed, 113 insertions(+)
> >
> > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> > index 7763149..3117390 100644
> > --- a/hw/ppc/spapr_pci.c
> > +++ b/hw/ppc/spapr_pci.c
> > @@ -404,6 +404,80 @@ static void rtas_ibm_query_interrupt_source_number(PowerPCCPU *cpu,
> > rtas_st(rets, 2, 1);/* 0 == level; 1 == edge */
> > }
> >
> > +static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> > + uint32_t token, uint32_t nargs,
> > + target_ulong args, uint32_t nret,
> > + target_ulong rets)
> > +{
> > + uint32_t indicator = rtas_ld(args, 0);
> > + uint32_t drc_index = rtas_ld(args, 1);
> > + uint32_t indicator_state = rtas_ld(args, 2);
> > + uint32_t encoded = 0, shift = 0, mask = 0;
> > + uint32_t *pind;
> > + DrcEntry *drc_entry = NULL;
> > +
> > + if (drc_index == 0) { /* platform indicator */
> > + pind = &spapr->state;
> > + } else {
> > + drc_entry = spapr_find_drc_entry(drc_index);
> > + if (!drc_entry) {
> > + g_warning("rtas_set_indicator: unable to find drc_entry for %x",
> > + drc_index);
> > + rtas_st(rets, 0, NO_SUCH_INDICATOR);
> > + return;
> > + }
> > + pind = &drc_entry->state;
> > + }
> > +
> > + switch (indicator) {
> > + case 9: /* EPOW */
> > + shift = INDICATOR_EPOW_SHIFT;
> > + mask = INDICATOR_EPOW_MASK;
> > + break;
> > + case 9001: /* Isolation state */
> > + /* encode the new value into the correct bit field */
> > + shift = INDICATOR_ISOLATION_SHIFT;
> > + mask = INDICATOR_ISOLATION_MASK;
> > + break;
> > + case 9002: /* DR */
> > + shift = INDICATOR_DR_SHIFT;
> > + mask = INDICATOR_DR_MASK;
> > + break;
> > + case 9003: /* Allocation State */
> > + shift = INDICATOR_ALLOCATION_SHIFT;
> > + mask = INDICATOR_ALLOCATION_MASK;
> > + break;
> > + case 9005: /* global interrupt */
> > + shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
> > + mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
> > + break;
> > + case 9006: /* error log */
> > + shift = INDICATOR_ERROR_LOG_SHIFT;
> > + mask = INDICATOR_ERROR_LOG_MASK;
> > + break;
> > + case 9007: /* identify */
> > + shift = INDICATOR_IDENTIFY_SHIFT;
> > + mask = INDICATOR_IDENTIFY_MASK;
> > + break;
> > + case 9009: /* reset */
> > + shift = INDICATOR_RESET_SHIFT;
> > + mask = INDICATOR_RESET_MASK;
> > + break;
> > + default:
> > + g_warning("rtas_set_indicator: indicator not implemented: %d",
> > + indicator);
> > + rtas_st(rets, 0, NO_SUCH_INDICATOR);
> > + return;
> > + }
> > +
> > + encoded = ENCODE_DRC_STATE(indicator_state, mask, shift);
> > + /* clear the current indicator value */
> > + *pind &= ~mask;
> > + /* set the new value */
> > + *pind |= encoded;
> > + rtas_st(rets, 0, 0);
> > +}
> > +
> > static int pci_spapr_swizzle(int slot, int pin)
> > {
> > return (slot + pin) % PCI_NUM_PINS;
> > @@ -637,6 +711,14 @@ static int spapr_phb_init(SysBusDevice *s)
> > sphb->lsi_table[i].irq = irq;
> > }
> >
> > + /* make sure the platform EPOW sensor is initialized - the
> > + * guest will probe it when there is a hotplug event.
> > + */
> > + spapr->state &= ~(uint32_t)INDICATOR_EPOW_MASK;
> > + spapr->state |= ENCODE_DRC_STATE(0,
> > + INDICATOR_EPOW_MASK,
> > + INDICATOR_EPOW_SHIFT);
> > +
> > return 0;
> > }
> >
> > @@ -856,6 +938,7 @@ void spapr_pci_rtas_init(void)
> > rtas_ibm_query_interrupt_source_number);
> > spapr_rtas_register("ibm,change-msi", rtas_ibm_change_msi);
> > }
> > + spapr_rtas_register("set-indicator", rtas_set_indicator);
> > }
> >
> > static void spapr_pci_register_types(void)
> > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> > index b2f11e9..d8c7de4 100644
> > --- a/include/hw/ppc/spapr.h
> > +++ b/include/hw/ppc/spapr.h
> > @@ -38,6 +38,9 @@ typedef struct sPAPREnvironment {
> > int htab_save_index;
> > bool htab_first_pass;
> > int htab_fd;
> > +
> > + /* platform state - sensors and indicators */
> > + uint32_t state;
> > } sPAPREnvironment;
> >
> > #define H_SUCCESS 0
> > @@ -299,6 +302,33 @@ typedef struct sPAPREnvironment {
> > #define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
> > #define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
> >
> > +/* For set-indicator RTAS interface */
> > +#define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
> > +#define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
> > +#define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
> > +#define INDICATOR_IDENTIFY_MASK 0x0008 /* 9007 one bit */
> > +#define INDICATOR_RESET_MASK 0x0010 /* 9009 one bit */
> > +#define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
> > +#define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
> > +#define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
> > +
> > +#define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
> > +#define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
> > +#define INDICATOR_ERROR_LOG_SHIFT 0x02 /* bit 2 */
> > +#define INDICATOR_IDENTIFY_SHIFT 0x03 /* bit 3 */
> > +#define INDICATOR_RESET_SHIFT 0x04 /* bit 4 */
> > +#define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
> > +#define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
> > +#define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
> > +
> > +#define NO_SUCH_INDICATOR -3
>
>
> The ppc-next tree has these for RTAS returns, recently added:
>
> #define RTAS_OUT_SUCCESS 0
> #define RTAS_OUT_NO_ERRORS_FOUND 1
> #define RTAS_OUT_HW_ERROR -1
> #define RTAS_OUT_BUSY -2
> #define RTAS_OUT_PARAM_ERROR -3
Thanks, will update to make use of these in v2
>
>
>
>
>
>
> --
> Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH 02/14] spapr_pci: add get/set-power-level RTAS interfaces
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface Michael Roth
` (11 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 3117390..64077f9 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -478,6 +478,26 @@ static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spapr,
rtas_st(rets, 0, 0);
}
+static void rtas_set_power_level(PowerPCCPU *cpu, sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args, uint32_t nret,
+ target_ulong rets)
+{
+ uint32_t power_lvl = rtas_ld(args, 1);
+ rtas_st(rets, 0, 0);
+ rtas_st(rets, 1, power_lvl);
+}
+
+static void rtas_get_power_level(PowerPCCPU *cpu, sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args, uint32_t nret,
+ target_ulong rets)
+{
+ /* return SUCCESS with a power level of 100 */
+ rtas_st(rets, 0, 0);
+ rtas_st(rets, 1, 100);
+}
+
static int pci_spapr_swizzle(int slot, int pin)
{
return (slot + pin) % PCI_NUM_PINS;
@@ -939,6 +959,8 @@ void spapr_pci_rtas_init(void)
spapr_rtas_register("ibm,change-msi", rtas_ibm_change_msi);
}
spapr_rtas_register("set-indicator", rtas_set_indicator);
+ spapr_rtas_register("set-power-level", rtas_set_power_level);
+ spapr_rtas_register("get-power-level", rtas_get_power_level);
}
static void spapr_pci_register_types(void)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 01/14] spapr_pci: add set-indicator RTAS interface Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 02/14] spapr_pci: add get/set-power-level RTAS interfaces Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 2:47 ` Alexey Kardashevskiy
2013-12-05 1:19 ` [Qemu-devel] [PATCH 04/14] spapr_pci: add ibm, configure-connector " Michael Roth
` (10 subsequent siblings)
13 siblings, 1 reply; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Mike Day <ncmike@ncultra.org>
Signed-off-by: Mike Day <ncmike@ncultra.org>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/ppc/spapr.h | 6 +++-
2 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 64077f9..95336f7 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -498,6 +498,77 @@ static void rtas_get_power_level(PowerPCCPU *cpu, sPAPREnvironment *spapr,
rtas_st(rets, 1, 100);
}
+static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args, uint32_t nret,
+ target_ulong rets)
+{
+ uint32_t sensor = rtas_ld(args, 0);
+ uint32_t drc_index = rtas_ld(args, 1);
+ uint32_t sensor_state = 0, decoded = 0, ccode = NO_SUCH_INDICATOR;
+ uint32_t shift = 0, mask = 0;
+ DrcEntry *drc_entry = NULL;
+
+ if (drc_index == 0) { /* platform state sensor/indicator */
+ sensor_state = spapr->state;
+ } else { /* we should have a drc entry */
+ drc_entry = spapr_find_drc_entry(drc_index);
+ if (!drc_entry) {
+ g_warning("unable to find DRC entry for index %x", drc_index);
+ sensor_state = 0; /* empty */
+ /* ccode is already set to -3 */
+ rtas_st(rets, 0, ccode);
+ return;
+ }
+ sensor_state = drc_entry->state;
+ }
+ switch (sensor) {
+ case 9: /* EPOW */
+ shift = INDICATOR_EPOW_SHIFT;
+ mask = INDICATOR_EPOW_MASK;
+ break;
+ case 9001: /* Isolation state */
+ /* encode the new value into the correct bit field */
+ shift = INDICATOR_ISOLATION_SHIFT;
+ mask = INDICATOR_ISOLATION_MASK;
+ break;
+ case 9002: /* DR */
+ shift = INDICATOR_DR_SHIFT;
+ mask = INDICATOR_DR_MASK;
+ break;
+ case 9003: /* entity sense */
+ shift = SENSOR_ENTITY_SENSE_SHIFT;
+ mask = SENSOR_ENTITY_SENSE_MASK;
+ break;
+ case 9005: /* global interrupt */
+ shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
+ mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
+ break;
+ case 9006: /* error log */
+ shift = INDICATOR_ERROR_LOG_SHIFT;
+ mask = INDICATOR_ERROR_LOG_MASK;
+ break;
+ case 9007: /* identify */
+ shift = INDICATOR_IDENTIFY_SHIFT;
+ mask = INDICATOR_IDENTIFY_MASK;
+ break;
+ case 9009: /* reset */
+ shift = INDICATOR_RESET_SHIFT;
+ mask = INDICATOR_RESET_MASK;
+ break;
+ default:
+ g_warning("rtas_get_sensor_state: sensor not implemented: %d",
+ sensor);
+ rtas_st(rets, 0, -3);
+ return;
+ }
+
+ decoded = DECODE_DRC_STATE(sensor_state, mask, shift);
+ ccode = 0;
+ rtas_st(rets, 0, ccode);
+ rtas_st(rets, 1, decoded);
+}
+
static int pci_spapr_swizzle(int slot, int pin)
{
return (slot + pin) % PCI_NUM_PINS;
@@ -961,6 +1032,7 @@ void spapr_pci_rtas_init(void)
spapr_rtas_register("set-indicator", rtas_set_indicator);
spapr_rtas_register("set-power-level", rtas_set_power_level);
spapr_rtas_register("get-power-level", rtas_get_power_level);
+ spapr_rtas_register("get-sensor-state", rtas_get_sensor_state);
}
static void spapr_pci_register_types(void)
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index d8c7de4..cadf95f 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -302,7 +302,7 @@ typedef struct sPAPREnvironment {
#define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
#define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
-/* For set-indicator RTAS interface */
+/* For set-indicator/get-sensor-state RTAS interfaces */
#define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
#define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
#define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
@@ -311,6 +311,7 @@ typedef struct sPAPREnvironment {
#define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
#define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
#define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
+#define SENSOR_ENTITY_SENSE_MASK 0xe000 /* 9003 three bits */
#define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
#define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
@@ -320,8 +321,11 @@ typedef struct sPAPREnvironment {
#define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
#define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
#define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
+#define SENSOR_ENTITY_SENSE_SHIFT 0x0d /* bits 13-15 */
#define NO_SUCH_INDICATOR -3
+#define DR_ENTITY_SENSE_EMPTY 0
+#define DR_ENTITY_SENSE_PRESENT 1
#define DECODE_DRC_STATE(state, m, s) \
((((uint32_t)(state) & (uint32_t)(m))) >> (s))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface
2013-12-05 1:19 ` [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface Michael Roth
@ 2013-12-05 2:47 ` Alexey Kardashevskiy
2013-12-05 17:29 ` Michael Roth
0 siblings, 1 reply; 21+ messages in thread
From: Alexey Kardashevskiy @ 2013-12-05 2:47 UTC (permalink / raw)
To: Michael Roth, qemu-devel; +Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
On 12/05/2013 12:19 PM, Michael Roth wrote:
> From: Mike Day <ncmike@ncultra.org>
>
> Signed-off-by: Mike Day <ncmike@ncultra.org>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> hw/ppc/spapr_pci.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 6 +++-
> 2 files changed, 77 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 64077f9..95336f7 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -498,6 +498,77 @@ static void rtas_get_power_level(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> rtas_st(rets, 1, 100);
> }
>
> +static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> + uint32_t token, uint32_t nargs,
> + target_ulong args, uint32_t nret,
> + target_ulong rets)
> +{
> + uint32_t sensor = rtas_ld(args, 0);
> + uint32_t drc_index = rtas_ld(args, 1);
> + uint32_t sensor_state = 0, decoded = 0, ccode = NO_SUCH_INDICATOR;
> + uint32_t shift = 0, mask = 0;
> + DrcEntry *drc_entry = NULL;
> +
> + if (drc_index == 0) { /* platform state sensor/indicator */
> + sensor_state = spapr->state;
> + } else { /* we should have a drc entry */
> + drc_entry = spapr_find_drc_entry(drc_index);
> + if (!drc_entry) {
> + g_warning("unable to find DRC entry for index %x", drc_index);
I did not see QEMU using g_warning(), it is error_report() or custom
defined DPRINTF or fprintf(stderr,...) or a trace point from ./trace-events
(traces which can be switched on/off in run-time).
It the case like this, I'd make it DPRINTF or trace-event, the current RTAS
handlers do not print error messages on errors by default.
> + sensor_state = 0; /* empty */
> + /* ccode is already set to -3 */
> + rtas_st(rets, 0, ccode);
> + return;
> + }
> + sensor_state = drc_entry->state;
> + }
> + switch (sensor) {
> + case 9: /* EPOW */
> + shift = INDICATOR_EPOW_SHIFT;
> + mask = INDICATOR_EPOW_MASK;
> + break;
> + case 9001: /* Isolation state */
> + /* encode the new value into the correct bit field */
> + shift = INDICATOR_ISOLATION_SHIFT;
> + mask = INDICATOR_ISOLATION_MASK;
> + break;
> + case 9002: /* DR */
> + shift = INDICATOR_DR_SHIFT;
> + mask = INDICATOR_DR_MASK;
> + break;
> + case 9003: /* entity sense */
> + shift = SENSOR_ENTITY_SENSE_SHIFT;
> + mask = SENSOR_ENTITY_SENSE_MASK;
> + break;
> + case 9005: /* global interrupt */
> + shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
> + mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
> + break;
> + case 9006: /* error log */
> + shift = INDICATOR_ERROR_LOG_SHIFT;
> + mask = INDICATOR_ERROR_LOG_MASK;
> + break;
> + case 9007: /* identify */
> + shift = INDICATOR_IDENTIFY_SHIFT;
> + mask = INDICATOR_IDENTIFY_MASK;
> + break;
> + case 9009: /* reset */
> + shift = INDICATOR_RESET_SHIFT;
> + mask = INDICATOR_RESET_MASK;
> + break;
> + default:
> + g_warning("rtas_get_sensor_state: sensor not implemented: %d",
> + sensor);
> + rtas_st(rets, 0, -3);
> + return;
> + }
> +
> + decoded = DECODE_DRC_STATE(sensor_state, mask, shift);
> + ccode = 0;
> + rtas_st(rets, 0, ccode);
> + rtas_st(rets, 1, decoded);
> +}
> +
> static int pci_spapr_swizzle(int slot, int pin)
> {
> return (slot + pin) % PCI_NUM_PINS;
> @@ -961,6 +1032,7 @@ void spapr_pci_rtas_init(void)
> spapr_rtas_register("set-indicator", rtas_set_indicator);
> spapr_rtas_register("set-power-level", rtas_set_power_level);
> spapr_rtas_register("get-power-level", rtas_get_power_level);
> + spapr_rtas_register("get-sensor-state", rtas_get_sensor_state);
> }
>
> static void spapr_pci_register_types(void)
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index d8c7de4..cadf95f 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -302,7 +302,7 @@ typedef struct sPAPREnvironment {
> #define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
> #define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
>
> -/* For set-indicator RTAS interface */
> +/* For set-indicator/get-sensor-state RTAS interfaces */
> #define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
> #define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
> #define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
> @@ -311,6 +311,7 @@ typedef struct sPAPREnvironment {
> #define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
> #define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
> #define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
> +#define SENSOR_ENTITY_SENSE_MASK 0xe000 /* 9003 three bits */
This one starts with "SENSOR_" when others with "INDICATOR_". Is it for a
reason?
> #define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
> #define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
> @@ -320,8 +321,11 @@ typedef struct sPAPREnvironment {
> #define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
> #define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
> #define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
> +#define SENSOR_ENTITY_SENSE_SHIFT 0x0d /* bits 13-15 */
>
> #define NO_SUCH_INDICATOR -3
> +#define DR_ENTITY_SENSE_EMPTY 0
> +#define DR_ENTITY_SENSE_PRESENT 1
>
> #define DECODE_DRC_STATE(state, m, s) \
> ((((uint32_t)(state) & (uint32_t)(m))) >> (s))
>
--
Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface
2013-12-05 2:47 ` Alexey Kardashevskiy
@ 2013-12-05 17:29 ` Michael Roth
0 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 17:29 UTC (permalink / raw)
To: Alexey Kardashevskiy, qemu-devel
Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Quoting Alexey Kardashevskiy (2013-12-04 20:47:52)
> On 12/05/2013 12:19 PM, Michael Roth wrote:
> > From: Mike Day <ncmike@ncultra.org>
> >
> > Signed-off-by: Mike Day <ncmike@ncultra.org>
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> > ---
> > hw/ppc/spapr_pci.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
> > include/hw/ppc/spapr.h | 6 +++-
> > 2 files changed, 77 insertions(+), 1 deletion(-)
> >
> > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> > index 64077f9..95336f7 100644
> > --- a/hw/ppc/spapr_pci.c
> > +++ b/hw/ppc/spapr_pci.c
> > @@ -498,6 +498,77 @@ static void rtas_get_power_level(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> > rtas_st(rets, 1, 100);
> > }
> >
> > +static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> > + uint32_t token, uint32_t nargs,
> > + target_ulong args, uint32_t nret,
> > + target_ulong rets)
> > +{
> > + uint32_t sensor = rtas_ld(args, 0);
> > + uint32_t drc_index = rtas_ld(args, 1);
> > + uint32_t sensor_state = 0, decoded = 0, ccode = NO_SUCH_INDICATOR;
> > + uint32_t shift = 0, mask = 0;
> > + DrcEntry *drc_entry = NULL;
> > +
> > + if (drc_index == 0) { /* platform state sensor/indicator */
> > + sensor_state = spapr->state;
> > + } else { /* we should have a drc entry */
> > + drc_entry = spapr_find_drc_entry(drc_index);
> > + if (!drc_entry) {
> > + g_warning("unable to find DRC entry for index %x", drc_index);
>
>
> I did not see QEMU using g_warning(), it is error_report() or custom
> defined DPRINTF or fprintf(stderr,...) or a trace point from ./trace-events
> (traces which can be switched on/off in run-time).
>
> It the case like this, I'd make it DPRINTF or trace-event, the current RTAS
> handlers do not print error messages on errors by default.
Yah, DPRINTF seems reasonable, invalid guest-specified params aren't really
a QEMU issue, this is more for debugging.
>
>
>
> > + sensor_state = 0; /* empty */
> > + /* ccode is already set to -3 */
> > + rtas_st(rets, 0, ccode);
> > + return;
> > + }
> > + sensor_state = drc_entry->state;
> > + }
> > + switch (sensor) {
> > + case 9: /* EPOW */
> > + shift = INDICATOR_EPOW_SHIFT;
> > + mask = INDICATOR_EPOW_MASK;
> > + break;
> > + case 9001: /* Isolation state */
> > + /* encode the new value into the correct bit field */
> > + shift = INDICATOR_ISOLATION_SHIFT;
> > + mask = INDICATOR_ISOLATION_MASK;
> > + break;
> > + case 9002: /* DR */
> > + shift = INDICATOR_DR_SHIFT;
> > + mask = INDICATOR_DR_MASK;
> > + break;
> > + case 9003: /* entity sense */
> > + shift = SENSOR_ENTITY_SENSE_SHIFT;
> > + mask = SENSOR_ENTITY_SENSE_MASK;
> > + break;
> > + case 9005: /* global interrupt */
> > + shift = INDICATOR_GLOBAL_INTERRUPT_SHIFT;
> > + mask = INDICATOR_GLOBAL_INTERRUPT_MASK;
> > + break;
> > + case 9006: /* error log */
> > + shift = INDICATOR_ERROR_LOG_SHIFT;
> > + mask = INDICATOR_ERROR_LOG_MASK;
> > + break;
> > + case 9007: /* identify */
> > + shift = INDICATOR_IDENTIFY_SHIFT;
> > + mask = INDICATOR_IDENTIFY_MASK;
> > + break;
> > + case 9009: /* reset */
> > + shift = INDICATOR_RESET_SHIFT;
> > + mask = INDICATOR_RESET_MASK;
> > + break;
> > + default:
> > + g_warning("rtas_get_sensor_state: sensor not implemented: %d",
> > + sensor);
> > + rtas_st(rets, 0, -3);
> > + return;
> > + }
> > +
> > + decoded = DECODE_DRC_STATE(sensor_state, mask, shift);
> > + ccode = 0;
> > + rtas_st(rets, 0, ccode);
> > + rtas_st(rets, 1, decoded);
> > +}
> > +
> > static int pci_spapr_swizzle(int slot, int pin)
> > {
> > return (slot + pin) % PCI_NUM_PINS;
> > @@ -961,6 +1032,7 @@ void spapr_pci_rtas_init(void)
> > spapr_rtas_register("set-indicator", rtas_set_indicator);
> > spapr_rtas_register("set-power-level", rtas_set_power_level);
> > spapr_rtas_register("get-power-level", rtas_get_power_level);
> > + spapr_rtas_register("get-sensor-state", rtas_get_sensor_state);
> > }
> >
> > static void spapr_pci_register_types(void)
> > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> > index d8c7de4..cadf95f 100644
> > --- a/include/hw/ppc/spapr.h
> > +++ b/include/hw/ppc/spapr.h
> > @@ -302,7 +302,7 @@ typedef struct sPAPREnvironment {
> > #define KVMPPC_H_LOGICAL_MEMOP (KVMPPC_HCALL_BASE + 0x1)
> > #define KVMPPC_HCALL_MAX KVMPPC_H_LOGICAL_MEMOP
> >
> > -/* For set-indicator RTAS interface */
> > +/* For set-indicator/get-sensor-state RTAS interfaces */
> > #define INDICATOR_ISOLATION_MASK 0x0001 /* 9001 one bit */
> > #define INDICATOR_GLOBAL_INTERRUPT_MASK 0x0002 /* 9005 one bit */
> > #define INDICATOR_ERROR_LOG_MASK 0x0004 /* 9006 one bit */
> > @@ -311,6 +311,7 @@ typedef struct sPAPREnvironment {
> > #define INDICATOR_DR_MASK 0x00e0 /* 9002 three bits */
> > #define INDICATOR_ALLOCATION_MASK 0x0300 /* 9003 two bits */
> > #define INDICATOR_EPOW_MASK 0x1c00 /* 9 three bits */
> > +#define SENSOR_ENTITY_SENSE_MASK 0xe000 /* 9003 three bits */
>
>
> This one starts with "SENSOR_" when others with "INDICATOR_". Is it for a
> reason?
This mostly due to how it was transcribed from PAPR documentation, we call
them "sensors" WRT to get-sensor-state, and "indicators" for
set-indicator-state.
But since we re-use the INDICATOR_* values for get-sensor-state as well, I
agree we should probably stick with the INDICATOR_ prefix.
>
>
> > #define INDICATOR_ISOLATION_SHIFT 0x00 /* bit 0 */
> > #define INDICATOR_GLOBAL_INTERRUPT_SHIFT 0x01 /* bit 1 */
> > @@ -320,8 +321,11 @@ typedef struct sPAPREnvironment {
> > #define INDICATOR_DR_SHIFT 0x05 /* bits 5-7 */
> > #define INDICATOR_ALLOCATION_SHIFT 0x08 /* bits 8-9 */
> > #define INDICATOR_EPOW_SHIFT 0x0a /* bits 10-12 */
> > +#define SENSOR_ENTITY_SENSE_SHIFT 0x0d /* bits 13-15 */
> >
> > #define NO_SUCH_INDICATOR -3
> > +#define DR_ENTITY_SENSE_EMPTY 0
> > +#define DR_ENTITY_SENSE_PRESENT 1
> >
> > #define DECODE_DRC_STATE(state, m, s) \
> > ((((uint32_t)(state) & (uint32_t)(m))) >> (s))
> >
>
>
> --
> Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH 04/14] spapr_pci: add ibm, configure-connector RTAS interface
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (2 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 03/14] spapr_pci: add get-sensor-state RTAS interface Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 05/14] spapr: populate DRC entries for root dt node Michael Roth
` (9 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 95336f7..5eb6852 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -569,6 +569,115 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPREnvironment *spapr,
rtas_st(rets, 1, decoded);
}
+/* configure-connector work area offsets, int32_t units */
+#define CC_IDX_NODE_NAME_OFFSET 2
+#define CC_IDX_PROP_NAME_OFFSET 2
+#define CC_IDX_PROP_LEN 3
+#define CC_IDX_PROP_DATA_OFFSET 4
+
+#define CC_VAL_DATA_OFFSET ((CC_IDX_PROP_DATA_OFFSET + 1) * 4)
+#define CC_RET_NEXT_SIB 1
+#define CC_RET_NEXT_CHILD 2
+#define CC_RET_NEXT_PROPERTY 3
+#define CC_RET_PREV_PARENT 4
+#define CC_RET_ERROR -1
+#define CC_RET_SUCCESS 0
+
+static void rtas_ibm_configure_connector(PowerPCCPU *cpu,
+ sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args, uint32_t nret,
+ target_ulong rets)
+{
+ uint64_t wa_addr = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 0);
+ DrcEntry *drc_entry = NULL;
+ ConfigureConnectorState *ccs;
+ void *wa_buf;
+ int32_t *wa_buf_int;
+ hwaddr map_len = 0x1024;
+ uint32_t drc_index;
+ int rc = 0, next_offset, tag, prop_len, node_name_len;
+ const struct fdt_property *prop;
+ const char *node_name, *prop_name;
+
+ wa_buf = cpu_physical_memory_map(wa_addr, &map_len, 1);
+ if (!wa_buf) {
+ rc = CC_RET_ERROR;
+ goto error_exit;
+ }
+ wa_buf_int = wa_buf;
+
+ drc_index = *(uint32_t *)wa_buf;
+ drc_entry = spapr_find_drc_entry(drc_index);
+ if (!drc_entry) {
+ rc = -1;
+ goto error_exit;
+ }
+
+ ccs = &drc_entry->cc_state;
+ if (ccs->state == CC_STATE_PENDING) {
+ /* fdt should've been been attached to drc_entry during
+ * realize/hotplug
+ */
+ g_assert(ccs->fdt);
+ ccs->depth = 0;
+ ccs->offset = ccs->offset_start;
+ ccs->state = CC_STATE_ACTIVE;
+ }
+
+ if (ccs->state == CC_STATE_IDLE) {
+ rc = -1;
+ goto error_exit;
+ }
+
+retry:
+ tag = fdt_next_tag(ccs->fdt, ccs->offset, &next_offset);
+
+ switch (tag) {
+ case FDT_BEGIN_NODE:
+ ccs->depth++;
+ node_name = fdt_get_name(ccs->fdt, ccs->offset, &node_name_len);
+ wa_buf_int[CC_IDX_NODE_NAME_OFFSET] = CC_VAL_DATA_OFFSET;
+ strcpy(wa_buf + wa_buf_int[CC_IDX_NODE_NAME_OFFSET], node_name);
+ rc = CC_RET_NEXT_CHILD;
+ break;
+ case FDT_END_NODE:
+ ccs->depth--;
+ if (ccs->depth == 0) {
+ /* reached the end of top-level node, declare success */
+ ccs->state = CC_STATE_PENDING;
+ rc = CC_RET_SUCCESS;
+ } else {
+ rc = CC_RET_PREV_PARENT;
+ }
+ break;
+ case FDT_PROP:
+ prop = fdt_get_property_by_offset(ccs->fdt, ccs->offset, &prop_len);
+ prop_name = fdt_string(ccs->fdt, fdt32_to_cpu(prop->nameoff));
+ wa_buf_int[CC_IDX_PROP_NAME_OFFSET] = CC_VAL_DATA_OFFSET;
+ wa_buf_int[CC_IDX_PROP_LEN] = prop_len;
+ wa_buf_int[CC_IDX_PROP_DATA_OFFSET] =
+ CC_VAL_DATA_OFFSET + strlen(prop_name) + 1;
+ strcpy(wa_buf + wa_buf_int[CC_IDX_PROP_NAME_OFFSET], prop_name);
+ memcpy(wa_buf + wa_buf_int[CC_IDX_PROP_DATA_OFFSET],
+ prop->data, prop_len);
+ rc = CC_RET_NEXT_PROPERTY;
+ break;
+ case FDT_END:
+ rc = CC_RET_ERROR;
+ break;
+ default:
+ ccs->offset = next_offset;
+ goto retry;
+ }
+
+ ccs->offset = next_offset;
+
+error_exit:
+ cpu_physical_memory_unmap(wa_buf, 0x1024, 1, 0x1024);
+ rtas_st(rets, 0, rc);
+}
+
static int pci_spapr_swizzle(int slot, int pin)
{
return (slot + pin) % PCI_NUM_PINS;
@@ -1033,6 +1142,8 @@ void spapr_pci_rtas_init(void)
spapr_rtas_register("set-power-level", rtas_set_power_level);
spapr_rtas_register("get-power-level", rtas_get_power_level);
spapr_rtas_register("get-sensor-state", rtas_get_sensor_state);
+ spapr_rtas_register("ibm,configure-connector",
+ rtas_ibm_configure_connector);
}
static void spapr_pci_register_types(void)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 05/14] spapr: populate DRC entries for root dt node
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (3 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 04/14] spapr_pci: add ibm, configure-connector " Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 06/14] spapr_pci: populate DRC dt entries for PHBs Michael Roth
` (8 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
This add entries to the root OF node to advertise our PHBs as being
DR-capable in according with PAPR specification.
Each PHB is given a name of PHB<bus#>, advertised as a PHB type,
and associated with a power domain of -1 (indicating to guests that
power management is handled automatically by hardware).
We currently allocate entries for up to 32 DR-capable PHBs, though
this limit can be increased later.
DrcEntry objects to track the state of the DR-connector associated
with each PHB are stored in a 32-entry array, and each DrcEntry has
in turn have a dynamically-sized number of child DR-connectors,
which we will use later to track the state of DR-connectors
associated with a PHB's physical slots.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/ppc/spapr.h | 34 +++++++++++++
2 files changed, 166 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7e53a5f..ec3ba43 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -81,6 +81,7 @@
#define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift))
sPAPREnvironment *spapr;
+DrcEntry drc_table[SPAPR_DRC_TABLE_SIZE];
int spapr_allocate_irq(int hint, bool lsi)
{
@@ -276,6 +277,130 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop,
return (p - prop) * sizeof(uint32_t);
}
+static void spapr_init_drc_table(void)
+{
+ int i;
+
+ memset(drc_table, 0, sizeof(drc_table));
+
+ /* For now we only care about PHB entries */
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ drc_table[i].drc_index = 0x2000001 + i;
+ }
+}
+
+DrcEntry *spapr_add_phb_to_drc_table(uint64_t buid, uint32_t state)
+{
+ DrcEntry *empty_drc = NULL;
+ DrcEntry *found_drc = NULL;
+ int i, phb_index;
+
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ if (drc_table[i].phb_buid == 0) {
+ empty_drc = &drc_table[i];
+ }
+
+ if (drc_table[i].phb_buid == buid) {
+ found_drc = &drc_table[i];
+ break;
+ }
+ }
+
+ if (found_drc) {
+ return found_drc;
+ }
+
+ if (empty_drc) {
+ empty_drc->phb_buid = buid;
+ empty_drc->state = state;
+ empty_drc->cc_state.fdt = NULL;
+ empty_drc->cc_state.offset = 0;
+ empty_drc->cc_state.depth = 0;
+ empty_drc->cc_state.state = CC_STATE_IDLE;
+ empty_drc->child_entries =
+ g_malloc0(sizeof(DrcEntry) * SPAPR_DRC_PHB_SLOT_MAX);
+ phb_index = buid - SPAPR_PCI_BASE_BUID;
+ for (i = 0; i < SPAPR_DRC_PHB_SLOT_MAX; i++) {
+ empty_drc->child_entries[i].drc_index =
+ SPAPR_DRC_DEV_ID_BASE + (phb_index << 8) + (i << 3);
+ }
+ return empty_drc;
+ }
+
+ return NULL;
+}
+
+static void spapr_create_drc_dt_entries(void *fdt)
+{
+ char char_buf[1024];
+ uint32_t int_buf[SPAPR_DRC_TABLE_SIZE + 1];
+ uint32_t *entries;
+ int offset, fdt_offset;
+ int i, ret;
+
+ fdt_offset = fdt_path_offset(fdt, "/");
+
+ /* ibm,drc-indexes */
+ memset(int_buf, 0, sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_TABLE_SIZE;
+
+ for (i = 1; i <= SPAPR_DRC_TABLE_SIZE; i++) {
+ int_buf[i] = drc_table[i-1].drc_index;
+ }
+
+ ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-indexes", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ fprintf(stderr, "Couldn't finalize ibm,drc-indexes property\n");
+ }
+
+ /* ibm,drc-power-domains */
+ memset(int_buf, 0, sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_TABLE_SIZE;
+
+ for (i = 1; i <= SPAPR_DRC_TABLE_SIZE; i++) {
+ int_buf[i] = 0xffffffff;
+ }
+
+ ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-power-domains", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ fprintf(stderr, "Couldn't finalize ibm,drc-power-domains property\n");
+ }
+
+ /* ibm,drc-names */
+ memset(char_buf, 0, sizeof(char_buf));
+ entries = (uint32_t *)&char_buf[0];
+ *entries = SPAPR_DRC_TABLE_SIZE;
+ offset = sizeof(*entries);
+
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ offset += sprintf(char_buf + offset, "PHB %d", i + 1);
+ char_buf[offset++] = '\0';
+ }
+
+ ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-names", char_buf, offset);
+ if (ret) {
+ fprintf(stderr, "Couldn't finalize ibm,drc-names property\n");
+ }
+
+ /* ibm,drc-types */
+ memset(char_buf, 0, sizeof(char_buf));
+ entries = (uint32_t *)&char_buf[0];
+ *entries = SPAPR_DRC_TABLE_SIZE;
+ offset = sizeof(*entries);
+
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ offset += sprintf(char_buf + offset, "PHB");
+ char_buf[offset++] = '\0';
+ }
+
+ ret = fdt_setprop(fdt, fdt_offset, "ibm,drc-types", char_buf, offset);
+ if (ret) {
+ fprintf(stderr, "Couldn't finalize ibm,drc-types property\n");
+ }
+}
+
#define _FDT(exp) \
do { \
int ret = (exp); \
@@ -307,6 +432,8 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
int i, smt = kvmppc_smt_threads();
unsigned char vec5[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x80};
+ spapr_init_drc_table();
+
fdt = g_malloc0(FDT_MAX_SIZE);
_FDT((fdt_create(fdt, FDT_MAX_SIZE)));
@@ -590,6 +717,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
int ret;
void *fdt;
sPAPRPHBState *phb;
+ DrcEntry *drc_entry;
fdt = g_malloc(FDT_MAX_SIZE);
@@ -609,6 +737,8 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
}
QLIST_FOREACH(phb, &spapr->phbs, list) {
+ drc_entry = spapr_add_phb_to_drc_table(phb->buid, 2 /* Unusable */);
+ g_assert(drc_entry);
ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);
}
@@ -633,6 +763,8 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
spapr_populate_chosen_stdout(fdt, spapr->vio_bus);
}
+ spapr_create_drc_dt_entries(fdt);
+
_FDT((fdt_pack(fdt)));
if (fdt_totalsize(fdt) > FDT_MAX_SIZE) {
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index cadf95f..55304c5 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -333,6 +333,40 @@ typedef struct sPAPREnvironment {
#define ENCODE_DRC_STATE(val, m, s) \
(((uint32_t)(val) << (s)) & (uint32_t)(m))
+/* For dlparable/hotpluggable slots */
+#define SPAPR_DRC_TABLE_SIZE 32
+#define SPAPR_DRC_PHB_SLOT_MAX 32
+#define SPAPR_DRC_DEV_ID_BASE 0x40000000
+
+typedef struct ConfigureConnectorState {
+ void *fdt;
+ int offset_start;
+ int offset;
+ int depth;
+ PCIDevice *dev;
+ enum {
+ CC_STATE_IDLE = 0,
+ CC_STATE_PENDING = 1,
+ CC_STATE_ACTIVE,
+ } state;
+} ConfigureConnectorState;
+
+typedef struct DrcEntry DrcEntry;
+
+struct DrcEntry {
+ uint32_t drc_index;
+ uint64_t phb_buid;
+ void *fdt;
+ int fdt_offset;
+ uint32_t state;
+ ConfigureConnectorState cc_state;
+ DrcEntry *child_entries;
+};
+
+extern DrcEntry drc_table[SPAPR_DRC_TABLE_SIZE];
+DrcEntry *spapr_add_phb_to_drc_table(uint64_t buid, uint32_t state);
+
+
extern sPAPREnvironment *spapr;
/*#define DEBUG_SPAPR_HCALLS*/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 06/14] spapr_pci: populate DRC dt entries for PHBs
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (4 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 05/14] spapr: populate DRC entries for root dt node Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry Michael Roth
` (7 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Reserve 32 entries of type PCI in each PHB's initial FDT. This
advertises to guests that each PHB is DR-capable device with
physical hotpluggable slots. This is necessary for allowing
hotplugging of devices to it later via bus rescan or guest rpaphp
hotplug module.
Each entry is assigned a name of "Slot <<bus_idx>*32 +1>",
advertised as a hotpluggable PCI slot, and assigned to power domain
-1 to indicate to the guest that power management is handled by the
hardware.
This models a DR-capable PCI expansion device attached to a host/lpar
via a single PHB with 32 physical hotpluggable slots (as opposed to a
virtual bridge device with external management console). Hotplug will
be handled by the guest via bus rescan or the rpaphp hotplug module.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr.c | 3 +-
hw/ppc/spapr_pci.c | 101 +++++++++++++++++++++++++++++++++++++++++++
include/hw/pci-host/spapr.h | 1 +
3 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ec3ba43..0607559 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -739,7 +739,8 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
QLIST_FOREACH(phb, &spapr->phbs, list) {
drc_entry = spapr_add_phb_to_drc_table(phb->buid, 2 /* Unusable */);
g_assert(drc_entry);
- ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);
+ ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, drc_entry->drc_index,
+ fdt);
}
if (ret < 0) {
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 5eb6852..4a88212 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1041,8 +1041,103 @@ PCIHostState *spapr_create_phb(sPAPREnvironment *spapr, int index)
#define b_fff(x) b_x((x), 8, 3) /* function number */
#define b_rrrrrrrr(x) b_x((x), 0, 8) /* register number */
+static void spapr_create_drc_phb_dt_entries(void *fdt, int bus_off, int phb_index)
+{
+ char char_buf[1024];
+ uint32_t int_buf[SPAPR_DRC_PHB_SLOT_MAX + 1];
+ uint32_t *entries;
+ int i, ret, offset;
+
+ /* ibm,drc-indexes */
+ memset(int_buf, 0 , sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_PHB_SLOT_MAX;
+
+ for (i = 1; i <= SPAPR_DRC_PHB_SLOT_MAX; i++) {
+ int_buf[i] = SPAPR_DRC_DEV_ID_BASE + (phb_index << 8) + ((i - 1) << 3);
+ }
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,drc-indexes", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ g_warning("error adding 'ibm,drc-indexes' field for PHB FDT");
+ }
+
+ /* ibm,drc-power-domains */
+ memset(int_buf, 0, sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_PHB_SLOT_MAX;
+
+ for (i = 1; i <= SPAPR_DRC_PHB_SLOT_MAX; i++) {
+ int_buf[i] = 0xffffffff;
+ }
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,drc-power-domains", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ g_warning("error adding 'ibm,drc-power-domains' field for PHB FDT");
+ }
+
+ /* ibm,drc-names */
+ memset(char_buf, 0, sizeof(char_buf));
+ entries = (uint32_t *)&char_buf[0];
+ *entries = SPAPR_DRC_PHB_SLOT_MAX;
+ offset = sizeof(*entries);
+
+ for (i = 1; i <= SPAPR_DRC_PHB_SLOT_MAX; i++) {
+ offset += sprintf(char_buf + offset, "Slot %d",
+ (phb_index * SPAPR_DRC_PHB_SLOT_MAX) + i - 1);
+ char_buf[offset++] = '\0';
+ }
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,drc-names", char_buf, offset);
+ if (ret) {
+ g_warning("error adding 'ibm,drc-names' field for PHB FDT");
+ }
+
+ /* ibm,drc-types */
+ memset(char_buf, 0, sizeof(char_buf));
+ entries = (uint32_t *)&char_buf[0];
+ *entries = SPAPR_DRC_PHB_SLOT_MAX;
+ offset = sizeof(*entries);
+
+ for (i = 0; i < SPAPR_DRC_PHB_SLOT_MAX; i++) {
+ offset += sprintf(char_buf + offset, "28");
+ char_buf[offset++] = '\0';
+ }
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,drc-types", char_buf, offset);
+ if (ret) {
+ g_warning("error adding 'ibm,drc-types' field for PHB FDT");
+ }
+
+ /* we want the initial indicator state to be 0 - "empty", when we
+ * hot-plug an adaptor in the slot, we need to set the indicator
+ * to 1 - "present."
+ */
+
+ /* ibm,indicator-9003 */
+ memset(int_buf, 0, sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_PHB_SLOT_MAX;
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,indicator-9003", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ g_warning("error adding 'ibm,indicator-9003' field for PHB FDT");
+ }
+
+ /* ibm,sensor-9003 */
+ memset(int_buf, 0, sizeof(int_buf));
+ int_buf[0] = SPAPR_DRC_PHB_SLOT_MAX;
+
+ ret = fdt_setprop(fdt, bus_off, "ibm,sensor-9003", int_buf,
+ sizeof(int_buf));
+ if (ret) {
+ g_warning("error adding 'ibm,sensor-9003' field for PHB FDT");
+ }
+}
+
int spapr_populate_pci_dt(sPAPRPHBState *phb,
uint32_t xics_phandle,
+ uint32_t drc_index,
void *fdt)
{
int bus_off, i, j;
@@ -1124,6 +1219,12 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
phb->dma_liobn, phb->dma_window_start,
phb->dma_window_size);
+ spapr_create_drc_phb_dt_entries(fdt, bus_off, phb->index);
+ if (drc_index) {
+ _FDT(fdt_setprop(fdt, bus_off, "ibm,my-drc-index", &drc_index,
+ sizeof(drc_index)));
+ }
+
return 0;
}
diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
index 970b4a9..43d19a5 100644
--- a/include/hw/pci-host/spapr.h
+++ b/include/hw/pci-host/spapr.h
@@ -86,6 +86,7 @@ PCIHostState *spapr_create_phb(sPAPREnvironment *spapr, int index);
int spapr_populate_pci_dt(sPAPRPHBState *phb,
uint32_t xics_phandle,
+ uint32_t drc_index,
void *fdt);
void spapr_pci_msi_init(sPAPREnvironment *spapr, hwaddr addr);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (5 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 06/14] spapr_pci: populate DRC dt entries for PHBs Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 2:30 ` Alexey Kardashevskiy
2013-12-05 1:19 ` [Qemu-devel] [PATCH 08/14] memory: add memory_region_find_subregion Michael Roth
` (6 subsequent siblings)
13 siblings, 1 reply; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr.c | 36 ++++++++++++++++++++++++++++++++++++
include/hw/ppc/spapr.h | 2 ++
2 files changed, 38 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0607559..2250ee1 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -277,6 +277,42 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop,
return (p - prop) * sizeof(uint32_t);
}
+DrcEntry *spapr_phb_to_drc_entry(uint64_t buid)
+{
+ int i;
+
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ if (drc_table[i].phb_buid == buid) {
+ return &drc_table[i];
+ }
+ }
+
+ return NULL;
+}
+
+DrcEntry *spapr_find_drc_entry(int drc_index)
+{
+ int i, j;
+
+ for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ DrcEntry *phb_entry = &drc_table[i];
+ if (phb_entry->drc_index == drc_index) {
+ return phb_entry;
+ }
+ if (phb_entry->child_entries == NULL) {
+ continue;
+ }
+ for (j = 0; j < SPAPR_DRC_PHB_SLOT_MAX; j++) {
+ DrcEntry *entry = &phb_entry->child_entries[j];
+ if (entry->drc_index == drc_index) {
+ return entry;
+ }
+ }
+ }
+
+ return NULL;
+}
+
static void spapr_init_drc_table(void)
{
int i;
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 55304c5..b3e6d4f 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -365,6 +365,8 @@ struct DrcEntry {
extern DrcEntry drc_table[SPAPR_DRC_TABLE_SIZE];
DrcEntry *spapr_add_phb_to_drc_table(uint64_t buid, uint32_t state);
+DrcEntry *spapr_phb_to_drc_entry(uint64_t buid);
+DrcEntry *spapr_find_drc_entry(int drc_index);
extern sPAPREnvironment *spapr;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry
2013-12-05 1:19 ` [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry Michael Roth
@ 2013-12-05 2:30 ` Alexey Kardashevskiy
2013-12-05 17:29 ` Michael Roth
0 siblings, 1 reply; 21+ messages in thread
From: Alexey Kardashevskiy @ 2013-12-05 2:30 UTC (permalink / raw)
To: Michael Roth, qemu-devel; +Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
On 12/05/2013 12:19 PM, Michael Roth wrote:
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> hw/ppc/spapr.c | 36 ++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 2 ++
> 2 files changed, 38 insertions(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 0607559..2250ee1 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -277,6 +277,42 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop,
> return (p - prop) * sizeof(uint32_t);
> }
>
> +DrcEntry *spapr_phb_to_drc_entry(uint64_t buid)
> +{
> + int i;
> +
> + for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
> + if (drc_table[i].phb_buid == buid) {
> + return &drc_table[i];
> + }
> + }
> +
> + return NULL;
> +}
> +
> +DrcEntry *spapr_find_drc_entry(int drc_index)
> +{
> + int i, j;
> +
> + for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
> + DrcEntry *phb_entry = &drc_table[i];
> + if (phb_entry->drc_index == drc_index) {
> + return phb_entry;
> + }
> + if (phb_entry->child_entries == NULL) {
> + continue;
> + }
> + for (j = 0; j < SPAPR_DRC_PHB_SLOT_MAX; j++) {
> + DrcEntry *entry = &phb_entry->child_entries[j];
> + if (entry->drc_index == drc_index) {
> + return entry;
> + }
> + }
> + }
> +
> + return NULL;
> +}
spapr_find_drc_entry() is used in patches 1/3/4 but defined only in 7th
patch, so patches 1..6 won't compile which breaks bisect.
--
Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry
2013-12-05 2:30 ` Alexey Kardashevskiy
@ 2013-12-05 17:29 ` Michael Roth
0 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 17:29 UTC (permalink / raw)
To: Alexey Kardashevskiy, qemu-devel
Cc: agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Quoting Alexey Kardashevskiy (2013-12-04 20:30:15)
> On 12/05/2013 12:19 PM, Michael Roth wrote:
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> > ---
> > hw/ppc/spapr.c | 36 ++++++++++++++++++++++++++++++++++++
> > include/hw/ppc/spapr.h | 2 ++
> > 2 files changed, 38 insertions(+)
> >
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 0607559..2250ee1 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -277,6 +277,42 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop,
> > return (p - prop) * sizeof(uint32_t);
> > }
> >
> > +DrcEntry *spapr_phb_to_drc_entry(uint64_t buid)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
> > + if (drc_table[i].phb_buid == buid) {
> > + return &drc_table[i];
> > + }
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +DrcEntry *spapr_find_drc_entry(int drc_index)
> > +{
> > + int i, j;
> > +
> > + for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
> > + DrcEntry *phb_entry = &drc_table[i];
> > + if (phb_entry->drc_index == drc_index) {
> > + return phb_entry;
> > + }
> > + if (phb_entry->child_entries == NULL) {
> > + continue;
> > + }
> > + for (j = 0; j < SPAPR_DRC_PHB_SLOT_MAX; j++) {
> > + DrcEntry *entry = &phb_entry->child_entries[j];
> > + if (entry->drc_index == drc_index) {
> > + return entry;
> > + }
> > + }
> > + }
> > +
> > + return NULL;
> > +}
>
>
> spapr_find_drc_entry() is used in patches 1/3/4 but defined only in 7th
> patch, so patches 1..6 won't compile which breaks bisect.
Sorry, I messed this up re-organizing the patches. Will fix and re-test
for v2.
>
>
>
>
> --
> Alexey
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Qemu-devel] [PATCH 08/14] memory: add memory_region_find_subregion
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (6 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 07/14] spapr: add helper to retrieve a PHB/device DrcEntry Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 09/14] pci: make pci_bar useable outside pci.c Michael Roth
` (5 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Similar to memory_region_find, but only search for overlaps among
regions that are a child of the region passed in. This is useful
for finding free ranges within a parent range to map to, in
addition to the use-cases similarly served by memory_region_find.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
include/exec/memory.h | 34 +++++++++++++++++++++++++++++++++
memory.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 480dfbf..784b262 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -883,6 +883,40 @@ MemoryRegionSection memory_region_find(MemoryRegion *mr,
hwaddr addr, uint64_t size);
/**
+ * memory_region_find_subregion: translate an address/size relative
+ * to a MemoryRegion into a #MemoryRegionSection corresponding to
+ * a child of that region.
+ *
+ * This is similar to memory_region_find, but locates the first
+ * #MemoryRegion within @mr that overlaps the range, as opposed to
+ * the first #MemoryRegion with @mr's address space.
+ *
+ * Returns a #MemoryRegionSection that describes a contiguous overlap.
+ * It will have the following characteristics:
+ * .@size = 0 iff no overlap was found
+ * .@mr is non-%NULL iff an overlap was found
+ *
+ * Remember that in the return value the @offset_within_region is
+ * relative to the returned region (in the .@mr field), not to the
+ * @mr argument.
+ *
+ * Similarly, the .@offset_within_address_space is relative to the
+ * address space that contains both regions, the passed and the
+ * returned one. However, in the special case where the @mr argument
+ * has no parent (and thus is the root of the address space), the
+ * following will hold:
+ * .@offset_within_address_space >= @addr
+ * .@offset_within_address_space + .@size <= @addr + @size
+ *
+ * @mr: a MemoryRegion within which @addr is a relative address
+ * @addr: start of the area within @as to be searched
+ * @size: size of the area to be searched
+ */
+MemoryRegionSection memory_region_find_subregion(MemoryRegion *mr,
+ hwaddr addr,
+ uint64_t size);
+
+/**
* address_space_sync_dirty_bitmap: synchronize the dirty log for all memory
*
* Synchronizes the dirty page log for an entire address space.
diff --git a/memory.c b/memory.c
index 28f6449..487e710 100644
--- a/memory.c
+++ b/memory.c
@@ -1574,6 +1574,56 @@ bool memory_region_present(MemoryRegion *parent, hwaddr addr)
return true;
}
+MemoryRegionSection memory_region_find_subregion(MemoryRegion *mr,
+ hwaddr addr, uint64_t size)
+{
+ MemoryRegionSection ret = { 0 };
+ MemoryRegion *submr = NULL;
+
+ QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
+ if (!(submr->addr + memory_region_size(submr) - 1 < addr ||
+ submr->addr >= addr + size)) {
+ break;
+ }
+ }
+
+ if (submr) {
+ hwaddr as_addr;
+ MemoryRegion *root;
+ Int128 last_range_addr = int128_make64(addr + size);
+ Int128 last_region_addr =
+ int128_make64(submr->addr + memory_region_size(submr));
+
+ for (root = submr, as_addr = submr->addr; root->parent; ) {
+ root = root->parent;
+ as_addr += root->addr;
+ }
+ ret.mr = submr;
+ ret.size = submr->size;
+ ret.offset_within_address_space = as_addr;
+ /* if the region begins before the range we're checking, subtract the
+ * difference from our offset/size
+ */
+ if (submr->addr <= addr) {
+ ret.offset_within_region = addr - submr->addr;
+ ret.offset_within_address_space += ret.offset_within_region;
+ ret.size = int128_sub(ret.size,
+ int128_make64(ret.offset_within_region));
+ }
+ /* if the region extends beyond the range we're checking, subtract the
+ * difference from our size
+ */
+ if (int128_gt(last_region_addr, last_range_addr)) {
+ ret.size = int128_sub(ret.size,
+ int128_sub(last_region_addr,
+ last_range_addr));
+ }
+ memory_region_ref(ret.mr);
+ }
+
+ return ret;
+}
+
MemoryRegionSection memory_region_find(MemoryRegion *mr,
hwaddr addr, uint64_t size)
{
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 09/14] pci: make pci_bar useable outside pci.c
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (7 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 08/14] memory: add memory_region_find_subregion Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 10/14] pci: allow 0 address for PCI IO regions Michael Roth
` (4 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/pci/pci.c | 3 ++-
include/hw/pci/pci.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index ed32059..f15bbb0 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -103,7 +103,8 @@ static const VMStateDescription vmstate_pcibus = {
VMSTATE_END_OF_LIST()
}
};
-static int pci_bar(PCIDevice *d, int reg)
+
+int pci_bar(PCIDevice *d, int reg)
{
uint8_t type;
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index b783e68..8fe7c5d 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -325,6 +325,7 @@ void pci_device_save(PCIDevice *s, QEMUFile *f);
int pci_device_load(PCIDevice *s, QEMUFile *f);
MemoryRegion *pci_address_space(PCIDevice *dev);
MemoryRegion *pci_address_space_io(PCIDevice *dev);
+int pci_bar(PCIDevice *d, int reg);
typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level);
typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 10/14] pci: allow 0 address for PCI IO regions
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (8 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 09/14] pci: make pci_bar useable outside pci.c Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 11/14] spapr_pci: enable basic hotplug operations Michael Roth
` (3 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
Some kernels program a 0 address for io regions. PCI 3.0 spec
sectio 6.2.5.1 doesn't seem to disallow this.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/pci/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index f15bbb0..fe5729c 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1030,7 +1030,7 @@ static pcibus_t pci_bar_address(PCIDevice *d,
/* Check if 32 bit BAR wraps around explicitly.
* TODO: make priorities correct and remove this work around.
*/
- if (last_addr <= new_addr || new_addr == 0 || last_addr >= UINT32_MAX) {
+ if (last_addr <= new_addr || last_addr >= UINT32_MAX) {
return PCI_BAR_UNMAPPED;
}
return new_addr;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 11/14] spapr_pci: enable basic hotplug operations
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (9 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 10/14] pci: allow 0 address for PCI IO regions Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 12/14] spapr_events: re-use EPOW event infrastructure for hotplug events Michael Roth
` (2 subsequent siblings)
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Mike Day <ncmike@ncultra.org>
This enables hotplug for PHB bridges. Upon hotplug we generate the
OF-nodes required by PAPR specification and IEEE 1275-1994
"PCI Bus Binding to Open Firmware" for the device.
We associate the corresponding FDT for these nodes with the DrcEntry
corresponding to the slot, which will be fetched via
ibm,configure-connector RTAS calls by the guest as described by PAPR
specification. The FDT is cleaned up in the case of unplug.
Amongst the required OF-node properties for each device are the "reg"
and "assigned-addresses" properties which describe the BAR-assignments
for IO/MEM/ROM regions. To handle these assignments we scan the address
space associated with each region for a contiguous range of appropriate
size based on PCI specification and encode these in accordance with
Open Firmware PCI Bus Binding spec.
These assignments will be used by the guest when the rpaphp hotplug
module is used, but may be re-assigned by guests for cases where we
rely on bus rescan.
Signed-off-by: Mike Day <ncmike@ncultra.org>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 375 ++++++++++++++++++++++++++++++++++++++++++++++--
include/hw/ppc/spapr.h | 1 +
2 files changed, 368 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 4a88212..9284acd 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -46,6 +46,17 @@
#define RTAS_TYPE_MSI 1
#define RTAS_TYPE_MSIX 2
+#define FDT_MAX_SIZE 0x10000
+#define _FDT(exp) \
+ do { \
+ int ret = (exp); \
+ if (ret < 0) { \
+ return ret; \
+ } \
+ } while (0)
+
+static void spapr_drc_state_reset(DrcEntry *drc_entry);
+
static sPAPRPHBState *find_phb(sPAPREnvironment *spapr, uint64_t buid)
{
sPAPRPHBState *sphb;
@@ -438,6 +449,22 @@ static void rtas_set_indicator(PowerPCCPU *cpu, sPAPREnvironment *spapr,
/* encode the new value into the correct bit field */
shift = INDICATOR_ISOLATION_SHIFT;
mask = INDICATOR_ISOLATION_MASK;
+ if (drc_entry) {
+ /* transition from unisolated to isolated for a hotplug slot
+ * entails completion of guest-side device unplug/cleanup, so
+ * we can now safely remove the device if qemu is waiting for
+ * it to be released
+ */
+ if (DECODE_DRC_STATE(*pind, mask, shift) != indicator_state) {
+ if (indicator_state == 0 && drc_entry->awaiting_release) {
+ /* device_del has been called and host is waiting
+ * for guest to release/isolate device, go ahead
+ * and remove it now
+ */
+ spapr_drc_state_reset(drc_entry);
+ }
+ }
+ }
break;
case 9002: /* DR */
shift = INDICATOR_DR_SHIFT;
@@ -768,6 +795,345 @@ static AddressSpace *spapr_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn)
return &phb->iommu_as;
}
+/* for 'reg'/'assigned-addresses' OF properties */
+#define RESOURCE_CELLS_SIZE 2
+#define RESOURCE_CELLS_ADDRESS 3
+#define RESOURCE_CELLS_TOTAL \
+ (RESOURCE_CELLS_SIZE + RESOURCE_CELLS_ADDRESS)
+
+static void fill_resource_props(PCIDevice *d, int bus_num,
+ uint32_t *reg, int *reg_size,
+ uint32_t *assigned, int *assigned_size)
+{
+ uint32_t *reg_row, *assigned_row;
+ uint32_t dev_id = ((bus_num << 8) |
+ (PCI_SLOT(d->devfn) << 3) | PCI_FUNC(d->devfn));
+ int i, idx = 0;
+
+ reg[0] = cpu_to_be32(dev_id << 8);
+
+ for (i = 0; i < PCI_NUM_REGIONS; i++) {
+ if (!d->io_regions[i].size) {
+ continue;
+ }
+ reg_row = ®[(idx + 1) * RESOURCE_CELLS_TOTAL];
+ assigned_row = &assigned[idx * RESOURCE_CELLS_TOTAL];
+ reg_row[0] = cpu_to_be32((dev_id << 8) | (pci_bar(d, i) & 0xff));
+ if (d->io_regions[i].type & PCI_BASE_ADDRESS_SPACE_IO) {
+ reg_row[0] |= cpu_to_be32(0x01000000);
+ } else {
+ reg_row[0] |= cpu_to_be32(0x02000000);
+ }
+ assigned_row[0] = cpu_to_be32(reg_row[0] | 0x80000000);
+ assigned_row[3] = reg_row[3] = cpu_to_be32(d->io_regions[i].size >> 32);
+ assigned_row[4] = reg_row[4] = cpu_to_be32(d->io_regions[i].size);
+ assigned_row[1] = cpu_to_be32(d->io_regions[i].addr >> 32);
+ assigned_row[2] = cpu_to_be32(d->io_regions[i].addr);
+ idx++;
+ }
+
+ *reg_size = (idx + 1) * RESOURCE_CELLS_TOTAL * sizeof(uint32_t);
+ *assigned_size = idx * RESOURCE_CELLS_TOTAL * sizeof(uint32_t);
+}
+
+static hwaddr spapr_find_bar_addr(sPAPRPHBState *phb, PCIIORegion *r)
+{
+ MemoryRegionSection mrs = { 0 };
+ hwaddr search_addr;
+ hwaddr size = r->size;
+ hwaddr addr_mask = ~(size - 1);
+ hwaddr increment = size;
+ hwaddr limit;
+
+ if (r->type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
+ /* beginning portion of mmio address space for bus does not get
+ * mapped into system memory, so calculate addr starting at the
+ * corresponding offset into mmio as.
+ */
+ search_addr = (SPAPR_PCI_MEM_WIN_BUS_OFFSET + increment) & addr_mask;
+ } else {
+ search_addr = increment;
+ }
+ limit = memory_region_size(r->address_space);
+
+ do {
+ mrs = memory_region_find_subregion(r->address_space, search_addr, size);
+ if (mrs.mr) {
+ hwaddr mr_last_addr;
+ mr_last_addr = mrs.mr->addr + memory_region_size(mrs.mr) - 1;
+ search_addr = (mr_last_addr + 1) & addr_mask;
+ if (search_addr <= mr_last_addr) {
+ search_addr += increment;
+ }
+ /* this memory region overlaps, unref and continue searching */
+ memory_region_unref(mrs.mr);
+ }
+ } while (int128_nz(mrs.size) && search_addr + size <= limit);
+
+ if (search_addr + size >= limit) {
+ return PCI_BAR_UNMAPPED;
+ }
+
+ return search_addr;
+}
+
+static int spapr_map_bars(sPAPRPHBState *phb, PCIDevice *dev)
+{
+ PCIIORegion *r;
+ int i, ret = -1;
+
+ for (i = 0; i < PCI_NUM_REGIONS; i++) {
+ uint32_t bar_address = pci_bar(dev, i);
+ uint32_t bar_value;
+ uint16_t cmd_value = pci_default_read_config(dev, PCI_COMMAND, 2);
+ hwaddr addr;
+
+ r = &dev->io_regions[i];
+
+ /* this region isn't registered */
+ if (!r->size) {
+ continue;
+ }
+
+ /* find a hw addr we can map */
+ addr = spapr_find_bar_addr(phb, r);
+ if (addr == PCI_BAR_UNMAPPED) {
+ /* we can't find a free range within address space for this BAR */
+ fprintf(stderr,
+ "Unable to map BAR %d, no free range available\n", i);
+ return -1;
+ }
+ /* we can probably map this region into memory if there is not
+ * a race condition with some other allocator. write the address
+ * to the device BAR which will force a call to pci_update_mappings
+ */
+ if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
+ pci_default_write_config(dev, PCI_COMMAND,
+ cmd_value | PCI_COMMAND_IO, 2);
+ } else {
+ pci_default_write_config(dev, PCI_COMMAND,
+ cmd_value | PCI_COMMAND_MEMORY, 2);
+ }
+
+ bar_value = addr;
+
+ if (i == PCI_ROM_SLOT) {
+ bar_value |= PCI_ROM_ADDRESS_ENABLE;
+ }
+ /* write the new bar value */
+ pci_default_write_config(dev, bar_address, bar_value, 4);
+
+ /* if this is a 64-bit BAR, we need to also write the
+ * upper 32 bit value.
+ */
+ if (r->type & PCI_BASE_ADDRESS_MEM_TYPE_64) {
+ bar_value = (addr >> 32) & 0xffffffffUL;
+ pci_default_write_config(dev, bar_address + 4, bar_value, 4);
+ }
+ ret = 0;
+ }
+ return ret;
+}
+
+static int spapr_populate_pci_child_dt(PCIDevice *dev, void *fdt, int offset,
+ int phb_index)
+{
+ int slot = PCI_SLOT(dev->devfn);
+ char slotname[16];
+ bool is_bridge = 1;
+ DrcEntry *drc_entry, *drc_entry_slot;
+ uint32_t reg[RESOURCE_CELLS_TOTAL * 8] = { 0 };
+ uint32_t assigned[RESOURCE_CELLS_TOTAL * 8] = { 0 };
+ int reg_size, assigned_size;
+
+ drc_entry = spapr_phb_to_drc_entry(phb_index + SPAPR_PCI_BASE_BUID);
+ g_assert(drc_entry);
+ drc_entry_slot = &drc_entry->child_entries[slot];
+
+ if (pci_default_read_config(dev, PCI_HEADER_TYPE, 1) ==
+ PCI_HEADER_TYPE_NORMAL) {
+ is_bridge = 0;
+ }
+
+ _FDT(fdt_setprop_cell(fdt, offset, "vendor-id",
+ pci_default_read_config(dev, PCI_VENDOR_ID, 2)));
+ _FDT(fdt_setprop_cell(fdt, offset, "device-id",
+ pci_default_read_config(dev, PCI_DEVICE_ID, 2)));
+ _FDT(fdt_setprop_cell(fdt, offset, "revision-id",
+ pci_default_read_config(dev, PCI_REVISION_ID, 1)));
+ _FDT(fdt_setprop_cell(fdt, offset, "class-code",
+ pci_default_read_config(dev, PCI_CLASS_DEVICE, 2) << 8));
+
+ _FDT(fdt_setprop_cell(fdt, offset, "interrupts",
+ pci_default_read_config(dev, PCI_INTERRUPT_PIN, 1)));
+
+ /* if this device is NOT a bridge */
+ if (!is_bridge) {
+ _FDT(fdt_setprop_cell(fdt, offset, "min-grant",
+ pci_default_read_config(dev, PCI_MIN_GNT, 1)));
+ _FDT(fdt_setprop_cell(fdt, offset, "max-latency",
+ pci_default_read_config(dev, PCI_MAX_LAT, 1)));
+ _FDT(fdt_setprop_cell(fdt, offset, "subsystem-id",
+ pci_default_read_config(dev, PCI_SUBSYSTEM_ID, 2)));
+ _FDT(fdt_setprop_cell(fdt, offset, "subsystem-vendor-id",
+ pci_default_read_config(dev, PCI_SUBSYSTEM_VENDOR_ID, 2)));
+ }
+
+ _FDT(fdt_setprop_cell(fdt, offset, "cache-line-size",
+ pci_default_read_config(dev, PCI_CACHE_LINE_SIZE, 1)));
+
+ /* the following fdt cells are masked off the pci status register */
+ int pci_status = pci_default_read_config(dev, PCI_STATUS, 2);
+ _FDT(fdt_setprop_cell(fdt, offset, "devsel-speed",
+ PCI_STATUS_DEVSEL_MASK & pci_status));
+ _FDT(fdt_setprop_cell(fdt, offset, "fast-back-to-back",
+ PCI_STATUS_FAST_BACK & pci_status));
+ _FDT(fdt_setprop_cell(fdt, offset, "66mhz-capable",
+ PCI_STATUS_66MHZ & pci_status));
+ _FDT(fdt_setprop_cell(fdt, offset, "udf-supported",
+ PCI_STATUS_UDF & pci_status));
+
+ _FDT(fdt_setprop_string(fdt, offset, "name", "pci"));
+ sprintf(slotname, "Slot %d", slot + phb_index * 32);
+ _FDT(fdt_setprop(fdt, offset, "ibm,loc-code", slotname, strlen(slotname)));
+ _FDT(fdt_setprop_cell(fdt, offset, "ibm,my-drc-index",
+ drc_entry_slot->drc_index));
+
+ _FDT(fdt_setprop_cell(fdt, offset, "#address-cells",
+ RESOURCE_CELLS_ADDRESS));
+ _FDT(fdt_setprop_cell(fdt, offset, "#size-cells",
+ RESOURCE_CELLS_SIZE));
+ _FDT(fdt_setprop_cell(fdt, offset, "ibm,req#msi-x",
+ RESOURCE_CELLS_SIZE));
+ fill_resource_props(dev, phb_index, reg, ®_size,
+ assigned, &assigned_size);
+ _FDT(fdt_setprop(fdt, offset, "reg", reg, reg_size));
+ _FDT(fdt_setprop(fdt, offset, "assigned-addresses",
+ assigned, assigned_size));
+
+ return 0;
+}
+
+static int spapr_device_hotplug_add(DeviceState *qdev, PCIDevice *dev)
+{
+ sPAPRPHBState *phb = SPAPR_PCI_HOST_BRIDGE(qdev);
+ DrcEntry *drc_entry, *drc_entry_slot;
+ ConfigureConnectorState *ccs;
+ int slot = PCI_SLOT(dev->devfn);
+ int offset, ret;
+ void *fdt_orig, *fdt;
+ char nodename[512];
+ uint32_t encoded = ENCODE_DRC_STATE(DR_ENTITY_SENSE_PRESENT,
+ SENSOR_ENTITY_SENSE_MASK,
+ SENSOR_ENTITY_SENSE_SHIFT);
+
+ drc_entry = spapr_phb_to_drc_entry(phb->buid);
+ g_assert(drc_entry);
+ drc_entry_slot = &drc_entry->child_entries[slot];
+
+ drc_entry->state &= ~(uint32_t)SENSOR_ENTITY_SENSE_MASK;
+ drc_entry->state |= encoded; /* DR entity present */
+ drc_entry_slot->state &= ~(uint32_t)SENSOR_ENTITY_SENSE_MASK;
+ drc_entry_slot->state |= encoded; /* and the slot */
+
+ /* need to allocate memory region for device BARs */
+ spapr_map_bars(phb, dev);
+
+ /* add OF node for pci device and required OF DT properties */
+ fdt_orig = g_malloc0(FDT_MAX_SIZE);
+ offset = fdt_create(fdt_orig, FDT_MAX_SIZE);
+ fdt_begin_node(fdt_orig, "");
+ fdt_end_node(fdt_orig);
+ fdt_finish(fdt_orig);
+
+ fdt = g_malloc0(FDT_MAX_SIZE);
+ fdt_open_into(fdt_orig, fdt, FDT_MAX_SIZE);
+ sprintf(nodename, "pci@%d", slot);
+ offset = fdt_add_subnode(fdt, 0, nodename);
+ ret = spapr_populate_pci_child_dt(dev, fdt, offset, phb->index);
+ g_assert(!ret);
+ g_free(fdt_orig);
+
+ /* hold on to node, configure_connector will pass it to the guest later */
+ ccs = &drc_entry_slot->cc_state;
+ ccs->fdt = fdt;
+ ccs->offset_start = offset;
+ ccs->state = CC_STATE_PENDING;
+ ccs->dev = dev;
+
+ return 0;
+}
+
+/* check whether guest has released/isolated device */
+static bool spapr_drc_state_is_releasable(DrcEntry *drc_entry)
+{
+ return !DECODE_DRC_STATE(drc_entry->state,
+ INDICATOR_ISOLATION_MASK,
+ INDICATOR_ISOLATION_SHIFT);
+}
+
+/* finalize device unplug/deletion */
+static void spapr_drc_state_reset(DrcEntry *drc_entry)
+{
+ ConfigureConnectorState *ccs = &drc_entry->cc_state;
+ uint32_t sense_empty = ENCODE_DRC_STATE(DR_ENTITY_SENSE_EMPTY,
+ SENSOR_ENTITY_SENSE_MASK,
+ SENSOR_ENTITY_SENSE_SHIFT);
+
+ g_free(ccs->fdt);
+ ccs->fdt = NULL;
+ object_unparent(OBJECT(ccs->dev));
+ ccs->dev = NULL;
+ ccs->state = CC_STATE_IDLE;
+ drc_entry->state &= ~SENSOR_ENTITY_SENSE_MASK;
+ drc_entry->state |= sense_empty;
+ drc_entry->awaiting_release = false;
+}
+
+static void spapr_device_hotplug_remove(DeviceState *qdev, PCIDevice *dev)
+{
+ sPAPRPHBState *phb = SPAPR_PCI_HOST_BRIDGE(qdev);
+ DrcEntry *drc_entry, *drc_entry_slot;
+ ConfigureConnectorState *ccs;
+ int slot = PCI_SLOT(dev->devfn);
+
+ drc_entry = spapr_phb_to_drc_entry(phb->buid);
+ g_assert(drc_entry);
+ drc_entry_slot = &drc_entry->child_entries[slot];
+ ccs = &drc_entry_slot->cc_state;
+ /* shouldn't be removing devices we haven't created an fdt for */
+ g_assert(ccs->state != CC_STATE_IDLE);
+ /* if the device has already been released/isolated by guest, go ahead
+ * and remove it now. Otherwise, flag it as pending guest release so it
+ * can be removed later
+ */
+ if (spapr_drc_state_is_releasable(drc_entry_slot)) {
+ spapr_drc_state_reset(drc_entry_slot);
+ } else {
+ if (drc_entry_slot->awaiting_release) {
+ g_warning("waiting for guest to release the device");
+ } else {
+ drc_entry_slot->awaiting_release = true;
+ }
+ }
+}
+
+static int spapr_device_hotplug(DeviceState *qdev, PCIDevice *dev,
+ PCIHotplugState state)
+{
+ if (state == PCI_COLDPLUG_ENABLED) {
+ return 0;
+ }
+
+ if (state == PCI_HOTPLUG_ENABLED) {
+ spapr_device_hotplug_add(qdev, dev);
+ } else {
+ spapr_device_hotplug_remove(qdev, dev);
+ }
+
+ return 0;
+}
+
static int spapr_phb_init(SysBusDevice *s)
{
DeviceState *dev = DEVICE(s);
@@ -881,6 +1247,7 @@ static int spapr_phb_init(SysBusDevice *s)
&sphb->memspace, &sphb->iospace,
PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
phb->bus = bus;
+ pci_bus_hotplug(phb->bus, spapr_device_hotplug, DEVICE(sphb));
sphb->dma_window_start = 0;
sphb->dma_window_size = 0x40000000;
@@ -1172,14 +1539,6 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
return bus_off;
}
-#define _FDT(exp) \
- do { \
- int ret = (exp); \
- if (ret < 0) { \
- return ret; \
- } \
- } while (0)
-
/* Write PHB properties */
_FDT(fdt_setprop_string(fdt, bus_off, "device_type", "pci"));
_FDT(fdt_setprop_string(fdt, bus_off, "compatible", "IBM,Logical_PHB"));
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index b3e6d4f..0359585 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -359,6 +359,7 @@ struct DrcEntry {
void *fdt;
int fdt_offset;
uint32_t state;
+ bool awaiting_release;
ConfigureConnectorState cc_state;
DrcEntry *child_entries;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 12/14] spapr_events: re-use EPOW event infrastructure for hotplug events
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (10 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 11/14] spapr_pci: enable basic hotplug operations Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 13/14] spapr_events: event-scan RTAS interface Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 14/14] spapr_pci: emit hotplug add/remove events during hotplug Michael Roth
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
This extends the data structures currently used to report EPOW events to
gets via the check-exception RTAS interfaces to also include event types
for hotplug/unplug events.
This is currently undocumented and being finalized for inclusion in PAPR
specification, but we implement this here as an extension for guest
userspace tools to implement (existing guest kernels simply log these
events via a sysfs interface that's read by rtas_errd).
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_events.c | 219 +++++++++++++++++++++++++++++++++++++++---------
include/hw/ppc/spapr.h | 4 +-
3 files changed, 184 insertions(+), 41 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 2250ee1..7079e4e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1522,7 +1522,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
spapr->fdt_skel = spapr_create_fdt_skel(initrd_base, initrd_size,
kernel_size, kernel_le,
boot_device, kernel_cmdline,
- spapr->epow_irq);
+ spapr->check_exception_irq);
assert(spapr->fdt_skel != NULL);
}
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 16fa49e..9dfdbcf 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -32,6 +32,8 @@
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
+#include "hw/pci/pci.h"
+#include "hw/pci-host/spapr.h"
#include <libfdt.h>
@@ -77,6 +79,7 @@ struct rtas_error_log {
#define RTAS_LOG_TYPE_ECC_UNCORR 0x00000009
#define RTAS_LOG_TYPE_ECC_CORR 0x0000000a
#define RTAS_LOG_TYPE_EPOW 0x00000040
+#define RTAS_LOG_TYPE_HOTPLUG 0x000000e5
uint32_t extended_length;
} QEMU_PACKED;
@@ -166,6 +169,38 @@ struct epow_log_full {
struct rtas_event_log_v6_epow epow;
} QEMU_PACKED;
+struct rtas_event_log_v6_hp {
+#define RTAS_LOG_V6_SECTION_ID_HOTPLUG 0x4850 /* HP */
+ struct rtas_event_log_v6_section_header hdr;
+ uint8_t hotplug_type;
+#define RTAS_LOG_V6_HP_TYPE_CPU 1
+#define RTAS_LOG_V6_HP_TYPE_MEMORY 2
+#define RTAS_LOG_V6_HP_TYPE_SLOT 3
+#define RTAS_LOG_V6_HP_TYPE_PHB 4
+#define RTAS_LOG_V6_HP_TYPE_PCI 5
+ uint8_t hotplug_action;
+#define RTAS_LOG_V6_HP_ACTION_ADD 1
+#define RTAS_LOG_V6_HP_ACTION_REMOVE 2
+ uint8_t hotplug_identifier;
+#define RTAS_LOG_V6_HP_ID_DRC_NAME 1
+#define RTAS_LOG_V6_HP_ID_DRC_INDEX 2
+#define RTAS_LOG_V6_HP_ID_DRC_COUNT 3
+ uint8_t reserved;
+ union {
+ uint32_t index;
+ uint32_t count;
+ char name[1];
+ } drc;
+} QEMU_PACKED;
+
+struct hp_log_full {
+ struct rtas_error_log hdr;
+ struct rtas_event_log_v6 v6hdr;
+ struct rtas_event_log_v6_maina maina;
+ struct rtas_event_log_v6_mainb mainb;
+ struct rtas_event_log_v6_hp hp;
+} QEMU_PACKED;
+
#define EVENT_MASK_INTERNAL_ERRORS 0x80000000
#define EVENT_MASK_EPOW 0x40000000
#define EVENT_MASK_HOTPLUG 0x10000000
@@ -181,29 +216,61 @@ struct epow_log_full {
} \
} while (0)
-void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq)
+void spapr_events_fdt_skel(void *fdt, uint32_t check_exception_irq)
{
- uint32_t epow_irq_ranges[] = {cpu_to_be32(epow_irq), cpu_to_be32(1)};
- uint32_t epow_interrupts[] = {cpu_to_be32(epow_irq), 0};
+ uint32_t irq_ranges[] = {cpu_to_be32(check_exception_irq), cpu_to_be32(1)};
+ uint32_t interrupts[] = {cpu_to_be32(check_exception_irq), 0};
_FDT((fdt_begin_node(fdt, "event-sources")));
_FDT((fdt_property(fdt, "interrupt-controller", NULL, 0)));
_FDT((fdt_property_cell(fdt, "#interrupt-cells", 2)));
_FDT((fdt_property(fdt, "interrupt-ranges",
- epow_irq_ranges, sizeof(epow_irq_ranges))));
+ irq_ranges, sizeof(irq_ranges))));
_FDT((fdt_begin_node(fdt, "epow-events")));
- _FDT((fdt_property(fdt, "interrupts",
- epow_interrupts, sizeof(epow_interrupts))));
+ _FDT((fdt_property(fdt, "interrupts", interrupts, sizeof(interrupts))));
_FDT((fdt_end_node(fdt)));
_FDT((fdt_end_node(fdt)));
}
static struct epow_log_full *pending_epow;
+static struct hp_log_full *pending_hp;
static uint32_t next_plid;
+static void spapr_init_v6hdr(struct rtas_event_log_v6 *v6hdr)
+{
+ v6hdr->b0 = RTAS_LOG_V6_B0_VALID | RTAS_LOG_V6_B0_NEW_LOG
+ | RTAS_LOG_V6_B0_BIGENDIAN;
+ v6hdr->b2 = RTAS_LOG_V6_B2_POWERPC_FORMAT
+ | RTAS_LOG_V6_B2_LOG_FORMAT_PLATFORM_EVENT;
+ v6hdr->company = cpu_to_be32(RTAS_LOG_V6_COMPANY_IBM);
+}
+
+static void spapr_init_maina(struct rtas_event_log_v6_maina *maina,
+ int section_count)
+{
+ struct tm tm;
+ int year;
+
+ maina->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINA);
+ maina->hdr.section_length = cpu_to_be16(sizeof(*maina));
+ /* FIXME: section version, subtype and creator id? */
+ qemu_get_timedate(&tm, spapr->rtc_offset);
+ year = tm.tm_year + 1900;
+ maina->creation_date = cpu_to_be32((to_bcd(year / 100) << 24)
+ | (to_bcd(year % 100) << 16)
+ | (to_bcd(tm.tm_mon + 1) << 8)
+ | to_bcd(tm.tm_mday));
+ maina->creation_time = cpu_to_be32((to_bcd(tm.tm_hour) << 24)
+ | (to_bcd(tm.tm_min) << 16)
+ | (to_bcd(tm.tm_sec) << 8));
+ maina->creator_id = 'H'; /* Hypervisor */
+ maina->section_count = section_count;
+ maina->plid = next_plid++;
+}
+
static void spapr_powerdown_req(Notifier *n, void *opaque)
{
sPAPREnvironment *spapr = container_of(n, sPAPREnvironment, epow_notifier);
@@ -212,8 +279,6 @@ static void spapr_powerdown_req(Notifier *n, void *opaque)
struct rtas_event_log_v6_maina *maina;
struct rtas_event_log_v6_mainb *mainb;
struct rtas_event_log_v6_epow *epow;
- struct tm tm;
- int year;
if (pending_epow) {
/* For now, we just throw away earlier events if two come
@@ -237,27 +302,8 @@ static void spapr_powerdown_req(Notifier *n, void *opaque)
hdr->extended_length = cpu_to_be32(sizeof(*pending_epow)
- sizeof(pending_epow->hdr));
- v6hdr->b0 = RTAS_LOG_V6_B0_VALID | RTAS_LOG_V6_B0_NEW_LOG
- | RTAS_LOG_V6_B0_BIGENDIAN;
- v6hdr->b2 = RTAS_LOG_V6_B2_POWERPC_FORMAT
- | RTAS_LOG_V6_B2_LOG_FORMAT_PLATFORM_EVENT;
- v6hdr->company = cpu_to_be32(RTAS_LOG_V6_COMPANY_IBM);
-
- maina->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINA);
- maina->hdr.section_length = cpu_to_be16(sizeof(*maina));
- /* FIXME: section version, subtype and creator id? */
- qemu_get_timedate(&tm, spapr->rtc_offset);
- year = tm.tm_year + 1900;
- maina->creation_date = cpu_to_be32((to_bcd(year / 100) << 24)
- | (to_bcd(year % 100) << 16)
- | (to_bcd(tm.tm_mon + 1) << 8)
- | to_bcd(tm.tm_mday));
- maina->creation_time = cpu_to_be32((to_bcd(tm.tm_hour) << 24)
- | (to_bcd(tm.tm_min) << 16)
- | (to_bcd(tm.tm_sec) << 8));
- maina->creator_id = 'H'; /* Hypervisor */
- maina->section_count = 3; /* Main-A, Main-B and EPOW */
- maina->plid = next_plid++;
+ spapr_init_v6hdr(v6hdr);
+ spapr_init_maina(maina, 3 /* Main-A, Main-B and EPOW */);
mainb->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINB);
mainb->hdr.section_length = cpu_to_be16(sizeof(*mainb));
@@ -274,9 +320,93 @@ static void spapr_powerdown_req(Notifier *n, void *opaque)
epow->event_modifier = RTAS_LOG_V6_EPOW_MODIFIER_NORMAL;
epow->extended_modifier = RTAS_LOG_V6_EPOW_XMODIFIER_PARTITION_SPECIFIC;
- qemu_irq_pulse(xics_get_qirq(spapr->icp, spapr->epow_irq));
+ qemu_irq_pulse(xics_get_qirq(spapr->icp, spapr->check_exception_irq));
+}
+
+static void spapr_hotplug_req_event(uint8_t hp_type, uint8_t hp_action,
+ sPAPRPHBState *phb, int slot)
+{
+ struct rtas_error_log *hdr;
+ struct rtas_event_log_v6 *v6hdr;
+ struct rtas_event_log_v6_maina *maina;
+ struct rtas_event_log_v6_mainb *mainb;
+ struct rtas_event_log_v6_hp *hp;
+ DrcEntry *drc_entry;
+
+ if (pending_hp) {
+ /* Just toss any pending hotplug events for now, this will
+ * need to be fixed later on.
+ */
+ g_free(pending_hp);
+ }
+
+ pending_hp = g_malloc0(sizeof(*pending_hp));
+ hdr = &pending_hp->hdr;
+ v6hdr = &pending_hp->v6hdr;
+ maina = &pending_hp->maina;
+ mainb = &pending_hp->mainb;
+ hp = &pending_hp->hp;
+
+ hdr->summary = cpu_to_be32(RTAS_LOG_VERSION_6
+ | RTAS_LOG_SEVERITY_EVENT
+ | RTAS_LOG_DISPOSITION_NOT_RECOVERED
+ | RTAS_LOG_OPTIONAL_PART_PRESENT
+ | RTAS_LOG_INITIATOR_HOTPLUG
+ | RTAS_LOG_TYPE_HOTPLUG);
+ hdr->extended_length = cpu_to_be32(sizeof(*pending_hp)
+ - sizeof(pending_hp->hdr));
+
+ spapr_init_v6hdr(v6hdr);
+ spapr_init_maina(maina, 3 /* Main-A, Main-B, HP */);
+
+ mainb->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINB);
+ mainb->hdr.section_length = cpu_to_be16(sizeof(*mainb));
+ mainb->subsystem_id = 0x80; /* External environment */
+ mainb->event_severity = 0x00; /* Informational / non-error */
+ mainb->event_subtype = 0x00; /* Normal shutdown */
+
+ hp->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_HOTPLUG);
+ hp->hdr.section_length = cpu_to_be16(sizeof(*hp));
+ hp->hdr.section_version = 1; /* includes extended modifier */
+ hp->hotplug_action = hp_action;
+
+ hp->hotplug_type = hp_type;
+
+ drc_entry = spapr_phb_to_drc_entry(phb->buid);
+ if (!drc_entry) {
+ drc_entry = spapr_add_phb_to_drc_table(phb->buid, 2 /* Unusable */);
+ }
+
+ switch (hp_type) {
+ case RTAS_LOG_V6_HP_TYPE_PCI:
+ hp->drc.index = drc_entry->child_entries[slot].drc_index;
+ hp->hotplug_identifier = RTAS_LOG_V6_HP_ID_DRC_INDEX;
+ break;
+ }
+
+ qemu_irq_pulse(xics_get_qirq(spapr->icp, spapr->check_exception_irq));
+}
+
+void spapr_pci_hotplug_add_event(DeviceState *qdev, int slot)
+{
+ sPAPRPHBState *phb = SPAPR_PCI_HOST_BRIDGE(qdev);
+
+ return spapr_hotplug_req_event(RTAS_LOG_V6_HP_TYPE_PCI,
+ RTAS_LOG_V6_HP_ACTION_ADD, phb, slot);
}
+void spapr_pci_hotplug_remove_event(DeviceState *qdev, int slot)
+{
+ sPAPRPHBState *phb = SPAPR_PCI_HOST_BRIDGE(qdev);
+
+ /* TODO: removal is generally initiated by guest, need to
+ * document what exactly the guest is supposed to do with
+ * this event. What does ACPI or shpc do?
+ */
+ return spapr_hotplug_req_event(RTAS_LOG_V6_HP_TYPE_PCI,
+ RTAS_LOG_V6_HP_ACTION_REMOVE, phb, slot);
+ }
+
static void check_exception(PowerPCCPU *cpu, sPAPREnvironment *spapr,
uint32_t token, uint32_t nargs,
target_ulong args,
@@ -298,15 +428,26 @@ static void check_exception(PowerPCCPU *cpu, sPAPREnvironment *spapr,
xinfo |= (uint64_t)rtas_ld(args, 6) << 32;
}
- if ((mask & EVENT_MASK_EPOW) && pending_epow) {
- if (sizeof(*pending_epow) < len) {
- len = sizeof(*pending_epow);
- }
+ if (mask & EVENT_MASK_EPOW) {
+ if (pending_epow) {
+ if (sizeof(*pending_epow) < len) {
+ len = sizeof(*pending_epow);
+ }
- cpu_physical_memory_write(buf, pending_epow, len);
- g_free(pending_epow);
- pending_epow = NULL;
- rtas_st(rets, 0, RTAS_OUT_SUCCESS);
+ cpu_physical_memory_write(buf, pending_epow, len);
+ g_free(pending_epow);
+ pending_epow = NULL;
+ rtas_st(rets, 0, RTAS_OUT_SUCCESS);
+ } else if (pending_hp) {
+ if (sizeof(*pending_hp) < len) {
+ len = sizeof(*pending_hp);
+ }
+
+ cpu_physical_memory_write(buf, pending_hp, len);
+ g_free(pending_hp);
+ pending_hp = NULL;
+ rtas_st(rets, 0, RTAS_OUT_SUCCESS);
+ }
} else {
rtas_st(rets, 0, RTAS_OUT_NO_ERRORS_FOUND);
}
@@ -314,7 +455,7 @@ static void check_exception(PowerPCCPU *cpu, sPAPREnvironment *spapr,
void spapr_events_init(sPAPREnvironment *spapr)
{
- spapr->epow_irq = spapr_allocate_msi(0);
+ spapr->check_exception_irq = spapr_allocate_msi(0);
spapr->epow_notifier.notify = spapr_powerdown_req;
qemu_register_powerdown_notifier(&spapr->epow_notifier);
spapr_rtas_register("check-exception", check_exception);
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 0359585..deda435 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -31,7 +31,7 @@ typedef struct sPAPREnvironment {
uint64_t rtc_offset;
bool has_graphics;
- uint32_t epow_irq;
+ uint32_t check_exception_irq;
Notifier epow_notifier;
/* Migration state */
@@ -475,5 +475,7 @@ int spapr_dma_dt(void *fdt, int node_off, const char *propname,
uint32_t liobn, uint64_t window, uint32_t size);
int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname,
sPAPRTCETable *tcet);
+void spapr_pci_hotplug_add_event(DeviceState *qdev, int slot);
+void spapr_pci_hotplug_remove_event(DeviceState *qdev, int slot);
#endif /* !defined (__HW_SPAPR_H__) */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 13/14] spapr_events: event-scan RTAS interface
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (11 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 12/14] spapr_events: re-use EPOW event infrastructure for hotplug events Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
2013-12-05 1:19 ` [Qemu-devel] [PATCH 14/14] spapr_pci: emit hotplug add/remove events during hotplug Michael Roth
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
We don't actually rely on this interface to surface hotplug events, and
instead rely on the similar-but-interrupt-driven check-exception RTAS
interface used for EPOW events. However, the existence of this interface
is needed to ensure guest kernels initialize the event-reporting
interfaces which will in turn be used by userspace tools to handle these
events, so we implement this interface as a stub.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr.c | 1 +
hw/ppc/spapr_events.c | 9 +++++++++
include/hw/ppc/spapr.h | 2 ++
3 files changed, 12 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7079e4e..e7a249b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -643,6 +643,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base,
refpoints, sizeof(refpoints))));
_FDT((fdt_property_cell(fdt, "rtas-error-log-max", RTAS_ERROR_LOG_MAX)));
+ _FDT((fdt_property_cell(fdt, "rtas-event-scan-rate", RTAS_EVENT_SCAN_RATE)));
_FDT((fdt_end_node(fdt)));
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 9dfdbcf..5fe77f4 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -453,10 +453,19 @@ static void check_exception(PowerPCCPU *cpu, sPAPREnvironment *spapr,
}
}
+static void event_scan(PowerPCCPU *cpu, sPAPREnvironment *spapr,
+ uint32_t token, uint32_t nargs,
+ target_ulong args,
+ uint32_t nret, target_ulong rets)
+{
+ rtas_st(rets, 0, 1);
+}
+
void spapr_events_init(sPAPREnvironment *spapr)
{
spapr->check_exception_irq = spapr_allocate_msi(0);
spapr->epow_notifier.notify = spapr_powerdown_req;
qemu_register_powerdown_notifier(&spapr->epow_notifier);
spapr_rtas_register("check-exception", check_exception);
+ spapr_rtas_register("event-scan", event_scan);
}
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index deda435..48888ad 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -447,6 +447,8 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr,
#define RTAS_ERROR_LOG_MAX 2048
+#define RTAS_EVENT_SCAN_RATE 1
+
typedef struct sPAPRTCETable sPAPRTCETable;
#define TYPE_SPAPR_TCE_TABLE "spapr-tce-table"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread* [Qemu-devel] [PATCH 14/14] spapr_pci: emit hotplug add/remove events during hotplug
2013-12-05 1:19 [Qemu-devel] [PATCH 00/14] spapr: add support for pci hotplug Michael Roth
` (12 preceding siblings ...)
2013-12-05 1:19 ` [Qemu-devel] [PATCH 13/14] spapr_events: event-scan RTAS interface Michael Roth
@ 2013-12-05 1:19 ` Michael Roth
13 siblings, 0 replies; 21+ messages in thread
From: Michael Roth @ 2013-12-05 1:19 UTC (permalink / raw)
To: qemu-devel; +Cc: aik, agraf, ncmike, paulus, tyreld, nfont, qemu-ppc
From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
This uses extension of existing EPOW interrupt/event mechanism
to notify userspace tools like librtas/drmgr to handle
in-guest configuration/cleanup operations in response to
device_add/device_del.
Userspace tools that don't implement this extension will need
to be run manually in response/advance of device_add/device_del,
respectively.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/ppc/spapr_pci.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 9284acd..77cd6a8 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1121,14 +1121,18 @@ static void spapr_device_hotplug_remove(DeviceState *qdev, PCIDevice *dev)
static int spapr_device_hotplug(DeviceState *qdev, PCIDevice *dev,
PCIHotplugState state)
{
+ int slot = PCI_SLOT(dev->devfn);
+
if (state == PCI_COLDPLUG_ENABLED) {
return 0;
}
if (state == PCI_HOTPLUG_ENABLED) {
spapr_device_hotplug_add(qdev, dev);
+ spapr_pci_hotplug_add_event(qdev, slot);
} else {
spapr_device_hotplug_remove(qdev, dev);
+ spapr_pci_hotplug_remove_event(qdev, slot);
}
return 0;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 21+ messages in thread