From patchwork Fri Aug 18 06:11:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 803049 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="bRGEfnah"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYXlh1JJ4z9t31 for ; Fri, 18 Aug 2017 16:11:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264AbdHRGL0 (ORCPT ); Fri, 18 Aug 2017 02:11:26 -0400 Received: from mail-by2nam01on0060.outbound.protection.outlook.com ([104.47.34.60]:11399 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751176AbdHRGLW (ORCPT ); Fri, 18 Aug 2017 02:11:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Y0CWqnG+3xiXQYqRWlnCyBu+Ti3QLQk3dZMJT/4z7cM=; b=bRGEfnahGha/xEhtLi56iAfyCuFHARqapZNBdUtmjSiRdbnSPZJeKuoyI/fYnzXv1Vpwp4hLF6JV4t9J/nmEnhOS5U1X3cQxOY3OZw+5VDmHp9PWtye4jawqBz4mq4WsaI8CgbbIfjoiJ5IPPgIBZKg2Hw/1mlXmO5xObo6M3V0= Received: from localhost (50.233.148.156) by MWHPR07MB3184.namprd07.prod.outlook.com (10.172.96.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.21; Fri, 18 Aug 2017 06:11:20 +0000 Date: Thu, 17 Aug 2017 23:11:30 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, ricardo.farrington@cavium.com Subject: [PATCH net-next 2/2] liquidio: with embedded f/w, issue droq credits before enablement Message-ID: <20170818061130.GA4045@felix-thinkpad.cavium.com> References: <20170818061037.GA4024@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170818061037.GA4024@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR22CA0055.namprd22.prod.outlook.com (10.171.142.17) To MWHPR07MB3184.namprd07.prod.outlook.com (10.172.96.142) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a446069-8622-4010-e222-08d4e5fff1f0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR07MB3184; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3184; 3:MkfmNTMDQsHld3a5SdtR3VlTk7+2f/tetoovTQ1R9gNg2G9PlcIh6TvJYQH7j1CW7qXRkqUjkFhopU1yGJIQmohphMn6H598u2df0fsRzslP8gXcm10wFdvncih3Ved4BmkpPDK9doXtbIiUwEy8t8WhbjNQbQ+hq4OLJc4L5jqKGnQWHM7xeB65ZlPnMc7CnIRB51SqmijvqhYddecQ+0GdgPrx+AayiQvnhfnzN+ZR2kzIxuv/RyKCDTV0kz3d; 25:b723y+zsFMBVUobntj2OzJfypxqK2msGM5k++DndePfINkvTYLZLYeL/cOVobxTSuubqZ2gq77SoT2IXn4p+i9WGurhHsDE4WjqZA68jP0/fc6EQx82F+zLnzXZRMSJL4ZCFlOvo2bQzr1BNwRb9Se9sjc2WgK2yH6zE7oos1kNNJwH5ujDuh5ccSWfqWzVPxZijPMAdivO+obgR7NisOhkqJzwZ9R3oAVoT5Fy+IwWmoXTp6bDhozXVrLTj1bzIUT9QbDQrfJmJw1M+TF9A/r7oEG7rWWek18WRVczg1I/hMpULkQaFy1ZP1/9w1l3eROOW40N4PNUU1mCeyWlVyg==; 31:7w7ZJqGagPhYNrwhAqpKR9lTTxYedf+ybLrU1VI0BxPcW1a3zr4NZbKIeP2IHp4W2C/QIV3zsfjZk9f8FyvZzajODU4LKy2dV4XMXwBnwrX2ewJ0fgCiZmwDYmBLdXVBY+JjnR2QSWenUshwF0ohM0/aGr7Px5/hfRlZbyUC9UlAR2ExozFQnQ5ZchgkesDlF+5SEyMcMrO/S7CbP5mkRLsjN+VEPm5Q++oPpOWrD8Y= X-MS-TrafficTypeDiagnostic: MWHPR07MB3184: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3184; 20:QqGY9PEzLykSANM4zubgKvbrNM18PunJ7R9V21CYKCQjCETsBPtMJbZZl9CRmSD0MMP6psWLaivhS9VRarcmWmrU7TB7ebfbnz6p33cQr7/SDMyOnLYKKqQ+VNE4GqRuIXoaxGfKEKSOMsA87RZOgZCYxl1gLUMRFkmKprKP6hrbV3vRizFXiqUaNgQgM2NFMMJJMllKb/g6vPnQHEk43XHWo1dsZ0Sb4ZyJuTNGmvxAwDWZA2s9gcyhwnqA7JHyf6IrXoUzR1NGjvel7MmwXGa2Axb/j9DQgikHsEAJeoD8EZ3KwMzOhOd/0CLaoJc5qikTsUJLldCxDIERDOjUOMvUmfvBXnOM5ACH8lFO1iDvW4GW7s4IoJWxrYWbD7DxzgiRKtB2Aorx2Dy1rmLXpHCBR9hBVU2EbL0DsXWyNcnaeDf880Pb1M6qpmp4TKk0hxmBIYwfKKHB5bq66HkBT2pyumPLNHjLawQoxiWMs4XqQT/l3UMm11RxTIFacCTn; 4:o6zR+IlGE2Z0lKwUiNzluqMjH9zNDtTMDT5LHOewv7l9Jtj7TbzwhSFgtyZa4xadbQULeq0uFM1dH8GHgZbWdOPieg1YwMcUJPz9SEe0jCBReEzldlSS4KDI+H5WGLAFK6TMCV+6+l9xevMievM+jl98zGPYNELPCheIx6Xbh47zZ0RH6Slp3ZOKk0rkk1d/dMHtP3WUNyxWX5NrCF0cqA3Cyn6KIGFlFfM/DlXX2utU/brD5Gz3R6HkPHA2DpDL X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(3002001)(6041248)(20161123555025)(20161123558100)(20161123560025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR07MB3184; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR07MB3184; X-Forefront-PRVS: 040359335D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6069001)(6009001)(199003)(189002)(25786009)(189998001)(6486002)(53936002)(110136004)(72206003)(107886003)(42186005)(6496005)(2361001)(76506005)(105586002)(86362001)(106356001)(2351001)(8676002)(66066001)(305945005)(101416001)(76176999)(54356999)(7736002)(50986999)(2906002)(4326008)(47776003)(68736007)(81166006)(81156014)(6666003)(7350300001)(33656002)(1076002)(5660300001)(478600001)(83506001)(50466002)(23726003)(6116002)(3846002)(2950100002)(6916009)(97736004)(4001350100001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3184; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR07MB3184; 23:7J1/6lyCafUtmQK/zZMzqP2zX324ewhZTCTlwRfU0?= =?us-ascii?Q?KbYtKU1Y7rKrkeW3hkOFqOF2Yw5KbmzpXENccxK9CMi8GhSSJg7SgfReqhUW?= =?us-ascii?Q?zL2knAKcGzBIyeHd+MqhMHwq6fLBBH/kEpjoU941PVM009BXoHPuT7iupZ99?= =?us-ascii?Q?yJh5oSd4dH5tbWqGjf8HRSAEq6t2W4pdB+uRStv7yDrMrcPjc7AReAOR0/NJ?= =?us-ascii?Q?yA2R65nrvpiSRdZqUPQ+/V78cH6iFuy84nrYNhe0CVl4DZM+CuMcAZG6f1aP?= =?us-ascii?Q?Hyk+cFIFhwMe5U0VDr2Ze3P8LEypEco2ut+Xv76IF7fJpq6g2u2o4xojE6hb?= =?us-ascii?Q?KIGYdrJtkSp0qZcMUNG4VOK44HtzHd6drFFGmfnRI+EZU1FQyrgsZVxMQFQs?= =?us-ascii?Q?wtcH0dOpPFIU//61Hu5QxJ8G2t50z/sqmVHhAVrXNE+TQ65sxHTHzSLwF74G?= =?us-ascii?Q?jsZBDlZzoHv/NCnxMnvTuE6ynXbiTvjad5NAHHzq9bVDbiKNxfzpnd56gen9?= =?us-ascii?Q?ZZV93Rk1mCFcQ5+kc0ykoE76r/U8ks48THbFHrCjOggaYb919a1CIf7kEZhV?= =?us-ascii?Q?cyOl5Kdm6ERo2bhXGZrYPXXjxEUaRD6WUioKaSi3NztViiJle8e/RRPsKDCJ?= =?us-ascii?Q?TkR0BfLfjgxLstMgKLiHq/4fH//DETeTYx1YjDPUlpfqu3IXKvBBm8eYZgJo?= =?us-ascii?Q?pWMRaZC5fwfBZ4swd7npeQmD5v7/s1zQRbDdBx78zxC6YobxtgrdLkqh1fv1?= =?us-ascii?Q?E1P0krw7URqS2fh9HyJWDKDO1dgD7GuMLz4DiSko+wCBbSybVpzQ1ZeEnWlg?= =?us-ascii?Q?0AyVge8NJnRB2TlhvZX8K5iwKSrzt+V6imnlHDQp8imOwSPIUyxBxSg3c7l+?= =?us-ascii?Q?Sqn1Q4k5VBYomsd8GzH6BFhBvRmhSvf3oQeF6fdBY/9K0snsDpuhoArjiuCu?= =?us-ascii?Q?Pzq0qPTdKe5micPvbKPFX5qT/l8z9yuNkwrvruA1MexE4yu7HnifEEhncoLf?= =?us-ascii?Q?EtnQV6aRwA9D0EdxyFVfmApAJOCpmV0SbelWEEXm+hgzwcpF1ZiBx3EWapbw?= =?us-ascii?Q?nvYRUGciVzVHniVEgCC9wWUYD+P10isMEF7FsBt2Am8ctXVqHkpnER0vTDoF?= =?us-ascii?Q?stOKnmeBsMhmSoVuruRp2K8g52ZYqJEQlE26SJtR33nAMZWoe7XjbTH1uvd2?= =?us-ascii?Q?OTnOFN3jJjIfHE0cb1TSdkUXR7O0sc/+jji6WVqpHAskpKyMW+dACiqKQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3184; 6:4fFdVtpvIcVigh9LM/gkKiiYxh7+hICjsdF82M4xf7/B9eekm3wtmT6zw3IQNR2KUDlevZulFo2CXxS5+Qjymr+7BqQCmNx3L5TCWJibS+amWx65RcIFLT7ebcq7dVjH8uZd4xvBlUjuC2uuNpDaVj6+somlncVoOcVI1bEuvUJkPciy92+uNOjZRI9l+N5KtFW3l25DO/7IHr/P5k2Bz6M+GRmZegezC5IYV9iItKVxLhDxx0xFAChI1HeXmr5h1jhsRdB13DIyAn0n4ZI3aErYZggQHyKeck55h2bb8OofPuyac1c1d/tU4RVoDShZo1Bn9dAEYDwJVT7gFYHJjw==; 5:upfntTchvnQkx2uGHADoEq22xvj8CpUlWVtCJOBJv6ONBjw6ZrMy9qQPWIJzq6nfjet+2Z7Gn7m59npcvet2D4ToFAYV3DoOQIDq2iP6W206RFJR7kmvgxZY/sagCuYMZztXGGQUdbR5Aig/WCw2BQ==; 24:wThYROPyCmapuAnf9tqWGVgTyKYpaFWOKMQQY605cQoUdrq2Er9Tp5r3hx6s6Wy5FTHBxhriJtKaPgO0CJ2EbtojRjQU+A+ZwUHKz9cisDk=; 7:zzygK74W1LuTXbbPfjShZuELENbiLGOuoK1hp3CUXWxaM8yl3AAOmiss7+9jL1iyc/0U4fd3cQ/a7/epu3dLpINowsFSSJgMhLnY/r6rtIKFq1v4vPOtuy3AH1coTFxGHcA1FPMmgaSQNnaXj8wN/yP+QQoFa0mbB1CQzY/KWI0Oeu84We955W4FWOEZOTSnU8myctGNInni3hibchNUzQRuugX/K5+0Za8ane2QSsE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 06:11:20.3505 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3184 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rick Farrington 1. Issue credits BEFORE enabling DROQ's; this prevents PKTPF_ERR interrupt. Signed-off-by: Rick Farrington Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index dccd447..89d4bbc 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -4040,6 +4040,18 @@ static int octeon_device_init(struct octeon_device *octeon_dev) atomic_set(&octeon_dev->status, OCT_DEV_INTR_SET_DONE); + /* Send Credit for Octeon Output queues. Credits are always sent BEFORE + * the output queue is enabled. + * This ensures that we'll receive the f/w CORE DRV_ACTIVE message in + * case we've configured CN23XX_SLI_GBL_CONTROL[NOPTR_D] = 0. + * Otherwise, it is possible that the DRV_ACTIVE message will be sent + * before any credits have been issued, causing the ring to be reset + * (and the f/w appear to never have started). + */ + for (j = 0; j < octeon_dev->num_oqs; j++) + writel(octeon_dev->droq[j]->max_count, + octeon_dev->droq[j]->pkts_credit_reg); + /* Enable the input and output queues for this Octeon device */ ret = octeon_dev->fn_list.enable_io_queues(octeon_dev); if (ret) { @@ -4124,14 +4136,6 @@ static int octeon_device_init(struct octeon_device *octeon_dev) atomic_set(&octeon_dev->status, OCT_DEV_HOST_OK); - /* Send Credit for Octeon Output queues. Credits are always sent after - * the output queue is enabled. - */ - for (j = 0; j < octeon_dev->num_oqs; j++) - writel(octeon_dev->droq[j]->max_count, - octeon_dev->droq[j]->pkts_credit_reg); - - /* Packets can start arriving on the output queues from this point. */ return 0; }