From: Ioana Ciornei <ioana.ciornei@nxp.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Cc: andrew@lunn.ch, f.fainelli@gmail.com,
Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH 10/12] staging: dpaa2-ethsw: enable the CTRL_IF based on the FW version
Date: Tue, 5 Nov 2019 14:34:33 +0200 [thread overview]
Message-ID: <1572957275-23383-11-git-send-email-ioana.ciornei@nxp.com> (raw)
In-Reply-To: <1572957275-23383-1-git-send-email-ioana.ciornei@nxp.com>
Introduce a features bitmask in the dpaa2-ethsw driver that would be
populated based on the running version of MC firmware. The first and
only feature, at the moment, is the control traffic which is available
only when the DPSW object version is greater than 8.4.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 13 +++++++++++++
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 11 +++++++++++
2 files changed, 24 insertions(+)
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index abe920f8a665..df9d81be242b 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -2111,6 +2111,14 @@ static int ethsw_ctrl_if_setup(struct ethsw_core *ethsw)
return err;
}
+void dpaa2_ethsw_set_features(struct ethsw_core *ethsw,
+ u16 major, u16 minor)
+{
+ if (major >= DPAA2_ETHSW_CTRL_IF_MIN_MAJOR &&
+ minor >= DPAA2_ETHSW_CTRL_IF_MIN_MINOR)
+ ethsw->features |= DPAA2_ETHSW_CONTROL_TRAFFIC;
+}
+
static int ethsw_init(struct fsl_mc_device *sw_dev)
{
struct device *dev = &sw_dev->dev;
@@ -2154,6 +2162,11 @@ static int ethsw_init(struct fsl_mc_device *sw_dev)
goto err_close;
}
+ /* Compose the set of supported features by
+ * the current firmware image
+ */
+ dpaa2_ethsw_set_features(ethsw, version_major, version_minor);
+
err = dpsw_reset(ethsw->mc_io, 0, ethsw->dpsw_handle);
if (err) {
dev_err(dev, "dpsw_reset err %d\n", err);
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 747a4e15d28a..d880a3321e14 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -116,6 +116,13 @@ struct ethsw_port_priv {
u16 tx_qdid;
};
+#define DPAA2_ETHSW_CTRL_IF_MIN_MAJOR 8
+#define DPAA2_ETHSW_CTRL_IF_MIN_MINOR 4
+
+enum dpaa2_ethsw_features {
+ DPAA2_ETHSW_CONTROL_TRAFFIC = BIT(0),
+};
+
/* Switch data */
struct ethsw_core {
struct device *dev;
@@ -125,6 +132,7 @@ struct ethsw_core {
int dev_id;
struct ethsw_port_priv **ports;
struct iommu_domain *iommu_domain;
+ int features;
u8 vlans[VLAN_VID_MASK + 1];
bool learning;
@@ -138,6 +146,9 @@ struct ethsw_core {
static inline bool ethsw_has_ctrl_if(struct ethsw_core *ethsw)
{
+ if (!ethsw->features & DPAA2_ETHSW_CONTROL_TRAFFIC)
+ return false;
+
return !(ethsw->sw_attr.options & DPSW_OPT_CTRL_IF_DIS);
}
#endif /* __ETHSW_H */
--
1.9.1
next prev parent reply other threads:[~2019-11-05 12:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 12:34 [PATCH 00/12] staging: dpaa2-ethsw: add support for control interface traffic Ioana Ciornei
2019-11-05 12:34 ` [PATCH 01/12] staging: dpaa2-ethsw: get control interface attributes Ioana Ciornei
2019-11-05 12:34 ` [PATCH 02/12] staging: dpaa2-ethsw: setup buffer pool for control traffic Ioana Ciornei
2019-11-05 12:34 ` [PATCH 03/12] staging: dpaa2-ethsw: setup RX path rings Ioana Ciornei
2019-11-05 12:34 ` [PATCH 04/12] staging: dpaa2-ethsw: setup dpio Ioana Ciornei
2019-11-05 12:34 ` [PATCH 05/12] staging: dpaa2-ethsw: add ACL table at port probe Ioana Ciornei
2019-11-05 12:34 ` [PATCH 06/12] staging: dpaa2-ethsw: add ACL entry to redirect STP to CPU Ioana Ciornei
2019-11-05 14:22 ` Andrew Lunn
2019-11-05 14:31 ` Ioana Ciornei
2019-11-05 15:59 ` Andrew Lunn
2019-11-06 13:47 ` Ioana Ciornei
2019-11-06 14:50 ` Andrew Lunn
2019-11-06 15:22 ` Ioana Ciornei
2019-11-06 16:01 ` Andrew Lunn
2019-11-05 12:34 ` [PATCH 07/12] staging: dpaa2-ethsw: seed the buffer pool Ioana Ciornei
2019-11-05 12:34 ` [PATCH 08/12] staging: dpaa2-ethsw: handle Rx path on control interface Ioana Ciornei
2019-11-05 14:31 ` Andrew Lunn
2019-11-05 12:34 ` [PATCH 09/12] staging: dpaa2-ethsw: add .ndo_start_xmit() callback Ioana Ciornei
2019-11-05 12:34 ` Ioana Ciornei [this message]
2019-11-05 12:34 ` [PATCH 11/12] staging: dpaa2-ethsw: enable the control interface Ioana Ciornei
2019-11-05 12:34 ` [PATCH 12/12] staging: dpaa2-ethsw: remove control traffic from TODO file Ioana Ciornei
2019-11-05 13:24 ` [PATCH 00/12] staging: dpaa2-ethsw: add support for control interface traffic Greg KH
2019-11-05 13:49 ` Ioana Ciornei
2019-11-05 14:02 ` Andrew Lunn
2019-11-05 14:22 ` Ioana Ciornei
2019-11-05 14:44 ` Andrew Lunn
2019-11-05 15:32 ` Greg KH
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=1572957275-23383-11-git-send-email-ioana.ciornei@nxp.com \
--to=ioana.ciornei@nxp.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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).