From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aik@ozlabs.ru, agraf@suse.de, ncmike@ncultra.org,
paulus@samba.org, tyreld@linux.vnet.ibm.com,
nfont@linux.vnet.ibm.com, qemu-ppc@nongnu.org
Subject: [Qemu-devel] [PATCH v2 07/14] spapr_pci: add ibm, configure-connector RTAS interface
Date: Thu, 5 Dec 2013 16:32:58 -0600 [thread overview]
Message-ID: <1386282785-466-8-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1386282785-466-1-git-send-email-mdroth@linux.vnet.ibm.com>
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 5c099a8..6e7ee31 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -577,6 +577,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);
+ 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;
@@ -1143,6 +1252,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
next prev parent reply other threads:[~2013-12-05 22:33 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 22:32 [Qemu-devel] [PATCH v2 00/14] spapr: add support for pci hotplug Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 01/14] spapr: populate DRC entries for root dt node Michael Roth
2013-12-16 2:59 ` Alexey Kardashevskiy
2013-12-16 4:54 ` Alexey Kardashevskiy
2014-01-16 20:51 ` Michael Roth
2014-01-20 2:58 ` Alexey Kardashevskiy
2014-01-20 14:12 ` Mike Day
2014-01-20 17:24 ` Michael Roth
2014-01-20 17:59 ` Mike Day
2014-01-20 18:51 ` Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 02/14] spapr_pci: populate DRC dt entries for PHBs Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 03/14] spapr: add helper to retrieve a PHB/device DrcEntry Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 04/14] spapr_pci: add set-indicator RTAS interface Michael Roth
2013-12-16 4:26 ` Alexey Kardashevskiy
2014-01-16 20:54 ` Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 05/14] spapr_pci: add get/set-power-level RTAS interfaces Michael Roth
2013-12-16 3:09 ` Alexey Kardashevskiy
2014-01-16 21:01 ` Michael Roth
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 06/14] spapr_pci: add get-sensor-state RTAS interface Michael Roth
2013-12-05 22:32 ` Michael Roth [this message]
2013-12-05 22:32 ` [Qemu-devel] [PATCH v2 08/14] memory: add memory_region_find_subregion Michael Roth
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 09/14] pci: make pci_bar useable outside pci.c Michael Roth
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 10/14] pci: allow 0 address for PCI IO regions Michael Roth
2013-12-05 23:33 ` Peter Maydell
2013-12-10 21:42 ` Michael Roth
2013-12-10 22:14 ` Peter Maydell
2013-12-10 23:03 ` [Qemu-devel] [Qemu-ppc] " Benjamin Herrenschmidt
2013-12-12 14:34 ` [Qemu-devel] " Michael S. Tsirkin
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 11/14] spapr_pci: enable basic hotplug operations Michael Roth
2013-12-16 4:36 ` Alexey Kardashevskiy
2014-01-16 21:22 ` Michael Roth
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 12/14] spapr_events: re-use EPOW event infrastructure for hotplug events Michael Roth
2013-12-16 5:05 ` Alexey Kardashevskiy
2014-01-16 21:32 ` Michael Roth
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 13/14] spapr_events: event-scan RTAS interface Michael Roth
2013-12-16 4:57 ` Alexey Kardashevskiy
2013-12-05 22:33 ` [Qemu-devel] [PATCH v2 14/14] spapr_pci: emit hotplug add/remove events during hotplug Michael Roth
2013-12-16 5:06 ` Alexey Kardashevskiy
2014-01-10 8:29 ` [Qemu-devel] [PATCH v2 00/14] spapr: add support for pci hotplug Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386282785-466-8-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=ncmike@ncultra.org \
--cc=nfont@linux.vnet.ibm.com \
--cc=paulus@samba.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=tyreld@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).