mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
Patch queue for ppc - 2015-01-07
New year's release. This time's highlights: - E500: More RAM support - pseries: New SLOF release - Migration fixes - Simplify USB spawning logic, removes support for explicit usb=off - TCG: Simple untansactional TM emulation -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJUrU6JAAoJECszeR4D/txgclcQALbuKWkpj4O85zfC3MbbC/ld dORPmHFI0OChyN9YOU8UKtetIQK6FlbBB+ZA0VVOusEVpiQ/bmj+iGelTRf4R08a 5pcqlF8yQPoWrIxH6JK+OJqg7rrNJSUSrlYnMQKsZudmvL6r1VzFCcGoL+lIzIi8 uGoD+ngBHdEjUKRD+BxnOdkBwIm5K6FlbK1uynN1Cj9FLkYw9RsmVNqNPtd0vYSn 2Qi4XPXZoLxwVM2x/M89d1HCW41eBeLhBr28KuXR4bphIS1eyZY5pBlS35LPPt9+ KWo9xvkT2y+18T968vwKHLmQlqN62N0rotSFlNCpnvoo3bd6KexsSkjg497HsUR9 eOHdgVOBOHReWmmqtjgECgjzBmI2hEY8fEHg8ktOdOJ0YupcGdbWui5+r0ObYbnp BKEvPiAo3/+XSASbW6NkAxcWvFt6DQx8nh5Y+9XFq1Q6Ge962SuCldzExzTo/8iQ kSxTeECsHZb5Ch0vPyrOICeWxeBFJYW6lWVl59qSS0NzHflBD/Nns9TBGO8LJxm6 6NLmAu47Q7KW4xYZOXve6+I5Ze20szasiPF2v9BeV6TeKdSCd2krut1D8lUurPQM EdtRmAKOCRQnC3x/lzQrrRxszoCqa3OSStO9RZ5TaGeq+7zec5J3g/9iomgGtMyz t4Q8k66Mez8BhviG0SoS =28q1 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging Patch queue for ppc - 2015-01-07 New year's release. This time's highlights: - E500: More RAM support - pseries: New SLOF release - Migration fixes - Simplify USB spawning logic, removes support for explicit usb=off - TCG: Simple untansactional TM emulation # gpg: Signature made Wed 07 Jan 2015 15:19:37 GMT using RSA key ID 03FEDC60 # gpg: Good signature from "Alexander Graf <agraf@suse.de>" # gpg: aka "Alexander Graf <alex@csgraf.de>" * remotes/agraf/tags/signed-ppc-for-upstream: (37 commits) hw/ppc/mac_newworld: simplify usb controller creation logic hw/ppc/spapr: simplify usb controller creation logic hw/ppc/mac_newworld: QOMified mac99 machines hw/usb: simplified usb_enabled hw/machine: added machine_usb wrapper hw/ppc: modified the condition for usb controllers to be created for some ppc machines target-ppc: Cast ssize_t to size_t before printing with %zx target-ppc: Mark SR() and gen_sync_exception() as !CONFIG_USER_ONLY PPC: e500: Fix GPIO controller interrupt number target-ppc: Introduce Privileged TM Noops target-ppc: Introduce tcheck target-ppc: Introduce TM Noops target-ppc: Introduce tbegin target-ppc: Introduce TEXASRU Bit Fields target-ppc: Power8 Supports Transactional Memory target-ppc: Introduce tm_enabled Bit to CPU State target-ppc: Introduce Feature Flag for Transactional Memory target-ppc: Introduce Instruction Type for Transactional Memory pseries: Update SLOF firmware image to 20141202 PPC: Fix crash on spapr_tce_table_finalize() ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
97052d64e4
20 changed files with 538 additions and 156 deletions
|
@ -559,6 +559,26 @@ struct ppc_slb_t {
|
|||
#define ESR_VLEMI (1 << (63 - 58)) /* VLE operation */
|
||||
#define ESR_MIF (1 << (63 - 62)) /* Misaligned instruction (VLE) */
|
||||
|
||||
/* Transaction EXception And Summary Register bits */
|
||||
#define TEXASR_FAILURE_PERSISTENT (63 - 7)
|
||||
#define TEXASR_DISALLOWED (63 - 8)
|
||||
#define TEXASR_NESTING_OVERFLOW (63 - 9)
|
||||
#define TEXASR_FOOTPRINT_OVERFLOW (63 - 10)
|
||||
#define TEXASR_SELF_INDUCED_CONFLICT (63 - 11)
|
||||
#define TEXASR_NON_TRANSACTIONAL_CONFLICT (63 - 12)
|
||||
#define TEXASR_TRANSACTION_CONFLICT (63 - 13)
|
||||
#define TEXASR_TRANSLATION_INVALIDATION_CONFLICT (63 - 14)
|
||||
#define TEXASR_IMPLEMENTATION_SPECIFIC (63 - 15)
|
||||
#define TEXASR_INSTRUCTION_FETCH_CONFLICT (63 - 16)
|
||||
#define TEXASR_ABORT (63 - 31)
|
||||
#define TEXASR_SUSPENDED (63 - 32)
|
||||
#define TEXASR_PRIVILEGE_HV (63 - 34)
|
||||
#define TEXASR_PRIVILEGE_PR (63 - 35)
|
||||
#define TEXASR_FAILURE_SUMMARY (63 - 36)
|
||||
#define TEXASR_TFIAR_EXACT (63 - 37)
|
||||
#define TEXASR_ROT (63 - 38)
|
||||
#define TEXASR_TRANSACTION_LEVEL (63 - 52) /* 12 bits */
|
||||
|
||||
enum {
|
||||
POWERPC_FLAG_NONE = 0x00000000,
|
||||
/* Flag for MSR bit 25 signification (VRE/SPE) */
|
||||
|
@ -585,6 +605,8 @@ enum {
|
|||
POWERPC_FLAG_CFAR = 0x00040000,
|
||||
/* Has VSX */
|
||||
POWERPC_FLAG_VSX = 0x00080000,
|
||||
/* Has Transaction Memory (ISA 2.07) */
|
||||
POWERPC_FLAG_TM = 0x00100000,
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2011,6 +2033,8 @@ enum {
|
|||
PPC2_ISA207S = 0x0000000000008000ULL,
|
||||
/* Double precision floating point conversion for signed integer 64 */
|
||||
PPC2_FP_CVT_S64 = 0x0000000000010000ULL,
|
||||
/* Transactional Memory (ISA 2.07, Book II) */
|
||||
PPC2_TM = 0x0000000000020000ULL,
|
||||
|
||||
#define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \
|
||||
PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \
|
||||
|
@ -2018,7 +2042,7 @@ enum {
|
|||
PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \
|
||||
PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \
|
||||
PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \
|
||||
PPC2_FP_CVT_S64)
|
||||
PPC2_FP_CVT_S64 | PPC2_TM)
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue