From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Angelo Dureghello <angelo@kernel-space.org>, netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de
Subject: Re: [net 05/11] can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate
Date: Tue, 16 Mar 2021 10:12:16 +0100 [thread overview]
Message-ID: <32b7bf35-e9b1-441f-d7f4-db297ad4d1b0@pengutronix.de> (raw)
In-Reply-To: <fc58e507-e04e-50bc-8817-2570365d96ca@kernel-space.org>
[-- Attachment #1.1: Type: text/plain, Size: 2221 bytes --]
On 3/16/21 10:02 AM, Angelo Dureghello wrote:
> Hi all,
>
> On 16/03/21 9:20 AM, Marc Kleine-Budde wrote:
>> From: Angelo Dureghello <angelo@kernel-space.org>
>>
>> For cases when flexcan is built-in, bitrate is still not set at
>> registering. So flexcan_chip_freeze() generates:
>>
>> [ 1.860000] *** ZERO DIVIDE *** FORMAT=4
>> [ 1.860000] Current process id is 1
>> [ 1.860000] BAD KERNEL TRAP: 00000000
>> [ 1.860000] PC: [<402e70c8>] flexcan_chip_freeze+0x1a/0xa8
>>
>> To allow chip freeze, using an hardcoded timeout when bitrate is still
>> not set.
>>
>> Fixes: ec15e27cc890 ("can: flexcan: enable RX FIFO after FRZ/HALT valid")
>> Link: https://lore.kernel.org/r/20210315231510.650593-1-angelo@kernel-space.org
>> Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>
>> [mkl: use if instead of ? operator]
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
>> ---
>> drivers/net/can/flexcan.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
>> index 134c05757a3b..57f3635ad8d7 100644
>> --- a/drivers/net/can/flexcan.c
>> +++ b/drivers/net/can/flexcan.c
>> @@ -697,9 +697,15 @@ static int flexcan_chip_disable(struct flexcan_priv *priv)
>> static int flexcan_chip_freeze(struct flexcan_priv *priv)
>> {
>> struct flexcan_regs __iomem *regs = priv->regs;
>> - unsigned int timeout = 1000 * 1000 * 10 / priv->can.bittiming.bitrate;
>> + unsigned int timeout;
>> + u32 bitrate = priv->can.bittiming.bitrate;
>> u32 reg;
>>
>> + if (bitrate)
>> + timeout = 1000 * 1000 * 10 / bitrate;
>> + else
>> + timeout = FLEXCAN_TIMEOUT_US / 10;
>> +
>> reg = priv->read(®s->mcr);
>> reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT;
>> priv->write(reg, ®s->mcr);
>
> ?
>
> Just curious, what's the issue with my "?" ?
Personal preference and readability.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-03-16 9:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 8:20 pull-request: can 2021-03-16 Marc Kleine-Budde
2021-03-16 8:20 ` [net 01/11] can: dev: Move device back to init netns on owning netns delete Marc Kleine-Budde
2021-03-16 21:16 ` Jakub Kicinski
2021-03-16 8:20 ` [net 02/11] can: isotp: isotp_setsockopt(): only allow to set low level TX flags for CAN-FD Marc Kleine-Budde
2021-03-16 8:20 ` [net 03/11] can: isotp: TX-path: ensure that CAN frame flags are initialized Marc Kleine-Budde
2021-03-18 10:11 ` Oliver Hartkopp
2021-03-16 8:20 ` [net 04/11] can: peak_usb: add forgotten supported devices Marc Kleine-Budde
2021-03-16 8:20 ` [net 05/11] can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate Marc Kleine-Budde
2021-03-16 9:02 ` Angelo Dureghello
2021-03-16 9:12 ` Marc Kleine-Budde [this message]
2021-03-16 8:20 ` [net 06/11] can: kvaser_pciefd: Always disable bus load reporting Marc Kleine-Budde
2021-03-16 8:21 ` [net 07/11] can: kvaser_usb: Add support for USBcan Pro 4xHS Marc Kleine-Budde
2021-03-16 8:21 ` [net 08/11] can: c_can_pci: c_can_pci_remove(): fix use-after-free Marc Kleine-Budde
2021-03-16 8:21 ` [net 09/11] can: c_can: move runtime PM enable/disable to c_can_platform Marc Kleine-Budde
2021-03-16 8:21 ` [net 10/11] can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning Marc Kleine-Budde
2021-03-16 8:21 ` [net 11/11] can: m_can: m_can_rx_peripheral(): fix RX being blocked by errors Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32b7bf35-e9b1-441f-d7f4-db297ad4d1b0@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=angelo@kernel-space.org \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).