From: "Cédric Le Goater" <clg@kaod.org>
To: <qemu-ppc@nongnu.org>, <qemu-devel@nongnu.org>
Cc: "Frederic Barrat" <fbarrat@linux.ibm.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Greg Kurz" <groug@kaod.org>, "Cédric Le Goater" <clg@kaod.org>
Subject: [PATCH v2 12/19] ppc/pnv: Remove "system-memory" property from PHB4 PEC
Date: Mon, 13 Dec 2021 14:28:23 +0100 [thread overview]
Message-ID: <20211213132830.108372-13-clg@kaod.org> (raw)
In-Reply-To: <20211213132830.108372-1-clg@kaod.org>
This is not useful and will be in the way for support of user created
PHB4 devices.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/pci-host/pnv_phb4_pec.c | 6 +-----
hw/ppc/pnv.c | 2 --
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index a7dd4173d598..dfed2af0f7df 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -124,7 +124,7 @@ static uint64_t pnv_pec_stk_nest_xscom_read(void *opaque, hwaddr addr,
static void pnv_pec_stk_update_map(PnvPhb4PecStack *stack)
{
PnvPhb4PecState *pec = stack->pec;
- MemoryRegion *sysmem = pec->system_memory;
+ MemoryRegion *sysmem = get_system_memory();
uint64_t bar_en = stack->nest_regs[PEC_NEST_STK_BAR_EN];
uint64_t bar, mask, size;
char name[64];
@@ -394,8 +394,6 @@ static void pnv_pec_realize(DeviceState *dev, Error **errp)
char name[64];
int i;
- assert(pec->system_memory);
-
if (pec->index >= PNV_CHIP_GET_CLASS(pec->chip)->num_pecs) {
error_setg(errp, "invalid PEC index: %d", pec->index);
return;
@@ -486,8 +484,6 @@ static Property pnv_pec_properties[] = {
DEFINE_PROP_UINT32("chip-id", PnvPhb4PecState, chip_id, 0),
DEFINE_PROP_LINK("chip", PnvPhb4PecState, chip, TYPE_PNV_CHIP,
PnvChip *),
- DEFINE_PROP_LINK("system-memory", PnvPhb4PecState, system_memory,
- TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 284fbd50dae3..c59a4a078cd0 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1396,8 +1396,6 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, Error **errp)
&error_fatal);
object_property_set_link(OBJECT(pec), "chip", OBJECT(chip),
&error_fatal);
- object_property_set_link(OBJECT(pec), "system-memory",
- OBJECT(get_system_memory()), &error_abort);
if (!qdev_realize(DEVICE(pec), NULL, errp)) {
return;
}
--
2.31.1
next prev parent reply other threads:[~2021-12-13 13:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 13:28 [PATCH v2 00/19] ppc/pnv: Add support for user created PHB3/PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 01/19] ppc/pnv: Change the maximum of PHB3 devices for Power8NVL Cédric Le Goater
2021-12-13 18:30 ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 02/19] ppc/pnv: Introduce a "chip" property under PHB3 Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 03/19] ppc/pnv: Use the chip class to check the index of PHB3 devices Cédric Le Goater
2021-12-13 18:33 ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 04/19] ppc/pnv: Drop the "num-phbs" property Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 05/19] ppc/pnv: Move mapping of the PHB3 CQ regions under pnv_pbcq_realize() Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 06/19] ppc/pnv: Use QOM hierarchy to scan PHB3 devices Cédric Le Goater
2021-12-13 18:37 ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 07/19] ppc/pnv: Introduce a num_pecs class attribute for PHB4 PEC devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 08/19] ppc/pnv: Introduce version and device_id class atributes for PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 09/19] ppc/pnv: Introduce a "chip" property under the PHB4 model Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 10/19] ppc/pnv: Introduce a num_stack class attribute Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 11/19] ppc/pnv: Compute the PHB index from the PHB4 PEC model Cédric Le Goater
2021-12-13 13:28 ` Cédric Le Goater [this message]
2021-12-13 13:28 ` [PATCH v2 13/19] ppc/pnv: Move realize of PEC stacks under the " Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 14/19] ppc/pnv: Use QOM hierarchy to scan PEC PHB4 devices Cédric Le Goater
2021-12-13 18:39 ` Daniel Henrique Barboza
2021-12-13 13:28 ` [PATCH v2 15/19] ppc/pnv: Introduce support for user created PHB3 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 16/19] ppc/pnv: Reparent user created PHB3 devices to the PnvChip Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 17/19] ppc/pnv: Complete user created PHB3 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 18/19] ppc/pnv: Introduce support for user created PHB4 devices Cédric Le Goater
2021-12-13 13:28 ` [PATCH v2 19/19] ppc/pnv: Move num_phbs under Pnv8Chip Cédric Le Goater
2022-01-04 9:53 ` Daniel Henrique Barboza
2022-01-04 10:07 ` Cédric Le Goater
2021-12-15 16:56 ` [PATCH v2 00/19] ppc/pnv: Add support for user created PHB3/PHB4 devices Cédric Le Goater
2022-01-04 9:56 ` Daniel Henrique Barboza
2022-01-04 10:07 ` Cédric Le Goater
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=20211213132830.108372-13-clg@kaod.org \
--to=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=fbarrat@linux.ibm.com \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).