Skip to content

Commit

Permalink
can: flexcan: flexcan_get_berr_counter(): switch on clocks before acc…
Browse files Browse the repository at this point in the history
…essing ecr register

The funcion flexcan_get_berr_counter() may be called from userspace even if the
interface is down, this the clocks are disabled. This patch switches on the
clocks before accessing the ecr register.

Reported-by: Ashutosh Singh <ashuleapyear@gmail.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Stefan Agner authored and Marc Kleine-Budde committed Aug 17, 2014
1 parent 4ade6fe commit ec56acf
Showing 1 changed file with 27 additions and 3 deletions.
30 changes: 27 additions & 3 deletions drivers/net/can/flexcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,9 @@ static int flexcan_chip_softreset(struct flexcan_priv *priv)
return 0;
}

static int flexcan_get_berr_counter(const struct net_device *dev,
struct can_berr_counter *bec)

static int __flexcan_get_berr_counter(const struct net_device *dev,
struct can_berr_counter *bec)
{
const struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->base;
Expand All @@ -391,6 +392,29 @@ static int flexcan_get_berr_counter(const struct net_device *dev,
return 0;
}

static int flexcan_get_berr_counter(const struct net_device *dev,
struct can_berr_counter *bec)
{
const struct flexcan_priv *priv = netdev_priv(dev);
int err;

err = clk_prepare_enable(priv->clk_ipg);
if (err)
return err;

err = clk_prepare_enable(priv->clk_per);
if (err)
goto out_disable_ipg;

err = __flexcan_get_berr_counter(dev, bec);

clk_disable_unprepare(priv->clk_per);
out_disable_ipg:
clk_disable_unprepare(priv->clk_ipg);

return err;
}

static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
const struct flexcan_priv *priv = netdev_priv(dev);
Expand Down Expand Up @@ -503,7 +527,7 @@ static void do_state(struct net_device *dev,
struct flexcan_priv *priv = netdev_priv(dev);
struct can_berr_counter bec;

flexcan_get_berr_counter(dev, &bec);
__flexcan_get_berr_counter(dev, &bec);

switch (priv->can.state) {
case CAN_STATE_ERROR_ACTIVE:
Expand Down

0 comments on commit ec56acf

Please sign in to comment.