UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

can: m_can: Avoid reading irqstatus twice 

For peripheral devices the m_can_rx_handler is called directly after
setting cdev->irqstatus. This means we don't have to read the irqstatus
again in m_can_rx_handler. Avoid this by adding a parameter that is
false for direct calls.

Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
Link: https://lore.kernel.org/all/20221206115728.1056014-3-msp@baylibre.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Markus Schneider-Pargmann 2022-12-06 12:57:19 +01:00 committed by Marc Kleine-Budde
parent c1eaf8b9bd
commit 5775793797
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/can/m_can/m_can.c
View File

@ -905,14 +905,13 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,
return work_done; return work_done;
} }
static int m_can_rx_handler(struct net_device *dev, int quota) static int m_can_rx_handler(struct net_device *dev, int quota, u32 irqstatus)
{ {
struct m_can_classdev *cdev = netdev_priv(dev); struct m_can_classdev *cdev = netdev_priv(dev);
int rx_work_or_err; int rx_work_or_err;
int work_done = 0; int work_done = 0;
u32 irqstatus, psr; u32 psr;
irqstatus = cdev->irqstatus | m_can_read(cdev, M_CAN_IR);
if (!irqstatus) if (!irqstatus)
goto end; goto end;
@ -956,12 +955,12 @@ end:
return work_done; return work_done;
} }
static int m_can_rx_peripheral(struct net_device *dev) static int m_can_rx_peripheral(struct net_device *dev, u32 irqstatus)
{ {
struct m_can_classdev *cdev = netdev_priv(dev); struct m_can_classdev *cdev = netdev_priv(dev);
int work_done; int work_done;
work_done = m_can_rx_handler(dev, NAPI_POLL_WEIGHT); work_done = m_can_rx_handler(dev, NAPI_POLL_WEIGHT, irqstatus);
/* Don't re-enable interrupts if the driver had a fatal error /* Don't re-enable interrupts if the driver had a fatal error
* (e.g., FIFO read failure). * (e.g., FIFO read failure).
@ -977,8 +976,11 @@ static int m_can_poll(struct napi_struct *napi, int quota)
struct net_device *dev = napi->dev; struct net_device *dev = napi->dev;
struct m_can_classdev *cdev = netdev_priv(dev); struct m_can_classdev *cdev = netdev_priv(dev);
int work_done; int work_done;
u32 irqstatus;
work_done = m_can_rx_handler(dev, quota); irqstatus = cdev->irqstatus | m_can_read(cdev, M_CAN_IR);
work_done = m_can_rx_handler(dev, quota, irqstatus);
/* Don't re-enable interrupts if the driver had a fatal error /* Don't re-enable interrupts if the driver had a fatal error
* (e.g., FIFO read failure). * (e.g., FIFO read failure).
@ -1088,7 +1090,7 @@ static irqreturn_t m_can_isr(int irq, void *dev_id)
m_can_disable_all_interrupts(cdev); m_can_disable_all_interrupts(cdev);
if (!cdev->is_peripheral) if (!cdev->is_peripheral)
napi_schedule(&cdev->napi); napi_schedule(&cdev->napi);
else if (m_can_rx_peripheral(dev) < 0) else if (m_can_rx_peripheral(dev, ir) < 0)
goto out_fail; goto out_fail;
} }