bigocean: Increase timeoutandroid-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-u-qpr2-beta-3_r0.7android-u-qpr2-beta-3_r0.6android-u-qpr2-beta-3_r0.5android-u-qpr2-beta-3_r0.4android-u-qpr2-beta-3_r0.3android-u-qpr2-beta-3_r0.2android-u-qpr2-beta-3.1_r0.7android-u-qpr2-beta-3.1_r0.5android-u-qpr2-beta-3.1_r0.4android-u-qpr2-beta-3.1_r0.3android-u-qpr2-beta-3.1_r0.2android-u-qpr2-beta-3.1_r0.1android-u-qpr2-beta-2_r0.7android-u-qpr2-beta-2_r0.5android-u-qpr2-beta-2_r0.4android-u-qpr2-beta-2_r0.3android-u-qpr2-beta-2_r0.2android-u-qpr2-beta-2_r0.1android-u-qpr2-beta-1_r0.6android-u-qpr2-beta-1_r0.5android-u-qpr2-beta-1_r0.4android-u-qpr2-beta-1_r0.3android-u-qpr2-beta-1_r0.2android-u-qpr2-beta-1_r0.1android-u-qpr1-beta-2_r0.7android-u-qpr1-beta-2_r0.5android-u-qpr1-beta-2_r0.4android-u-qpr1-beta-2_r0.3android-u-qpr1-beta-2_r0.2android-u-qpr1-beta-2_r0.1android-u-qpr1-beta-2.2_r0.6android-u-qpr1-beta-2.2_r0.5android-u-qpr1-beta-2.2_r0.4android-u-qpr1-beta-2.2_r0.3android-u-qpr1-beta-2.2_r0.2android-u-qpr1-beta-2.2_r0.1android-u-qpr1-beta-2.1_r0.7android-u-qpr1-beta-2.1_r0.5android-u-qpr1-beta-2.1_r0.4android-u-qpr1-beta-2.1_r0.3android-u-qpr1-beta-2.1_r0.2android-u-qpr1-beta-2.1_r0.1android-u-qpr1-beta-1_r0.7android-u-qpr1-beta-1_r0.5android-u-qpr1-beta-1_r0.4android-u-qpr1-beta-1_r0.3android-u-qpr1-beta-1_r0.2android-u-qpr1-beta-1_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1android-14.0.0_r0.56android-14.0.0_r0.55android-14.0.0_r0.54android-14.0.0_r0.53android-14.0.0_r0.52android-14.0.0_r0.51android-14.0.0_r0.44android-14.0.0_r0.43android-14.0.0_r0.42android-14.0.0_r0.41android-14.0.0_r0.40android-14.0.0_r0.39android-14.0.0_r0.37android-14.0.0_r0.36android-14.0.0_r0.35android-14.0.0_r0.34android-14.0.0_r0.33android-14.0.0_r0.31android-14.0.0_r0.25android-14.0.0_r0.23android-14.0.0_r0.22android-14.0.0_r0.21android-14.0.0_r0.19android-gs-tangorpro-5.10-u-qpr1-beta2android-gs-tangorpro-5.10-android14-qpr2-betaandroid-gs-tangorpro-5.10-android14-qpr1-betaandroid-gs-tangorpro-5.10-android14-qpr1android-gs-raviole-5.10-u-qpr1-beta2android-gs-raviole-5.10-android14-qpr2-betaandroid-gs-raviole-5.10-android14-qpr1-betaandroid-gs-raviole-5.10-android14-qpr1android-gs-pantah-5.10-u-qpr1-beta2android-gs-pantah-5.10-android14-qpr2-betaandroid-gs-pantah-5.10-android14-qpr1-betaandroid-gs-pantah-5.10-android14-qpr1android-gs-lynx-5.10-u-qpr1-beta2android-gs-lynx-5.10-android14-qpr2-betaandroid-gs-lynx-5.10-android14-qpr1-betaandroid-gs-lynx-5.10-android14-qpr1android-gs-felix-5.10-u-qpr1-beta2android-gs-felix-5.10-android14-qpr2-betaandroid-gs-felix-5.10-android14-qpr1-betaandroid-gs-felix-5.10-android14-qpr1android-gs-bluejay-5.10-u-qpr1-beta2android-gs-bluejay-5.10-android14-qpr2-betaandroid-gs-bluejay-5.10-android14-qpr1-betaandroid-gs-bluejay-5.10-android14-qpr1

Increase timeout for HW operation. Add more debug logs incase the HW
times out.

bug: 292057436

(cherry picked from commit Ib8775eb6731c7445ffd92deb2b2aca4f01e231aa)
Change-Id: I46e29c4a86b6dd361e7fb98c16d91d9155e31166
Signed-off-by: Vinay Kalia <vinaykalia@google.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/bigo.c b/bigo.c
index f6c3c87..9927798 100644
--- a/bigo.c
+++ b/bigo.c
@@ -239,6 +239,12 @@ static int bigo_run_job(struct bigo_core *core, struct bigo_job *job)
 			msecs_to_jiffies(JOB_COMPLETE_TIMEOUT_MS));
 	if (!ret) {
 		pr_err("timed out waiting for HW\n");
+		pr_err("last rd addr: 0x%x, last_wr_addr: 0x%x\n",
+			bigo_core_readl(core, BIGO_REG_LAST_RD_AXI_ADDR),
+			bigo_core_readl(core, BIGO_REG_LAST_WR_AXI_ADDR));
+		pr_err("last rd addr: 0x%x, last_wr_addr: 0x%x\n",
+			bigo_core_readl(core, BIGO_REG_LAST_RD_AXI_ADDR),
+			bigo_core_readl(core, BIGO_REG_LAST_WR_AXI_ADDR));
 
 		spin_lock_irqsave(&core->status_lock, flags);
 		core->stat_with_irq = bigo_core_readl(core, BIGO_REG_STAT);
diff --git a/bigo_io.h b/bigo_io.h
index 040680e..8acb727 100644
--- a/bigo_io.h
+++ b/bigo_io.h
@@ -15,6 +15,8 @@
 #define BIGO_REG_PRODUCT 0x00
 #define BIGO_REG_CFG 0x04
 #define BIGO_REG_STAT 0x08
+#define BIGO_REG_LAST_RD_AXI_ADDR 0x1C
+#define BIGO_REG_LAST_WR_AXI_ADDR 0x20
 
 #define BIGO_CFG_H264 BIT(2)
 #define BIGO_CFG_VP9D BIT(3)
@@ -46,7 +48,7 @@
  *    BIGO_STAT_IRQ_TIMEOUT_BIT so HW hang should be caught there.
  * 3. This timeout is to catch any other issues with the system.
  */
-#define JOB_COMPLETE_TIMEOUT_MS 500
+#define JOB_COMPLETE_TIMEOUT_MS 1000
 
 int bigo_init_io(struct bigo_core *core, irq_handler_t handler);
 u32 bigo_core_readl(struct bigo_core *core, ptrdiff_t offset);