From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 15735A04DD; Tue, 20 Oct 2020 11:11:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F3285CFE7; Tue, 20 Oct 2020 10:50:34 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 6C622BBAE for ; Tue, 20 Oct 2020 10:49:10 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.61]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 1B5DF6005A for ; Tue, 20 Oct 2020 08:49:08 +0000 (UTC) Received: from us4-mdac16-41.ut7.mdlocal (unknown [10.7.64.23]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 1BFBE8009E for ; Tue, 20 Oct 2020 08:49:08 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.41]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 98D4B80056 for ; Tue, 20 Oct 2020 08:49:07 +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 4BD704C005C for ; Tue, 20 Oct 2020 08:49: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, 20 Oct 2020 09:48:50 +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, 20 Oct 2020 09:48:50 +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 09K8mnvY030801; Tue, 20 Oct 2020 09:48:50 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id DF6FF1613AB; Tue, 20 Oct 2020 09:48:49 +0100 (BST) From: Andrew Rybchenko To: CC: , Ivan Malov Date: Tue, 20 Oct 2020 09:48:08 +0100 Message-ID: <1603183709-23420-42-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603183709-23420-1-git-send-email-arybchenko@solarflare.com> References: <1603183709-23420-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-25736.003 X-TM-AS-Result: No-3.744000-8.000000-10 X-TMASE-MatchedRID: USBznjRQ989MPcmMaoae6R3EEAbn+GRbOTjDMsgp/8GrZHMcVOhFSMzp aT8RVq/tFGVIZCbILXTy7+YHWQ1L0RskZmIm07Kryf21YeIsPYZ6i696PjRPiA5bRK3kNPhULPJ tWpbJjY12wcINfceTjnDlPghqPnfyhmayTFnN39Yn6YVq3MQsI1M8G40owbvKCmsLHmesXbFtqw 6rEcE6N94uOUmYluEd0zoQrejyE606NBdUxznZvceuFL5UpINx70qdorrh7aL3Ru3JrjJxKJPpO oE2MGLrAz50BRibi1tRKFInjeMGM7xfZDNk09XDjhVIiMAyis7M8zLNncnslfkuQv9PIVnNouaX E/reSZkbpFu2LL52JiA7TAOaRNCdDPIzF4wRfrAURSScn+QSXtADGm4LoiiT+gtHj7OwNO0NstC Xmf87HH6NWRsXLx5K5F9kzd71rK3ruNneCXN7kbZenzIjRXqmhtxeP8NjoZG6uY1l2joOgMSa0Y kW2GDPbpmIqVEZl89NS22e9i4qE9pAu0sLxpSoQ8G+yYJYYdZRZDsGiXQioBjm28f1HLY3 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.744000-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25736.003 X-MDID: 1603183748-mB1LQfeKMz4Q X-PPE-DISP: 1603183748;mB1LQfeKMz4Q Subject: [dpdk-dev] [PATCH 41/62] common/sfc_efx/base: add an API for querying board info 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" From: Ivan Malov Riverhead boards can provide extended version information. Implement facilities necessary to obtain it. Add an API for querying board information. A client driver may use this to discover which of its instances relate to which physical boards, based on board serial number persistence for a given physical board. Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/common/sfc_efx/base/efx.h | 16 +++++++ drivers/common/sfc_efx/base/efx_mcdi.c | 48 ++++++++++++++++--- drivers/common/sfc_efx/base/efx_mcdi.h | 18 +++++++ drivers/common/sfc_efx/base/efx_nic.c | 46 ++++++++++++++++++ .../sfc_efx/rte_common_sfc_efx_version.map | 1 + 5 files changed, 123 insertions(+), 6 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h index 4a4dc8ba4d..75edb59a49 100644 --- a/drivers/common/sfc_efx/base/efx.h +++ b/drivers/common/sfc_efx/base/efx.h @@ -1647,6 +1647,22 @@ efx_nic_get_fw_version( __in efx_nic_t *enp, __out efx_nic_fw_info_t *enfip); +#define EFX_NIC_BOARD_INFO_SERIAL_LEN (64) +#define EFX_NIC_BOARD_INFO_NAME_LEN (16) + +typedef struct efx_nic_board_info_s { + /* The following two fields are NUL-terminated ASCII strings. */ + char enbi_serial[EFX_NIC_BOARD_INFO_SERIAL_LEN]; + char enbi_name[EFX_NIC_BOARD_INFO_NAME_LEN]; + uint32_t enbi_revision; +} efx_nic_board_info_t; + +LIBEFX_API +extern __checkReturn efx_rc_t +efx_nic_get_board_info( + __in efx_nic_t *enp, + __out efx_nic_board_info_t *board_infop); + /* Driver resource limits (minimum required/maximum usable). */ typedef struct efx_drv_limits_s { uint32_t edl_min_evq_count; diff --git a/drivers/common/sfc_efx/base/efx_mcdi.c b/drivers/common/sfc_efx/base/efx_mcdi.c index edd069c969..8c984d8cad 100644 --- a/drivers/common/sfc_efx/base/efx_mcdi.c +++ b/drivers/common/sfc_efx/base/efx_mcdi.c @@ -964,11 +964,13 @@ efx_mcdi_ev_death( __checkReturn efx_rc_t efx_mcdi_get_version( __in efx_nic_t *enp, + __in uint32_t flags_req, __out efx_mcdi_version_t *verp) { + efx_nic_board_info_t *board_infop = &verp->emv_board_info; EFX_MCDI_DECLARE_BUF(payload, - MC_CMD_GET_VERSION_IN_LEN, - MC_CMD_GET_VERSION_OUT_LEN); + MC_CMD_GET_VERSION_EXT_IN_LEN, + MC_CMD_GET_VERSION_V2_OUT_LEN); size_t min_resp_len_required; efx_mcdi_req_t req; efx_rc_t rc; @@ -978,15 +980,35 @@ efx_mcdi_get_version( EFX_STATIC_ASSERT(sizeof (verp->emv_firmware) == MC_CMD_GET_VERSION_OUT_FIRMWARE_LEN); + EFX_STATIC_ASSERT(EFX_MCDI_VERSION_BOARD_INFO == + (1U << MC_CMD_GET_VERSION_V2_OUT_BOARD_EXT_INFO_PRESENT_LBN)); + + EFX_STATIC_ASSERT(sizeof (board_infop->enbi_serial) == + MC_CMD_GET_VERSION_V2_OUT_BOARD_SERIAL_LEN); + EFX_STATIC_ASSERT(sizeof (board_infop->enbi_name) == + MC_CMD_GET_VERSION_V2_OUT_BOARD_NAME_LEN); + EFX_STATIC_ASSERT(sizeof (board_infop->enbi_revision) == + MC_CMD_GET_VERSION_V2_OUT_BOARD_REVISION_LEN); + EFSYS_ASSERT3U(enp->en_features, &, EFX_FEATURE_MCDI); req.emr_cmd = MC_CMD_GET_VERSION; req.emr_in_buf = payload; req.emr_out_buf = payload; - req.emr_in_length = MC_CMD_GET_VERSION_IN_LEN; - req.emr_out_length = MC_CMD_GET_VERSION_OUT_LEN; - min_resp_len_required = MC_CMD_GET_VERSION_V0_OUT_LEN; + if (flags_req != 0) { + /* Request basic + extended version information. */ + req.emr_in_length = MC_CMD_GET_VERSION_EXT_IN_LEN; + req.emr_out_length = MC_CMD_GET_VERSION_V2_OUT_LEN; + + min_resp_len_required = MC_CMD_GET_VERSION_V2_OUT_LEN; + } else { + /* Request only basic version information. */ + req.emr_in_length = MC_CMD_GET_VERSION_IN_LEN; + req.emr_out_length = MC_CMD_GET_VERSION_OUT_LEN; + + min_resp_len_required = MC_CMD_GET_VERSION_V0_OUT_LEN; + } efx_mcdi_execute(enp, &req); @@ -1020,6 +1042,20 @@ efx_mcdi_get_version( verp->emv_firmware = MCDI_OUT_DWORD(req, GET_VERSION_OUT_FIRMWARE); + verp->emv_flags = MCDI_OUT_DWORD(req, GET_VERSION_V2_OUT_FLAGS); + verp->emv_flags &= flags_req; + + if ((verp->emv_flags & EFX_MCDI_VERSION_BOARD_INFO) != 0) { + memcpy(board_infop->enbi_serial, + MCDI_OUT2(req, char, GET_VERSION_V2_OUT_BOARD_SERIAL), + sizeof (board_infop->enbi_serial)); + memcpy(board_infop->enbi_name, + MCDI_OUT2(req, char, GET_VERSION_V2_OUT_BOARD_NAME), + sizeof (board_infop->enbi_name)); + board_infop->enbi_revision = + MCDI_OUT_DWORD(req, GET_VERSION_V2_OUT_BOARD_REVISION); + } + return (0); fail3: @@ -1090,7 +1126,7 @@ efx_mcdi_version( efx_mcdi_boot_t status; efx_rc_t rc; - rc = efx_mcdi_get_version(enp, &ver); + rc = efx_mcdi_get_version(enp, 0, &ver); if (rc != 0) goto fail1; diff --git a/drivers/common/sfc_efx/base/efx_mcdi.h b/drivers/common/sfc_efx/base/efx_mcdi.h index 8b50b8a949..0b39a6f7f6 100644 --- a/drivers/common/sfc_efx/base/efx_mcdi.h +++ b/drivers/common/sfc_efx/base/efx_mcdi.h @@ -118,16 +118,34 @@ efx_mcdi_raise_exception( __in_opt efx_mcdi_req_t *emrp, __in int rc); +/* + * Flags that name portions of extended version information + * + * The values match their MCDI counterparts. + */ +#define EFX_MCDI_VERSION_BOARD_INFO (1U << 4) + typedef struct efx_mcdi_version_s { /* Basic version information */ uint16_t emv_version[4]; uint32_t emv_firmware; + + /* + * Extended version information + * + * Valid portions of obtained information are indicated by flags. + */ + uint32_t emv_flags; + + /* Information valid if emv_flags has EFX_MCDI_VERSION_BOARD_INFO set */ + efx_nic_board_info_t emv_board_info; } efx_mcdi_version_t; LIBEFX_INTERNAL extern __checkReturn efx_rc_t efx_mcdi_get_version( __in efx_nic_t *enp, + __in uint32_t flags_req, __out efx_mcdi_version_t *verp); typedef enum efx_mcdi_boot_e { diff --git a/drivers/common/sfc_efx/base/efx_nic.c b/drivers/common/sfc_efx/base/efx_nic.c index a78c4c3737..7c28fb1744 100644 --- a/drivers/common/sfc_efx/base/efx_nic.c +++ b/drivers/common/sfc_efx/base/efx_nic.c @@ -791,6 +791,52 @@ efx_nic_get_fw_version( return (0); +fail3: + EFSYS_PROBE(fail3); +fail2: + EFSYS_PROBE(fail2); +fail1: + EFSYS_PROBE1(fail1, efx_rc_t, rc); + + return (rc); +} + + __checkReturn efx_rc_t +efx_nic_get_board_info( + __in efx_nic_t *enp, + __out efx_nic_board_info_t *board_infop) +{ + efx_mcdi_version_t ver; + efx_rc_t rc; + + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_MCDI); + EFSYS_ASSERT3U(enp->en_features, &, EFX_FEATURE_MCDI); + + rc = efx_mcdi_get_version(enp, EFX_MCDI_VERSION_BOARD_INFO, &ver); + if (rc == EMSGSIZE) { + /* + * Typically, EMSGSIZE is returned by above call in the + * case when the NIC does not provide extra information. + */ + rc = ENOTSUP; + goto fail1; + } else if (rc != 0) { + goto fail2; + } + + if ((ver.emv_flags & EFX_MCDI_VERSION_BOARD_INFO) == 0) { + rc = ENOTSUP; + goto fail3; + } + + memcpy(board_infop, &ver.emv_board_info, sizeof (*board_infop)); + + /* MCDI should provide NUL-terminated strings, but stay vigilant. */ + board_infop->enbi_serial[sizeof (board_infop->enbi_serial) - 1] = '\0'; + board_infop->enbi_name[sizeof (board_infop->enbi_name) - 1] = '\0'; + + return (0); + fail3: EFSYS_PROBE(fail3); fail2: diff --git a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map index 7cc692db3f..37056abd60 100644 --- a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map +++ b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map @@ -131,6 +131,7 @@ INTERNAL { efx_nic_destroy; efx_nic_fini; efx_nic_get_bar_region; + efx_nic_get_board_info; efx_nic_get_fw_subvariant; efx_nic_get_fw_version; efx_nic_get_vi_pool; -- 2.17.1