Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-can-fixes-for-6.9-20240319

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEUEC6huC2BN0pvD5fKDiiPnotvG8FAmX5oKATHG1rbEBwZW5n
 dXRyb25peC5kZQAKCRAoOKI+ei28b6tTB/4gBx9ZhrhPyI7FZ52adjVwxvtcnaWX
 ifXhPU3/JL2CIMfW84bcp+6OSI/6F0nY7ZxgKBFx/7dWgWHNHDIaj/N0yvTH+Tqk
 nDOWs36JvA2VzaANG9tOW7rjFKcGTzVJYJAP/zbVyOKmSN81r30tRogODUI4Tr7X
 C5BxaBOpe0bUAi+O5cmbuTpFOzKO8/xAjq4rZm1/ix2ELetk91BPO305/nuWa6Qy
 5m+WZ/5ec23wwJACmPOenIcHt/d6KJ9ew0XnatazasfmWeqZovbyrB19Yhi2kD+d
 6o73120o27PCe9cQy09mOEOeISUmuCufp31u+xOGl7Hn9+G0lydbEUHs
 =SXTQ
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2024-03-20

this is a pull request of 1 patch for net/master.

Martin Jocić contributes a fix for the kvaser_pciefd driver, so that
up to 8 channels on the Xilinx-based adapters can be used. This issue
has been introduced in net-next for v6.9.

linux-can-fixes-for-6.9-20240319

* tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: kvaser_pciefd: Add additional Xilinx interrupts
====================

Link: https://lore.kernel.org/r/20240320112144.582741-1-mkl@pengutronix.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni 2024-03-21 12:59:04 +01:00
commit f411e25005
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/can/kvaser_pciefd.c
View File

@ -370,8 +370,8 @@ static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = {
static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = {
.kcan_rx0 = BIT(4),
.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) },
.all = GENMASK(19, 16) | BIT(4),
.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) },
.all = GENMASK(23, 16) | BIT(4),
};
static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = {