Commit 3fd3cb2f authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/misc/iotkit-secctl.c: Implement SECMPCINTSTATUS 



Implement the SECMPCINTSTATUS register. This is the only register
in the security controller that deals with Memory Protection
Controllers, and it simply provides a read-only view of the
interrupt lines from the various MPCs in the system.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 20180620132032.28865-6-peter.maydell@linaro.org
parent dd29d068

hw/misc/iotkit-secctl.c

+36 −2
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr, 
    case A_NSCCFG:

        r = s->nsccfg;

        break;

    case A_SECMPCINTSTATUS:

        r = s->mpcintstatus;

        break;

    case A_SECPPCINTSTAT:

        r = s->secppcintstat;

        break;
@@ -186,7 +189,6 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr, 
    case A_APBSPPPCEXP3:

        r = s->apbexp[offset_to_ppc_idx(offset)].sp;

        break;

    case A_SECMPCINTSTATUS:

    case A_SECMSCINTSTAT:

    case A_SECMSCINTEN:

    case A_NSMSCEXP:
@@ -572,6 +574,20 @@ static void iotkit_secctl_reset(DeviceState *dev) 
    foreach_ppc(s, iotkit_secctl_reset_ppc);

}



static void iotkit_secctl_mpc_status(void *opaque, int n, int level)

{

    IoTKitSecCtl *s = IOTKIT_SECCTL(opaque);



    s->mpcintstatus = deposit32(s->mpcintstatus, 0, 1, !!level);

}



static void iotkit_secctl_mpcexp_status(void *opaque, int n, int level)

{

    IoTKitSecCtl *s = IOTKIT_SECCTL(opaque);



    s->mpcintstatus = deposit32(s->mpcintstatus, n + 16, 1, !!level);

}



static void iotkit_secctl_ppc_irqstatus(void *opaque, int n, int level)

{

    IoTKitSecCtlPPC *ppc = opaque;
@@ -640,6 +656,10 @@ static void iotkit_secctl_init(Object *obj) 
    qdev_init_gpio_out_named(dev, &s->sec_resp_cfg, "sec_resp_cfg", 1);

    qdev_init_gpio_out_named(dev, &s->nsc_cfg_irq, "nsc_cfg", 1);



    qdev_init_gpio_in_named(dev, iotkit_secctl_mpc_status, "mpc_status", 1);

    qdev_init_gpio_in_named(dev, iotkit_secctl_mpcexp_status,

                            "mpcexp_status", IOTS_NUM_EXP_MPC);



    memory_region_init_io(&s->s_regs, obj, &iotkit_secctl_s_ops,

                          s, "iotkit-secctl-s-regs", 0x1000);

    memory_region_init_io(&s->ns_regs, obj, &iotkit_secctl_ns_ops,
@@ -660,6 +680,16 @@ static const VMStateDescription iotkit_secctl_ppc_vmstate = { 
    }

};



static const VMStateDescription iotkit_secctl_mpcintstatus_vmstate = {

    .name = "iotkit-secctl-mpcintstatus",

    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(mpcintstatus, IoTKitSecCtl),

        VMSTATE_END_OF_LIST()

    }

};



static const VMStateDescription iotkit_secctl_vmstate = {

    .name = "iotkit-secctl",

    .version_id = 1,
@@ -677,7 +707,11 @@ static const VMStateDescription iotkit_secctl_vmstate = { 
        VMSTATE_STRUCT_ARRAY(ahbexp, IoTKitSecCtl, IOTS_NUM_AHB_EXP_PPC, 1,

                             iotkit_secctl_ppc_vmstate, IoTKitSecCtlPPC),

        VMSTATE_END_OF_LIST()

    }

    },

    .subsections = (const VMStateDescription*[]) {

        &iotkit_secctl_mpcintstatus_vmstate,

        NULL

    },

};



static void iotkit_secctl_class_init(ObjectClass *klass, void *data)

include/hw/misc/iotkit-secctl.h

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
 *  + named GPIO outputs ahb_ppcexp{0,1,2,3}_irq_enable

 *  + named GPIO outputs ahb_ppcexp{0,1,2,3}_irq_clear

 *  + named GPIO inputs ahb_ppcexp{0,1,2,3}_irq_status

 * Controlling the MPC in the IoTKit:

 *  + named GPIO input mpc_status

 * Controlling each of the 16 expansion MPCs which a system using the IoTKit

 * might provide:

 *  + named GPIO inputs mpcexp_status[0..15]

 */



#ifndef IOTKIT_SECCTL_H
@@ -55,6 +60,8 @@ 
#define IOTS_NUM_APB_PPC 2

#define IOTS_NUM_APB_EXP_PPC 4

#define IOTS_NUM_AHB_EXP_PPC 4

#define IOTS_NUM_EXP_MPC 16

#define IOTS_NUM_MPC 1



typedef struct IoTKitSecCtl IoTKitSecCtl;
@@ -94,6 +101,7 @@ struct IoTKitSecCtl { 
    uint32_t secrespcfg;

    uint32_t nsccfg;

    uint32_t brginten;

    uint32_t mpcintstatus;



    IoTKitSecCtlPPC apb[IOTS_NUM_APB_PPC];

    IoTKitSecCtlPPC apbexp[IOTS_NUM_APB_EXP_PPC];