From patchwork Sat Sep 29 08:14:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 45647 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E7247D0B2; Sat, 29 Sep 2018 10:14:41 +0200 (CEST) Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-eopbgr690074.outbound.protection.outlook.com [40.107.69.74]) by dpdk.org (Postfix) with ESMTP id 43FAA5F35 for ; Sat, 29 Sep 2018 10:14:35 +0200 (CEST) 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:X-MS-Exchange-SenderADCheck; bh=y8qVSHvL0oeVJdt/Tc9GIanXMA2sY5dxTv8eQGggaq4=; b=JTv5imSMN4Xb+PYkmEcA0MFJg0PomolSO41VkToKwPC0Xm7g9pvPrZE4xuFynDHVxGX0/v9SWNeYh9W+GdxiQatsUp4i5Qn0WYsKxoOB8nrwUENpvfTvYgrwBpEWDemgyhncKrug9Co6WSxtCwTpyrv8AyiwH5bXnM1OXw7BRaE= Received: from BYAPR07MB5365.namprd07.prod.outlook.com (20.177.125.18) by BYAPR07MB5320.namprd07.prod.outlook.com (20.177.124.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Sat, 29 Sep 2018 08:14:28 +0000 Received: from BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::2047:9647:f196:bde0]) by BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::2047:9647:f196:bde0%6]) with mapi id 15.20.1143.022; Sat, 29 Sep 2018 08:14:28 +0000 From: "Mody, Rasesh" To: "dev@dpdk.org" CC: "Mody, Rasesh" , "ferruh.yigit@intel.com" , Dept-Eng DPDK Dev Thread-Topic: [PATCH 02/18] net/qede/base: check for EDPM enabled in DB recovery Thread-Index: AQHUV8xwZwryAYdO8UeuQd3zVSaGJA== Date: Sat, 29 Sep 2018 08:14:28 +0000 Message-ID: <1538208822-9726-3-git-send-email-rasesh.mody@cavium.com> References: <1538208822-9726-1-git-send-email-rasesh.mody@cavium.com> In-Reply-To: <1538208822-9726-1-git-send-email-rasesh.mody@cavium.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0059.namprd11.prod.outlook.com (2603:10b6:a03:80::36) To BYAPR07MB5365.namprd07.prod.outlook.com (2603:10b6:a03:64::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [198.186.1.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR07MB5320; 6:c8splJSIUCP9aHB6tV0BamGvNgYTfsOkRR6v9h3TtfMCdEI3tRNJKDsuu1urkG6g7L+9atvKfqzMyG/A5Exvnnz5uxK7CWsSXGxtFUZVdwh71ajDUUCyUXlTB0e6KjPCgeGylLDs3W+qJVZQ2Fu53mY/CdqCDLvJMZO7wpjcuR63L562rVGYl3EkehF4syffiJxBY55D1Xm3G/gm/mDEbsrRZwoLWU8eyg0rGeTA2Ia9ETRp+4ZXspg6qPKdWo383e5cHimEtha09qHr6vTOpxDjTb9FnDxgDMM2TTS039b3RY3PSHgV+dg6SNlcYixAJHjMZfTgIqAP/Ybx5VPfZEliUWaGV+fdZGB/TRFAPUjEW0J/85bq9IzvZV7gmOp2L+ST1ye49bM+DfYVE8H5BuD/YRtJ1DQ3ZTb25DDGnI1f51OvR5g2gyviS6W+UKMgtdRKSBq196+yNEaCcTxP0A==; 5:JLqvg+AGd8pl1mCk362IgpKUbh+L4m0L05UB4qZ9NK69dbcQ9yn7Fza7rPZXuO/OAifH+iK0/JZfm+3QroC2UKJslIqWVaSv59IAHRKlxlk69YiU0NL9jZ6kaQiavCZpKh/xltfzjmVaYcJYMpg9sdpxsLdNqmZPv/L6Igw0rjU=; 7:3iip8omrCAzMTMx7MPX/bczMQl+FocpeNLuRmeSZRpSE4NyklBr6cTcy8HWZlHOoiuBJSSn5v+ObAQvF16TWqSz+hpLOvY/J5+5SDb2En8pIuppCROWbZn5f0q6IFSw2gAgUaqbxEKcI3jMSVW8z+mJSskLGUTzXdL/KQRiLaxhxU11P/Dqce1VJ84242LSAM1Nj3UgdJ1ogpsYrXt4iRyX65KreqGNOSSl1yzX714rA+9dWjVcEtt6GUYNf0hR9 x-ms-office365-filtering-correlation-id: a6296870-401b-4679-8ed8-08d625e3934a x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB5320; x-ms-traffictypediagnostic: BYAPR07MB5320: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3231355)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051); SRVR:BYAPR07MB5320; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB5320; x-forefront-prvs: 0810818DA0 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(396003)(136003)(346002)(39860400002)(199004)(189003)(97736004)(256004)(14454004)(4326008)(11346002)(2501003)(2900100001)(99286004)(54906003)(1730700003)(86362001)(68736007)(446003)(3846002)(25786009)(76176011)(5660300001)(2616005)(8676002)(305945005)(8936002)(486006)(107886003)(2351001)(26005)(2906002)(14444005)(5250100002)(71190400001)(5640700003)(36756003)(6436002)(6486002)(53936002)(316002)(72206003)(386003)(105586002)(71200400001)(6916009)(102836004)(6512007)(6116002)(6506007)(7736002)(81156014)(81166006)(186003)(52116002)(476003)(478600001)(66066001)(34290500001)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB5320; H:BYAPR07MB5365.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: aFl6wU+ugrP2MVD1rbnjFab7USjBRizU1BqmKu2jgfxL/AWuUm6YtnCAsOPDxBh7ka4cP64wvojmoS+Z/YcvtREVsn88vP/28UAsXj4RqnLFv5+f2zOH9KtXdKYRZjk5SIa1BzEPsTxrjzRCaT8XSifizFHWsGkWK6nN0Y6jzRMNypcM6iufZe+KPnQdiNFgwlgixQOUm7bAEalEPrmOHTvySrTBhRrJjQUJLq9nq5r/8Jar+rcVF9PaDci09IBhIxVnS7EBOHv4vkazFHQ0GO4uaLbYBSNb9gG74osJQ9qwzjoJr6gXb6CNw6cEM2TQ+ERGrK0IDxC1AdAtsLvIqUStyizqWWfhEmFJmWfV3es= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6296870-401b-4679-8ed8-08d625e3934a X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2018 08:14:28.1366 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB5320 Subject: [dpdk-dev] [PATCH 02/18] net/qede/base: check for EDPM enabled in DB recovery X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add a check for EDPM enabled before flushing doorbell recovery queue. Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore.h | 2 ++ drivers/net/qede/base/ecore_dev.c | 10 +++++++++- drivers/net/qede/base/ecore_int.c | 20 +++++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h index 8982214..4607a80 100644 --- a/drivers/net/qede/base/ecore.h +++ b/drivers/net/qede/base/ecore.h @@ -962,6 +962,8 @@ void ecore_set_fw_mac_addr(__le16 *fw_msb, __le16 *fw_mid, __le16 *fw_lsb, void ecore_db_recovery_execute(struct ecore_hwfn *p_hwfn, enum ecore_db_rec_exec); +bool ecore_edpm_enabled(struct ecore_hwfn *p_hwfn); + /* amount of resources used in qm init */ u8 ecore_init_qm_get_num_tcs(struct ecore_hwfn *p_hwfn); u16 ecore_init_qm_get_num_vfs(struct ecore_hwfn *p_hwfn); diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index b83f003..f09f771 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -1974,6 +1974,14 @@ enum ECORE_ROCE_EDPM_MODE { ECORE_ROCE_EDPM_MODE_DISABLE = 2, }; +bool ecore_edpm_enabled(struct ecore_hwfn *p_hwfn) +{ + if (p_hwfn->dcbx_no_edpm || p_hwfn->db_bar_no_edpm) + return false; + + return true; +} + static enum _ecore_status_t ecore_hw_init_pf_doorbell_bar(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt) @@ -2061,7 +2069,7 @@ enum ECORE_ROCE_EDPM_MODE { DP_INFO(p_hwfn, " dpi_size=%d, dpi_count=%d, roce_edpm=%s\n", p_hwfn->dpi_size, p_hwfn->dpi_count, - ((p_hwfn->dcbx_no_edpm) || (p_hwfn->db_bar_no_edpm)) ? + (!ecore_edpm_enabled(p_hwfn)) ? "disabled" : "enabled"); /* Check return codes from above calls */ diff --git a/drivers/net/qede/base/ecore_int.c b/drivers/net/qede/base/ecore_int.c index d41107d..c9acc72 100644 --- a/drivers/net/qede/base/ecore_int.c +++ b/drivers/net/qede/base/ecore_int.c @@ -431,9 +431,8 @@ static enum _ecore_status_t ecore_fw_assertion(struct ecore_hwfn *p_hwfn) #define ECORE_DB_REC_COUNT 10 #define ECORE_DB_REC_INTERVAL 100 -/* assumes sticky overflow indication was set for this PF */ -static enum _ecore_status_t ecore_db_rec_attn(struct ecore_hwfn *p_hwfn, - struct ecore_ptt *p_ptt) +static enum _ecore_status_t ecore_db_rec_flush_queue(struct ecore_hwfn *p_hwfn, + struct ecore_ptt *p_ptt) { u8 count = ECORE_DB_REC_COUNT; u32 usage = 1; @@ -461,6 +460,21 @@ static enum _ecore_status_t ecore_db_rec_attn(struct ecore_hwfn *p_hwfn, return ECORE_TIMEOUT; } + return ECORE_SUCCESS; +} + +/* assumes sticky overflow indication was set for this PF */ +static enum _ecore_status_t ecore_db_rec_attn(struct ecore_hwfn *p_hwfn, + struct ecore_ptt *p_ptt) +{ + enum _ecore_status_t rc; + + if (ecore_edpm_enabled(p_hwfn)) { + rc = ecore_db_rec_flush_queue(p_hwfn, p_ptt); + if (rc != ECORE_SUCCESS) + return rc; + } + /* flush any pedning (e)dpm as they may never arrive */ ecore_wr(p_hwfn, p_ptt, DORQ_REG_DPM_FORCE_ABORT, 0x1);