From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Anssi Hannula <anssi.hannula@bitwise.fi>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 4.17 59/66] can: xilinx_can: fix recovery from error states not being propagated
Date: Fri, 27 Jul 2018 11:45:52 +0200 [thread overview]
Message-ID: <20180727093815.669318017@linuxfoundation.org> (raw)
In-Reply-To: <20180727093809.043856530@linuxfoundation.org>
4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anssi Hannula <anssi.hannula@bitwise.fi>
commit 877e0b75947e2c7acf5624331bb17ceb093c98ae upstream.
The xilinx_can driver contains no mechanism for propagating recovery
from CAN_STATE_ERROR_WARNING and CAN_STATE_ERROR_PASSIVE.
Add such a mechanism by factoring the handling of
XCAN_STATE_ERROR_PASSIVE and XCAN_STATE_ERROR_WARNING out of
xcan_err_interrupt and checking for recovery after RX and TX if the
interface is in one of those states.
Tested with the integrated CAN on Zynq-7000 SoC.
Fixes: b1201e44f50b ("can: xilinx CAN controller support")
Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Cc: <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/can/xilinx_can.c | 155 +++++++++++++++++++++++++++++++++++--------
1 file changed, 127 insertions(+), 28 deletions(-)
--- a/drivers/net/can/xilinx_can.c
+++ b/drivers/net/can/xilinx_can.c
@@ -2,6 +2,7 @@
*
* Copyright (C) 2012 - 2014 Xilinx, Inc.
* Copyright (C) 2009 PetaLogix. All rights reserved.
+ * Copyright (C) 2017 Sandvik Mining and Construction Oy
*
* Description:
* This driver is developed for Axi CAN IP and for Zynq CANPS Controller.
@@ -530,6 +531,123 @@ static int xcan_rx(struct net_device *nd
}
/**
+ * xcan_current_error_state - Get current error state from HW
+ * @ndev: Pointer to net_device structure
+ *
+ * Checks the current CAN error state from the HW. Note that this
+ * only checks for ERROR_PASSIVE and ERROR_WARNING.
+ *
+ * Return:
+ * ERROR_PASSIVE or ERROR_WARNING if either is active, ERROR_ACTIVE
+ * otherwise.
+ */
+static enum can_state xcan_current_error_state(struct net_device *ndev)
+{
+ struct xcan_priv *priv = netdev_priv(ndev);
+ u32 status = priv->read_reg(priv, XCAN_SR_OFFSET);
+
+ if ((status & XCAN_SR_ESTAT_MASK) == XCAN_SR_ESTAT_MASK)
+ return CAN_STATE_ERROR_PASSIVE;
+ else if (status & XCAN_SR_ERRWRN_MASK)
+ return CAN_STATE_ERROR_WARNING;
+ else
+ return CAN_STATE_ERROR_ACTIVE;
+}
+
+/**
+ * xcan_set_error_state - Set new CAN error state
+ * @ndev: Pointer to net_device structure
+ * @new_state: The new CAN state to be set
+ * @cf: Error frame to be populated or NULL
+ *
+ * Set new CAN error state for the device, updating statistics and
+ * populating the error frame if given.
+ */
+static void xcan_set_error_state(struct net_device *ndev,
+ enum can_state new_state,
+ struct can_frame *cf)
+{
+ struct xcan_priv *priv = netdev_priv(ndev);
+ u32 ecr = priv->read_reg(priv, XCAN_ECR_OFFSET);
+ u32 txerr = ecr & XCAN_ECR_TEC_MASK;
+ u32 rxerr = (ecr & XCAN_ECR_REC_MASK) >> XCAN_ESR_REC_SHIFT;
+
+ priv->can.state = new_state;
+
+ if (cf) {
+ cf->can_id |= CAN_ERR_CRTL;
+ cf->data[6] = txerr;
+ cf->data[7] = rxerr;
+ }
+
+ switch (new_state) {
+ case CAN_STATE_ERROR_PASSIVE:
+ priv->can.can_stats.error_passive++;
+ if (cf)
+ cf->data[1] = (rxerr > 127) ?
+ CAN_ERR_CRTL_RX_PASSIVE :
+ CAN_ERR_CRTL_TX_PASSIVE;
+ break;
+ case CAN_STATE_ERROR_WARNING:
+ priv->can.can_stats.error_warning++;
+ if (cf)
+ cf->data[1] |= (txerr > rxerr) ?
+ CAN_ERR_CRTL_TX_WARNING :
+ CAN_ERR_CRTL_RX_WARNING;
+ break;
+ case CAN_STATE_ERROR_ACTIVE:
+ if (cf)
+ cf->data[1] |= CAN_ERR_CRTL_ACTIVE;
+ break;
+ default:
+ /* non-ERROR states are handled elsewhere */
+ WARN_ON(1);
+ break;
+ }
+}
+
+/**
+ * xcan_update_error_state_after_rxtx - Update CAN error state after RX/TX
+ * @ndev: Pointer to net_device structure
+ *
+ * If the device is in a ERROR-WARNING or ERROR-PASSIVE state, check if
+ * the performed RX/TX has caused it to drop to a lesser state and set
+ * the interface state accordingly.
+ */
+static void xcan_update_error_state_after_rxtx(struct net_device *ndev)
+{
+ struct xcan_priv *priv = netdev_priv(ndev);
+ enum can_state old_state = priv->can.state;
+ enum can_state new_state;
+
+ /* changing error state due to successful frame RX/TX can only
+ * occur from these states
+ */
+ if (old_state != CAN_STATE_ERROR_WARNING &&
+ old_state != CAN_STATE_ERROR_PASSIVE)
+ return;
+
+ new_state = xcan_current_error_state(ndev);
+
+ if (new_state != old_state) {
+ struct sk_buff *skb;
+ struct can_frame *cf;
+
+ skb = alloc_can_err_skb(ndev, &cf);
+
+ xcan_set_error_state(ndev, new_state, skb ? cf : NULL);
+
+ if (skb) {
+ struct net_device_stats *stats = &ndev->stats;
+
+ stats->rx_packets++;
+ stats->rx_bytes += cf->can_dlc;
+ netif_rx(skb);
+ }
+ }
+}
+
+/**
* xcan_err_interrupt - error frame Isr
* @ndev: net_device pointer
* @isr: interrupt status register value
@@ -544,16 +662,12 @@ static void xcan_err_interrupt(struct ne
struct net_device_stats *stats = &ndev->stats;
struct can_frame *cf;
struct sk_buff *skb;
- u32 err_status, status, txerr = 0, rxerr = 0;
+ u32 err_status;
skb = alloc_can_err_skb(ndev, &cf);
err_status = priv->read_reg(priv, XCAN_ESR_OFFSET);
priv->write_reg(priv, XCAN_ESR_OFFSET, err_status);
- txerr = priv->read_reg(priv, XCAN_ECR_OFFSET) & XCAN_ECR_TEC_MASK;
- rxerr = ((priv->read_reg(priv, XCAN_ECR_OFFSET) &
- XCAN_ECR_REC_MASK) >> XCAN_ESR_REC_SHIFT);
- status = priv->read_reg(priv, XCAN_SR_OFFSET);
if (isr & XCAN_IXR_BSOFF_MASK) {
priv->can.state = CAN_STATE_BUS_OFF;
@@ -563,28 +677,10 @@ static void xcan_err_interrupt(struct ne
can_bus_off(ndev);
if (skb)
cf->can_id |= CAN_ERR_BUSOFF;
- } else if ((status & XCAN_SR_ESTAT_MASK) == XCAN_SR_ESTAT_MASK) {
- priv->can.state = CAN_STATE_ERROR_PASSIVE;
- priv->can.can_stats.error_passive++;
- if (skb) {
- cf->can_id |= CAN_ERR_CRTL;
- cf->data[1] = (rxerr > 127) ?
- CAN_ERR_CRTL_RX_PASSIVE :
- CAN_ERR_CRTL_TX_PASSIVE;
- cf->data[6] = txerr;
- cf->data[7] = rxerr;
- }
- } else if (status & XCAN_SR_ERRWRN_MASK) {
- priv->can.state = CAN_STATE_ERROR_WARNING;
- priv->can.can_stats.error_warning++;
- if (skb) {
- cf->can_id |= CAN_ERR_CRTL;
- cf->data[1] |= (txerr > rxerr) ?
- CAN_ERR_CRTL_TX_WARNING :
- CAN_ERR_CRTL_RX_WARNING;
- cf->data[6] = txerr;
- cf->data[7] = rxerr;
- }
+ } else {
+ enum can_state new_state = xcan_current_error_state(ndev);
+
+ xcan_set_error_state(ndev, new_state, skb ? cf : NULL);
}
/* Check for Arbitration lost interrupt */
@@ -714,8 +810,10 @@ static int xcan_rx_poll(struct napi_stru
isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
}
- if (work_done)
+ if (work_done) {
can_led_event(ndev, CAN_LED_EVENT_RX);
+ xcan_update_error_state_after_rxtx(ndev);
+ }
if (work_done < quota) {
napi_complete_done(napi, work_done);
@@ -746,6 +844,7 @@ static void xcan_tx_interrupt(struct net
isr = priv->read_reg(priv, XCAN_ISR_OFFSET);
}
can_led_event(ndev, CAN_LED_EVENT_TX);
+ xcan_update_error_state_after_rxtx(ndev);
netif_wake_queue(ndev);
}
next prev parent reply other threads:[~2018-07-27 9:49 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 9:44 [PATCH 4.17 00/66] 4.17.11-stable review Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 01/66] KVM: VMX: support MSR_IA32_ARCH_CAPABILITIES as a feature MSR Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 02/66] Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()" Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 03/66] MIPS: ath79: fix register address in ath79_ddr_wb_flush() Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 04/66] MIPS: Fix off-by-one in pci_resource_to_user() Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 05/66] clk: mvebu: armada-37xx-periph: Fix switching CPU rate from 300Mhz to 1.2GHz Greg Kroah-Hartman
2018-07-27 9:44 ` [PATCH 4.17 06/66] clk: aspeed: Mark bclk (PCIe) and dclk (VGA) as critical Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 08/66] xen/PVH: Set up GS segment for stack canary Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 09/66] KVM: PPC: Check if IOMMU page is contained in the pinned physical page Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 10/66] drm/nouveau/drm/nouveau: Fix runtime PM leak in nv50_disp_atomic_commit() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 11/66] drm/nouveau: Set DRIVER_ATOMIC cap earlier to fix debugfs Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 12/66] clk: meson-gxbb: set fclk_div2 as CLK_IS_CRITICAL Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 13/66] bonding: set default miimon value for non-arp modes if not set Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 14/66] ip: hash fragments consistently Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 15/66] ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 17/66] net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 18/66] net-next/hinic: fix a problem in hinic_xmit_frame() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 19/66] net: skb_segment() should not return NULL Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 20/66] tcp: fix dctcp delayed ACK schedule Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 21/66] tcp: helpers to send special DCTCP ack Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 22/66] tcp: do not cancel delay-AcK on DCTCP special ACK Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 23/66] tcp: do not delay ACK in DCTCP upon CE status change Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 24/66] net/mlx5: E-Switch, UBSAN fix undefined behavior in mlx5_eswitch_mode Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 25/66] r8169: restore previous behavior to accept BIOS WoL settings Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 26/66] tls: check RCV_SHUTDOWN in tls_wait_data Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 27/66] net/mlx5e: Add ingress/egress indication for offloaded TC flows Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 28/66] net/mlx5e: Only allow offloading decap egress (egdev) flows Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 29/66] net/mlx5e: Refine ets validation function Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 30/66] nfp: flower: ensure dead neighbour entries are not offloaded Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 31/66] sock: fix sg page frag coalescing in sk_alloc_sg Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 32/66] net: phy: consider PHY_IGNORE_INTERRUPT in phy_start_aneg_priv Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 33/66] multicast: do not restore deleted record source filter mode to new one Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 34/66] net/ipv6: Fix linklocal to global address with VRF Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 35/66] net/mlx5e: Dont allow aRFS for encapsulated packets Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 36/66] net/mlx5e: Fix quota counting in aRFS expire flow Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 37/66] net/mlx5: Adjust clock overflow work period Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 38/66] rtnetlink: add rtnl_link_state check in rtnl_configure_link Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 39/66] vxlan: add new fdb alloc and create helpers Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 40/66] vxlan: make netlink notify in vxlan_fdb_destroy optional Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 41/66] vxlan: fix default fdb entry netlink notify ordering during netdev create Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 42/66] tcp: free batches of packets in tcp_prune_ofo_queue() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 43/66] tcp: avoid collapses in tcp_prune_queue() if possible Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 44/66] tcp: detect malicious patterns in tcp_collapse_ofo_queue() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 45/66] tcp: call tcp_drop() from tcp_data_queue_ofo() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 46/66] tcp: add tcp_ooo_try_coalesce() helper Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 47/66] Revert "staging:r8188eu: Use lib80211 to support TKIP" Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 48/66] staging: speakup: fix wraparound in uaccess length check Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 49/66] usb: cdc_acm: Add quirk for Castles VEGA3000 Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 50/66] usb: core: handle hub C_PORT_OVER_CURRENT condition Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 52/66] usb: xhci: Fix memory leak in xhci_endpoint_reset() Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 53/66] usb: gadget: Fix OS descriptors support Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 54/66] usb: gadget: f_fs: Only return delayed status when len is 0 Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 55/66] ACPICA: AML Parser: ignore dispatcher error status during table load Greg Kroah-Hartman
2018-07-30 9:52 ` Rafael J. Wysocki
2018-07-30 11:44 ` Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 56/66] driver core: Partially revert "driver core: correct devices shutdown order" Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 57/66] can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 58/66] can: xilinx_can: fix power management handling Greg Kroah-Hartman
2018-07-27 9:45 ` Greg Kroah-Hartman [this message]
2018-07-27 9:45 ` [PATCH 4.17 60/66] can: xilinx_can: fix device dropping off bus on RX overrun Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 61/66] can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 62/66] can: xilinx_can: fix incorrect clear of non-processed interrupts Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 63/66] can: xilinx_can: fix RX overflow interrupt not being enabled Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 64/66] can: peak_canfd: fix firmware < v3.3.0: limit allocation to 32-bit DMA addr only Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 65/66] can: m_can: Fix runtime resume call Greg Kroah-Hartman
2018-07-27 9:45 ` [PATCH 4.17 66/66] can: m_can.c: fix setup of CCCR register: clear CCCR NISO bit before checking can.ctrlmode Greg Kroah-Hartman
2018-07-27 17:31 ` [PATCH 4.17 00/66] 4.17.11-stable review Guenter Roeck
2018-07-28 5:41 ` Greg Kroah-Hartman
2018-07-27 19:49 ` Shuah Khan
2018-07-28 5:41 ` Greg Kroah-Hartman
2018-07-28 6:54 ` Naresh Kamboju
2018-07-28 7:20 ` Greg Kroah-Hartman
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=20180727093815.669318017@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=anssi.hannula@bitwise.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=stable@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).