[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v0 02/15] ppc: Rename SPAPR_DRC_TABLE_SIZE to SP
From: |
Bharata B Rao |
Subject: |
[Qemu-devel] [RFC PATCH v0 02/15] ppc: Rename SPAPR_DRC_TABLE_SIZE to SPAPR_DRC_PHB_TABLE_SIZE |
Date: |
Thu, 4 Sep 2014 11:36:12 +0530 |
DRC table could contain entries for both PHB and CPU types. The existing
size of this table is only for PHB entries, reflect the same in the code.
This patch doesn't change the code functionality.
Signed-off-by: Bharata B Rao <address@hidden>
---
hw/ppc/spapr.c | 26 +++++++++++++-------------
include/hw/ppc/spapr.h | 8 ++++----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 47fc21d..071d65b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -300,7 +300,7 @@ sPAPRDrcEntry *spapr_phb_to_drc_entry(uint64_t buid)
{
int i;
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
if (spapr->drc_table[i].phb_buid == buid) {
return &spapr->drc_table[i];
}
@@ -313,7 +313,7 @@ sPAPRDrcEntry *spapr_find_drc_entry(int drc_index)
{
int i, j;
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
sPAPRDrcEntry *phb_entry = &spapr->drc_table[i];
if (phb_entry->drc_index == drc_index) {
return phb_entry;
@@ -339,7 +339,7 @@ static void spapr_init_drc_table(void)
memset(spapr->drc_table, 0, sizeof(spapr->drc_table));
/* For now we only care about PHB entries */
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
spapr->drc_table[i].drc_index = 0x2000001 + i;
}
}
@@ -350,7 +350,7 @@ sPAPRDrcEntry *spapr_add_phb_to_drc_table(uint64_t buid,
uint32_t state)
sPAPRDrcEntry *found_drc = NULL;
int i, phb_index;
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
if (spapr->drc_table[i].phb_buid == 0) {
empty_drc = &spapr->drc_table[i];
}
@@ -388,7 +388,7 @@ sPAPRDrcEntry *spapr_add_phb_to_drc_table(uint64_t buid,
uint32_t state)
static void spapr_create_drc_dt_entries(void *fdt)
{
char char_buf[1024];
- uint32_t int_buf[SPAPR_DRC_TABLE_SIZE + 1];
+ uint32_t int_buf[SPAPR_DRC_PHB_TABLE_SIZE + 1];
uint32_t *entries;
int offset, fdt_offset;
int i, ret;
@@ -397,9 +397,9 @@ static void spapr_create_drc_dt_entries(void *fdt)
/* ibm,drc-indexes */
memset(int_buf, 0, sizeof(int_buf));
- int_buf[0] = SPAPR_DRC_TABLE_SIZE;
+ int_buf[0] = SPAPR_DRC_PHB_TABLE_SIZE;
- for (i = 1; i <= SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 1; i <= SPAPR_DRC_PHB_TABLE_SIZE; i++) {
int_buf[i] = spapr->drc_table[i-1].drc_index;
}
@@ -411,9 +411,9 @@ static void spapr_create_drc_dt_entries(void *fdt)
/* ibm,drc-power-domains */
memset(int_buf, 0, sizeof(int_buf));
- int_buf[0] = SPAPR_DRC_TABLE_SIZE;
+ int_buf[0] = SPAPR_DRC_PHB_TABLE_SIZE;
- for (i = 1; i <= SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 1; i <= SPAPR_DRC_PHB_TABLE_SIZE; i++) {
int_buf[i] = 0xffffffff;
}
@@ -426,10 +426,10 @@ static void spapr_create_drc_dt_entries(void *fdt)
/* ibm,drc-names */
memset(char_buf, 0, sizeof(char_buf));
entries = (uint32_t *)&char_buf[0];
- *entries = SPAPR_DRC_TABLE_SIZE;
+ *entries = SPAPR_DRC_PHB_TABLE_SIZE;
offset = sizeof(*entries);
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
offset += sprintf(char_buf + offset, "PHB %d", i + 1);
char_buf[offset++] = '\0';
}
@@ -442,10 +442,10 @@ static void spapr_create_drc_dt_entries(void *fdt)
/* ibm,drc-types */
memset(char_buf, 0, sizeof(char_buf));
entries = (uint32_t *)&char_buf[0];
- *entries = SPAPR_DRC_TABLE_SIZE;
+ *entries = SPAPR_DRC_PHB_TABLE_SIZE;
offset = sizeof(*entries);
- for (i = 0; i < SPAPR_DRC_TABLE_SIZE; i++) {
+ for (i = 0; i < SPAPR_DRC_PHB_TABLE_SIZE; i++) {
offset += sprintf(char_buf + offset, "PHB");
char_buf[offset++] = '\0';
}
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index aab627f..9631aeb 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -11,9 +11,9 @@ struct sPAPRNVRAM;
#define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL
/* For dlparable/hotpluggable slots */
-#define SPAPR_DRC_TABLE_SIZE 32
-#define SPAPR_DRC_PHB_SLOT_MAX 32
-#define SPAPR_DRC_DEV_ID_BASE 0x40000000
+#define SPAPR_DRC_PHB_TABLE_SIZE 32
+#define SPAPR_DRC_PHB_SLOT_MAX 32
+#define SPAPR_DRC_DEV_ID_BASE 0x40000000
typedef struct sPAPRConfigureConnectorState {
void *fdt;
@@ -72,7 +72,7 @@ typedef struct sPAPREnvironment {
int htab_fd;
/* state for Dynamic Reconfiguration Connectors */
- sPAPRDrcEntry drc_table[SPAPR_DRC_TABLE_SIZE];
+ sPAPRDrcEntry drc_table[SPAPR_DRC_PHB_TABLE_SIZE];
/* Platform state - sensors and indicators */
uint32_t state;
--
1.7.11.7
- [Qemu-devel] [RFC PATCH v0 07/15] ppc: Initialize DRC table before initializing CPUs, (continued)
- [Qemu-devel] [RFC PATCH v0 07/15] ppc: Initialize DRC table before initializing CPUs, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 06/15] ppc: stop after getting first unused DR slot in DRC table, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 04/15] ppc: Make creation of DRC entries in FDT endian safe, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 05/15] ppc: Accommodate CPU DRC entries in DRC table, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 14/15] ppc: Add CPU hotplug support for sPAPR guests, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 12/15] ppc: Support ibm, lrdr-capacity device tree property, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 10/15] ppc: Factor out CPU initialization code to a new routine, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 13/15] ppc: Make ibm, configure-connector endian-safe, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 11/15] ppc: Move RTAS indicator defines to a header file, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 02/15] ppc: Rename SPAPR_DRC_TABLE_SIZE to SPAPR_DRC_PHB_TABLE_SIZE,
Bharata B Rao <=
- [Qemu-devel] [RFC PATCH v0 08/15] ppc: Add CPU dynamic reconfiguration (DR) support, Bharata B Rao, 2014/09/04
- [Qemu-devel] [RFC PATCH v0 15/15] ppc: Allow hotplugging of CPU cores only, Bharata B Rao, 2014/09/04