Commit 1414c75d authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

target/ppc: fix doorbell and hypervisor doorbell definitions 



commit f03a1af5 ("ppc: Fix POWER7 and POWER8 exception definitions")
introduced definitions for the server doorbell exceptions by reusing
the embedded definitions but this adds complexity in the powerpc_excp()
routine. Let's introduce specific definitions for the Server doorbells
exception.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent f8567a11

target/ppc/cpu.h

+4 −4
Original line number Diff line number Diff line
@@ -140,9 +140,6 @@ enum { 
    POWERPC_EXCP_HYPPRIV  = 41, /* Embedded hypervisor priv instruction      */

    /* Vectors 42 to 63 are reserved                                         */

    /* Exceptions defined in the PowerPC server specification                */

    /* Server doorbell variants */

#define POWERPC_EXCP_SDOOR      POWERPC_EXCP_GDOORI

#define POWERPC_EXCP_SDOOR_HV   POWERPC_EXCP_DOORI

    POWERPC_EXCP_RESET    = 64, /* System reset exception                    */

    POWERPC_EXCP_DSEG     = 65, /* Data segment exception                    */

    POWERPC_EXCP_ISEG     = 66, /* Instruction segment exception             */
@@ -189,8 +186,11 @@ enum { 
    POWERPC_EXCP_HV_EMU   = 96, /* HV emulation assistance                   */

    POWERPC_EXCP_HV_MAINT = 97, /* HMI                                       */

    POWERPC_EXCP_HV_FU    = 98, /* Hypervisor Facility unavailable           */

    /* Server doorbell variants */

    POWERPC_EXCP_SDOOR    = 99,

    POWERPC_EXCP_SDOOR_HV = 100,

    /* EOL                                                                   */

    POWERPC_EXCP_NB       = 99,

    POWERPC_EXCP_NB       = 101,

    /* QEMU exceptions: used internally during code translation              */

    POWERPC_EXCP_STOP         = 0x200, /* stop translation                   */

    POWERPC_EXCP_BRANCH       = 0x201, /* branch instruction                 */