forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/net/can/rcar/rcar_canfd.c
....@@ -1,11 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0+
12 /* Renesas R-Car CAN FD device driver
23  *
34  * Copyright (C) 2015 Renesas Electronics Corp.
4
- *
5
- * This program is free software; you can redistribute  it and/or modify it
6
- * under  the terms of  the GNU General  Public License as published by the
7
- * Free Software Foundation;  either version 2 of the  License, or (at your
8
- * option) any later version.
95  */
106 
117 /* The R-Car CAN FD controller can operate in either one of the below two modes
....@@ -1079,7 +1075,7 @@
10791075 	struct rcar_canfd_global *gpriv = dev_id;
10801076 	struct net_device *ndev;
10811077 	struct rcar_canfd_channel *priv;
1082
-	u32 sts, gerfl;
1078
+	u32 sts, cc, gerfl;
10831079 	u32 ch, ridx;
10841080 
10851081 	/* Global error interrupts still indicate a condition specific
....@@ -1097,7 +1093,9 @@
10971093 
10981094 		/* Handle Rx interrupts */
10991095 		sts = rcar_canfd_read(priv->base, RCANFD_RFSTS(ridx));
1100
-		if (likely(sts & RCANFD_RFSTS_RFIF)) {
1096
+		cc = rcar_canfd_read(priv->base, RCANFD_RFCC(ridx));
1097
+		if (likely(sts & RCANFD_RFSTS_RFIF &&
1098
+			   cc & RCANFD_RFCC_RFIE)) {
11011099 			if (napi_schedule_prep(&priv->napi)) {
11021100 				/* Disable Rx FIFO interrupts */
11031101 				rcar_canfd_clear_bit(priv->base,
....@@ -1602,15 +1600,15 @@
16021600 
16031601 	netif_napi_add(ndev, &priv->napi, rcar_canfd_rx_poll,
16041602 		       RCANFD_NAPI_WEIGHT);
1603
+	spin_lock_init(&priv->tx_lock);
1604
+	devm_can_led_init(ndev);
1605
+	gpriv->ch[priv->channel] = priv;
16051606 	err = register_candev(ndev);
16061607 	if (err) {
16071608 		dev_err(&pdev->dev,
16081609 			"register_candev() failed, error %d\n", err);
16091610 		goto fail_candev;
16101611 	}
1611
-	spin_lock_init(&priv->tx_lock);
1612
-	devm_can_led_init(ndev);
1613
-	gpriv->ch[priv->channel] = priv;
16141612 	dev_info(&pdev->dev, "device registered (channel %u)\n", priv->channel);
16151613 	return 0;
16161614 
....@@ -1634,7 +1632,6 @@
16341632 
16351633 static int rcar_canfd_probe(struct platform_device *pdev)
16361634 {
1637
-	struct resource *mem;
16381635 	void __iomem *addr;
16391636 	u32 sts, ch, fcan_freq;
16401637 	struct rcar_canfd_global *gpriv;
....@@ -1656,14 +1653,12 @@
16561653 
16571654 	ch_irq = platform_get_irq(pdev, 0);
16581655 	if (ch_irq < 0) {
1659
-		dev_err(&pdev->dev, "no Channel IRQ resource\n");
16601656 		err = ch_irq;
16611657 		goto fail_dev;
16621658 	}
16631659 
16641660 	g_irq = platform_get_irq(pdev, 1);
16651661 	if (g_irq < 0) {
1666
-		dev_err(&pdev->dev, "no Global IRQ resource\n");
16671662 		err = g_irq;
16681663 		goto fail_dev;
16691664 	}
....@@ -1710,8 +1705,7 @@
17101705 		/* CANFD clock is further divided by (1/2) within the IP */
17111706 		fcan_freq /= 2;
17121707 
1713
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1714
-	addr = devm_ioremap_resource(&pdev->dev, mem);
1708
+	addr = devm_platform_ioremap_resource(pdev, 0);
17151709 	if (IS_ERR(addr)) {
17161710 		err = PTR_ERR(addr);
17171711 		goto fail_dev;