Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
-8
+1
-1
drivers/extcon/Kconfig
+1
-1
drivers/extcon/Kconfig
···
116
116
117
117
config EXTCON_PTN5150
118
118
tristate "NXP PTN5150 CC LOGIC USB EXTCON support"
119
-
depends on I2C && GPIOLIB || COMPILE_TEST
119
+
depends on I2C && (GPIOLIB || COMPILE_TEST)
120
120
select REGMAP_I2C
121
121
help
122
122
Say Y here to enable support for USB peripheral and USB host
+6
-1
drivers/misc/fastrpc.c
+6
-1
drivers/misc/fastrpc.c
···
1184
1184
struct fastrpc_session_ctx *sess;
1185
1185
struct device *dev = &pdev->dev;
1186
1186
int i, sessions = 0;
1187
+
int rc;
1187
1188
1188
1189
cctx = dev_get_drvdata(dev->parent);
1189
1190
if (!cctx)
···
1214
1213
}
1215
1214
cctx->sesscount++;
1216
1215
spin_unlock(&cctx->lock);
1217
-
dma_set_mask(dev, DMA_BIT_MASK(32));
1216
+
rc = dma_set_mask(dev, DMA_BIT_MASK(32));
1217
+
if (rc) {
1218
+
dev_err(dev, "32-bit DMA enable failed\n");
1219
+
return rc;
1220
+
}
1218
1221
1219
1222
return 0;
1220
1223
}
+4
-5
drivers/misc/habanalabs/goya/goya.c
+4
-5
drivers/misc/habanalabs/goya/goya.c
···
1688
1688
1689
1689
/*
1690
1690
* Workaround for H2 #HW-23 bug
1691
-
* Set DMA max outstanding read requests to 240 on DMA CH 1. Set it
1692
-
* to 16 on KMD DMA
1693
-
* We need to limit only these DMAs because the user can only read
1691
+
* Set DMA max outstanding read requests to 240 on DMA CH 1.
1692
+
* This limitation is still large enough to not affect Gen4 bandwidth.
1693
+
* We need to only limit that DMA channel because the user can only read
1694
1694
* from Host using DMA CH 1
1695
1695
*/
1696
-
WREG32(mmDMA_CH_0_CFG0, 0x0fff0010);
1697
1696
WREG32(mmDMA_CH_1_CFG0, 0x0fff00F0);
1698
1697
1699
1698
goya->hw_cap_initialized |= HW_CAP_GOLDEN;
···
3692
3693
* WA for HW-23.
3693
3694
* We can't allow user to read from Host using QMANs other than 1.
3694
3695
*/
3695
-
if (parser->hw_queue_id > GOYA_QUEUE_ID_DMA_1 &&
3696
+
if (parser->hw_queue_id != GOYA_QUEUE_ID_DMA_1 &&
3696
3697
hl_mem_area_inside_range(le64_to_cpu(user_dma_pkt->src_addr),
3697
3698
le32_to_cpu(user_dma_pkt->tsize),
3698
3699
hdev->asic_prop.va_space_host_start_address,