From c4f9c112fc172d19acdc9143045d5c745eb1b4de Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Mon, 20 May 2019 14:22:01 +1000 Subject: npu2: Fix clearing the FIR bits [ Upstream commit 5ed3884f8d04db684e2288a7db011c7b59f1501e ] FIR registers are SCOM-only so they cannot be accesses with the indirect write, and yet we use SCOM-based addresses for these; fix this. Signed-off-by: Alexey Kardashevskiy Reviewed-By: Alistair Popple Reviewed-by: Andrew Donnellan Signed-off-by: Stewart Smith Signed-off-by: Vasant Hegde --- hw/npu2-hw-procedures.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index b671b8a..e1f5e8d 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -331,7 +331,7 @@ static uint32_t reset_ntl_release(struct npu2_dev *ndev) npu2_fir = 0; for (i = 0; i < NPU2_TOTAL_FIR_REGISTERS; i++) { - npu2_write(ndev->npu, npu2_fir_addr, npu2_fir); + xscom_write(ndev->npu->chip_id, npu2_fir_addr, npu2_fir); npu2_fir_addr += NPU2_FIR_OFFSET; } -- cgit v1.1