mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
char/misc fixes for 5.1-rc6
Here are 4 small misc driver fixes for 5.1-rc6. Nothing major at all, they fix up a Kconfig issues, a SPDX invalid license tag, and 2 tiny bugfixes. All have been in linux-next for a while with no reported issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCXLm6yw8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ykBXQCgok0WblimRO9jTDQul7JXTxwZyxMAoMU841gi WPjtj2t1aqbxn8IdJPP/ =bIbF -----END PGP SIGNATURE----- Merge tag 'char-misc-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc fixes from Greg KH: "Here are four small misc driver fixes for 5.1-rc6. Nothing major at all, they fix up a Kconfig issues, a SPDX invalid license tag, and two tiny bugfixes. All have been in linux-next for a while with no reported issues" * tag 'char-misc-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: drivers: power: supply: goldfish_battery: Fix bogus SPDX identifier extcon: ptn5150: fix COMPILE_TEST dependencies misc: fastrpc: add checked value for dma_set_mask habanalabs: remove low credit limit of DMA #0
This commit is contained in:
commit
f9764dd4d3
4 changed files with 12 additions and 8 deletions
|
@ -116,7 +116,7 @@ config EXTCON_PALMAS
|
|||
|
||||
config EXTCON_PTN5150
|
||||
tristate "NXP PTN5150 CC LOGIC USB EXTCON support"
|
||||
depends on I2C && GPIOLIB || COMPILE_TEST
|
||||
depends on I2C && (GPIOLIB || COMPILE_TEST)
|
||||
select REGMAP_I2C
|
||||
help
|
||||
Say Y here to enable support for USB peripheral and USB host
|
||||
|
|
|
@ -1184,6 +1184,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
|
|||
struct fastrpc_session_ctx *sess;
|
||||
struct device *dev = &pdev->dev;
|
||||
int i, sessions = 0;
|
||||
int rc;
|
||||
|
||||
cctx = dev_get_drvdata(dev->parent);
|
||||
if (!cctx)
|
||||
|
@ -1213,7 +1214,11 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
|
|||
}
|
||||
cctx->sesscount++;
|
||||
spin_unlock(&cctx->lock);
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -1688,12 +1688,11 @@ static void goya_init_golden_registers(struct hl_device *hdev)
|
|||
|
||||
/*
|
||||
* 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);
|
||||
|
||||
goya->hw_cap_initialized |= HW_CAP_GOLDEN;
|
||||
|
@ -3693,7 +3692,7 @@ static int goya_validate_dma_pkt_mmu(struct hl_device *hdev,
|
|||
* WA for HW-23.
|
||||
* We can't allow user to read from Host using QMANs other than 1.
|
||||
*/
|
||||
if (parser->hw_queue_id > GOYA_QUEUE_ID_DMA_1 &&
|
||||
if (parser->hw_queue_id != GOYA_QUEUE_ID_DMA_1 &&
|
||||
hl_mem_area_inside_range(le64_to_cpu(user_dma_pkt->src_addr),
|
||||
le32_to_cpu(user_dma_pkt->tsize),
|
||||
hdev->asic_prop.va_space_host_start_address,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// SPDX-License-Identifier: GPL
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Power supply driver for the goldfish emulator
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue