Revert "ubwcp: disable range translation before flush"
This reverts commit ea698cbfaa
.
Change-Id: I9c098039097a487eee22a21b3c2a4fbf17e35b61
Signed-off-by: Linux Image Build Automation <quic_ibautomat@quicinc.com>
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
#include <linux/cdev.h>
|
||||
#include <linux/qcom_scm.h>
|
||||
#include <linux/delay.h>
|
||||
#include <asm/barrier.h>
|
||||
|
||||
#include "ubwcp_hw.h"
|
||||
|
||||
@@ -210,19 +209,6 @@ int ubwcp_hw_disable_range_check_with_flush(void __iomem *base, u16 index)
|
||||
u32 val;
|
||||
u16 ctrl_reg = index >> 5;
|
||||
|
||||
/*
|
||||
* It is not clear that the isb() calls in this sequence are
|
||||
* requried, we may be able to remove them.
|
||||
*/
|
||||
|
||||
//ensure all CMOs have completed
|
||||
isb();
|
||||
|
||||
//disable range ck
|
||||
val = UBWCP_REG_READ(base, RANGE_CHECK_CONTROL + ctrl_reg*4);
|
||||
val &= ~(1 << (index & 0x1F));
|
||||
UBWCP_REG_WRITE(base, RANGE_CHECK_CONTROL + ctrl_reg*4, val);
|
||||
isb();
|
||||
//assert flush
|
||||
UBWCP_REG_WRITE(base, FLUSH_CONTROL, 0x3);
|
||||
|
||||
@@ -230,6 +216,11 @@ int ubwcp_hw_disable_range_check_with_flush(void __iomem *base, u16 index)
|
||||
do {
|
||||
flush_complete = UBWCP_REG_READ(base, FLUSH_STATUS) & 0x1;
|
||||
if (flush_complete) {
|
||||
//disable range ck
|
||||
val = UBWCP_REG_READ(base, RANGE_CHECK_CONTROL + ctrl_reg*4);
|
||||
val &= ~(1 << (index & 0x1F));
|
||||
UBWCP_REG_WRITE(base, RANGE_CHECK_CONTROL + ctrl_reg*4, val);
|
||||
|
||||
//clear flush
|
||||
UBWCP_REG_WRITE(base, FLUSH_CONTROL, 0x0);
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user