Merge "jtagv8: do not lock os double lock in debug save path" (16ac0fc5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/jtagv8.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -396,9 +396,6 @@ static inline void dbg_save_state(int cpu)
		dbg.state[i++] = (uint32_t)dbg_readl(OSDTRRX_EL1);
		dbg.state[i++] = (uint32_t)dbg_readl(OSDTRTX_EL1);

		/* Set the OS double lock */
		isb();
		dbg_write(0x1, OSDLR_EL1);
		isb();
		break;
		default:
		@@ -418,6 +415,7 @@ static inline void dbg_restore_state(int cpu)
		/* Set OS lock. Lock will already be set after power collapse
		* but this write is included to ensure it is set.
		*/
		isb();
		dbg_write(0x1, OSLAR_EL1);
		isb();