From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 6991FA04E1;
Tue, 22 Sep 2020 11:42:03 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id C54B61DD99;
Tue, 22 Sep 2020 11:36:05 +0200 (CEST)
Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com
[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 9D5061DC50
for <dev@dpdk.org>; Tue, 22 Sep 2020 11:35:08 +0200 (CEST)
Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.143])
by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id
771852004D for <dev@dpdk.org>; Tue, 22 Sep 2020 09:35:08 +0000 (UTC)
Received: from us4-mdac16-15.at1.mdlocal (unknown [10.110.49.197])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 76E7A8009B
for <dev@dpdk.org>; Tue, 22 Sep 2020 09:35:08 +0000 (UTC)
X-Virus-Scanned: Proofpoint Essentials engine
Received: from mx1-us1.ppe-hosted.com (unknown [10.110.49.30])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 1A24D40058
for <dev@dpdk.org>; Tue, 22 Sep 2020 09:35:08 +0000 (UTC)
Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
(No client certificate requested)
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id D7012140067
for <dev@dpdk.org>; Tue, 22 Sep 2020 09:35:07 +0000 (UTC)
Received: from ukex01.SolarFlarecom.com (10.17.10.4) by
ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id
15.0.1497.2; Tue, 22 Sep 2020 10:34:57 +0100
Received: from opal.uk.solarflarecom.com (10.17.10.1) by
ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id
15.0.1497.2 via Frontend Transport; Tue, 22 Sep 2020 10:34:57 +0100
Received: from ukv-loginhost.uk.solarflarecom.com
(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])
by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08M9YvXf027000;
Tue, 22 Sep 2020 10:34:57 +0100
Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])
by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id AEFC81613A9;
Tue, 22 Sep 2020 10:34:57 +0100 (BST)
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
CC: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 22 Sep 2020 10:34:35 +0100
Message-ID: <1600767288-12109-48-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1600767288-12109-1-git-send-email-arybchenko@solarflare.com>
References: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com>
<1600767288-12109-1-git-send-email-arybchenko@solarflare.com>
MIME-Version: 1.0
Content-Type: text/plain
X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25674.003
X-TM-AS-Result: No-6.290900-8.000000-10
X-TMASE-MatchedRID: UkY5AdpCN6h60j/UbRmWKCi9uJ8hAvsa4lzqEpaPQLWfY7WWTE/HG5TG
vUNFceb02XHJ0L4jOIQs/31GzKkTsVPnI9A/227jA9lly13c/gGsU/iX0A2wj+y9vsxhLmzel5E
fwglrgiZyr5HNUx5/yLoMzS9RtdnoUg11xZzZhTAJaVZHbbd1rn0tCKdnhB589yM15V5aWpj6C0
ePs7A07b5LO7CI0nt7nAVnnYnJji01SNSVGO+04fFgSsf64Pdy6QUj8jRXur5WXGvUUmKP2w==
X-TM-AS-User-Approved-Sender: Yes
X-TM-AS-User-Blocked-Sender: No
X-TMASE-Result: 10--6.290900-8.000000
X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25674.003
X-MDID: 1600767308-W1O00GEcPx5D
Subject: [dpdk-dev] [PATCH v2 47/60] common/sfc_efx/base: add NIC magic
check on BAR lookup
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Check that BAR lookup was successful by looking at the content
of signature register.
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
---
drivers/common/sfc_efx/base/rhead_pci.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/common/sfc_efx/base/rhead_pci.c b/drivers/common/sfc_efx/base/rhead_pci.c
index 0a6e72f076..dfb163b96d 100644
--- a/drivers/common/sfc_efx/base/rhead_pci.c
+++ b/drivers/common/sfc_efx/base/rhead_pci.c
@@ -56,6 +56,9 @@ rhead_pci_nic_membar_lookup(
boolean_t bar_found = B_FALSE;
efx_rc_t rc = ENOENT;
efsys_bar_t xil_eb;
+ efsys_bar_t nic_eb;
+ efx_dword_t magic_ed;
+ uint32_t magic;
/*
* SF-119689-TC Riverhead Host Interface section 4.2.2. describes
@@ -107,8 +110,25 @@ rhead_pci_nic_membar_lookup(
if (bar_found == B_FALSE)
goto fail4;
+ EFSYS_PCI_FIND_MEM_BAR(espcp, ebrp->ebr_index, &nic_eb, &rc);
+ if (rc != 0)
+ goto fail5;
+
+ EFSYS_BAR_READD(&nic_eb, ebrp->ebr_offset + ER_GZ_NIC_MAGIC_OFST,
+ &magic_ed, B_FALSE);
+
+ magic = EFX_DWORD_FIELD(magic_ed, ERF_GZ_NIC_MAGIC);
+ if (magic != EFE_GZ_NIC_MAGIC_EXPECTED) {
+ rc = EINVAL;
+ goto fail6;
+ }
+
return (0);
+fail6:
+ EFSYS_PROBE(fail6);
+fail5:
+ EFSYS_PROBE(fail5);
fail4:
EFSYS_PROBE(fail4);
fail3:
--
2.17.1