Commit 12f42174 authored by David Gibson's avatar David Gibson Committed by Alexander Graf
Browse files

pseries: Move sPAPR RTC code into its own file 



At the moment the RTAS (firmware/hypervisor) time of day functions are
implemented in spapr_rtas.c along with a bunch of other things.  Since
we're going to be expanding these a bit, move the RTAS RTC related code
out into new file spapr_rtc.c.  Also add its own initialization function,
spapr_rtc_init() called from the main machine init routine.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 87774a4a

hw/ppc/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y += ppc.o ppc_booke.o 
# IBM pSeries (sPAPR)

obj-$(CONFIG_PSERIES) += spapr.o spapr_vio.o spapr_events.o

obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o

obj-$(CONFIG_PSERIES) += spapr_pci.o

obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o

ifeq ($(CONFIG_PCI)$(CONFIG_PSERIES)$(CONFIG_LINUX), yyy)

obj-y += spapr_pci_vfio.o

endif

hw/ppc/spapr.c

+3 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,9 @@ static void ppc_spapr_init(MachineState *machine) 
    /* Set up EPOW events infrastructure */

    spapr_events_init(spapr);



    /* Set up the RTC RTAS interfaces */

    spapr_rtc_init();



    /* Set up VIO bus */

    spapr->vio_bus = spapr_vio_bus_init();

hw/ppc/spapr_rtas.c

+0 −49
Original line number Diff line number Diff line
@@ -52,51 +52,6 @@ static void rtas_display_character(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
    }

}



static void rtas_get_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr,

                                 uint32_t token, uint32_t nargs,

                                 target_ulong args,

                                 uint32_t nret, target_ulong rets)

{

    struct tm tm;



    if (nret != 8) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }



    qemu_get_timedate(&tm, spapr->rtc_offset);



    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

    rtas_st(rets, 1, tm.tm_year + 1900);

    rtas_st(rets, 2, tm.tm_mon + 1);

    rtas_st(rets, 3, tm.tm_mday);

    rtas_st(rets, 4, tm.tm_hour);

    rtas_st(rets, 5, tm.tm_min);

    rtas_st(rets, 6, tm.tm_sec);

    rtas_st(rets, 7, 0); /* we don't do nanoseconds */

}



static void rtas_set_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr,

                                 uint32_t token, uint32_t nargs,

                                 target_ulong args,

                                 uint32_t nret, target_ulong rets)

{

    struct tm tm;



    tm.tm_year = rtas_ld(args, 0) - 1900;

    tm.tm_mon = rtas_ld(args, 1) - 1;

    tm.tm_mday = rtas_ld(args, 2);

    tm.tm_hour = rtas_ld(args, 3);

    tm.tm_min = rtas_ld(args, 4);

    tm.tm_sec = rtas_ld(args, 5);



    /* Just generate a monitor event for the change */

    qapi_event_send_rtc_change(qemu_timedate_diff(&tm), &error_abort);

    spapr->rtc_offset = qemu_timedate_diff(&tm);



    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

}



static void rtas_power_off(PowerPCCPU *cpu, sPAPREnvironment *spapr,

                           uint32_t token, uint32_t nargs, target_ulong args,

                           uint32_t nret, target_ulong rets)
@@ -400,10 +355,6 @@ static void core_rtas_register_types(void) 
{

    spapr_rtas_register(RTAS_DISPLAY_CHARACTER, "display-character",

                        rtas_display_character);

    spapr_rtas_register(RTAS_GET_TIME_OF_DAY, "get-time-of-day",

                        rtas_get_time_of_day);

    spapr_rtas_register(RTAS_SET_TIME_OF_DAY, "set-time-of-day",

                        rtas_set_time_of_day);

    spapr_rtas_register(RTAS_POWER_OFF, "power-off", rtas_power_off);

    spapr_rtas_register(RTAS_SYSTEM_REBOOT, "system-reboot",

                        rtas_system_reboot);

hw/ppc/spapr_rtc.c

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

 * QEMU PowerPC pSeries Logical Partition (aka sPAPR) hardware System Emulator

 *

 * RTAS Real Time Clock

 *

 * Copyright (c) 2010-2011 David Gibson, IBM Corporation.

 * Copyright 2014 David Gibson, Red Hat.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 *

 */

#include "cpu.h"

#include "hw/ppc/spapr.h"

#include "qapi-event.h"



static void rtas_get_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr,

                                 uint32_t token, uint32_t nargs,

                                 target_ulong args,

                                 uint32_t nret, target_ulong rets)

{

    struct tm tm;



    if (nret != 8) {

        rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);

        return;

    }



    qemu_get_timedate(&tm, spapr->rtc_offset);



    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

    rtas_st(rets, 1, tm.tm_year + 1900);

    rtas_st(rets, 2, tm.tm_mon + 1);

    rtas_st(rets, 3, tm.tm_mday);

    rtas_st(rets, 4, tm.tm_hour);

    rtas_st(rets, 5, tm.tm_min);

    rtas_st(rets, 6, tm.tm_sec);

    rtas_st(rets, 7, 0); /* we don't do nanoseconds */

}



static void rtas_set_time_of_day(PowerPCCPU *cpu, sPAPREnvironment *spapr,

                                 uint32_t token, uint32_t nargs,

                                 target_ulong args,

                                 uint32_t nret, target_ulong rets)

{

    struct tm tm;



    tm.tm_year = rtas_ld(args, 0) - 1900;

    tm.tm_mon = rtas_ld(args, 1) - 1;

    tm.tm_mday = rtas_ld(args, 2);

    tm.tm_hour = rtas_ld(args, 3);

    tm.tm_min = rtas_ld(args, 4);

    tm.tm_sec = rtas_ld(args, 5);



    /* Just generate a monitor event for the change */

    qapi_event_send_rtc_change(qemu_timedate_diff(&tm), &error_abort);

    spapr->rtc_offset = qemu_timedate_diff(&tm);



    rtas_st(rets, 0, RTAS_OUT_SUCCESS);

}



void spapr_rtc_init(void)

{

    spapr_rtas_register(RTAS_GET_TIME_OF_DAY, "get-time-of-day",

                        rtas_get_time_of_day);

    spapr_rtas_register(RTAS_SET_TIME_OF_DAY, "set-time-of-day",

                        rtas_set_time_of_day);

}

include/hw/ppc/spapr.h

+1 −0
Original line number Diff line number Diff line
@@ -480,5 +480,6 @@ int spapr_dma_dt(void *fdt, int node_off, const char *propname, 
                 uint32_t liobn, uint64_t window, uint32_t size);

int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname,

                      sPAPRTCETable *tcet);

void spapr_rtc_init(void);



#endif /* !defined (__HW_SPAPR_H__) */