diff options
author | Chandrakala Chavva <cchavva@caviumnetworks.com> | 2015-01-15 08:11:08 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-20 09:29:36 -0500 |
commit | 2d98cae6e35cfda8c008dba9c43c6f78f85e2792 (patch) | |
tree | 6e70675d29a49b129722a426b7fad04d05a0213c | |
parent | 6b3a287e6351b00df6624b41c160e1c0817f40e2 (diff) |
MIPS: OCTEON: Use correct instruction to read 64-bit COP0 register
Use dmfc0/dmtc0 instructions for reading CvmMemCtl COP0 register,
its a 64-bit wide.
Signed-off-by: Chandrakala Chavva <cchavva@caviumnetworks.com>
Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com>
Patchwork: https://patchwork.linux-mips.org/patch/8936/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/octeon_switch.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S index 590ca2d56b6a..f0a699d73627 100644 --- a/arch/mips/kernel/octeon_switch.S +++ b/arch/mips/kernel/octeon_switch.S | |||
@@ -80,7 +80,7 @@ | |||
80 | 1: | 80 | 1: |
81 | #if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0 | 81 | #if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0 |
82 | /* Check if we need to store CVMSEG state */ | 82 | /* Check if we need to store CVMSEG state */ |
83 | mfc0 t0, $11,7 /* CvmMemCtl */ | 83 | dmfc0 t0, $11,7 /* CvmMemCtl */ |
84 | bbit0 t0, 6, 3f /* Is user access enabled? */ | 84 | bbit0 t0, 6, 3f /* Is user access enabled? */ |
85 | 85 | ||
86 | /* Store the CVMSEG state */ | 86 | /* Store the CVMSEG state */ |
@@ -104,9 +104,9 @@ | |||
104 | .set reorder | 104 | .set reorder |
105 | 105 | ||
106 | /* Disable access to CVMSEG */ | 106 | /* Disable access to CVMSEG */ |
107 | mfc0 t0, $11,7 /* CvmMemCtl */ | 107 | dmfc0 t0, $11,7 /* CvmMemCtl */ |
108 | xori t0, t0, 0x40 /* Bit 6 is CVMSEG user enable */ | 108 | xori t0, t0, 0x40 /* Bit 6 is CVMSEG user enable */ |
109 | mtc0 t0, $11,7 /* CvmMemCtl */ | 109 | dmtc0 t0, $11,7 /* CvmMemCtl */ |
110 | #endif | 110 | #endif |
111 | 3: | 111 | 3: |
112 | 112 | ||