Merge tag 'linux-can-fixes-for-4.2-20150712' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says: ==================== pull-request: can 2015-07-12 this is a pull request of 8 patchs for net/master. Sergei Shtylyov contributes 5 patches for the rcar_can driver, fixing the IRQ check and several info and error messages. There are two patches by J.D. Schroeder and Roger Quadros for the c_can driver and dra7x-evm device tree, which precent a glitch in the DCAN1 pinmux. Oliver Hartkopp provides a better approach to make the CAN skbs unique, the timestamp is replaced by a counter. ====================

David S. Miller committed 11 years ago

Commit cee9f6d2 parents 76b63da d3b58c411 files · +42 −29Browse files

Unified · Split

11 files

arch/arm/boot/dts/dra7-evm.dts +3 −2
arch/arm/boot/dts/dra72-evm.dts +3 −2
drivers/net/can/c_can/c_can.c +8 −2
drivers/net/can/dev.c +2 −5
drivers/net/can/rcar_can.c +10 −6
drivers/net/can/slcan.c +1 −1
drivers/net/can/vcan.c +0 −3
include/linux/can/skb.h +2 −0
net/can/af_can.c +7 −5
net/can/bcm.c +2 −0
net/can/raw.c +4 −3

arch/arm/boot/dts/dra7-evm.dts+3−2

@@ -686,7 +686,8 @@ · 685 unmodified lines
686		686
687	&dcan1 {	687	&dcan1 {
688	status = "ok";	688	status = "ok";
689	pinctrl-names = "default", "sleep";	689	pinctrl-names = "default", "sleep", "active";
690	pinctrl-0 = <&dcan1_pins_default>;	690	pinctrl-0 = <&dcan1_pins_sleep>;
691	pinctrl-1 = <&dcan1_pins_sleep>;	691	pinctrl-1 = <&dcan1_pins_sleep>;
		692	pinctrl-2 = <&dcan1_pins_default>;
692	};	693	};

arch/arm/boot/dts/dra72-evm.dts+3−2

 &dcan1 {
 	status = "ok";
-	pinctrl-names = "default", "sleep";
+	pinctrl-names = "default", "sleep", "active";
-	pinctrl-0 = <&dcan1_pins_default>;
+	pinctrl-0 = <&dcan1_pins_sleep>;
 	pinctrl-1 = <&dcan1_pins_sleep>;
+	pinctrl-2 = <&dcan1_pins_default>;
 };
 &qspi {

drivers/net/can/c_can/c_can.c+8−2

 {
 	struct c_can_priv *priv = netdev_priv(dev);
 	int err;
+	struct pinctrl *p;
 	/* basic c_can configuration */
 	err = c_can_chip_config(dev);
 	priv->can.state = CAN_STATE_ERROR_ACTIVE;
-	/* activate pins */
+	/* Attempt to use "active" if available else use "default" */
-	pinctrl_pm_select_default_state(dev->dev.parent);
+	p = pinctrl_get_select(priv->device, "active");
+	if (!IS_ERR(p))
+		pinctrl_put(p);
+	else
+		pinctrl_pm_select_default_state(priv->device);
 	return 0;
 }

drivers/net/can/dev.c+2−5

 		struct can_frame *cf = (struct can_frame *)skb->data;
 		u8 dlc = cf->can_dlc;
-		if (!(skb->tstamp.tv64))
-			__net_timestamp(skb);
 		netif_rx(priv->echo_skb[idx]);
 		priv->echo_skb[idx] = NULL;
 	if (unlikely(!skb))
 		return NULL;
-	__net_timestamp(skb);
 	skb->protocol = htons(ETH_P_CAN);
 	skb->pkt_type = PACKET_BROADCAST;
 	skb->ip_summed = CHECKSUM_UNNECESSARY;
 	can_skb_reserve(skb);
 	can_skb_prv(skb)->ifindex = dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	*cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
 	memset(*cf, 0, sizeof(struct can_frame));
 	if (unlikely(!skb))
 		return NULL;
-	__net_timestamp(skb);
 	skb->protocol = htons(ETH_P_CANFD);
 	skb->pkt_type = PACKET_BROADCAST;
 	skb->ip_summed = CHECKSUM_UNNECESSARY;
 	can_skb_reserve(skb);
 	can_skb_prv(skb)->ifindex = dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	*cfd = (struct canfd_frame *)skb_put(skb, sizeof(struct canfd_frame));
 	memset(*cfd, 0, sizeof(struct canfd_frame));

drivers/net/can/rcar_can.c+10−6

 	err = clk_prepare_enable(priv->clk);
 	if (err) {
-		netdev_err(ndev, "failed to enable periperal clock, error %d\n",
+		netdev_err(ndev,
+			   "failed to enable peripheral clock, error %d\n",
 			   err);
 		goto out;
 	}
 	napi_enable(&priv->napi);
 	err = request_irq(ndev->irq, rcar_can_interrupt, 0, ndev->name, ndev);
 	if (err) {
-		netdev_err(ndev, "error requesting interrupt %x\n", ndev->irq);
+		netdev_err(ndev, "request_irq(%d) failed, error %d\n",
+			   ndev->irq, err);
 		goto out_close;
 	}
 	can_led_event(ndev, CAN_LED_EVENT_OPEN);
 	}
 	irq = platform_get_irq(pdev, 0);
-	if (!irq) {
+	if (irq < 0) {
 		dev_err(&pdev->dev, "No IRQ resource\n");
+		err = irq;
 		goto fail;
 	}
 	priv->clk = devm_clk_get(&pdev->dev, "clkp1");
 	if (IS_ERR(priv->clk)) {
 		err = PTR_ERR(priv->clk);
-		dev_err(&pdev->dev, "cannot get peripheral clock: %d\n", err);
+		dev_err(&pdev->dev, "cannot get peripheral clock, error %d\n",
+			err);
 		goto fail_clk;
 	}
 	priv->can_clk = devm_clk_get(&pdev->dev, clock_names[clock_select]);
 	if (IS_ERR(priv->can_clk)) {
 		err = PTR_ERR(priv->can_clk);
-		dev_err(&pdev->dev, "cannot get CAN clock: %d\n", err);
+		dev_err(&pdev->dev, "cannot get CAN clock, error %d\n", err);
 		goto fail_clk;
 	}
 	devm_can_led_init(ndev);
-	dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%u)\n",
+	dev_info(&pdev->dev, "device registered (regs @ %p, IRQ%d)\n",
 		 priv->regs, ndev->irq);
 	return 0;

drivers/net/can/slcan.c+1−1

 	if (!skb)
 		return;
-	__net_timestamp(skb);
 	skb->dev = sl->dev;
 	skb->protocol = htons(ETH_P_CAN);
 	skb->pkt_type = PACKET_BROADCAST;
 	can_skb_reserve(skb);
 	can_skb_prv(skb)->ifindex = sl->dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	memcpy(skb_put(skb, sizeof(struct can_frame)),
 	       &cf, sizeof(struct can_frame));

drivers/net/can/vcan.c+0−3

@@ -78,9 +78,6 @@ static void vcan_rx(struct sk_buff skb, struct net_device dev) · 77 unmodified lines
78	skb->dev = dev;	78	skb->dev = dev;
79	skb->ip_summed = CHECKSUM_UNNECESSARY;	79	skb->ip_summed = CHECKSUM_UNNECESSARY;
80		80
81	if (!(skb->tstamp.tv64))
82	__net_timestamp(skb);
83
84	netif_rx_ni(skb);	81	netif_rx_ni(skb);
85	}	82	}
86		83

include/linux/can/skb.h+2−0

 /**
  * struct can_skb_priv - private additional data inside CAN sk_buffs
  * @ifindex:	ifindex of the first interface the CAN frame appeared on
+ * @skbcnt:	atomic counter to have an unique id together with skb pointer
  * @cf:		align to the following CAN frame at skb->data
  */
 struct can_skb_priv {
 	int ifindex;
+	int skbcnt;
 	struct can_frame cf[0];
 };

net/can/af_can.c+7−5

 struct s_stats    can_stats;       /* packet statistics */
 struct s_pstats   can_pstats;      /* receive list statistics */
+static atomic_t skbcounter = ATOMIC_INIT(0);
 /*
  * af_can socket functions
  */
 		return err;
 	}
-	if (newskb) {
+	if (newskb)
-		if (!(newskb->tstamp.tv64))
-			__net_timestamp(newskb);
 		netif_rx_ni(newskb);
-	}
 	/* update statistics */
 	can_stats.tx_frames++;
 	can_stats.rx_frames++;
 	can_stats.rx_frames_delta++;
+	/* create non-zero unique skb identifier together with *skb */
+	while (!(can_skb_prv(skb)->skbcnt))
+		can_skb_prv(skb)->skbcnt = atomic_inc_return(&skbcounter);
 	rcu_read_lock();
 	/* deliver the packet to sockets listening on all devices */

net/can/bcm.c+2−0

 	can_skb_reserve(skb);
 	can_skb_prv(skb)->ifindex = dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	memcpy(skb_put(skb, CFSIZ), cf, CFSIZ);
 	}
 	can_skb_prv(skb)->ifindex = dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	skb->dev = dev;
 	can_skb_set_owner(skb, sk);
 	err = can_send(skb, 1); /* send with loopback */

net/can/raw.c+4−3

  */
 struct uniqframe {
-	ktime_t tstamp;
+	int skbcnt;
 	const struct sk_buff *skb;
 	unsigned int join_rx_count;
 };
 	/* eliminate multiple filter matches for the same skb */
 	if (this_cpu_ptr(ro->uniq)->skb == oskb &&
-	    ktime_equal(this_cpu_ptr(ro->uniq)->tstamp, oskb->tstamp)) {
+	    this_cpu_ptr(ro->uniq)->skbcnt == can_skb_prv(oskb)->skbcnt) {
 		if (ro->join_filters) {
 			this_cpu_inc(ro->uniq->join_rx_count);
 			/* drop frame until all enabled filters matched */
 		}
 	} else {
 		this_cpu_ptr(ro->uniq)->skb = oskb;
-		this_cpu_ptr(ro->uniq)->tstamp = oskb->tstamp;
+		this_cpu_ptr(ro->uniq)->skbcnt = can_skb_prv(oskb)->skbcnt;
 		this_cpu_ptr(ro->uniq)->join_rx_count = 1;
 		/* drop first frame to check all enabled filters? */
 		if (ro->join_filters && ro->count > 1)
 	can_skb_reserve(skb);
 	can_skb_prv(skb)->ifindex = dev->ifindex;
+	can_skb_prv(skb)->skbcnt = 0;
 	err = memcpy_from_msg(skb_put(skb, size), msg, size);
 	if (err < 0)