Skip to content

net: use bps units for bitrate in SocketCAN interfaces. #16225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

net: use bps units for bitrate in SocketCAN interfaces. #16225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions arch/arm/src/imx9/imx9_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,11 +1549,11 @@ static int imx9_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
if (priv->canfd_capable)
{
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
}
else
Expand All @@ -1572,7 +1572,7 @@ static int imx9_ioctl(struct net_driver_s *dev, int cmd,
(struct can_ioctl_data_s *)((uintptr_t)arg);

struct flexcan_timeseg arbi_timing;
arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;

if (imx9_bitratetotimeseg(&arbi_timing, 10, 0))
Expand All @@ -1586,7 +1586,7 @@ static int imx9_ioctl(struct net_driver_s *dev, int cmd,

if (priv->canfd_capable)
{
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;

if (ret == OK && imx9_bitratetotimeseg(&data_timing, 10, 1))
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/imxrt/imxrt_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,11 +1517,11 @@ static int imxrt_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
if (priv->canfd_capable)
{
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
}
else
Expand All @@ -1540,7 +1540,7 @@ static int imxrt_ioctl(struct net_driver_s *dev, int cmd,
(struct can_ioctl_data_s *)((uintptr_t)arg);

struct flexcan_timeseg arbi_timing;
arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;

if (imxrt_bitratetotimeseg(&arbi_timing, 10, 0))
Expand All @@ -1554,7 +1554,7 @@ static int imxrt_ioctl(struct net_driver_s *dev, int cmd,

if (priv->canfd_capable)
{
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;

if (ret == OK && imxrt_bitratetotimeseg(&data_timing, 10, 1))
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/kinetis/kinetis_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,10 +1485,10 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
#ifdef CONFIG_NET_CAN_CANFD
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
#else
req->data_bitrate = 0;
Expand All @@ -1504,7 +1504,7 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd,
(struct can_ioctl_data_s *)((uintptr_t)arg);

struct flexcan_timeseg arbi_timing;
arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;

if (kinetis_bitratetotimeseg(&arbi_timing, 10, 0))
Expand All @@ -1518,7 +1518,7 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd,

#ifdef CONFIG_NET_CAN_CANFD
struct flexcan_timeseg data_timing;
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;

if (ret == OK && kinetis_bitratetotimeseg(&data_timing, 10, 1))
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/s32k1xx/s32k1xx_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,10 +1468,10 @@ static int s32k1xx_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
#ifdef CONFIG_NET_CAN_CANFD
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
#else
req->data_bitrate = 0;
Expand All @@ -1487,7 +1487,7 @@ static int s32k1xx_ioctl(struct net_driver_s *dev, int cmd,
(struct can_ioctl_data_s *)((uintptr_t)arg);

struct flexcan_timeseg arbi_timing;
arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;

if (s32k1xx_bitratetotimeseg(&arbi_timing, 10, 0))
Expand All @@ -1501,7 +1501,7 @@ static int s32k1xx_ioctl(struct net_driver_s *dev, int cmd,

#ifdef CONFIG_NET_CAN_CANFD
struct flexcan_timeseg data_timing;
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;

if (ret == OK && s32k1xx_bitratetotimeseg(&data_timing, 10, 1))
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/s32k3xx/s32k3xx_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,10 +1657,10 @@ static int s32k3xx_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
#ifdef CONFIG_NET_CAN_CANFD
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
#else
req->data_bitrate = 0;
Expand All @@ -1676,7 +1676,7 @@ static int s32k3xx_ioctl(struct net_driver_s *dev, int cmd,
(struct can_ioctl_data_s *)((uintptr_t)arg);

struct flexcan_timeseg arbi_timing;
arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;

if (s32k3xx_bitratetotimeseg(&arbi_timing, 10, 0,
Expand All @@ -1691,7 +1691,7 @@ static int s32k3xx_ioctl(struct net_driver_s *dev, int cmd,

#ifdef CONFIG_NET_CAN_CANFD
struct flexcan_timeseg data_timing;
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;

if (ret == OK && s32k3xx_bitratetotimeseg(&data_timing, 10, 1,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/stm32h7/stm32_fdcan_sock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,9 +1951,9 @@ static int fdcan_netdev_ioctl(struct net_driver_s *dev, int cmd,
{
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
#ifdef CONFIG_NET_CAN_CANFD
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
#else
req->data_bitrate = 0;
#endif
Expand All @@ -1968,9 +1968,9 @@ static int fdcan_netdev_ioctl(struct net_driver_s *dev, int cmd,

/* Apply the new timings (interface is guaranteed to be down) */

priv->arbi_timing.bitrate = req->arbi_bitrate * 1000;
priv->arbi_timing.bitrate = req->arbi_bitrate;
#ifdef CONFIG_NET_CAN_CANFD
priv->data_timing.bitrate = req->data_bitrate * 1000;
priv->data_timing.bitrate = req->data_bitrate;
#endif
}
break;
Expand Down
8 changes: 4 additions & 4 deletions arch/arm64/src/imx9/imx9_flexcan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,11 +1597,11 @@ static int imx9_ioctl(struct net_driver_s *dev, int cmd,
struct imx9_driver_s *priv = (struct imx9_driver_s *)dev;
struct can_ioctl_data_s *req =
(struct can_ioctl_data_s *)((uintptr_t)arg);
req->arbi_bitrate = priv->arbi_timing.bitrate / 1000; /* kbit/s */
req->arbi_bitrate = priv->arbi_timing.bitrate;
req->arbi_samplep = priv->arbi_timing.samplep;
if (priv->canfd_capable)
{
req->data_bitrate = priv->data_timing.bitrate / 1000; /* kbit/s */
req->data_bitrate = priv->data_timing.bitrate;
req->data_samplep = priv->data_timing.samplep;
}
else
Expand All @@ -1622,12 +1622,12 @@ static int imx9_ioctl(struct net_driver_s *dev, int cmd,
struct flexcan_timeseg arbi_timing;
struct flexcan_timeseg data_timing;

arbi_timing.bitrate = req->arbi_bitrate * 1000;
arbi_timing.bitrate = req->arbi_bitrate;
arbi_timing.samplep = req->arbi_samplep;
ret = imx9_bitratetotimeseg(priv, &arbi_timing, false);
if (ret == OK && priv->canfd_capable)
{
data_timing.bitrate = req->data_bitrate * 1000;
data_timing.bitrate = req->data_bitrate;
data_timing.samplep = req->data_samplep;
ret = imx9_bitratetotimeseg(priv, &data_timing, true);
}
Expand Down
4 changes: 2 additions & 2 deletions include/net/if.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ struct mii_ioctl_data_s

struct can_ioctl_data_s
{
uint16_t arbi_bitrate; /* Classic CAN / Arbitration phase bitrate kbit/s */
uint32_t arbi_bitrate; /* Classic CAN / Arbitration phase bitrate bit/s */
uint16_t arbi_samplep; /* Classic CAN / Arbitration phase input % */
uint16_t data_bitrate; /* Data phase bitrate kbit/s */
uint32_t data_bitrate; /* Data phase bitrate bit/s */
uint16_t data_samplep; /* Data phase sample point % */
};

Expand Down
Loading