| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 24 Jul 2023 11:48:18 +0200
From: Louis Peens <louis.peens@...igine.com>
To: David Miller <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>
Cc: Simon Horman <simon.horman@...igine.com>,
Yinjun Zhang <yinjun.zhang@...igine.com>,
Tianyu Yuan <tianyu.yuan@...igine.com>,
netdev@...r.kernel.org,
oss-drivers@...igine.com
Subject: [PATCH net-next 09/12] nfp: enable multi-PF in application firmware if supported
From: Yinjun Zhang <yinjun.zhang@...igine.com>
For backward compatibility concern, the new application firmware
is designed to support both single-PF setup and multi-PF setup.
Thus driver should inform application firmware which setup current
is. This should be done as early as possible since the setup may
affect some configurations exposed by firmware.
Signed-off-by: Yinjun Zhang <yinjun.zhang@...igine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@...igine.com>
Acked-by: Simon Horman <simon.horman@...igine.com>
Signed-off-by: Louis Peens <louis.peens@...igine.com>
---
.../net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 +
.../net/ethernet/netronome/nfp/nfp_net_main.c | 129 ++++++++++++++----
2 files changed, 100 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h
index 3e63f6d6a563..d6b127f13ed3 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h
@@ -268,6 +268,7 @@
#define NFP_NET_CFG_CTRL_PKT_TYPE (0x1 << 0) /* Pkttype offload */
#define NFP_NET_CFG_CTRL_IPSEC (0x1 << 1) /* IPsec offload */
#define NFP_NET_CFG_CTRL_MCAST_FILTER (0x1 << 2) /* Multicast Filter */
+#define NFP_NET_CFG_CTRL_MULTI_PF (0x1 << 5) /* Multi PF */
#define NFP_NET_CFG_CTRL_FREELIST_EN (0x1 << 6) /* Freelist enable flag bit */
#define NFP_NET_CFG_CAP_WORD1 0x00a4
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 98e155d79eb8..f6f4fea0a791 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -684,15 +684,108 @@ int nfp_net_refresh_eth_port(struct nfp_port *port)
return ret;
}
+/**
+ * nfp_net_pre_init() - Some necessary check and configuration
+ * in firmware before fully utilizing it.
+ * @pf: NFP PF handler
+ * @stride: queue stride
+ *
+ * Return: 0 on success, a negative error code otherwise.
+ */
+static int nfp_net_pre_init(struct nfp_pf *pf, int *stride)
+{
+ struct nfp_net_fw_version fw_ver;
+ struct nfp_cpp_area *area;
+ u8 __iomem *ctrl_bar;
+ int err = 0;
+
+ ctrl_bar = nfp_pf_map_rtsym(pf, NULL, "_pf%d_net_bar0", NFP_PF_CSR_SLICE_SIZE, &area);
+ if (IS_ERR(ctrl_bar)) {
+ nfp_err(pf->cpp, "Failed to find data vNIC memory symbol\n");
+ return PTR_ERR(ctrl_bar);
+ }
+
+ nfp_net_get_fw_version(&fw_ver, ctrl_bar);
+ if (fw_ver.extend & NFP_NET_CFG_VERSION_RESERVED_MASK ||
+ fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) {
+ nfp_err(pf->cpp, "Unknown Firmware ABI %d.%d.%d.%d\n",
+ fw_ver.extend, fw_ver.class,
+ fw_ver.major, fw_ver.minor);
+ err = -EINVAL;
+ goto end;
+ }
+
+ /* Determine stride */
+ if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1)) {
+ *stride = 2;
+ nfp_warn(pf->cpp, "OBSOLETE Firmware detected - VF isolation not available\n");
+ } else {
+ switch (fw_ver.major) {
+ case 1 ... 5:
+ *stride = 4;
+ break;
+ default:
+ nfp_err(pf->cpp, "Unsupported Firmware ABI %d.%d.%d.%d\n",
+ fw_ver.extend, fw_ver.class,
+ fw_ver.major, fw_ver.minor);
+ err = -EINVAL;
+ goto end;
+ }
+ }
+
+ if (!pf->multi_pf.en)
+ goto end;
+
+ /* Enable multi-PF. */
+ if (readl(ctrl_bar + NFP_NET_CFG_CAP_WORD1) & NFP_NET_CFG_CTRL_MULTI_PF) {
+ unsigned long long addr;
+ u32 cfg_q, cpp_id, ret;
+ unsigned long timeout;
+
+ writel(NFP_NET_CFG_CTRL_MULTI_PF, ctrl_bar + NFP_NET_CFG_CTRL_WORD1);
+ writel(NFP_NET_CFG_UPDATE_GEN, ctrl_bar + NFP_NET_CFG_UPDATE);
+
+ /* Config queue is next to txq. */
+ cfg_q = readl(ctrl_bar + NFP_NET_CFG_START_TXQ) + 1;
+ addr = nfp_qcp_queue_offset(pf->dev_info, cfg_q) + NFP_QCP_QUEUE_ADD_WPTR;
+ cpp_id = NFP_CPP_ISLAND_ID(0, NFP_CPP_ACTION_RW, 0, 0);
+ err = nfp_cpp_writel(pf->cpp, cpp_id, addr, 1);
+ if (err)
+ goto end;
+
+ timeout = jiffies + HZ * NFP_NET_POLL_TIMEOUT;
+ while ((ret = readl(ctrl_bar + NFP_NET_CFG_UPDATE))) {
+ if (ret & NFP_NET_CFG_UPDATE_ERR) {
+ nfp_err(pf->cpp, "Enable multi-PF failed\n");
+ err = -EIO;
+ break;
+ }
+
+ usleep_range(250, 500);
+ if (time_is_before_eq_jiffies(timeout)) {
+ nfp_err(pf->cpp, "Enable multi-PF timeout\n");
+ err = -ETIMEDOUT;
+ break;
+ }
+ };
+ } else {
+ nfp_err(pf->cpp, "Loaded firmware doesn't support multi-PF\n");
+ err = -EINVAL;
+ }
+
+end:
+ nfp_cpp_area_release_free(area);
+ return err;
+}
+
/*
* PCI device functions
*/
int nfp_net_pci_probe(struct nfp_pf *pf)
{
struct devlink *devlink = priv_to_devlink(pf);
- struct nfp_net_fw_version fw_ver;
u8 __iomem *ctrl_bar, *qc_bar;
- int stride;
+ int stride = 0;
int err;
INIT_WORK(&pf->port_refresh_work, nfp_net_refresh_vnics);
@@ -703,6 +796,10 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
return -EINVAL;
}
+ err = nfp_net_pre_init(pf, &stride);
+ if (err)
+ return err;
+
pf->max_data_vnics = nfp_net_pf_get_num_ports(pf);
if ((int)pf->max_data_vnics < 0)
return pf->max_data_vnics;
@@ -723,34 +820,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
goto err_unmap;
}
- nfp_net_get_fw_version(&fw_ver, ctrl_bar);
- if (fw_ver.extend & NFP_NET_CFG_VERSION_RESERVED_MASK ||
- fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) {
- nfp_err(pf->cpp, "Unknown Firmware ABI %d.%d.%d.%d\n",
- fw_ver.extend, fw_ver.class,
- fw_ver.major, fw_ver.minor);
- err = -EINVAL;
- goto err_unmap;
- }
-
- /* Determine stride */
- if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1)) {
- stride = 2;
- nfp_warn(pf->cpp, "OBSOLETE Firmware detected - VF isolation not available\n");
- } else {
- switch (fw_ver.major) {
- case 1 ... 5:
- stride = 4;
- break;
- default:
- nfp_err(pf->cpp, "Unsupported Firmware ABI %d.%d.%d.%d\n",
- fw_ver.extend, fw_ver.class,
- fw_ver.major, fw_ver.minor);
- err = -EINVAL;
- goto err_unmap;
- }
- }
-
err = nfp_net_pf_app_init(pf, qc_bar, stride);
if (err)
goto err_unmap;
--
2.34.1
Powered by blists - more mailing lists