msm: eva: Propagate tip of 1.0 to 2.0

For Kailua SoD bring up.

Change-Id: I69e41850b55c688caf40f2066ed2628c2df274a3
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
This commit is contained in:
George Shen
2021-11-28 14:41:07 -08:00
vanhempi 40716f1fe7
commit 250bb8b4e1
12 muutettua tiedostoa jossa 80 lisäystä ja 12 poistoa

Näytä tiedosto

@@ -1802,7 +1802,9 @@ static int iris_pm_qos_update(void *device)
dev = device;
mutex_lock(&dev->lock);
cvp_pm_qos_update(dev, true);
mutex_unlock(&dev->lock);
return 0;
}
@@ -3204,7 +3206,9 @@ static int reset_ahb2axi_bridge(struct iris_hfi_device *device)
else
s = CVP_POWER_OFF;
#ifdef CONFIG_EVA_WAIPIO
s = CVP_POWER_IGNORED;
#endif
for (i = 0; i < device->res->reset_set.count; i++) {
rc = __handle_reset_clk(device->res, i, ASSERT, s);
@@ -4077,6 +4081,13 @@ static int __power_off_controller(struct iris_hfi_device *device)
"DBLP Release: lpi_status %x\n", lpi_status);
}
/* PDXFIFO reset: addition for Kailua */
#ifdef CONFIG_EVA_KALAMA
__write_register(device, CVP_WRAPPER_AXI_CLOCK_CONFIG, 0x3);
__write_register(device, CVP_WRAPPER_QNS4PDXFIFO_RESET, 0x1);
__write_register(device, CVP_WRAPPER_QNS4PDXFIFO_RESET, 0x0);
__write_register(device, CVP_WRAPPER_AXI_CLOCK_CONFIG, 0x0);
#endif
/* HPG 6.2.2 Step 5 */
msm_cvp_disable_unprepare_clk(device, "cvp_clk");
@@ -4454,6 +4465,12 @@ static void __noc_error_info_iris2(struct iris_hfi_device *device)
noc_log = &core->log.noc_log;
if (noc_log->used) {
dprintk(CVP_WARN, "Data already in NoC log, skip logging\n");
return;
}
noc_log->used = 1;
val = __read_register(device, CVP_NOC_ERR_SWID_LOW_OFFS);
__err_log(log_required, &noc_log->err_ctrl_swid_low,
"CVP_NOC_ERL_MAIN_SWID_LOW", val);
@@ -4550,7 +4567,6 @@ static void __noc_error_info_iris2(struct iris_hfi_device *device)
__write_register(device, CVP_SS_ARP_TEST_BUS_CONTROL, regi);
val = __read_register(device, CVP_SS_ARP_TEST_BUS_REGISTER);
noc_log->arp_test_bus[i] = val;
dprintk(CVP_ERR, "ARP_CTL:%x - %x\n", regi, val);
}
for (i = 0; i < 512; i++) {
@@ -4558,7 +4574,6 @@ static void __noc_error_info_iris2(struct iris_hfi_device *device)
__write_register(device, CVP_DMA_TEST_BUS_CONTROL, regi);
val = __read_register(device, CVP_DMA_TEST_BUS_REGISTER);
noc_log->dma_test_bus[i] = val;
dprintk(CVP_ERR, "DMA_CTL:%x - %x\n", regi, val);
}
}