* [PATCH net 0/1] pull-request: can 2024-03-20
@ 2024-03-20 10:50 Marc Kleine-Budde
2024-03-20 10:50 ` [PATCH net] can: kvaser_pciefd: Add additional Xilinx interrupts Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2024-03-20 10:50 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello netdev-team,
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.
regards,
Marc
---
The following changes since commit e54e09c05c00120cbe817bdb037088035be4bd79:
net: remove {revc,send}msg_copy_msghdr() from exports (2024-03-14 16:48:53 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-6.9-20240319
for you to fetch changes up to af1752ecdc9c665b72fbe2cef9035a6cba34b473:
can: kvaser_pciefd: Add additional Xilinx interrupts (2024-03-19 15:26:01 +0100)
----------------------------------------------------------------
linux-can-fixes-for-6.9-20240319
----------------------------------------------------------------
Martin Jocić (1):
can: kvaser_pciefd: Add additional Xilinx interrupts
drivers/net/can/kvaser_pciefd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH net] can: kvaser_pciefd: Add additional Xilinx interrupts 2024-03-20 10:50 [PATCH net 0/1] pull-request: can 2024-03-20 Marc Kleine-Budde @ 2024-03-20 10:50 ` Marc Kleine-Budde 2024-03-21 12:20 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 3+ messages in thread From: Marc Kleine-Budde @ 2024-03-20 10:50 UTC (permalink / raw) To: netdev; +Cc: davem, kuba, linux-can, kernel, Martin Jocić, Marc Kleine-Budde From: Martin Jocić <martin.jocic@kvaser.com> Since Xilinx-based adapters now support up to eight CAN channels, the TX interrupt mask array must have eight elements. Signed-off-by: Martin Jocic <martin.jocic@kvaser.com> Link: https://lore.kernel.org/all/2ab3c0585c3baba272ede0487182a423a420134b.camel@kvaser.com Fixes: 9b221ba452aa ("can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN") [mkl: replace Link by Fixes tag] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/kvaser_pciefd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index f81b598147b3..7b5028b67cd5 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -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 = { base-commit: e54e09c05c00120cbe817bdb037088035be4bd79 -- 2.43.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] can: kvaser_pciefd: Add additional Xilinx interrupts 2024-03-20 10:50 ` [PATCH net] can: kvaser_pciefd: Add additional Xilinx interrupts Marc Kleine-Budde @ 2024-03-21 12:20 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 3+ messages in thread From: patchwork-bot+netdevbpf @ 2024-03-21 12:20 UTC (permalink / raw) To: Marc Kleine-Budde; +Cc: netdev, davem, kuba, linux-can, kernel, martin.jocic Hello: This patch was applied to netdev/net.git (main) by Marc Kleine-Budde <mkl@pengutronix.de>: On Wed, 20 Mar 2024 11:50:26 +0100 you wrote: > From: Martin Jocić <martin.jocic@kvaser.com> > > Since Xilinx-based adapters now support up to eight CAN channels, the > TX interrupt mask array must have eight elements. > > Signed-off-by: Martin Jocic <martin.jocic@kvaser.com> > Link: https://lore.kernel.org/all/2ab3c0585c3baba272ede0487182a423a420134b.camel@kvaser.com > Fixes: 9b221ba452aa ("can: kvaser_pciefd: Add support for Kvaser PCIe 8xCAN") > [mkl: replace Link by Fixes tag] > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > [...] Here is the summary with links: - [net] can: kvaser_pciefd: Add additional Xilinx interrupts https://git.kernel.org/netdev/net/c/af1752ecdc9c You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-21 12:20 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-03-20 10:50 [PATCH net 0/1] pull-request: can 2024-03-20 Marc Kleine-Budde 2024-03-20 10:50 ` [PATCH net] can: kvaser_pciefd: Add additional Xilinx interrupts Marc Kleine-Budde 2024-03-21 12:20 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).