Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 90e6b048365950416419c031f2f2d9a8afb5b70c

Authored by Russell King
Committed by Russell King
1 parent 198a6d5a61
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] vfp: fix fuitod/fsitod instructions 

These two instructions exceptionally take a single precision register
as their operand.  This means we can't use vfp_get_dm() to read the
register number - we need to use vfp_get_sm() instead.  Add a flag to
indicate this exception to the general rule.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 13 additions and 3 deletions Side-by-side Diff

... ... @@ -361,10 +361,12 @@
361 361 * OP_SCALAR - this operation always operates in scalar mode
362 362 * OP_SD - the instruction exceptionally writes to a single precision result.
363 363 * OP_DD - the instruction exceptionally writes to a double precision result.
  364 + * OP_SM - the instruction exceptionally reads from a single precision operand.
364 365 */
365 366 #define OP_SCALAR (1 << 0)
366 367 #define OP_SD (1 << 1)
367 368 #define OP_DD (1 << 1)
  369 +#define OP_SM (1 << 2)
368 370  
369 371 struct op {
370 372 u32 (* const fn)(int dd, int dn, int dm, u32 fpscr);
arch/arm/vfp/vfpdouble.c
Diff comments   View file @ 90e6b04
... ... @@ -668,8 +668,8 @@
668 668 [FEXT_TO_IDX(FEXT_FCMPZ)] = { vfp_double_fcmpz, OP_SCALAR },
669 669 [FEXT_TO_IDX(FEXT_FCMPEZ)] = { vfp_double_fcmpez, OP_SCALAR },
670 670 [FEXT_TO_IDX(FEXT_FCVT)] = { vfp_double_fcvts, OP_SCALAR|OP_SD },
671   - [FEXT_TO_IDX(FEXT_FUITO)] = { vfp_double_fuito, OP_SCALAR },
672   - [FEXT_TO_IDX(FEXT_FSITO)] = { vfp_double_fsito, OP_SCALAR },
  671 + [FEXT_TO_IDX(FEXT_FUITO)] = { vfp_double_fuito, OP_SCALAR|OP_SM },
  672 + [FEXT_TO_IDX(FEXT_FSITO)] = { vfp_double_fsito, OP_SCALAR|OP_SM },
673 673 [FEXT_TO_IDX(FEXT_FTOUI)] = { vfp_double_ftoui, OP_SCALAR|OP_SD },
674 674 [FEXT_TO_IDX(FEXT_FTOUIZ)] = { vfp_double_ftouiz, OP_SCALAR|OP_SD },
675 675 [FEXT_TO_IDX(FEXT_FTOSI)] = { vfp_double_ftosi, OP_SCALAR|OP_SD },
... ... @@ -1128,7 +1128,7 @@
1128 1128 u32 exceptions = 0;
1129 1129 unsigned int dest;
1130 1130 unsigned int dn = vfp_get_dn(inst);
1131   - unsigned int dm = vfp_get_dm(inst);
  1131 + unsigned int dm;
1132 1132 unsigned int vecitr, veclen, vecstride;
1133 1133 struct op *fop;
1134 1134  
... ... @@ -1144,6 +1144,14 @@
1144 1144 dest = vfp_get_sd(inst);
1145 1145 else
1146 1146 dest = vfp_get_dd(inst);
  1147 +
  1148 + /*
  1149 + * f[us]ito takes a sN operand, not a dN operand.
  1150 + */
  1151 + if (fop->flags & OP_SM)
  1152 + dm = vfp_get_sm(inst);
  1153 + else
  1154 + dm = vfp_get_dm(inst);
1147 1155  
1148 1156 /*
1149 1157 * If destination bank is zero, vector length is always '1'.