Skip to contentSkip to conversation

pull-request: can 2021-08-10

PATCH New Marc Kleine-Budde 2 participants 4 messages Aug 10, 2021

Subsystems (4)
lore
Share & tools
lore

Marc Kleine-Budde

author maintainer
#0 lore raw

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(-)
author maintainer
#1 lore raw

PATCH 1/2 MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo

From: Baruch Siach <[email protected]>

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")
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index c9467d2839f5..25dc566a67c1 100644
@@ -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 <[email protected]>
 L:	[email protected]
 S:	Maintained

base-commit: 143a8526ab5fd4f8a0c4fe2a9cb28c181dc5a95f

Signature · 1 line
2.30.2
author maintainer
#2 lore raw

PATCH 2/2 can: m_can: m_can_set_bittiming(): fix setting M_CAN_DBTP register

In reply to Marc Kleine-Budde

From: Hussein Alasadi <[email protected]>

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

Fixes 20779943a080 ("can: m_can: use bits.h macros for all regmasks")
Cc Torin Cooper-Bennun <[email protected]>
Cc Chandrasekar Ramakrishnan <[email protected]>
[mkl: update patch description, update indention]
---
 drivers/net/can/m_can/m_can.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/can/m_can/m_can.c +4 -4
index bba2a449ac70..43bca315a66c 100644
@@ -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);
 	}
Signature · 1 line
2.30.2
#3 lore raw
In reply to Marc Kleine-Budde
This pull request was applied to netdev/net.git (refs/heads/master):

Hello:

This pull request was applied to netdev/net.git (refs/heads/master):

Quoted 8 lines · 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