From nobody Mon Feb 9 16:55:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738070495572.872401300149; Tue, 6 Jun 2017 01:34:30 -0700 (PDT) Received: from localhost ([::1]:36820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9wb-00052k-4W for importer@patchew.org; Tue, 06 Jun 2017 04:34:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003Oy-8t for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uf-00021Y-MC for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([103.22.144.67]:57255) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9uf-00020Y-1o; Tue, 06 Jun 2017 04:32:29 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL23Nchz9s7h; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=MQIn9xBRkmGwls2qRfja73fWRLvFmPSBDO58FlKlUCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Emh2/6B7DZFtR+SrWgKVTN20ftuvhIn5LnxGZfd/swE08pCqncAPbC0IEpH2j5D+x 04wYry+h4U1JrhgzZqNXS8HzutAPfbRnf7003YOGPym18jVU3iWZDUoJP05qwR00Oh NIhmgHGahBYv/KI65wTa1AxVr5Qb5wQyz6QEShRM= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:15 +1000 Message-Id: <20170606083221.9299-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 1/7] spapr: Clean up DR entity sense handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DRC classes have an entity_sense method to determine (in a specific PAPR sense) the presence or absence of a device plugged into a DRC. However, we only have one implementation of the method, which explicitly tests for different DRC types. This changes it to instead have different method implementations for the two cases: "logical" and "physical" DRCs. While we're at it, the entity sense method always returns RTAS_OUT_SUCCESS, and the interesting value is returned via pass-by-reference. Simplify this to directly return the value we care about Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr_drc.c | 76 ++++++++++++++++++++++++------------------= ---- hw/ppc/spapr_pci.c | 6 ++-- hw/ppc/trace-events | 1 - include/hw/ppc/spapr_drc.h | 4 +-- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 39e7f30..da3779e 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -185,39 +185,29 @@ static void set_signalled(sPAPRDRConnector *drc) * based on the current allocation/indicator/power states * for the DR connector. */ -static uint32_t entity_sense(sPAPRDRConnector *drc, sPAPRDREntitySense *st= ate) +static sPAPRDREntitySense physical_entity_sense(sPAPRDRConnector *drc) { - if (drc->dev) { - if (spapr_drc_type(drc) !=3D SPAPR_DR_CONNECTOR_TYPE_PCI && - drc->allocation_state =3D=3D SPAPR_DR_ALLOCATION_STATE_UNUSABL= E) { - /* for logical DR, we return a state of UNUSABLE - * iff the allocation state UNUSABLE. - * Otherwise, report the state as USABLE/PRESENT, - * as we would for PCI. - */ - *state =3D SPAPR_DR_ENTITY_SENSE_UNUSABLE; - } else { - /* this assumes all PCI devices are assigned to - * a 'live insertion' power domain, where QEMU - * manages power state automatically as opposed - * to the guest. present, non-PCI resources are - * unaffected by power state. - */ - *state =3D SPAPR_DR_ENTITY_SENSE_PRESENT; - } + /* this assumes all PCI devices are assigned to a 'live insertion' + * power domain, where QEMU manages power state automatically as + * opposed to the guest. present, non-PCI resources are unaffected + * by power state. + */ + return drc->dev ? SPAPR_DR_ENTITY_SENSE_PRESENT + : SPAPR_DR_ENTITY_SENSE_EMPTY; +} + +static sPAPRDREntitySense logical_entity_sense(sPAPRDRConnector *drc) +{ + /* for logical DR, we return a state of UNUSABLE iff the + * allocation state UNUSABLE. Otherwise, report the state as + * USABLE/PRESENT, as we would for PCI. + */ + if (drc->dev + && (drc->allocation_state !=3D SPAPR_DR_ALLOCATION_STATE_UNUSABLE)= ) { + return SPAPR_DR_ENTITY_SENSE_PRESENT; } else { - if (spapr_drc_type(drc) =3D=3D SPAPR_DR_CONNECTOR_TYPE_PCI) { - /* PCI devices, and only PCI devices, use EMPTY - * in cases where we'd otherwise use UNUSABLE - */ - *state =3D SPAPR_DR_ENTITY_SENSE_EMPTY; - } else { - *state =3D SPAPR_DR_ENTITY_SENSE_UNUSABLE; - } + return SPAPR_DR_ENTITY_SENSE_UNUSABLE; } - - trace_spapr_drc_entity_sense(spapr_drc_index(drc), *state); - return RTAS_OUT_SUCCESS; } =20 static void prop_get_index(Object *obj, Visitor *v, const char *name, @@ -445,7 +435,6 @@ static void reset(DeviceState *d) { sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(d); sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - sPAPRDREntitySense state; =20 trace_spapr_drc_reset(spapr_drc_index(drc)); =20 @@ -477,8 +466,7 @@ static void reset(DeviceState *d) } } =20 - drck->entity_sense(drc, &state); - if (state =3D=3D SPAPR_DR_ENTITY_SENSE_PRESENT) { + if (drck->dr_entity_sense(drc) =3D=3D SPAPR_DR_ENTITY_SENSE_PRESENT) { drck->set_signalled(drc); } } @@ -488,8 +476,7 @@ static bool spapr_drc_needed(void *opaque) sPAPRDRConnector *drc =3D (sPAPRDRConnector *)opaque; sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); bool rc =3D false; - sPAPRDREntitySense value; - drck->entity_sense(drc, &value); + sPAPRDREntitySense value =3D drck->dr_entity_sense(drc); =20 /* If no dev is plugged in there is no need to migrate the DRC state */ if (value !=3D SPAPR_DR_ENTITY_SENSE_PRESENT) { @@ -667,7 +654,6 @@ static void spapr_dr_connector_class_init(ObjectClass *= k, void *data) drck->set_indicator_state =3D set_indicator_state; drck->set_allocation_state =3D set_allocation_state; drck->get_name =3D get_name; - drck->entity_sense =3D entity_sense; drck->attach =3D attach; drck->detach =3D detach; drck->release_pending =3D release_pending; @@ -678,6 +664,20 @@ static void spapr_dr_connector_class_init(ObjectClass = *k, void *data) dk->user_creatable =3D false; } =20 +static void spapr_drc_physical_class_init(ObjectClass *k, void *data) +{ + sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_CLASS(k); + + drck->dr_entity_sense =3D physical_entity_sense; +} + +static void spapr_drc_logical_class_init(ObjectClass *k, void *data) +{ + sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_CLASS(k); + + drck->dr_entity_sense =3D logical_entity_sense; +} + static void spapr_drc_cpu_class_init(ObjectClass *k, void *data) { sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_CLASS(k); @@ -716,6 +716,7 @@ static const TypeInfo spapr_drc_physical_info =3D { .name =3D TYPE_SPAPR_DRC_PHYSICAL, .parent =3D TYPE_SPAPR_DR_CONNECTOR, .instance_size =3D sizeof(sPAPRDRConnector), + .class_init =3D spapr_drc_physical_class_init, .abstract =3D true, }; =20 @@ -723,6 +724,7 @@ static const TypeInfo spapr_drc_logical_info =3D { .name =3D TYPE_SPAPR_DRC_LOGICAL, .parent =3D TYPE_SPAPR_DR_CONNECTOR, .instance_size =3D sizeof(sPAPRDRConnector), + .class_init =3D spapr_drc_logical_class_init, .abstract =3D true, }; =20 @@ -1010,7 +1012,7 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sP= APRMachineState *spapr, goto out; } drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - ret =3D drck->entity_sense(drc, &sensor_state); + sensor_state =3D drck->dr_entity_sense(drc); =20 out: rtas_st(rets, 0, ret); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 0c181bb..5cba8f9 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1481,7 +1481,7 @@ static void spapr_phb_hot_plug_child(HotplugHandler *= plug_handler, func_drc =3D spapr_phb_get_pci_func_drc(phb, pci_bus_num(bus), PCI_DEVFN(slotnr, i)); func_drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(func_drc); - func_drck->entity_sense(func_drc, &state); + state =3D func_drck->dr_entity_sense(func_drc); =20 if (state =3D=3D SPAPR_DR_ENTITY_SENSE_PRESENT) { spapr_hotplug_req_add_by_index(func_drc); @@ -1522,7 +1522,7 @@ static void spapr_phb_hot_unplug_child(HotplugHandler= *plug_handler, func_drc =3D spapr_phb_get_pci_func_drc(phb, pci_bus_num(b= us), PCI_DEVFN(slotnr, i)= ); func_drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(func_drc); - func_drck->entity_sense(func_drc, &state); + state =3D func_drck->dr_entity_sense(func_drc); if (state =3D=3D SPAPR_DR_ENTITY_SENSE_PRESENT && !func_drck->release_pending(func_drc)) { error_setg(errp, @@ -1548,7 +1548,7 @@ static void spapr_phb_hot_unplug_child(HotplugHandler= *plug_handler, func_drc =3D spapr_phb_get_pci_func_drc(phb, pci_bus_num(b= us), PCI_DEVFN(slotnr, i)= ); func_drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(func_drc); - func_drck->entity_sense(func_drc, &state); + state =3D func_drck->dr_entity_sense(func_drc); if (state =3D=3D SPAPR_DR_ENTITY_SENSE_PRESENT) { spapr_hotplug_req_remove_by_index(func_drc); } diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 43d265f..4979397 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -44,7 +44,6 @@ spapr_drc_set_allocation_state(uint32_t index, int state)= "drc: 0x%"PRIx32", sta spapr_drc_set_allocation_state_finalizing(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_set_configured(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_set_configured_skipping(uint32_t index) "drc: 0x%"PRIx32", isola= ted device" -spapr_drc_entity_sense(uint32_t index, int state) "drc: 0x%"PRIx32", state= : 0x%x" spapr_drc_attach(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_detach(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_awaiting_isolated(uint32_t index) "drc: 0x%"PRIx32 diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index c88e1be..f892b94 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -214,6 +214,8 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRConnectorTypeShift typeshift; const char *typename; /* used in device tree, PAPR 13.5.2.6 & C.6.1 */ =20 + sPAPRDREntitySense (*dr_entity_sense)(sPAPRDRConnector *drc); + /* accessors for guest-visible (generally via RTAS) DR state */ uint32_t (*set_isolation_state)(sPAPRDRConnector *drc, sPAPRDRIsolationState state); @@ -223,8 +225,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRAllocationState state); const char *(*get_name)(sPAPRDRConnector *drc); =20 - uint32_t (*entity_sense)(sPAPRDRConnector *drc, sPAPRDREntitySense *st= ate); - /* QEMU interfaces for managing hotplug operations */ void (*attach)(sPAPRDRConnector *drc, DeviceState *d, void *fdt, int fdt_start_offset, bool coldplug, Error **errp); --=20 2.9.4 From nobody Mon Feb 9 16:55:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738211201834.9345125862839; Tue, 6 Jun 2017 01:36:51 -0700 (PDT) Received: from localhost ([::1]:36838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9yr-0006wK-Q9 for importer@patchew.org; Tue, 06 Jun 2017 04:36:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003Ov-8f for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uf-00021T-LV for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([103.22.144.67]:43207) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9uf-00020X-35; Tue, 06 Jun 2017 04:32:29 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL22QP2z9s3s; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=OPNllUrtkxtpfhxHgHZ1kk6c0xli/bumnOaZrjRZw5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cVN6COJZAMeHCdwA7ujMiW84NmSpSwWg+Ku/mcDBV9Ae7YLXUH+aljamTcs3pbWU+ OYK0E9NNujhMNq9vCaJpKc2wBXp1jPH3jJ+YnM9BxrBfktTzegz5zYnDySgPPmeCuO V+UwXZNp7Kk9TnY/HpknRqAXVNiDc/x6aNckN+xw= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:16 +1000 Message-Id: <20170606083221.9299-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 2/7] spapr: Abolish DRC get_name method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DRConnectorClass has a get_name method, however: * There's only one implementation, and only ever likely to be one * There's exactly one caller, which is (now) local * The implementation is trivial So just open-code what we need. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr_drc.c | 11 ++--------- include/hw/ppc/spapr_drc.h | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index da3779e..9140b48 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -167,11 +167,6 @@ static uint32_t set_allocation_state(sPAPRDRConnector = *drc, return RTAS_OUT_SUCCESS; } =20 -static const char *get_name(sPAPRDRConnector *drc) -{ - return drc->name; -} - /* has the guest been notified of device attachment? */ static void set_signalled(sPAPRDRConnector *drc) { @@ -221,8 +216,7 @@ static void prop_get_index(Object *obj, Visitor *v, con= st char *name, static char *prop_get_name(Object *obj, Error **errp) { sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(obj); - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - return g_strdup(drck->get_name(drc)); + return g_strdup(drc->name); } =20 static void prop_get_fdt(Object *obj, Visitor *v, const char *name, @@ -653,7 +647,6 @@ static void spapr_dr_connector_class_init(ObjectClass *= k, void *data) drck->set_isolation_state =3D set_isolation_state; drck->set_indicator_state =3D set_indicator_state; drck->set_allocation_state =3D set_allocation_state; - drck->get_name =3D get_name; drck->attach =3D attach; drck->detach =3D detach; drck->release_pending =3D release_pending; @@ -848,7 +841,7 @@ int spapr_drc_populate_dt(void *fdt, int fdt_offset, Ob= ject *owner, g_array_append_val(drc_power_domains, drc_power_domain); =20 /* ibm,drc-names */ - drc_names =3D g_string_append(drc_names, drck->get_name(drc)); + drc_names =3D g_string_append(drc_names, drc->name); drc_names =3D g_string_insert_len(drc_names, -1, "\0", 1); =20 /* ibm,drc-types */ diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index f892b94..795b7dd 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -223,7 +223,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRIndicatorState state); uint32_t (*set_allocation_state)(sPAPRDRConnector *drc, sPAPRDRAllocationState state); - const char *(*get_name)(sPAPRDRConnector *drc); =20 /* QEMU interfaces for managing hotplug operations */ void (*attach)(sPAPRDRConnector *drc, DeviceState *d, void *fdt, --=20 2.9.4 From nobody Mon Feb 9 16:55:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738350761646.0850272220933; Tue, 6 Jun 2017 01:39:10 -0700 (PDT) Received: from localhost ([::1]:36849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIA17-0000XF-D0 for importer@patchew.org; Tue, 06 Jun 2017 04:39:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9uh-0003Ns-RB for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9ug-00021q-B3 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:31 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:54515) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9uf-00020b-L1; Tue, 06 Jun 2017 04:32:30 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL24SCwz9s7B; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=cmpkb1XJMNomrW3YpFNNVax8iZjMhc7wlv1gP6XDep0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TgtD7Q26vTuj0e9It1rflueJhoq+Qlc9appZLTd9ZV/RYGPSWb6ujfessjgY6jlGK Wn0NqPimv3sK/+Tfo4VnIprzJXBqSS7qm7ey1iu2P04D+onwe7+RQ4SbsxHcncWIG0 d01mq2cvQ/zzQSQUk7VZMedHK8SGHbnM7Vd83uys= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:17 +1000 Message-Id: <20170606083221.9299-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 3/7] spapr: Assign DRC names from owners X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At present, spapr_dr_connector_new assigns a name to the drc based on its type and ID. The few places the DRC name are used, however, are supposed to give some sort of human-useful information to correlate guest-side problems with host-side resources (for PCI devices it's supposed to be a physical location code). The owners who set up the DRCs are in a much better position to supply this information than the DRC core. We already have a "name" R/O property, so make it R/W and set from the callers. We change the "name" property from a new-style QOM one to the property list form, simply because it's a bit less verbose that way. Signed-off-by: David Gibson --- hw/ppc/spapr.c | 16 +++++++++--- hw/ppc/spapr_drc.c | 61 ++++++++++++------------------------------= ---- hw/ppc/spapr_pci.c | 29 ++++++++++++++++++++-- include/hw/ppc/spapr_drc.h | 5 ++-- 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 86e6228..671cdbb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1909,11 +1909,14 @@ static void spapr_create_lmb_dr_connectors(sPAPRMac= hineState *spapr) =20 for (i =3D 0; i < nr_lmbs; i++) { sPAPRDRConnector *drc; + char *drc_name; uint64_t addr; =20 addr =3D i * lmb_size + spapr->hotplug_memory.base; + drc_name =3D g_strdup_printf("LMB %"PRId64, addr / lmb_size); drc =3D spapr_dr_connector_new(OBJECT(spapr), TYPE_SPAPR_DRC_LMB, - addr/lmb_size); + addr / lmb_size, drc_name, &error_abo= rt); + g_free(drc_name); qemu_register_reset(spapr_drc_reset, drc); } } @@ -2008,9 +2011,14 @@ static void spapr_init_cpus(sPAPRMachineState *spapr) int core_id =3D i * smp_threads; =20 if (mc->has_hotpluggable_cpus) { - sPAPRDRConnector *drc =3D - spapr_dr_connector_new(OBJECT(spapr), TYPE_SPAPR_DRC_CPU, - (core_id / smp_threads) * smt); + int id =3D (core_id / smp_threads) * smt; + char *drc_name; + sPAPRDRConnector *drc; + + drc_name =3D g_strdup_printf("CPU %d", id); + drc =3D spapr_dr_connector_new(OBJECT(spapr), TYPE_SPAPR_DRC_C= PU, + id, drc_name, &error_abort); + g_free(drc_name); =20 qemu_register_reset(spapr_drc_reset, drc); } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 9140b48..1fc51c9 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -213,12 +213,6 @@ static void prop_get_index(Object *obj, Visitor *v, co= nst char *name, visit_type_uint32(v, name, &value, errp); } =20 -static char *prop_get_name(Object *obj, Error **errp) -{ - sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(obj); - return g_strdup(drc->name); -} - static void prop_get_fdt(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -564,9 +558,11 @@ static void unrealize(DeviceState *d, Error **errp) } =20 sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type, - uint32_t id) + uint32_t id, const char *name, + Error **errp) { sPAPRDRConnector *drc =3D SPAPR_DR_CONNECTOR(object_new(type)); + Error *local_err =3D NULL; char *prop_name; =20 drc->id =3D id; @@ -574,48 +570,16 @@ sPAPRDRConnector *spapr_dr_connector_new(Object *owne= r, const char *type, prop_name =3D g_strdup_printf("dr-connector[%"PRIu32"]", spapr_drc_index(drc)); object_property_add_child(owner, prop_name, OBJECT(drc), NULL); - object_property_set_bool(OBJECT(drc), true, "realized", NULL); g_free(prop_name); =20 - /* human-readable name for a DRC to encode into the DT - * description. this is mainly only used within a guest in place - * of the unique DRC index. - * - * in the case of VIO/PCI devices, it corresponds to a - * "location code" that maps a logical device/function (DRC index) - * to a physical (or virtual in the case of VIO) location in the - * system by chaining together the "location label" for each - * encapsulating component. - * - * since this is more to do with diagnosing physical hardware - * issues than guest compatibility, we choose location codes/DRC - * names that adhere to the documented format, but avoid encoding - * the entire topology information into the label/code, instead - * just using the location codes based on the labels for the - * endpoints (VIO/PCI adaptor connectors), which is basically - * just "C" followed by an integer ID. - * - * DRC names as documented by PAPR+ v2.7, 13.5.2.4 - * location codes as documented by PAPR+ v2.7, 12.3.1.5 - */ - switch (spapr_drc_type(drc)) { - case SPAPR_DR_CONNECTOR_TYPE_CPU: - drc->name =3D g_strdup_printf("CPU %d", id); - break; - case SPAPR_DR_CONNECTOR_TYPE_PHB: - drc->name =3D g_strdup_printf("PHB %d", id); - break; - case SPAPR_DR_CONNECTOR_TYPE_VIO: - case SPAPR_DR_CONNECTOR_TYPE_PCI: - drc->name =3D g_strdup_printf("C%d", id); - break; - case SPAPR_DR_CONNECTOR_TYPE_LMB: - drc->name =3D g_strdup_printf("LMB %d", id); - break; - default: - g_assert(false); + object_property_set_str(OBJECT(drc), name, "name", &local_err); + if (local_err) { + error_propagate(errp, local_err); + return NULL; } =20 + object_property_set_bool(OBJECT(drc), true, "realized", NULL); + /* PCI slot always start in a USABLE state, and stay there */ if (spapr_drc_type(drc) =3D=3D SPAPR_DR_CONNECTOR_TYPE_PCI) { drc->allocation_state =3D SPAPR_DR_ALLOCATION_STATE_USABLE; @@ -631,16 +595,21 @@ static void spapr_dr_connector_instance_init(Object *= obj) object_property_add_uint32_ptr(obj, "id", &drc->id, NULL); object_property_add(obj, "index", "uint32", prop_get_index, NULL, NULL, NULL, NULL); - object_property_add_str(obj, "name", prop_get_name, NULL, NULL); object_property_add(obj, "fdt", "struct", prop_get_fdt, NULL, NULL, NULL, NULL); } =20 +static Property spapr_drc_properties[] =3D { + DEFINE_PROP_STRING("name", sPAPRDRConnector, name), + DEFINE_PROP_END_OF_LIST(), +}; + static void spapr_dr_connector_class_init(ObjectClass *k, void *data) { DeviceClass *dk =3D DEVICE_CLASS(k); sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_CLASS(k); =20 + dk->props =3D spapr_drc_properties; dk->reset =3D reset; dk->realize =3D realize; dk->unrealize =3D unrealize; diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 5cba8f9..967d7c3 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1570,10 +1570,10 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) sPAPRTCETable *tcet; const unsigned windows_supported =3D sphb->ddw_enabled ? SPAPR_PCI_DMA_MAX_WINDOWS : 1; + Error *local_err =3D NULL; =20 if (sphb->index !=3D (uint32_t)-1) { sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); - Error *local_err =3D NULL; =20 if ((sphb->buid !=3D (uint64_t)-1) || (sphb->dma_liobn[0] !=3D (ui= nt32_t)-1) || (sphb->dma_liobn[1] !=3D (uint32_t)-1 && windows_supported = =3D=3D 2) @@ -1759,8 +1759,33 @@ static void spapr_phb_realize(DeviceState *dev, Erro= r **errp) /* allocate connectors for child PCI devices */ if (sphb->dr_enabled) { for (i =3D 0; i < PCI_SLOT_MAX * 8; i++) { + int id =3D sphb->index << 16 | i; + char *drc_name; + + /* Name for a DRC for the DT. For PCI devices, it is a + * "location code" mapping a logical device/function (DRC + * index) to a physical location in the system. + * + * This is more to do with diagnosing physical hardware + * issues than guest compatibility, so choose names that + * adhere to the documented format, but avoid encoding the + * entire topology information into the label/code, + * instead just using the location codes based on the + * labels for the endpoints (VIO/PCI adaptor connectors), + * which is basically just "C" followed by an integer ID. + * + * DRC names as documented by PAPR+ v2.7, 13.5.2.4 + * location codes as documented by PAPR+ v2.7, 12.3.1.5 + */ + + drc_name =3D g_strdup_printf("C%d", id); spapr_dr_connector_new(OBJECT(phb), TYPE_SPAPR_DRC_PCI, - (sphb->index << 16) | i); + id, drc_name, &local_err); + g_free(drc_name); + if (local_err) { + error_propagate(errp, local_err); + return; + } } } =20 diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 795b7dd..d437e0a 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -184,7 +184,7 @@ typedef struct sPAPRDRConnector { =20 uint32_t id; Object *owner; - const char *name; + char *name; =20 /* sensor/indicator states */ uint32_t isolation_state; @@ -236,7 +236,8 @@ uint32_t spapr_drc_index(sPAPRDRConnector *drc); sPAPRDRConnectorType spapr_drc_type(sPAPRDRConnector *drc); =20 sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type, - uint32_t id); + uint32_t id, const char *name, + Error **errp); sPAPRDRConnector *spapr_drc_by_index(uint32_t index); sPAPRDRConnector *spapr_drc_by_id(const char *type, uint32_t id); int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, --=20 2.9.4 From nobody Mon Feb 9 16:55:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738247917925.5796775910453; Tue, 6 Jun 2017 01:37:27 -0700 (PDT) Received: from localhost ([::1]:36841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9zO-0007RO-Tl for importer@patchew.org; Tue, 06 Jun 2017 04:37:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003Ow-8e for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uf-00021O-LM for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([103.22.144.67]:54255) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9uf-00020f-5H; Tue, 06 Jun 2017 04:32:29 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL251WKz9s7p; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=6Kz57DM9pjdomas671UTlPDTK9e33Uqecch6Z6mVnwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cD0ZMpsqwkKiFTk2vf//n3upQeAdAe3jwHlNr7e5Pn0G9/PIzfLK4zvbEBKkZEZm/ Sq2db9WbG9OSeYLdblGUnETp7RyS6D5C/5rU8i1Dx9YGIjLwXMyyTX0BuOfyJu1bjJ eG4ybnJZRwrKUAroXD7X6hOb+qdo7zAdu26dOvA8= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:18 +1000 Message-Id: <20170606083221.9299-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 4/7] spapr: Don't misuse DR-indicator in spapr_recover_pending_dimm_state() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" With some combinations of migration and hotplug we can lost temporary state indicating how many DRCs (guest side hotplug handles) are still connected to a DIMM object in the process of removal. When we hit that situation spapr_recover_pending_dimm_state() is used to scan more extensively and work out the right number. It does this using drc->indicator state to determine what state of disconnection the DRC is in. However, this is not safe, because the indicator state is guest settable - in fact it's more-or-less a purely guest->host notification mechanism which should have no bearing on the internals of hotplug state management. So, replace the test for this with a test on drc->dev, which is a purely qemu side managed variable, and updated the same BQL critical section as the indicator state. This does introduce an off-by-one change, because the indicator state was updated before the call to spapr_lmb_release() on the current DRC, whereas drc->dev is updated afterwards. That's corrected by always decrementing the nr_lmbs value instead of only doing so in the case where we didn't have to recover information. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 671cdbb..e8cecaf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2683,7 +2683,7 @@ static sPAPRDIMMState *spapr_recover_pending_dimm_sta= te(sPAPRMachineState *ms, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, addr / SPAPR_MEMORY_BLOCK_SIZE); g_assert(drc); - if (drc->indicator_state !=3D SPAPR_DR_INDICATOR_STATE_INACTIVE) { + if (drc->dev) { avail_lmbs++; } addr +=3D SPAPR_MEMORY_BLOCK_SIZE; @@ -2707,10 +2707,11 @@ void spapr_lmb_release(DeviceState *dev) * during the unplug process. In this case recover it. */ if (ds =3D=3D NULL) { ds =3D spapr_recover_pending_dimm_state(spapr, PC_DIMM(dev)); - if (ds->nr_lmbs) { - return; - } - } else if (--ds->nr_lmbs) { + /* The DRC being examined by the caller at least must be counted */ + g_assert(ds->nr_lmbs); + } + + if (--ds->nr_lmbs) { return; } =20 --=20 2.9.4 From nobody Mon Feb 9 16:55:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738069839190.6376442982894; Tue, 6 Jun 2017 01:34:29 -0700 (PDT) Received: from localhost ([::1]:36819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9wa-00052d-4G for importer@patchew.org; Tue, 06 Jun 2017 04:34:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9uj-0003Ot-ON for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9ui-00022T-KW for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:33 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:40837) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9ui-00021i-8c; Tue, 06 Jun 2017 04:32:32 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL25rXgz9s82; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=ruJILlHWIT8AqsEorEMd2UzdR9WTadSE0BrodSdvn/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J9hLyhIynJVTMYihcfYfo2LUcHP4111sME5JNQrz6r/wKWjXG8f/ZZ9HHukkZ7K+j 7ChRthgaRmebdjSGhMrbVZfU8UR/UQmD7Hc5alEqJy+/dp3sCszCgRtifzgx57kff3 pCS2OJg3s0otgjTtrxqQ6zCehzs1S+tFDyrpNJaI= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:19 +1000 Message-Id: <20170606083221.9299-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 5/7] spapr: Clean up RTAS set-indicator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In theory the RTAS set-indicator call can be used for a number of "indicators" defined by PAPR. In practice the only ones we're ever likely to implement are those used for Dynamic Reconfiguration (i.e. hotplug). Because of this, the current implementation determines the associated DRC object, before dispatching based on the type of indicator. However, this means we also need a check that we're dealing with a DR related indicator at all, which duplicates some of the logic from the switch further down. Even though it means a bit of code duplication, things work out cleaner if we delegate the DRC lookup to the individual indicator type functions - and it also allows some further cleanups. While we're there, remove references to "sensor", a copy/paste artefact from the related, but distinct "get-sensor" call. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr_drc.c | 84 ++++++++++++++++++++++++++++---------------------= ---- hw/ppc/trace-events | 2 -- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 1fc51c9..6c2fa93 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -869,74 +869,78 @@ out: * RTAS calls */ =20 -static bool sensor_type_is_dr(uint32_t sensor_type) +static uint32_t rtas_set_isolation_state(uint32_t idx, uint32_t state) { - switch (sensor_type) { - case RTAS_SENSOR_TYPE_ISOLATION_STATE: - case RTAS_SENSOR_TYPE_DR: - case RTAS_SENSOR_TYPE_ALLOCATION_STATE: - return true; + sPAPRDRConnector *drc =3D spapr_drc_by_index(idx); + sPAPRDRConnectorClass *drck; + + if (!drc) { + return RTAS_OUT_PARAM_ERROR; } =20 - return false; + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); + return drck->set_isolation_state(drc, state); } =20 -static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMachineState *spapr, - uint32_t token, uint32_t nargs, - target_ulong args, uint32_t nret, - target_ulong rets) +static uint32_t rtas_set_allocation_state(uint32_t idx, uint32_t state) { - uint32_t sensor_type; - uint32_t sensor_index; - uint32_t sensor_state; - uint32_t ret =3D RTAS_OUT_SUCCESS; - sPAPRDRConnector *drc; + sPAPRDRConnector *drc =3D spapr_drc_by_index(idx); sPAPRDRConnectorClass *drck; =20 - if (nargs !=3D 3 || nret !=3D 1) { - ret =3D RTAS_OUT_PARAM_ERROR; - goto out; + if (!drc) { + return RTAS_OUT_PARAM_ERROR; } =20 - sensor_type =3D rtas_ld(args, 0); - sensor_index =3D rtas_ld(args, 1); - sensor_state =3D rtas_ld(args, 2); + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); + return drck->set_allocation_state(drc, state); +} =20 - if (!sensor_type_is_dr(sensor_type)) { - goto out_unimplemented; - } +static uint32_t rtas_set_indicator_state(uint32_t idx, uint32_t state) +{ + sPAPRDRConnector *drc =3D spapr_drc_by_index(idx); + sPAPRDRConnectorClass *drck; =20 - /* if this is a DR sensor we can assume sensor_index =3D=3D drc_index = */ - drc =3D spapr_drc_by_index(sensor_index); if (!drc) { - trace_spapr_rtas_set_indicator_invalid(sensor_index); + return RTAS_OUT_PARAM_ERROR; + } + + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); + return drck->set_indicator_state(drc, state); +} + +static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMachineState *spapr, + uint32_t token, + uint32_t nargs, target_ulong args, + uint32_t nret, target_ulong rets) +{ + uint32_t type, idx, state; + uint32_t ret =3D RTAS_OUT_SUCCESS; + + if (nargs !=3D 3 || nret !=3D 1) { ret =3D RTAS_OUT_PARAM_ERROR; goto out; } - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 - switch (sensor_type) { + type =3D rtas_ld(args, 0); + idx =3D rtas_ld(args, 1); + state =3D rtas_ld(args, 2); + + switch (type) { case RTAS_SENSOR_TYPE_ISOLATION_STATE: - ret =3D drck->set_isolation_state(drc, sensor_state); + ret =3D rtas_set_isolation_state(idx, state); break; case RTAS_SENSOR_TYPE_DR: - ret =3D drck->set_indicator_state(drc, sensor_state); + ret =3D rtas_set_indicator_state(idx, state); break; case RTAS_SENSOR_TYPE_ALLOCATION_STATE: - ret =3D drck->set_allocation_state(drc, sensor_state); + ret =3D rtas_set_allocation_state(idx, state); break; default: - goto out_unimplemented; + ret =3D RTAS_OUT_NOT_SUPPORTED; } =20 out: rtas_st(rets, 0, ret); - return; - -out_unimplemented: - /* currently only DR-related sensors are implemented */ - trace_spapr_rtas_set_indicator_not_supported(sensor_index, sensor_type= ); - rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED); } =20 static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPRMachineState *spap= r, diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 4979397..581fa85 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -60,8 +60,6 @@ spapr_ovec_parse_vector(int vector, int byte, uint16_t ve= c_len, uint8_t entry) " spapr_ovec_populate_dt(int byte, uint16_t vec_len, uint8_t entry) "encodin= g guest vector byte %3d / %3d: 0x%.2x" =20 # hw/ppc/spapr_rtas.c -spapr_rtas_set_indicator_invalid(uint32_t index) "sensor index: 0x%"PRIx32 -spapr_rtas_set_indicator_not_supported(uint32_t index, uint32_t type) "sen= sor index: 0x%"PRIx32", type: %"PRIu32 spapr_rtas_get_sensor_state_not_supported(uint32_t index, uint32_t type) "= sensor index: 0x%"PRIx32", type: %"PRIu32 spapr_rtas_get_sensor_state_invalid(uint32_t index) "sensor index: 0x%"PRI= x32 spapr_rtas_ibm_configure_connector_invalid(uint32_t index) "DRC index: 0x%= "PRIx32 --=20 2.9.4 From nobody Mon Feb 9 16:55:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496738094360113.54179121734444; Tue, 6 Jun 2017 01:34:54 -0700 (PDT) Received: from localhost ([::1]:36822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9wy-0005JG-VQ for importer@patchew.org; Tue, 06 Jun 2017 04:34:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003P0-8j for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uj-00022j-4y for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:36991) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9ui-00021l-F4; Tue, 06 Jun 2017 04:32:33 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL30ptsz9s8Y; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737947; bh=fh5xbpFxN7RG7hovKbARwgQf/4GpSKWGCNJ+aoC6l3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mg+ijDz3oMiFCVwhfTwWHJqB/1LpkExY0xAOU8lcJW2IWiW2C0VyLBAbEhEbmhYNW V1A14NT1HwiRn7rTLAJPpDr4UrLZjwGWJCJIttaTIqIz+HdzG1nvse+K5bw5F2qr9P ZqSLI5FMr66UvieCI1ryOs2EQ9ShSiZUjLRaDRjk= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:20 +1000 Message-Id: <20170606083221.9299-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 6/7] spapr: Clean up handling of DR-indicator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are 3 types of "indicator" associated with hotplug in the PAPR spec the "allocation state", "isolation state" and "DR-indicator". The first two are intimately tied to the various state transitions associated with hotplug. The DR-indicator, however, is different and simpler. It's basically just a guest controlled variable which can be used by the guest to flag state or problems associated with a device. The idea is that the hypervisor can use it to present information back on management consoles (on some machines with PowerVM it may even control physical LEDs on the machine case associated with the relevant device). For that reason, there's only ever likely to be a single update implementation so the set_indicator_state method isn't useful. Replace it with a direct function call. While we're there, make some small associated cleanups: * PAPR doesn't use the term "indicator state", just "DR-indicator" and the allocation state and isolation state are also considered "indicators". Rename things to be less confusing * Fold set_indicator_state() and rtas_set_indicator_state() into a single rtas_set_dr_indicator() function. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr_drc.c | 25 ++++++++----------------- hw/ppc/trace-events | 2 +- include/hw/ppc/spapr_drc.h | 16 ++++++++-------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 6c2fa93..a4ece2e 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -116,14 +116,6 @@ static uint32_t set_isolation_state(sPAPRDRConnector *= drc, return RTAS_OUT_SUCCESS; } =20 -static uint32_t set_indicator_state(sPAPRDRConnector *drc, - sPAPRDRIndicatorState state) -{ - trace_spapr_drc_set_indicator_state(spapr_drc_index(drc), state); - drc->indicator_state =3D state; - return RTAS_OUT_SUCCESS; -} - static uint32_t set_allocation_state(sPAPRDRConnector *drc, sPAPRDRAllocationState state) { @@ -313,7 +305,7 @@ static void attach(sPAPRDRConnector *drc, DeviceState *= d, void *fdt, if (spapr_drc_type(drc) =3D=3D SPAPR_DR_CONNECTOR_TYPE_PCI) { drc->isolation_state =3D SPAPR_DR_ISOLATION_STATE_UNISOLATED; } - drc->indicator_state =3D SPAPR_DR_INDICATOR_STATE_ACTIVE; + drc->dr_indicator =3D SPAPR_DR_INDICATOR_ACTIVE; =20 drc->dev =3D d; drc->fdt =3D fdt; @@ -386,7 +378,7 @@ static void detach(sPAPRDRConnector *drc, DeviceState *= d, Error **errp) } } =20 - drc->indicator_state =3D SPAPR_DR_INDICATOR_STATE_INACTIVE; + drc->dr_indicator =3D SPAPR_DR_INDICATOR_INACTIVE; =20 /* Calling release callbacks based on spapr_drc_type(drc). */ switch (spapr_drc_type(drc)) { @@ -499,7 +491,7 @@ static const VMStateDescription vmstate_spapr_drc =3D { .fields =3D (VMStateField []) { VMSTATE_UINT32(isolation_state, sPAPRDRConnector), VMSTATE_UINT32(allocation_state, sPAPRDRConnector), - VMSTATE_UINT32(indicator_state, sPAPRDRConnector), + VMSTATE_UINT32(dr_indicator, sPAPRDRConnector), VMSTATE_BOOL(configured, sPAPRDRConnector), VMSTATE_BOOL(awaiting_release, sPAPRDRConnector), VMSTATE_BOOL(awaiting_allocation, sPAPRDRConnector), @@ -614,7 +606,6 @@ static void spapr_dr_connector_class_init(ObjectClass *= k, void *data) dk->realize =3D realize; dk->unrealize =3D unrealize; drck->set_isolation_state =3D set_isolation_state; - drck->set_indicator_state =3D set_indicator_state; drck->set_allocation_state =3D set_allocation_state; drck->attach =3D attach; drck->detach =3D detach; @@ -895,17 +886,17 @@ static uint32_t rtas_set_allocation_state(uint32_t id= x, uint32_t state) return drck->set_allocation_state(drc, state); } =20 -static uint32_t rtas_set_indicator_state(uint32_t idx, uint32_t state) +static uint32_t rtas_set_dr_indicator(uint32_t idx, uint32_t state) { sPAPRDRConnector *drc =3D spapr_drc_by_index(idx); - sPAPRDRConnectorClass *drck; =20 if (!drc) { return RTAS_OUT_PARAM_ERROR; } =20 - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - return drck->set_indicator_state(drc, state); + trace_spapr_drc_set_dr_indicator(idx, state); + drc->dr_indicator =3D state; + return RTAS_OUT_SUCCESS; } =20 static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMachineState *spapr, @@ -930,7 +921,7 @@ static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMa= chineState *spapr, ret =3D rtas_set_isolation_state(idx, state); break; case RTAS_SENSOR_TYPE_DR: - ret =3D rtas_set_indicator_state(idx, state); + ret =3D rtas_set_dr_indicator(idx, state); break; case RTAS_SENSOR_TYPE_ALLOCATION_STATE: ret =3D rtas_set_allocation_state(idx, state); diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 581fa85..3e8e3cf 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -39,7 +39,7 @@ spapr_iommu_ddw_reset(uint64_t buid, uint32_t cfgaddr) "b= uid=3D%"PRIx64" addr=3D%"PR spapr_drc_set_isolation_state(uint32_t index, int state) "drc: 0x%"PRIx32"= , state: %"PRIx32 spapr_drc_set_isolation_state_finalizing(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_set_isolation_state_deferring(uint32_t index) "drc: 0x%"PRIx32 -spapr_drc_set_indicator_state(uint32_t index, int state) "drc: 0x%"PRIx32"= , state: 0x%x" +spapr_drc_set_dr_indicator(uint32_t index, int state) "drc: 0x%"PRIx32", s= tate: 0x%x" spapr_drc_set_allocation_state(uint32_t index, int state) "drc: 0x%"PRIx32= ", state: 0x%x" spapr_drc_set_allocation_state_finalizing(uint32_t index) "drc: 0x%"PRIx32 spapr_drc_set_configured(uint32_t index) "drc: 0x%"PRIx32 diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index d437e0a..802c708 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -125,7 +125,7 @@ typedef enum { } sPAPRDRAllocationState; =20 /* - * LED/visual indicator state + * DR-indicator (LED/visual indicator) * * set via set-indicator RTAS calls * as documented by PAPR+ 2.7 13.5.3.4, Table 177, @@ -137,10 +137,10 @@ typedef enum { * action: (currently unused) */ typedef enum { - SPAPR_DR_INDICATOR_STATE_INACTIVE =3D 0, - SPAPR_DR_INDICATOR_STATE_ACTIVE =3D 1, - SPAPR_DR_INDICATOR_STATE_IDENTIFY =3D 2, - SPAPR_DR_INDICATOR_STATE_ACTION =3D 3, + SPAPR_DR_INDICATOR_INACTIVE =3D 0, + SPAPR_DR_INDICATOR_ACTIVE =3D 1, + SPAPR_DR_INDICATOR_IDENTIFY =3D 2, + SPAPR_DR_INDICATOR_ACTION =3D 3, } sPAPRDRIndicatorState; =20 /* @@ -186,10 +186,12 @@ typedef struct sPAPRDRConnector { Object *owner; char *name; =20 + /* DR-indicator */ + uint32_t dr_indicator; + /* sensor/indicator states */ uint32_t isolation_state; uint32_t allocation_state; - uint32_t indicator_state; =20 /* configure-connector state */ void *fdt; @@ -219,8 +221,6 @@ typedef struct sPAPRDRConnectorClass { /* accessors for guest-visible (generally via RTAS) DR state */ uint32_t (*set_isolation_state)(sPAPRDRConnector *drc, sPAPRDRIsolationState state); - uint32_t (*set_indicator_state)(sPAPRDRConnector *drc, - sPAPRDRIndicatorState state); uint32_t (*set_allocation_state)(sPAPRDRConnector *drc, sPAPRDRAllocationState state); =20 --=20 2.9.4 From nobody Mon Feb 9 16:55:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149673836067288.17420138794512; Tue, 6 Jun 2017 01:39:20 -0700 (PDT) Received: from localhost ([::1]:36850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIA1F-0000dP-Vz for importer@patchew.org; Tue, 06 Jun 2017 04:39:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dI9ul-0003Oz-8r for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dI9uj-00022d-2G for qemu-devel@nongnu.org; Tue, 06 Jun 2017 04:32:34 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:45733) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dI9ui-00021k-Bz; Tue, 06 Jun 2017 04:32:33 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3whlL26tdcz9s8N; Tue, 6 Jun 2017 18:32:26 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1496737946; bh=kjfUrkWus410WhqJCLcAMqH60PphG9dev/gvnAwzB1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gb0BOkmw9FT/Zow7ELjEr3LMZLujKl1BaTW0NirWWTFMBdh1zZbXZUgnV78v6briT wrqzQtKU0/tXzmZOn+O/Xhc05LTUuXW6v6zSpjf75Rg5HwNC2n4aIDO2KHineYfGA1 kGnFJpCblBSQiTbu7Ycl5mTgRVVa9yhTVoH1ryI4= From: David Gibson To: mdroth@linux.vnet.ibm.com Date: Tue, 6 Jun 2017 18:32:21 +1000 Message-Id: <20170606083221.9299-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170606083221.9299-1-david@gibson.dropbear.id.au> References: <20170606083221.9299-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 7/7] spapr: Change DRC attach & detach methods to functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, sursingh@redhat.com, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DRC objects have attach & detach methods, but there's only one implementation. Although there are some differences in its behaviour for different DRC types, the overall structure is the same, so while we might want different method implementations for some parts, we're unlikely to want them for the top-level functions. So, replace them with direct function calls. Signed-off-by: David Gibson Reviewed-by: Michael Roth --- hw/ppc/spapr.c | 19 ++++++------------- hw/ppc/spapr_drc.c | 18 ++++++------------ hw/ppc/spapr_pci.c | 9 +++------ include/hw/ppc/spapr_drc.h | 7 ++++--- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e8cecaf..37466df 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2533,7 +2533,6 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t= addr_start, uint64_t size, Error **errp) { sPAPRDRConnector *drc; - sPAPRDRConnectorClass *drck; uint32_t nr_lmbs =3D size/SPAPR_MEMORY_BLOCK_SIZE; int i, fdt_offset, fdt_size; void *fdt; @@ -2548,10 +2547,10 @@ static void spapr_add_lmbs(DeviceState *dev, uint64= _t addr_start, uint64_t size, fdt_offset =3D spapr_populate_memory_node(fdt, node, addr, SPAPR_MEMORY_BLOCK_SIZE); =20 - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - drck->attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, errp); + spapr_drc_attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, errp= ); addr +=3D SPAPR_MEMORY_BLOCK_SIZE; if (!dev->hotplugged) { + sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(d= rc); /* guests expect coldplugged LMBs to be pre-allocated */ drck->set_allocation_state(drc, SPAPR_DR_ALLOCATION_STATE_USAB= LE); drck->set_isolation_state(drc, SPAPR_DR_ISOLATION_STATE_UNISOL= ATED); @@ -2564,7 +2563,6 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t= addr_start, uint64_t size, if (dedicated_hp_event_source) { drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, addr_start / SPAPR_MEMORY_BLOCK_SIZE); - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); spapr_hotplug_req_add_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE= _LMB, nr_lmbs, spapr_drc_index(drc)); @@ -2749,7 +2747,6 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, uint64_t addr_start, addr; int i; sPAPRDRConnector *drc; - sPAPRDRConnectorClass *drck; sPAPRDIMMState *ds; =20 addr_start =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, @@ -2769,14 +2766,12 @@ static void spapr_memory_unplug_request(HotplugHand= ler *hotplug_dev, addr / SPAPR_MEMORY_BLOCK_SIZE); g_assert(drc); =20 - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - drck->detach(drc, dev, errp); + spapr_drc_detach(drc, dev, errp); addr +=3D SPAPR_MEMORY_BLOCK_SIZE; } =20 drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, addr_start / SPAPR_MEMORY_BLOCK_SIZE); - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); spapr_hotplug_req_remove_by_count_indexed(SPAPR_DR_CONNECTOR_TYPE_LMB, nr_lmbs, spapr_drc_index(drc= )); out: @@ -2831,7 +2826,6 @@ void spapr_core_unplug_request(HotplugHandler *hotplu= g_dev, DeviceState *dev, { int index; sPAPRDRConnector *drc; - sPAPRDRConnectorClass *drck; Error *local_err =3D NULL; CPUCore *cc =3D CPU_CORE(dev); int smt =3D kvmppc_smt_threads(); @@ -2849,8 +2843,7 @@ void spapr_core_unplug_request(HotplugHandler *hotplu= g_dev, DeviceState *dev, drc =3D spapr_drc_by_id(TYPE_SPAPR_DRC_CPU, index * smt); g_assert(drc); =20 - drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - drck->detach(drc, dev, &local_err); + spapr_drc_detach(drc, dev, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -2894,8 +2887,8 @@ static void spapr_core_plug(HotplugHandler *hotplug_d= ev, DeviceState *dev, } =20 if (drc) { - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - drck->attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, &local_e= rr); + spapr_drc_attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, + &local_err); if (local_err) { g_free(fdt); error_propagate(errp, local_err); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index a4ece2e..c73fae0 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -49,8 +49,6 @@ uint32_t spapr_drc_index(sPAPRDRConnector *drc) static uint32_t set_isolation_state(sPAPRDRConnector *drc, sPAPRDRIsolationState state) { - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - trace_spapr_drc_set_isolation_state(spapr_drc_index(drc), state); =20 /* if the guest is configuring a device attached to this DRC, we @@ -105,7 +103,7 @@ static uint32_t set_isolation_state(sPAPRDRConnector *d= rc, uint32_t drc_index =3D spapr_drc_index(drc); if (drc->configured) { trace_spapr_drc_set_isolation_state_finalizing(drc_index); - drck->detach(drc, DEVICE(drc->dev), NULL); + spapr_drc_detach(drc, DEVICE(drc->dev), NULL); } else { trace_spapr_drc_set_isolation_state_deferring(drc_index); } @@ -119,8 +117,6 @@ static uint32_t set_isolation_state(sPAPRDRConnector *d= rc, static uint32_t set_allocation_state(sPAPRDRConnector *drc, sPAPRDRAllocationState state) { - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - trace_spapr_drc_set_allocation_state(spapr_drc_index(drc), state); =20 if (state =3D=3D SPAPR_DR_ALLOCATION_STATE_USABLE) { @@ -151,7 +147,7 @@ static uint32_t set_allocation_state(sPAPRDRConnector *= drc, drc->allocation_state =3D=3D SPAPR_DR_ALLOCATION_STATE_UNUSABL= E) { uint32_t drc_index =3D spapr_drc_index(drc); trace_spapr_drc_set_allocation_state_finalizing(drc_index); - drck->detach(drc, DEVICE(drc->dev), NULL); + spapr_drc_detach(drc, DEVICE(drc->dev), NULL); } else if (drc->allocation_state =3D=3D SPAPR_DR_ALLOCATION_STATE_= USABLE) { drc->awaiting_allocation =3D false; } @@ -281,8 +277,8 @@ static void prop_get_fdt(Object *obj, Visitor *v, const= char *name, } while (fdt_depth !=3D 0); } =20 -static void attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt, - int fdt_start_offset, bool coldplug, Error **errp) +void spapr_drc_attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt, + int fdt_start_offset, bool coldplug, Error **errp) { trace_spapr_drc_attach(spapr_drc_index(drc)); =20 @@ -333,7 +329,7 @@ static void attach(sPAPRDRConnector *drc, DeviceState *= d, void *fdt, NULL, 0, NULL); } =20 -static void detach(sPAPRDRConnector *drc, DeviceState *d, Error **errp) +void spapr_drc_detach(sPAPRDRConnector *drc, DeviceState *d, Error **errp) { trace_spapr_drc_detach(spapr_drc_index(drc)); =20 @@ -436,7 +432,7 @@ static void reset(DeviceState *d) * force removal if we are */ if (drc->awaiting_release) { - drck->detach(drc, DEVICE(drc->dev), NULL); + spapr_drc_detach(drc, DEVICE(drc->dev), NULL); } =20 /* non-PCI devices may be awaiting a transition to UNUSABLE */ @@ -607,8 +603,6 @@ static void spapr_dr_connector_class_init(ObjectClass *= k, void *data) dk->unrealize =3D unrealize; drck->set_isolation_state =3D set_isolation_state; drck->set_allocation_state =3D set_allocation_state; - drck->attach =3D attach; - drck->detach =3D detach; drck->release_pending =3D release_pending; drck->set_signalled =3D set_signalled; /* diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 967d7c3..46e736d 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1349,7 +1349,6 @@ static void spapr_phb_add_pci_device(sPAPRDRConnector= *drc, PCIDevice *pdev, Error **errp) { - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); DeviceState *dev =3D DEVICE(pdev); void *fdt =3D NULL; int fdt_start_offset =3D 0, fdt_size; @@ -1361,8 +1360,8 @@ static void spapr_phb_add_pci_device(sPAPRDRConnector= *drc, goto out; } =20 - drck->attach(drc, DEVICE(pdev), - fdt, fdt_start_offset, !dev->hotplugged, errp); + spapr_drc_attach(drc, DEVICE(pdev), + fdt, fdt_start_offset, !dev->hotplugged, errp); out: if (*errp) { g_free(fdt); @@ -1391,9 +1390,7 @@ static void spapr_phb_remove_pci_device(sPAPRDRConnec= tor *drc, PCIDevice *pdev, Error **errp) { - sPAPRDRConnectorClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); - - drck->detach(drc, DEVICE(pdev), errp); + spapr_drc_detach(drc, DEVICE(pdev), errp); } =20 static sPAPRDRConnector *spapr_phb_get_pci_func_drc(sPAPRPHBState *phb, diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 802c708..ec0256b 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -225,9 +225,6 @@ typedef struct sPAPRDRConnectorClass { sPAPRDRAllocationState state); =20 /* QEMU interfaces for managing hotplug operations */ - void (*attach)(sPAPRDRConnector *drc, DeviceState *d, void *fdt, - int fdt_start_offset, bool coldplug, Error **errp); - void (*detach)(sPAPRDRConnector *drc, DeviceState *d, Error **errp); bool (*release_pending)(sPAPRDRConnector *drc); void (*set_signalled)(sPAPRDRConnector *drc); } sPAPRDRConnectorClass; @@ -243,4 +240,8 @@ sPAPRDRConnector *spapr_drc_by_id(const char *type, uin= t32_t id); int spapr_drc_populate_dt(void *fdt, int fdt_offset, Object *owner, uint32_t drc_type_mask); =20 +void spapr_drc_attach(sPAPRDRConnector *drc, DeviceState *d, void *fdt, + int fdt_start_offset, bool coldplug, Error **errp); +void spapr_drc_detach(sPAPRDRConnector *drc, DeviceState *d, Error **errp); + #endif /* HW_SPAPR_DRC_H */ --=20 2.9.4