Commit eeddd59f authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

tests: add RTAS command in the protocol 



Add a first test to validate the protocol:

- rtas/get-time-of-day compares the time
  from the guest with the time from the host.

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8d6ef7c9

hw/ppc/spapr_rtas.c

+19 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 


#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_vio.h"

#include "hw/ppc/spapr_rtas.h"

#include "hw/ppc/ppc.h"

#include "qapi-event.h"

#include "hw/boards.h"
@@ -692,6 +693,24 @@ target_ulong spapr_rtas_call(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    return H_PARAMETER;

}



uint64_t qtest_rtas_call(char *cmd, uint32_t nargs, uint64_t args,

                         uint32_t nret, uint64_t rets)

{

    int token;



    for (token = 0; token < RTAS_TOKEN_MAX - RTAS_TOKEN_BASE; token++) {

        if (strcmp(cmd, rtas_table[token].name) == 0) {

            sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

            PowerPCCPU *cpu = POWERPC_CPU(first_cpu);



            rtas_table[token].fn(cpu, spapr, token + RTAS_TOKEN_BASE,

                                 nargs, args, nret, rets);

            return H_SUCCESS;

        }

    }

    return H_PARAMETER;

}



void spapr_rtas_register(int token, const char *name, spapr_rtas_fn fn)

{

    assert((token >= RTAS_TOKEN_BASE) && (token < RTAS_TOKEN_MAX));

include/hw/ppc/spapr_rtas.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef HW_SPAPR_RTAS_H

#define HW_SPAPR_RTAS_H

/*

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



uint64_t qtest_rtas_call(char *cmd, uint32_t nargs, uint64_t args,

                         uint32_t nret, uint64_t rets);

#endif /* HW_SPAPR_RTAS_H */

qtest.c

+17 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include "qemu/option.h"

#include "qemu/error-report.h"

#include "qemu/cutils.h"

#ifdef TARGET_PPC64

#include "hw/ppc/spapr_rtas.h"

#endif



#define MAX_IRQ 256
@@ -534,6 +537,20 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) 


        qtest_send_prefix(chr);

        qtest_send(chr, "OK\n");

#ifdef TARGET_PPC64

    } else if (strcmp(words[0], "rtas") == 0) {

        uint64_t res, args, ret;

        unsigned long nargs, nret;



        g_assert(qemu_strtoul(words[2], NULL, 0, &nargs) == 0);

        g_assert(qemu_strtoull(words[3], NULL, 0, &args) == 0);

        g_assert(qemu_strtoul(words[4], NULL, 0, &nret) == 0);

        g_assert(qemu_strtoull(words[5], NULL, 0, &ret) == 0);

        res = qtest_rtas_call(words[1], nargs, args, nret, ret);



        qtest_send_prefix(chr);

        qtest_sendf(chr, "OK %"PRIu64"\n", res);

#endif

    } else if (qtest_enabled() && strcmp(words[0], "clock_step") == 0) {

        int64_t ns;

tests/Makefile.include

+3 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) 
check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)

check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)

check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)

check-qtest-ppc64-y += tests/rtas-test$(EXESUF)



check-qtest-sh4-y = tests/endianness-test$(EXESUF)
@@ -585,6 +586,7 @@ libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o tests/libqos/malloc.o 
libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o

libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o

libqos-spapr-obj-y += tests/libqos/libqos-spapr.o

libqos-spapr-obj-y += tests/libqos/rtas.o

libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o

libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o

libqos-pc-obj-y += tests/libqos/ahci.o
@@ -599,6 +601,7 @@ tests/m48t59-test$(EXESUF): tests/m48t59-test.o 
tests/endianness-test$(EXESUF): tests/endianness-test.o

tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)

tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)

tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)

tests/fdc-test$(EXESUF): tests/fdc-test.o

tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)

tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)

tests/libqos/rtas.c

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "libqtest.h"

#include "libqos/rtas.h"



static void qrtas_copy_args(uint64_t target_args, uint32_t nargs,

                            uint32_t *args)

{

    int i;



    for (i = 0; i < nargs; i++) {

        writel(target_args + i * sizeof(uint32_t), args[i]);

    }

}



static void qrtas_copy_ret(uint64_t target_ret, uint32_t nret, uint32_t *ret)

{

    int i;



    for (i = 0; i < nret; i++) {

        ret[i] = readl(target_ret + i * sizeof(uint32_t));

    }

}



static uint64_t qrtas_call(QGuestAllocator *alloc, const char *name,

                           uint32_t nargs, uint32_t *args,

                           uint32_t nret, uint32_t *ret)

{

    uint64_t res;

    uint64_t target_args, target_ret;



    target_args = guest_alloc(alloc, nargs * sizeof(uint32_t));

    target_ret = guest_alloc(alloc, nret * sizeof(uint32_t));



    qrtas_copy_args(target_args, nargs, args);

    res = qtest_rtas_call(global_qtest, name,

                          nargs, target_args, nret, target_ret);

    qrtas_copy_ret(target_ret, nret, ret);



    guest_free(alloc, target_ret);

    guest_free(alloc, target_args);



    return res;

}



int qrtas_get_time_of_day(QGuestAllocator *alloc, struct tm *tm, uint32_t *ns)

{

    int res;

    uint32_t ret[8];



    res = qrtas_call(alloc, "get-time-of-day", 0, NULL, 8, ret);

    if (res != 0) {

        return res;

    }



    res = ret[0];

    memset(tm, 0, sizeof(*tm));

    tm->tm_year = ret[1] - 1900;

    tm->tm_mon = ret[2] - 1;

    tm->tm_mday = ret[3];

    tm->tm_hour = ret[4];

    tm->tm_min = ret[5];

    tm->tm_sec = ret[6];

    *ns = ret[7];



    return res;

}