From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 21 Apr 2019 21:14:47 +0000 (+0200)
Subject: Merge 5.1-rc6 into char-misc-next
X-Git-Tag: Ubuntu-5.13.0-19.19~8624^2~131
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3a26172437bb5ecdf6921e3ae24730ef37d3c860;p=mirror_ubuntu-jammy-kernel.git

Merge 5.1-rc6 into char-misc-next

We want the fixes, and this resolves a merge error in the fastrpc
driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

3a26172437bb5ecdf6921e3ae24730ef37d3c860
diff --cc drivers/misc/fastrpc.c
index c4cc8e53243d,36d0d5c9cfba..98603e235cf0
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@@ -1314,7 -1184,7 +1314,8 @@@ static int fastrpc_cb_probe(struct plat
  	struct fastrpc_session_ctx *sess;
  	struct device *dev = &pdev->dev;
  	int i, sessions = 0;
 +	unsigned long flags;
+ 	int rc;
  
  	cctx = dev_get_drvdata(dev->parent);
  	if (!cctx)
@@@ -1343,8 -1213,12 +1344,12 @@@
  		}
  	}
  	cctx->sesscount++;
 -	spin_unlock(&cctx->lock);
 +	spin_unlock_irqrestore(&cctx->lock, flags);
- 	dma_set_mask(dev, DMA_BIT_MASK(32));
+ 	rc = dma_set_mask(dev, DMA_BIT_MASK(32));
+ 	if (rc) {
+ 		dev_err(dev, "32-bit DMA enable failed\n");
+ 		return rc;
+ 	}
  
  	return 0;
  }
diff --cc drivers/misc/habanalabs/goya/goya.c
index 5100dfbf3acc,3c509e19d69d..bde11fc2c251
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@@ -1447,16 -1688,13 +1447,15 @@@ static void goya_init_golden_registers(
  
  	/*
  	 * Workaround for H2 #HW-23 bug
- 	 * Set DMA max outstanding read requests to 240 on DMA CH 1. Set it
- 	 * to 16 on KMD DMA
- 	 * We need to limit only these DMAs because the user can only read
+ 	 * Set DMA max outstanding read requests to 240 on DMA CH 1.
+ 	 * This limitation is still large enough to not affect Gen4 bandwidth.
+ 	 * We need to only limit that DMA channel because the user can only read
  	 * from Host using DMA CH 1
  	 */
- 	WREG32(mmDMA_CH_0_CFG0, 0x0fff0010);
  	WREG32(mmDMA_CH_1_CFG0, 0x0fff00F0);
  
 +	WREG32(mmTPC_PLL_CLK_RLX_0, 0x200020);
 +
  	goya->hw_cap_initialized |= HW_CAP_GOLDEN;
  }