d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa: check status before configuring shared MAC

Browse Source 
For shared MAC interface, it is a prerequisite to enable the
interface in the kernel, before using it in user-space. This
patch makes sure that device is not getting configured in
case shared MAC interface is not enabled in the kernel.

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Nipun Gupta 2022-01-03 15:31:25 +05:30 committed by Ferruh Yigit
parent f023d05976
commit 953b6fedbb
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/bus/dpaa/base/fman/fman_hw.c
View File

@ -314,6 +314,17 @@ fman_if_disable_rx(struct fman_if *p)
out_be32(__if->ccsr_map + 8, in_be32(__if->ccsr_map + 8) & ~(u32)2);
}
int
fman_if_get_rx_status(struct fman_if *p)
{
struct __fman_if *__if = container_of(p, struct __fman_if, __if);
assert(fman_ccsr_map_fd != -1);
/* return true if RX bit is set */
return !!(in_be32(__if->ccsr_map + 8) & (u32)2);
}
void
fman_if_loopback_enable(struct fman_if *p)
{

2
drivers/bus/dpaa/include/fsl_fman.h
View File

@ -81,6 +81,8 @@ __rte_internal
void fman_if_enable_rx(struct fman_if *p);
__rte_internal
void fman_if_disable_rx(struct fman_if *p);
__rte_internal
int fman_if_get_rx_status(struct fman_if *p);
/* Enable/disable loopback on specific interfaces */
__rte_internal

1
drivers/bus/dpaa/version.map
View File

@ -33,6 +33,7 @@ INTERNAL {
fman_if_get_fdoff;
fman_if_get_maxfrm;
fman_if_get_sg_enable;
fman_if_get_rx_status;
fman_if_loopback_disable;
fman_if_loopback_enable;
fman_if_promiscuous_disable;

13
drivers/net/dpaa/dpaa_ethdev.c
View File

@ -195,6 +195,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
uint64_t rx_offloads = eth_conf->rxmode.offloads;
uint64_t tx_offloads = eth_conf->txmode.offloads;
struct dpaa_if *dpaa_intf = dev->data->dev_private;
struct rte_device *rdev = dev->device;
struct rte_eth_link *link = &dev->data->dev_link;
struct rte_dpaa_device *dpaa_dev;
@ -203,7 +204,7 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
struct rte_intr_handle *intr_handle;
uint32_t max_rx_pktlen;
int speed, duplex;
int ret;
int ret, rx_status;
PMD_INIT_FUNC_TRACE();
@ -211,6 +212,16 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
intr_handle = dpaa_dev->intr_handle;
__fif = container_of(fif, struct __fman_if, __if);
/* Check if interface is enabled in case of shared MAC */
if (fif->is_shared_mac) {
rx_status = fman_if_get_rx_status(fif);
if (!rx_status) {
DPAA_PMD_ERR("%s Interface not enabled in kernel!",
dpaa_intf->name);
return -EHOSTDOWN;
}
}
/* Rx offloads which are enabled by default */
if (dev_rx_offloads_nodis & ~rx_offloads) {
DPAA_PMD_INFO(