Re: [PATCH 09/14] ppc/pnv: Introduce a "chip" property under the PHB4 model

2021-12-07 Thread Frederic Barrat 




On 02/12/2021 15:42, Cédric Le Goater wrote:

Next changes will make use of it.

Signed-off-by: Cédric Le Goater 
---


Reviewed-by: Frederic Barrat 



  include/hw/pci-host/pnv_phb4.h | 2 ++
  hw/pci-host/pnv_phb4_pec.c | 2 ++
  hw/ppc/pnv.c   | 2 ++
  3 files changed, 6 insertions(+)

diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index b2864233641e..8a585c9a42f7 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -205,6 +205,8 @@ struct PnvPhb4PecState {
  #define PHB4_PEC_MAX_STACKS 3
  uint32_t num_stacks;
  PnvPhb4PecStack stacks[PHB4_PEC_MAX_STACKS];
+
+PnvChip *chip;
  };
  
  
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c

index 9f722729ac50..e9750c41c595 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -462,6 +462,8 @@ static Property pnv_pec_properties[] = {
  DEFINE_PROP_UINT32("index", PnvPhb4PecState, index, 0),
  DEFINE_PROP_UINT32("num-stacks", PnvPhb4PecState, num_stacks, 0),
  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 0c65e1e88cf5..76b2f5468b38 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1389,6 +1389,8 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, 
Error **errp)
  _fatal);
  object_property_set_int(OBJECT(pec), "chip-id", chip->chip_id,
  _fatal);
+object_property_set_link(OBJECT(pec), "chip", OBJECT(chip),
+ _fatal);
  object_property_set_link(OBJECT(pec), "system-memory",
   OBJECT(get_system_memory()), _abort);
  if (!qdev_realize(DEVICE(pec), NULL, errp)) {

Re: [PATCH 09/14] ppc/pnv: Introduce a "chip" property under the PHB4 model

2021-12-02 Thread Daniel Henrique Barboza 




On 12/2/21 11:42, Cédric Le Goater wrote:

Next changes will make use of it.

Signed-off-by: Cédric Le Goater 
---


Reviewed-by: Daniel Henrique Barboza 


  include/hw/pci-host/pnv_phb4.h | 2 ++
  hw/pci-host/pnv_phb4_pec.c | 2 ++
  hw/ppc/pnv.c   | 2 ++
  3 files changed, 6 insertions(+)

diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index b2864233641e..8a585c9a42f7 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -205,6 +205,8 @@ struct PnvPhb4PecState {
  #define PHB4_PEC_MAX_STACKS 3
  uint32_t num_stacks;
  PnvPhb4PecStack stacks[PHB4_PEC_MAX_STACKS];
+
+PnvChip *chip;
  };
  
  
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c

index 9f722729ac50..e9750c41c595 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -462,6 +462,8 @@ static Property pnv_pec_properties[] = {
  DEFINE_PROP_UINT32("index", PnvPhb4PecState, index, 0),
  DEFINE_PROP_UINT32("num-stacks", PnvPhb4PecState, num_stacks, 0),
  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 0c65e1e88cf5..76b2f5468b38 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1389,6 +1389,8 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, 
Error **errp)
  _fatal);
  object_property_set_int(OBJECT(pec), "chip-id", chip->chip_id,
  _fatal);
+object_property_set_link(OBJECT(pec), "chip", OBJECT(chip),
+ _fatal);
  object_property_set_link(OBJECT(pec), "system-memory",
   OBJECT(get_system_memory()), _abort);
  if (!qdev_realize(DEVICE(pec), NULL, errp)) {

[PATCH 09/14] ppc/pnv: Introduce a "chip" property under the PHB4 model

2021-12-02 Thread Cédric Le Goater 
Next changes will make use of it.

Signed-off-by: Cédric Le Goater 
---
 include/hw/pci-host/pnv_phb4.h | 2 ++
 hw/pci-host/pnv_phb4_pec.c | 2 ++
 hw/ppc/pnv.c   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index b2864233641e..8a585c9a42f7 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -205,6 +205,8 @@ struct PnvPhb4PecState {
 #define PHB4_PEC_MAX_STACKS 3
 uint32_t num_stacks;
 PnvPhb4PecStack stacks[PHB4_PEC_MAX_STACKS];
+
+PnvChip *chip;
 };
 
 
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index 9f722729ac50..e9750c41c595 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -462,6 +462,8 @@ static Property pnv_pec_properties[] = {
 DEFINE_PROP_UINT32("index", PnvPhb4PecState, index, 0),
 DEFINE_PROP_UINT32("num-stacks", PnvPhb4PecState, num_stacks, 0),
 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 0c65e1e88cf5..76b2f5468b38 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1389,6 +1389,8 @@ static void pnv_chip_power9_phb_realize(PnvChip *chip, 
Error **errp)
 _fatal);
 object_property_set_int(OBJECT(pec), "chip-id", chip->chip_id,
 _fatal);
+object_property_set_link(OBJECT(pec), "chip", OBJECT(chip),
+ _fatal);
 object_property_set_link(OBJECT(pec), "system-memory",
  OBJECT(get_system_memory()), _abort);
 if (!qdev_realize(DEVICE(pec), NULL, errp)) {
-- 
2.31.1