Previously the machines/chips tested by qtest was till Power10, update
the tests to also test PowerNV11 and Power11 PNV Chip
Since if-else-if ladder was common pattern to get machine type,
implement pnv_get_machine_type so new processor cases can be implemented
in one location in pnv_get_machine_type
While at it, also add g_autofree to allocation by g_strdup_printf in
modified tests
Signed-off-by: Aditya Gupta <adityag@linux.ibm.com>
---
tests/qtest/pnv-host-i2c-test.c | 10 ++++------
tests/qtest/pnv-spi-seeprom-test.c | 2 +-
tests/qtest/pnv-xive2-test.c | 2 +-
tests/qtest/pnv-xscom-test.c | 22 +++++---------------
tests/qtest/pnv-xscom.h | 32 +++++++++++++++++++++++++++---
5 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/tests/qtest/pnv-host-i2c-test.c b/tests/qtest/pnv-host-i2c-test.c
index 51e613ebdcb2..5fd54f9de771 100644
--- a/tests/qtest/pnv-host-i2c-test.c
+++ b/tests/qtest/pnv-host-i2c-test.c
@@ -402,15 +402,14 @@ static void reset_all(QTestState *qts, const PnvChip *chip)
static void test_host_i2c(const void *data)
{
const PnvChip *chip = data;
+ const char *machine = pnv_get_machine_type(chip->chip_type);
QTestState *qts;
- const char *machine = "powernv8";
PnvI2cCtlr ctlr;
PnvI2cDev pca9552;
PnvI2cDev pca9554;
- if (chip->chip_type == PNV_CHIP_POWER9) {
- machine = "powernv9";
- } else if (chip->chip_type == PNV_CHIP_POWER10) {
+ /* i2c is initialised for rainier in case of P10 */
+ if (chip->chip_type == PNV_CHIP_POWER10) {
machine = "powernv10-rainier";
}
@@ -473,10 +472,9 @@ static void add_test(const char *name, void (*test)(const void *data))
int i;
for (i = 0; i < ARRAY_SIZE(pnv_chips); i++) {
- char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
+ g_autofree char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
pnv_chips[i].cpu_model);
qtest_add_data_func(tname, &pnv_chips[i], test);
- g_free(tname);
}
}
diff --git a/tests/qtest/pnv-spi-seeprom-test.c b/tests/qtest/pnv-spi-seeprom-test.c
index 1a78e8d966a5..8bb30eb649aa 100644
--- a/tests/qtest/pnv-spi-seeprom-test.c
+++ b/tests/qtest/pnv-spi-seeprom-test.c
@@ -77,7 +77,7 @@ static void test_spi_seeprom(const void *data)
const PnvChip *chip = data;
QTestState *qts = NULL;
g_autofree char *tmp_path = NULL;
- const char *machine = "powernv10";
+ const char *machine = pnv_get_machine_type(chip->chip_type);
int ret;
int fd;
diff --git a/tests/qtest/pnv-xive2-test.c b/tests/qtest/pnv-xive2-test.c
index 5313d4ef18b7..80de9d09ed09 100644
--- a/tests/qtest/pnv-xive2-test.c
+++ b/tests/qtest/pnv-xive2-test.c
@@ -548,7 +548,7 @@ static void test_xive(void)
{
QTestState *qts;
- qts = qtest_initf("-M powernv10 -smp %d,cores=1,threads=%d -nographic "
+ qts = qtest_initf("-M powernv11 -smp %d,cores=1,threads=%d -nographic "
"-nodefaults -serial mon:stdio -S "
"-d guest_errors -trace '*xive*'",
SMT, SMT);
diff --git a/tests/qtest/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c
index c814c0f4f5b1..94b50c071c02 100644
--- a/tests/qtest/pnv-xscom-test.c
+++ b/tests/qtest/pnv-xscom-test.c
@@ -28,15 +28,9 @@ static void test_xscom_cfam_id(QTestState *qts, const PnvChip *chip)
static void test_cfam_id(const void *data)
{
const PnvChip *chip = data;
- const char *machine = "powernv8";
+ const char *machine = pnv_get_machine_type(chip->chip_type);
QTestState *qts;
- if (chip->chip_type == PNV_CHIP_POWER9) {
- machine = "powernv9";
- } else if (chip->chip_type == PNV_CHIP_POWER10) {
- machine = "powernv10";
- }
-
qts = qtest_initf("-M %s -accel tcg -cpu %s",
machine, chip->cpu_model);
test_xscom_cfam_id(qts, chip);
@@ -57,7 +51,8 @@ static void test_cfam_id(const void *data)
static void test_xscom_core(QTestState *qts, const PnvChip *chip)
{
- if (chip->chip_type == PNV_CHIP_POWER10) {
+ if ((chip->chip_type == PNV_CHIP_POWER10) ||
+ (chip->chip_type == PNV_CHIP_POWER11)) {
uint32_t first_core_thread_state =
PNV_XSCOM_P10_EC_BASE(chip->first_core) + 0x412;
uint64_t thread_state;
@@ -84,14 +79,8 @@ static void test_xscom_core(QTestState *qts, const PnvChip *chip)
static void test_core(const void *data)
{
const PnvChip *chip = data;
+ const char *machine = pnv_get_machine_type(chip->chip_type);
QTestState *qts;
- const char *machine = "powernv8";
-
- if (chip->chip_type == PNV_CHIP_POWER9) {
- machine = "powernv9";
- } else if (chip->chip_type == PNV_CHIP_POWER10) {
- machine = "powernv10";
- }
qts = qtest_initf("-M %s -accel tcg -cpu %s",
machine, chip->cpu_model);
@@ -104,10 +93,9 @@ static void add_test(const char *name, void (*test)(const void *data))
int i;
for (i = 0; i < ARRAY_SIZE(pnv_chips); i++) {
- char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
+ g_autofree char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
pnv_chips[i].cpu_model);
qtest_add_data_func(tname, &pnv_chips[i], test);
- g_free(tname);
}
}
diff --git a/tests/qtest/pnv-xscom.h b/tests/qtest/pnv-xscom.h
index 5aa1701ea768..eefe206a2007 100644
--- a/tests/qtest/pnv-xscom.h
+++ b/tests/qtest/pnv-xscom.h
@@ -9,6 +9,9 @@
#ifndef PNV_XSCOM_H
#define PNV_XSCOM_H
+#include <stdint.h>
+#include <assert.h>
+
#define SMT 4 /* some tests will break if less than 4 */
typedef enum PnvChipType {
@@ -17,6 +20,7 @@ typedef enum PnvChipType {
PNV_CHIP_POWER8NVL, /* AKA Naples */
PNV_CHIP_POWER9, /* AKA Nimbus */
PNV_CHIP_POWER10,
+ PNV_CHIP_POWER11,
} PnvChipType;
typedef struct PnvChip {
@@ -60,15 +64,23 @@ static const PnvChip pnv_chips[] = {
.first_core = 0x0,
.num_i2c = 4,
},
+ {
+ .chip_type = PNV_CHIP_POWER11,
+ .cpu_model = "Power11",
+ .xscom_base = 0x000603fc00000000ull,
+ .cfam_id = 0x220da04980000000ull,
+ .first_core = 0x0,
+ .num_i2c = 0,
+ },
};
static inline uint64_t pnv_xscom_addr(const PnvChip *chip, uint32_t pcba)
{
uint64_t addr = chip->xscom_base;
- if (chip->chip_type == PNV_CHIP_POWER10) {
- addr |= ((uint64_t) pcba << 3);
- } else if (chip->chip_type == PNV_CHIP_POWER9) {
+ if ((chip->chip_type == PNV_CHIP_POWER11) ||
+ (chip->chip_type == PNV_CHIP_POWER10) ||
+ (chip->chip_type == PNV_CHIP_POWER9)) {
addr |= ((uint64_t) pcba << 3);
} else {
addr |= (((uint64_t) pcba << 4) & ~0xffull) |
@@ -77,4 +89,18 @@ static inline uint64_t pnv_xscom_addr(const PnvChip *chip, uint32_t pcba)
return addr;
}
+static const char *pnv_get_machine_type(enum PnvChipType chip_type)
+{
+ static const char *const machine_types[] = {
+ [PNV_CHIP_POWER8] = "powernv8",
+ [PNV_CHIP_POWER9] = "powernv9",
+ [PNV_CHIP_POWER10] = "powernv10",
+ [PNV_CHIP_POWER11] = "powernv11",
+ };
+
+ g_assert(chip_type <= PNV_CHIP_POWER11);
+
+ return machine_types[chip_type];
+}
+
#endif /* PNV_XSCOM_H */
--
2.54.0On 6/29/26 13:04, Aditya Gupta wrote:
> Previously the machines/chips tested by qtest was till Power10, update
> the tests to also test PowerNV11 and Power11 PNV Chip
>
> Since if-else-if ladder was common pattern to get machine type,
> implement pnv_get_machine_type so new processor cases can be implemented
> in one location in pnv_get_machine_type
>
> While at it, also add g_autofree to allocation by g_strdup_printf in
> modified tests
>
> Signed-off-by: Aditya Gupta <adityag@linux.ibm.com>
> ---
> tests/qtest/pnv-host-i2c-test.c | 10 ++++------
> tests/qtest/pnv-spi-seeprom-test.c | 2 +-
> tests/qtest/pnv-xive2-test.c | 2 +-
> tests/qtest/pnv-xscom-test.c | 22 +++++---------------
> tests/qtest/pnv-xscom.h | 32 +++++++++++++++++++++++++++---
> 5 files changed, 40 insertions(+), 28 deletions(-)
>
> diff --git a/tests/qtest/pnv-host-i2c-test.c b/tests/qtest/pnv-host-i2c-test.c
> index 51e613ebdcb2..5fd54f9de771 100644
> --- a/tests/qtest/pnv-host-i2c-test.c
> +++ b/tests/qtest/pnv-host-i2c-test.c
> @@ -402,15 +402,14 @@ static void reset_all(QTestState *qts, const PnvChip *chip)
> static void test_host_i2c(const void *data)
> {
> const PnvChip *chip = data;
> + const char *machine = pnv_get_machine_type(chip->chip_type);
> QTestState *qts;
> - const char *machine = "powernv8";
> PnvI2cCtlr ctlr;
> PnvI2cDev pca9552;
> PnvI2cDev pca9554;
>
> - if (chip->chip_type == PNV_CHIP_POWER9) {
> - machine = "powernv9";
> - } else if (chip->chip_type == PNV_CHIP_POWER10) {
> + /* i2c is initialised for rainier in case of P10 */
> + if (chip->chip_type == PNV_CHIP_POWER10) {
> machine = "powernv10-rainier";
Is that true for all tests ? in that case, pnv_get_machine_type()
could return "powernv10-rainier".
> }
>
> @@ -473,10 +472,9 @@ static void add_test(const char *name, void (*test)(const void *data))
> int i;
>
> for (i = 0; i < ARRAY_SIZE(pnv_chips); i++) {
> - char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
> + g_autofree char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
> pnv_chips[i].cpu_model);
> qtest_add_data_func(tname, &pnv_chips[i], test);
> - g_free(tname);
> }
> }
>
> diff --git a/tests/qtest/pnv-spi-seeprom-test.c b/tests/qtest/pnv-spi-seeprom-test.c
> index 1a78e8d966a5..8bb30eb649aa 100644
> --- a/tests/qtest/pnv-spi-seeprom-test.c
> +++ b/tests/qtest/pnv-spi-seeprom-test.c
> @@ -77,7 +77,7 @@ static void test_spi_seeprom(const void *data)
> const PnvChip *chip = data;
> QTestState *qts = NULL;
> g_autofree char *tmp_path = NULL;
> - const char *machine = "powernv10";
> + const char *machine = pnv_get_machine_type(chip->chip_type);
> int ret;
> int fd;
>
> diff --git a/tests/qtest/pnv-xive2-test.c b/tests/qtest/pnv-xive2-test.c
> index 5313d4ef18b7..80de9d09ed09 100644
> --- a/tests/qtest/pnv-xive2-test.c
> +++ b/tests/qtest/pnv-xive2-test.c
> @@ -548,7 +548,7 @@ static void test_xive(void)
> {
> QTestState *qts;
>
> - qts = qtest_initf("-M powernv10 -smp %d,cores=1,threads=%d -nographic "
> + qts = qtest_initf("-M powernv11 -smp %d,cores=1,threads=%d -nographic "
> "-nodefaults -serial mon:stdio -S "
> "-d guest_errors -trace '*xive*'",
> SMT, SMT);
> diff --git a/tests/qtest/pnv-xscom-test.c b/tests/qtest/pnv-xscom-test.c
> index c814c0f4f5b1..94b50c071c02 100644
> --- a/tests/qtest/pnv-xscom-test.c
> +++ b/tests/qtest/pnv-xscom-test.c
> @@ -28,15 +28,9 @@ static void test_xscom_cfam_id(QTestState *qts, const PnvChip *chip)
> static void test_cfam_id(const void *data)
> {
> const PnvChip *chip = data;
> - const char *machine = "powernv8";
> + const char *machine = pnv_get_machine_type(chip->chip_type);
> QTestState *qts;
>
> - if (chip->chip_type == PNV_CHIP_POWER9) {
> - machine = "powernv9";
> - } else if (chip->chip_type == PNV_CHIP_POWER10) {
> - machine = "powernv10";
> - }
> -
> qts = qtest_initf("-M %s -accel tcg -cpu %s",
> machine, chip->cpu_model);
> test_xscom_cfam_id(qts, chip);
> @@ -57,7 +51,8 @@ static void test_cfam_id(const void *data)
>
> static void test_xscom_core(QTestState *qts, const PnvChip *chip)
> {
> - if (chip->chip_type == PNV_CHIP_POWER10) {
> + if ((chip->chip_type == PNV_CHIP_POWER10) ||
> + (chip->chip_type == PNV_CHIP_POWER11)) {
> uint32_t first_core_thread_state =
> PNV_XSCOM_P10_EC_BASE(chip->first_core) + 0x412;
> uint64_t thread_state;
> @@ -84,14 +79,8 @@ static void test_xscom_core(QTestState *qts, const PnvChip *chip)
> static void test_core(const void *data)
> {
> const PnvChip *chip = data;
> + const char *machine = pnv_get_machine_type(chip->chip_type);
> QTestState *qts;
> - const char *machine = "powernv8";
> -
> - if (chip->chip_type == PNV_CHIP_POWER9) {
> - machine = "powernv9";
> - } else if (chip->chip_type == PNV_CHIP_POWER10) {
> - machine = "powernv10";
> - }
>
> qts = qtest_initf("-M %s -accel tcg -cpu %s",
> machine, chip->cpu_model);
> @@ -104,10 +93,9 @@ static void add_test(const char *name, void (*test)(const void *data))
> int i;
>
> for (i = 0; i < ARRAY_SIZE(pnv_chips); i++) {
> - char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
> + g_autofree char *tname = g_strdup_printf("pnv-xscom/%s/%s", name,
> pnv_chips[i].cpu_model);
> qtest_add_data_func(tname, &pnv_chips[i], test);
> - g_free(tname);
> }
> }
>
> diff --git a/tests/qtest/pnv-xscom.h b/tests/qtest/pnv-xscom.h
> index 5aa1701ea768..eefe206a2007 100644
> --- a/tests/qtest/pnv-xscom.h
> +++ b/tests/qtest/pnv-xscom.h
> @@ -9,6 +9,9 @@
> #ifndef PNV_XSCOM_H
> #define PNV_XSCOM_H
>
> +#include <stdint.h>
> +#include <assert.h>
Seems unrelated. Why do you need these includes ?
Thanks,
C.
> +
> #define SMT 4 /* some tests will break if less than 4 */
>
> typedef enum PnvChipType {
> @@ -17,6 +20,7 @@ typedef enum PnvChipType {
> PNV_CHIP_POWER8NVL, /* AKA Naples */
> PNV_CHIP_POWER9, /* AKA Nimbus */
> PNV_CHIP_POWER10,
> + PNV_CHIP_POWER11,
> } PnvChipType;
>
> typedef struct PnvChip {
> @@ -60,15 +64,23 @@ static const PnvChip pnv_chips[] = {
> .first_core = 0x0,
> .num_i2c = 4,
> },
> + {
> + .chip_type = PNV_CHIP_POWER11,
> + .cpu_model = "Power11",
> + .xscom_base = 0x000603fc00000000ull,
> + .cfam_id = 0x220da04980000000ull,
> + .first_core = 0x0,
> + .num_i2c = 0,
> + },
> };
>
> static inline uint64_t pnv_xscom_addr(const PnvChip *chip, uint32_t pcba)
> {
> uint64_t addr = chip->xscom_base;
>
> - if (chip->chip_type == PNV_CHIP_POWER10) {
> - addr |= ((uint64_t) pcba << 3);
> - } else if (chip->chip_type == PNV_CHIP_POWER9) {
> + if ((chip->chip_type == PNV_CHIP_POWER11) ||
> + (chip->chip_type == PNV_CHIP_POWER10) ||
> + (chip->chip_type == PNV_CHIP_POWER9)) {
> addr |= ((uint64_t) pcba << 3);
> } else {
> addr |= (((uint64_t) pcba << 4) & ~0xffull) |
> @@ -77,4 +89,18 @@ static inline uint64_t pnv_xscom_addr(const PnvChip *chip, uint32_t pcba)
> return addr;
> }
>
> +static const char *pnv_get_machine_type(enum PnvChipType chip_type)
> +{
> + static const char *const machine_types[] = {
> + [PNV_CHIP_POWER8] = "powernv8",
> + [PNV_CHIP_POWER9] = "powernv9",
> + [PNV_CHIP_POWER10] = "powernv10",
> + [PNV_CHIP_POWER11] = "powernv11",
> + };
> +
> + g_assert(chip_type <= PNV_CHIP_POWER11);
> +
> + return machine_types[chip_type];
> +}
> +
> #endif /* PNV_XSCOM_H */
On 26/06/29 01:18PM, Cédric Le Goater wrote:
> On 6/29/26 13:04, Aditya Gupta wrote:
> > <...snip...>
> > --- a/tests/qtest/pnv-host-i2c-test.c
> > +++ b/tests/qtest/pnv-host-i2c-test.c
> > @@ -402,15 +402,14 @@ static void reset_all(QTestState *qts, const PnvChip *chip)
> > static void test_host_i2c(const void *data)
> > {
> > const PnvChip *chip = data;
> > + const char *machine = pnv_get_machine_type(chip->chip_type);
> > QTestState *qts;
> > - const char *machine = "powernv8";
> > PnvI2cCtlr ctlr;
> > PnvI2cDev pca9552;
> > PnvI2cDev pca9554;
> > - if (chip->chip_type == PNV_CHIP_POWER9) {
> > - machine = "powernv9";
> > - } else if (chip->chip_type == PNV_CHIP_POWER10) {
> > + /* i2c is initialised for rainier in case of P10 */
> > + if (chip->chip_type == PNV_CHIP_POWER10) {
> > machine = "powernv10-rainier";
>
> Is that true for all tests ? in that case, pnv_get_machine_type()
> could return "powernv10-rainier".
>
No this i2c test is the only test which specifically requires rainier,
other tests like pnv-spi-seeprom-test and pnv-xscom-test.
> > <...snip...>
> >
> > diff --git a/tests/qtest/pnv-xscom.h b/tests/qtest/pnv-xscom.h
> > index 5aa1701ea768..eefe206a2007 100644
> > --- a/tests/qtest/pnv-xscom.h
> > +++ b/tests/qtest/pnv-xscom.h
> > @@ -9,6 +9,9 @@
> > #ifndef PNV_XSCOM_H
> > #define PNV_XSCOM_H
> > +#include <stdint.h>
> > +#include <assert.h>
>
>
> Seems unrelated. Why do you need these includes ?
Not really cedric, i had added stdint.h since PnvChip used uint64_t, and
assert.h since i used assert in v1 & v2, which is not the case now.
I can remove these in v4.
Thanks for the reviews Cedric !
>
> Thanks,
>
> C.
© 2016 - 2026 Red Hat, Inc.