From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJXCC-00087b-N1 for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJXC1-00043z-SA for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:22:40 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:35061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJXC1-00043K-LM for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:22:29 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 18 Aug 2014 18:22:29 -0600 From: Michael Roth Date: Mon, 18 Aug 2014 19:21:53 -0500 Message-Id: <1408407718-10835-8-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1408407718-10835-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1408407718-10835-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 07/12] spapr_pci: add ibm, configure-connector RTAS interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, agraf@suse.de, ncmike@ncultra.org, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com Signed-off-by: Michael Roth --- 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 8d1351d..96a57be 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -606,6 +606,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 RTAS_OUT_HW_ERROR +#define CC_RET_SUCCESS RTAS_OUT_SUCCESS + +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); + sPAPRDrcEntry *drc_entry = NULL; + sPAPRConfigureConnectorState *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; @@ -1276,6 +1385,8 @@ void spapr_pci_rtas_init(void) rtas_get_power_level); spapr_rtas_register(RTAS_GET_SENSOR_STATE, "get-sensor-state", rtas_get_sensor_state); + spapr_rtas_register(RTAS_IBM_CONFIGURE_CONNECTOR, "ibm,configure-connector", + rtas_ibm_configure_connector); } static void spapr_pci_register_types(void) -- 1.9.1