* pull-request: can 2021-08-10
@ 2021-08-10 6:37 Marc Kleine-Budde
2021-08-10 6:37 ` [PATCH net 1/2] MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo Marc Kleine-Budde
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2021-08-10 6:37 UTC (permalink / raw)
To: netdev; +Cc: davem, kuba, linux-can, kernel
Hello Jakub, hello David,
this is a pull request of 2 patches for net/master.
Baruch Siach's patch fixes a typo for the Microchip CAN BUS Analyzer
Tool entry in the MAINTAINERS file.
Hussein Alasadi fixes the setting of the M_CAN_DBTP register in the
m_can driver. The regression git mainline in v5.14-rc1, so no backport
to stable is needed.
regards,
Marc
---
The following changes since commit 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f:
bareudp: Fix invalid read beyond skb's linear data (2021-08-09 15:37:43 -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-5.14-20210810
for you to fetch changes up to aae32b784ebdbda6f6055a8021c9fb8a0ab5bcba:
can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register (2021-08-10 08:10:27 +0200)
----------------------------------------------------------------
linux-can-fixes-for-5.14-20210810
----------------------------------------------------------------
Baruch Siach (1):
MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo
Hussein Alasadi (1):
can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register
MAINTAINERS | 2 +-
drivers/net/can/m_can/m_can.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net 1/2] MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo 2021-08-10 6:37 pull-request: can 2021-08-10 Marc Kleine-Budde @ 2021-08-10 6:37 ` Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register Marc Kleine-Budde 2021-08-10 9:00 ` pull-request: can 2021-08-10 patchwork-bot+netdevbpf 2 siblings, 0 replies; 4+ messages in thread From: Marc Kleine-Budde @ 2021-08-10 6:37 UTC (permalink / raw) To: netdev; +Cc: davem, kuba, linux-can, kernel, Baruch Siach, Marc Kleine-Budde From: Baruch Siach <baruch@tkos.co.il> This patch fixes the abbreviated name of the Microchip CAN BUS Analyzer Tool. Fixes: 8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver") Link: https://lore.kernel.org/r/cc4831cb1c8759c15fb32c21fd326e831183733d.1627876781.git.baruch@tkos.co.il Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index c9467d2839f5..25dc566a67c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11327,7 +11327,7 @@ W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git F: drivers/media/radio/radio-maxiradio* -MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER +MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER R: Yasushi SHOJI <yashi@spacecubics.com> L: linux-can@vger.kernel.org S: Maintained base-commit: 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f -- 2.30.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net 2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register 2021-08-10 6:37 pull-request: can 2021-08-10 Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 1/2] MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo Marc Kleine-Budde @ 2021-08-10 6:37 ` Marc Kleine-Budde 2021-08-10 9:00 ` pull-request: can 2021-08-10 patchwork-bot+netdevbpf 2 siblings, 0 replies; 4+ messages in thread From: Marc Kleine-Budde @ 2021-08-10 6:37 UTC (permalink / raw) To: netdev Cc: davem, kuba, linux-can, kernel, Hussein Alasadi, Torin Cooper-Bennun, Chandrasekar Ramakrishnan, Marc Kleine-Budde From: Hussein Alasadi <alasadi@arecs.eu> This patch fixes the setting of the M_CAN_DBTP register contents: - use DBTP_ (the data bitrate macros) instead of NBTP_ which area used for the nominal bitrate - do not overwrite possibly-existing DBTP_TDC flag by ORing reg_btp instead of overwriting Link: https://lore.kernel.org/r/FRYP281MB06140984ABD9994C0AAF7433D1F69@FRYP281MB0614.DEUP281.PROD.OUTLOOK.COM Fixes: 20779943a080 ("can: m_can: use bits.h macros for all regmasks") Cc: Torin Cooper-Bennun <torin@maxiluxsystems.com> Cc: Chandrasekar Ramakrishnan <rcsekar@samsung.com> Signed-off-by: Hussein Alasadi <alasadi@arecs.eu> [mkl: update patch description, update indention] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/m_can/m_can.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index bba2a449ac70..43bca315a66c 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1164,10 +1164,10 @@ static int m_can_set_bittiming(struct net_device *dev) FIELD_PREP(TDCR_TDCO_MASK, tdco)); } - reg_btp = FIELD_PREP(NBTP_NBRP_MASK, brp) | - FIELD_PREP(NBTP_NSJW_MASK, sjw) | - FIELD_PREP(NBTP_NTSEG1_MASK, tseg1) | - FIELD_PREP(NBTP_NTSEG2_MASK, tseg2); + reg_btp |= FIELD_PREP(DBTP_DBRP_MASK, brp) | + FIELD_PREP(DBTP_DSJW_MASK, sjw) | + FIELD_PREP(DBTP_DTSEG1_MASK, tseg1) | + FIELD_PREP(DBTP_DTSEG2_MASK, tseg2); m_can_write(cdev, M_CAN_DBTP, reg_btp); } -- 2.30.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: pull-request: can 2021-08-10 2021-08-10 6:37 pull-request: can 2021-08-10 Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 1/2] MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register Marc Kleine-Budde @ 2021-08-10 9:00 ` patchwork-bot+netdevbpf 2 siblings, 0 replies; 4+ messages in thread From: patchwork-bot+netdevbpf @ 2021-08-10 9:00 UTC (permalink / raw) To: Marc Kleine-Budde; +Cc: netdev, davem, kuba, linux-can, kernel Hello: This pull request was applied to netdev/net.git (refs/heads/master): On Tue, 10 Aug 2021 08:37:00 +0200 you wrote: > Hello Jakub, hello David, > > this is a pull request of 2 patches for net/master. > > Baruch Siach's patch fixes a typo for the Microchip CAN BUS Analyzer > Tool entry in the MAINTAINERS file. > > [...] Here is the summary with links: - pull-request: can 2021-08-10 https://git.kernel.org/netdev/net/c/31782a01d14f - [net,2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register https://git.kernel.org/netdev/net/c/aae32b784ebd 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] 4+ messages in thread
end of thread, other threads:[~2021-08-10 9:00 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-08-10 6:37 pull-request: can 2021-08-10 Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 1/2] MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo Marc Kleine-Budde 2021-08-10 6:37 ` [PATCH net 2/2] can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register Marc Kleine-Budde 2021-08-10 9:00 ` pull-request: can 2021-08-10 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).