From patchwork Thu Jul 3 02:23:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Qiang X-Patchwork-Id: 366521 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C5831400B7 for ; Thu, 3 Jul 2014 12:27:13 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 382241A001D for ; Thu, 3 Jul 2014 12:27:13 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0207.outbound.protection.outlook.com [207.46.163.207]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 51F321A0004 for ; Thu, 3 Jul 2014 12:26:35 +1000 (EST) Received: from BY2PR03CA055.namprd03.prod.outlook.com (10.141.249.28) by BLUPR03MB341.namprd03.prod.outlook.com (10.141.48.12) with Microsoft SMTP Server (TLS) id 15.0.980.8; Thu, 3 Jul 2014 02:26:28 +0000 Received: from BN1BFFO11FD042.protection.gbl (2a01:111:f400:7c10::1:176) by BY2PR03CA055.outlook.office365.com (2a01:111:e400:2c5d::28) with Microsoft SMTP Server (TLS) id 15.0.974.11 via Frontend Transport; Thu, 3 Jul 2014 02:26:28 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD042.mail.protection.outlook.com (10.58.144.105) with Microsoft SMTP Server (TLS) id 15.0.969.12 via Frontend Transport; Thu, 3 Jul 2014 02:26:27 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s632QNPL022651; Wed, 2 Jul 2014 19:26:24 -0700 From: Zhao Qiang To: , , , , Subject: [PATCH v5] flexcan: add err_irq handler for flexcan Date: Thu, 3 Jul 2014 10:23:00 +0800 Message-ID: <1404354180-46431-1-git-send-email-B45475@freescale.com> X-Mailer: git-send-email 1.8.5 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(85306003)(104016002)(84676001)(102836001)(107046002)(62966002)(97736001)(46102001)(20776003)(229853001)(87286001)(74502001)(81156004)(50466002)(95666004)(80022001)(47776003)(93916002)(105606002)(50226001)(36756003)(106466001)(48376002)(4396001)(64706001)(21056001)(74662001)(92726001)(31966008)(92566001)(26826002)(89996001)(77982001)(2201001)(88136002)(77156001)(19580405001)(19580395003)(44976005)(6806004)(50986999)(83072002)(83322001)(81342001)(87936001)(81542001)(69596002)(99396002)(85852003)(104166001)(68736004)(76482001)(109986001)(79102001)(42262001); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB341; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 0261CCEEDF Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=qiang.zhao@freescale.com; X-OriginatorOrg: freescale.com Cc: Zhao Qiang X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" when flexcan is not physically linked, command 'cantest' will trigger an err_irq, add err_irq handler for it. Signed-off-by: Zhao Qiang --- Changes for v2: - use a space instead of tab - use flexcan_poll_state instead of print Changes for v3: - return IRQ_HANDLED if err is triggered - stop transmitted packets when there is an err_interrupt Changes for v4: - call flexcan_irq Changes for v5: - move err_int_handling code from flexcan_irq to flexcan_err_irq - call flexcan_err_irq from flexcan_irq drivers/net/can/flexcan.c | 55 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index f425ec2..a12d3a4 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -208,6 +208,7 @@ struct flexcan_priv { void __iomem *base; u32 reg_esr; u32 reg_ctrl_default; + int err_irq; struct clk *clk_ipg; struct clk *clk_per; @@ -690,19 +691,22 @@ static int flexcan_poll(struct napi_struct *napi, int quota) return work_done; } -static irqreturn_t flexcan_irq(int irq, void *dev_id) +static irqreturn_t flexcan_err_irq(int irq, void *dev_id) { struct net_device *dev = dev_id; - struct net_device_stats *stats = &dev->stats; struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_regs __iomem *regs = priv->base; - u32 reg_iflag1, reg_esr; + u32 reg_ctrl, reg_esr, reg_iflag1; + irqreturn_t ret = IRQ_NONE; - reg_iflag1 = flexcan_read(®s->iflag1); reg_esr = flexcan_read(®s->esr); - /* ACK all bus error and state change IRQ sources */ - if (reg_esr & FLEXCAN_ESR_ALL_INT) + reg_ctrl = flexcan_read(®s->ctrl); + reg_iflag1 = flexcan_read(®s->iflag1); + + if (reg_esr & FLEXCAN_ESR_ALL_INT) { flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, ®s->esr); + ret = IRQ_HANDLED; + } /* * schedule NAPI in case of: @@ -725,6 +729,23 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) napi_schedule(&priv->napi); } + if (reg_esr & FLEXCAN_ESR_ERR_INT) + flexcan_write(reg_ctrl & ~FLEXCAN_CTRL_ERR_MSK, ®s->ctrl); + + return ret; +} + +static irqreturn_t flexcan_irq(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct net_device_stats *stats = &dev->stats; + struct flexcan_priv *priv = netdev_priv(dev); + struct flexcan_regs __iomem *regs = priv->base; + u32 reg_iflag1; + + reg_iflag1 = flexcan_read(®s->iflag1); + + flexcan_err_irq(irq, dev); /* FIFO overflow */ if (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_OVERFLOW) { flexcan_write(FLEXCAN_IFLAG_RX_FIFO_OVERFLOW, ®s->iflag1); @@ -944,10 +965,17 @@ static int flexcan_open(struct net_device *dev) if (err) goto out_close; + if (priv->err_irq) { + err = request_irq(priv->err_irq, flexcan_err_irq, IRQF_SHARED, + dev->name, dev); + if (err) + goto out_free_irq; + } + /* start chip and queuing */ err = flexcan_chip_start(dev); if (err) - goto out_free_irq; + goto out_free_err_irq; can_led_event(dev, CAN_LED_EVENT_OPEN); @@ -956,6 +984,9 @@ static int flexcan_open(struct net_device *dev) return 0; + out_free_err_irq: + if (priv->err_irq) + free_irq(priv->err_irq, dev); out_free_irq: free_irq(dev->irq, dev); out_close: @@ -977,6 +1008,9 @@ static int flexcan_close(struct net_device *dev) flexcan_chip_stop(dev); free_irq(dev->irq, dev); + if (priv->err_irq) + free_irq(priv->err_irq, dev); + clk_disable_unprepare(priv->clk_per); clk_disable_unprepare(priv->clk_ipg); @@ -1099,7 +1133,7 @@ static int flexcan_probe(struct platform_device *pdev) struct resource *mem; struct clk *clk_ipg = NULL, *clk_per = NULL; void __iomem *base; - int err, irq; + int err, irq, err_irq; u32 clock_freq = 0; if (pdev->dev.of_node) @@ -1126,6 +1160,10 @@ static int flexcan_probe(struct platform_device *pdev) if (irq <= 0) return -ENODEV; + err_irq = platform_get_irq(pdev, 1); + if (err_irq <= 0) + err_irq = 0; + base = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(base)) return PTR_ERR(base); @@ -1149,6 +1187,7 @@ static int flexcan_probe(struct platform_device *pdev) dev->flags |= IFF_ECHO; priv = netdev_priv(dev); + priv->err_irq = err_irq; priv->can.clock.freq = clock_freq; priv->can.bittiming_const = &flexcan_bittiming_const; priv->can.do_set_mode = flexcan_set_mode;