samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ubwcp: disable range translation before flush"

Browse Source 
This reverts commit ea698cbfaa.

Change-Id: I9c098039097a487eee22a21b3c2a4fbf17e35b61
Signed-off-by: Linux Image Build Automation <quic_ibautomat@quicinc.com>
This commit is contained in:
Linux Image Build Automation
2023-07-06 17:38:05 -07:00
parent ea698cbfaa
commit b4135a28d3
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ubwcp/ubwcp_hw.c
View File

@@ -12,7 +12,6 @@
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/barrier.h>
#include "ubwcp_hw.h" #include "ubwcp_hw.h"
@@ -210,19 +209,6 @@ int ubwcp_hw_disable_range_check_with_flush(void __iomem *base, u16 index)
u32 val; u32 val;
u16 ctrl_reg = index >> 5; 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 //assert flush
UBWCP_REG_WRITE(base, FLUSH_CONTROL, 0x3); 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 { do {
flush_complete = UBWCP_REG_READ(base, FLUSH_STATUS) & 0x1; flush_complete = UBWCP_REG_READ(base, FLUSH_STATUS) & 0x1;
if (flush_complete) { 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 //clear flush
UBWCP_REG_WRITE(base, FLUSH_CONTROL, 0x0); UBWCP_REG_WRITE(base, FLUSH_CONTROL, 0x0);
return 0; return 0;