From: Rasesh Mody <rasesh.mody@cavium.com>
To: <ferruh.yigit@intel.com>
Cc: Rasesh Mody <rasesh.mody@cavium.com>, <dev@dpdk.org>,
<Dept-EngDPDKDev@cavium.com>
Subject: [dpdk-dev] [PATCH v2 24/26] net/qede/base: refactor some code bits
Date: Wed, 4 Jan 2017 23:04:06 -0800 [thread overview]
Message-ID: <1483599848-7714-25-git-send-email-rasesh.mody@cavium.com> (raw)
In-Reply-To: <1480756289-11835-1-git-send-email-Rasesh.Mody@cavium.com>
Bits of code refactoring in ecore_hw_bar_size(), ecore_get_hw_info()
and ecore_init_cmd_*.
Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>
---
drivers/net/qede/base/ecore_dev.c | 39 ++++++++++++++++----------------
drivers/net/qede/base/ecore_init_ops.c | 19 +++++++---------
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c
index f7a36c9..b754028 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -70,28 +70,26 @@ static u32 ecore_hw_bar_size(struct ecore_hwfn *p_hwfn, enum BAR_ID bar_id)
}
val = ecore_rd(p_hwfn, p_hwfn->p_main_ptt, bar_reg);
+ if (val)
+ return 1 << (val + 15);
/* The above registers were updated in the past only in CMT mode. Since
* they were found to be useful MFW started updating them from 8.7.7.0.
* In older MFW versions they are set to 0 which means disabled.
*/
- if (!val) {
- if (p_hwfn->p_dev->num_hwfns > 1) {
- DP_NOTICE(p_hwfn, false,
- "BAR size not configured. Assuming BAR size");
- DP_NOTICE(p_hwfn, false,
- "of 256kB for GRC and 512kB for DB\n");
- return BAR_ID_0 ? 256 * 1024 : 512 * 1024;
- } else {
- DP_NOTICE(p_hwfn, false,
- "BAR size not configured. Assuming BAR size");
- DP_NOTICE(p_hwfn, false,
- "of 512kB for GRC and 512kB for DB\n");
- return 512 * 1024;
- }
+ if (p_hwfn->p_dev->num_hwfns > 1) {
+ DP_NOTICE(p_hwfn, false,
+ "BAR size not configured. Assuming BAR size of 256kB"
+ " for GRC and 512kB for DB\n");
+ val = BAR_ID_0 ? 256 * 1024 : 512 * 1024;
+ } else {
+ DP_NOTICE(p_hwfn, false,
+ "BAR size not configured. Assuming BAR size of 512kB"
+ " for GRC and 512kB for DB\n");
+ val = 512 * 1024;
}
- return 1 << (val + 15);
+ return val;
}
void ecore_init_dp(struct ecore_dev *p_dev,
@@ -2785,11 +2783,14 @@ ecore_get_hw_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
ecore_mcp_cmd_port_init(p_hwfn, p_ptt);
}
- if (personality != ECORE_PCI_DEFAULT)
+ if (personality != ECORE_PCI_DEFAULT) {
p_hwfn->hw_info.personality = personality;
- else if (ecore_mcp_is_init(p_hwfn))
- p_hwfn->hw_info.personality =
- p_hwfn->mcp_info->func_info.protocol;
+ } else if (ecore_mcp_is_init(p_hwfn)) {
+ enum ecore_pci_personality protocol;
+
+ protocol = p_hwfn->mcp_info->func_info.protocol;
+ p_hwfn->hw_info.personality = protocol;
+ }
#ifndef ASIC_ONLY
/* To overcome ILT lack for emulation, until at least until we'll have
diff --git a/drivers/net/qede/base/ecore_init_ops.c b/drivers/net/qede/base/ecore_init_ops.c
index a6ed590..b907a95 100644
--- a/drivers/net/qede/base/ecore_init_ops.c
+++ b/drivers/net/qede/base/ecore_init_ops.c
@@ -190,19 +190,19 @@ static enum _ecore_status_t ecore_init_cmd_array(struct ecore_hwfn *p_hwfn,
bool b_must_dmae,
bool b_can_dmae)
{
+ u32 dmae_array_offset = OSAL_LE32_TO_CPU(cmd->args.array_offset);
+ u32 data = OSAL_LE32_TO_CPU(cmd->data);
+ u32 addr = GET_FIELD(data, INIT_WRITE_OP_ADDRESS) << 2;
#ifdef CONFIG_ECORE_ZIPPED_FW
u32 offset, output_len, input_len, max_size;
#endif
- u32 dmae_array_offset = OSAL_LE32_TO_CPU(cmd->args.array_offset);
struct ecore_dev *p_dev = p_hwfn->p_dev;
- enum _ecore_status_t rc = ECORE_SUCCESS;
union init_array_hdr *hdr;
const u32 *array_data;
- u32 size, addr, data;
+ enum _ecore_status_t rc = ECORE_SUCCESS;
+ u32 size;
array_data = p_dev->fw_data->arr_data;
- data = OSAL_LE32_TO_CPU(cmd->data);
- addr = GET_FIELD(data, INIT_WRITE_OP_ADDRESS) << 2;
hdr = (union init_array_hdr *)
(uintptr_t)(array_data + dmae_array_offset);
@@ -272,13 +272,10 @@ static enum _ecore_status_t ecore_init_cmd_wr(struct ecore_hwfn *p_hwfn,
struct init_write_op *p_cmd,
bool b_can_dmae)
{
+ u32 data = OSAL_LE32_TO_CPU(p_cmd->data);
+ bool b_must_dmae = GET_FIELD(data, INIT_WRITE_OP_WIDE_BUS);
+ u32 addr = GET_FIELD(data, INIT_WRITE_OP_ADDRESS) << 2;
enum _ecore_status_t rc = ECORE_SUCCESS;
- bool b_must_dmae;
- u32 addr, data;
-
- data = OSAL_LE32_TO_CPU(p_cmd->data);
- b_must_dmae = GET_FIELD(data, INIT_WRITE_OP_WIDE_BUS);
- addr = GET_FIELD(data, INIT_WRITE_OP_ADDRESS) << 2;
/* Sanitize */
if (b_must_dmae && !b_can_dmae) {
--
1.7.10.3
next prev parent reply other threads:[~2017-01-05 7:06 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-03 9:11 [dpdk-dev] [PATCH 00/25] net/qede: update qede pmd to 2.0.0.1 Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 01/25] net/qede/base: add request for PF FLR before load request Rasesh Mody
2016-12-23 15:32 ` Ferruh Yigit
2016-12-23 19:07 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 02/25] net/qede/base: improve set field macro Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 03/25] net/qede/base: add handling of malicious VF Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 04/25] net/qede/base: change return codes in SR-IOV Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 05/25] net/qede/base: make API non-static Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 06/25] net/qede/base: rename macro Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 07/25] net/qede/base: add check to validate txq Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 08/25] net/qede/base: fix updating VF queue zone id Rasesh Mody
2016-12-23 15:36 ` Ferruh Yigit
2016-12-03 9:11 ` [dpdk-dev] [PATCH 09/25] net/qede/base: improve Tx-switching performance Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 10/25] net/qede/base: semantic change Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 11/25] net/qede: remove unused struct member Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 12/25] net/qede/base: enhance resource info set printouts Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 13/25] net/qede/base: add new enum member to status codes Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 14/25] net/qede/base: add macros for converting pointer Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 15/25] net/qede: add new host ring type option Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 16/25] net/qede/base: add check for get nvm info return code Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 17/25] net/qede/base: retrieve FW crash dump info Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 18/25] net/qede/base: add support for external PHY Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 19/25] net/qede/base: add support for 2x10G mode Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 20/25] net/qede: add PCI ids for new chip variant Rasesh Mody
2016-12-23 15:39 ` Ferruh Yigit
2016-12-23 19:18 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 21/25] net/qede: add 50G device PCI id Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 22/25] net/qede/base: add support for new firmware Rasesh Mody
2016-12-23 15:40 ` Ferruh Yigit
2016-12-31 7:40 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 23/25] net/qede/base: semantic/formatting changes Rasesh Mody
2016-12-23 15:42 ` Ferruh Yigit
2016-12-31 7:41 ` Mody, Rasesh
2017-01-03 15:40 ` Ferruh Yigit
2017-01-05 7:16 ` Mody, Rasesh
2016-12-03 9:11 ` [dpdk-dev] [PATCH 24/25] net/qede/base: dcbx changes for base driver Rasesh Mody
2016-12-03 9:11 ` [dpdk-dev] [PATCH 25/25] net/qede: update PMD version to 2.0.0.1 Rasesh Mody
2016-12-09 16:53 ` [dpdk-dev] [PATCH 00/25] net/qede: update qede pmd " Ferruh Yigit
2016-12-09 17:48 ` Mody, Rasesh
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 00/26] " Rasesh Mody
2017-01-05 13:18 ` Ferruh Yigit
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 01/26] net/qede/base: add request for PF FLR before load request Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 02/26] net/qede/base: improve set field macro Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 03/26] net/qede/base: add handling of malicious VF Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 04/26] net/qede/base: change return codes in SR-IOV Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 05/26] net/qede/base: make API non-static Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 06/26] net/qede/base: rename macro Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 07/26] net/qede/base: add check to validate txq Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 08/26] net/qede/base: fix updating VF queue zone id Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 09/26] net/qede/base: improve Tx-switching performance Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 10/26] net/qede/base: semantic change Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 11/26] net/qede: remove unused struct member Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 12/26] net/qede/base: enhance resource info set printouts Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 13/26] net/qede/base: add new enum member to status codes Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 14/26] net/qede/base: add macros for converting pointer Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 15/26] net/qede: add new host ring type option Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 16/26] net/qede/base: add check for get nvm info return code Rasesh Mody
2017-01-05 7:03 ` [dpdk-dev] [PATCH v2 17/26] net/qede/base: retrieve FW crash dump info Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 18/26] net/qede/base: add support for external PHY Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 19/26] net/qede/base: add support for 2x10G mode Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 20/26] net/qede: add PCI ids for new chip variant Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 21/26] net/qede: add 50G device PCI id Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 22/26] net/qede/base: add support for new firmware Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 23/26] net/qede/base: semantic/formatting changes Rasesh Mody
2017-01-05 7:04 ` Rasesh Mody [this message]
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 25/26] net/qede/base: dcbx changes for base driver Rasesh Mody
2017-01-05 7:04 ` [dpdk-dev] [PATCH v2 26/26] net/qede: update PMD version to 2.0.0.1 Rasesh Mody
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483599848-7714-25-git-send-email-rasesh.mody@cavium.com \
--to=rasesh.mody@cavium.com \
--cc=Dept-EngDPDKDev@cavium.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).