|
|
@@ -681,6 +681,21 @@ static int vsr_active(struct task_struct *target,
|
|
|
return target->thread.used_vsr ? regset->n : 0;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * When the transaction is active, 'transact_fp' holds the current running
|
|
|
+ * value of all FPR registers and 'fp_state' holds the last checkpointed
|
|
|
+ * value of all FPR registers for the current transaction. When transaction
|
|
|
+ * is not active 'fp_state' holds the current running state of all the FPR
|
|
|
+ * registers. So this function which returns the current running values of
|
|
|
+ * all the FPR registers, needs to know whether any transaction is active
|
|
|
+ * or not.
|
|
|
+ *
|
|
|
+ * Userspace interface buffer layout:
|
|
|
+ *
|
|
|
+ * struct data {
|
|
|
+ * u64 vsx[32];
|
|
|
+ * };
|
|
|
+ */
|
|
|
static int vsr_get(struct task_struct *target, const struct user_regset *regset,
|
|
|
unsigned int pos, unsigned int count,
|
|
|
void *kbuf, void __user *ubuf)
|
|
|
@@ -688,16 +703,47 @@ static int vsr_get(struct task_struct *target, const struct user_regset *regset,
|
|
|
u64 buf[32];
|
|
|
int ret, i;
|
|
|
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+ flush_fp_to_thread(target);
|
|
|
+ flush_altivec_to_thread(target);
|
|
|
+ flush_tmregs_to_thread(target);
|
|
|
+#endif
|
|
|
flush_vsx_to_thread(target);
|
|
|
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+ if (MSR_TM_ACTIVE(target->thread.regs->msr)) {
|
|
|
+ for (i = 0; i < 32 ; i++)
|
|
|
+ buf[i] = target->thread.
|
|
|
+ transact_fp.fpr[i][TS_VSRLOWOFFSET];
|
|
|
+ } else {
|
|
|
+ for (i = 0; i < 32 ; i++)
|
|
|
+ buf[i] = target->thread.
|
|
|
+ fp_state.fpr[i][TS_VSRLOWOFFSET];
|
|
|
+ }
|
|
|
+#else
|
|
|
for (i = 0; i < 32 ; i++)
|
|
|
buf[i] = target->thread.fp_state.fpr[i][TS_VSRLOWOFFSET];
|
|
|
+#endif
|
|
|
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
|
|
buf, 0, 32 * sizeof(double));
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * When the transaction is active, 'transact_fp' holds the current running
|
|
|
+ * value of all FPR registers and 'fp_state' holds the last checkpointed
|
|
|
+ * value of all FPR registers for the current transaction. When transaction
|
|
|
+ * is not active 'fp_state' holds the current running state of all the FPR
|
|
|
+ * registers. So this function which sets the current running values of all
|
|
|
+ * the FPR registers, needs to know whether any transaction is active or not.
|
|
|
+ *
|
|
|
+ * Userspace interface buffer layout:
|
|
|
+ *
|
|
|
+ * struct data {
|
|
|
+ * u64 vsx[32];
|
|
|
+ * };
|
|
|
+ */
|
|
|
static int vsr_set(struct task_struct *target, const struct user_regset *regset,
|
|
|
unsigned int pos, unsigned int count,
|
|
|
const void *kbuf, const void __user *ubuf)
|
|
|
@@ -705,12 +751,30 @@ static int vsr_set(struct task_struct *target, const struct user_regset *regset,
|
|
|
u64 buf[32];
|
|
|
int ret,i;
|
|
|
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+ flush_fp_to_thread(target);
|
|
|
+ flush_altivec_to_thread(target);
|
|
|
+ flush_tmregs_to_thread(target);
|
|
|
+#endif
|
|
|
flush_vsx_to_thread(target);
|
|
|
|
|
|
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
|
|
buf, 0, 32 * sizeof(double));
|
|
|
+
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+ if (MSR_TM_ACTIVE(target->thread.regs->msr)) {
|
|
|
+ for (i = 0; i < 32 ; i++)
|
|
|
+ target->thread.transact_fp.
|
|
|
+ fpr[i][TS_VSRLOWOFFSET] = buf[i];
|
|
|
+ } else {
|
|
|
+ for (i = 0; i < 32 ; i++)
|
|
|
+ target->thread.fp_state.
|
|
|
+ fpr[i][TS_VSRLOWOFFSET] = buf[i];
|
|
|
+ }
|
|
|
+#else
|
|
|
for (i = 0; i < 32 ; i++)
|
|
|
target->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = buf[i];
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
return ret;
|