From 4b989a1221b31131892d0df8be8bb3e8a250bc9b Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Tue, 11 Aug 2015 19:05:00 -0700 Subject: [PATCH] hdcp1x: cipher: Fixed disable function for unplug scenario. During an unplug event, the clock may not be stable which will cause the disable function to stall. Removing the wait for the encryption function to finish after the cipher has been disabled will not affect functionality. Signed-off-by: Andrei-Liviu Simion Acked by: Rohit Consul --- XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c b/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c index f3d9bbe1..799fa5d0 100644 --- a/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c +++ b/XilinxProcessorIPLib/drivers/hdcp1x/src/xhdcp1x_cipher.c @@ -268,9 +268,6 @@ int XHdcp1x_CipherDisable(XHdcp1x *InstancePtr) XHdcp1x_WriteReg(InstancePtr->Config.BaseAddress, XHDCP1X_CIPHER_REG_CONTROL, Value); - /* Wait until the XOR has actually stopped */ - while (XHdcp1x_CipherXorInProgress(InstancePtr)); - return (XST_SUCCESS); } @@ -692,11 +689,6 @@ int XHdcp1x_CipherDisableEncryption(XHdcp1x *InstancePtr, u64 StreamMap) XHdcp1x_WriteReg(InstancePtr->Config.BaseAddress, XHDCP1X_CIPHER_REG_CONTROL, Val); - /* If disabling the XOR, wait until no longer in progress */ - if (DisableXor) { - while (XHdcp1x_CipherXorInProgress(InstancePtr)); - } - return (XST_SUCCESS); }