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

net/enetc: replace register read/write macros with functions

Browse Source 
Replacing read-write macros with already available
read-write functions.

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
This commit is contained in:
Gagandeep Singh 2019-04-12 12:29:00 +00:00 committed by Ferruh Yigit
parent 01128d3103
commit 7de1c06a8f
2 changed files with 30 additions and 36 deletions
drivers/net/enetc
enetc.henetc_ethdev.c

7
drivers/net/enetc/enetc.h

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause /* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2018 NXP * Copyright 2018-2019 NXP
*/ */
#ifndef _ENETC_H_ #ifndef _ENETC_H_
@ -86,11 +86,6 @@ struct enetc_eth_adapter {
#define ENETC_DEV_PRIVATE_TO_INTR(adapter) \ #define ENETC_DEV_PRIVATE_TO_INTR(adapter) \
(&((struct enetc_eth_adapter *)adapter)->intr) (&((struct enetc_eth_adapter *)adapter)->intr)
#define ENETC_GET_HW_ADDR(reg, addr) ((void *)(((size_t)reg) + (addr)))
#define ENETC_REG_READ(addr) (*(uint32_t *)addr)
#define ENETC_REG_WRITE(addr, val) (*(uint32_t *)addr = val)
#define ENETC_REG_WRITE_RELAXED(addr, val) (*(uint32_t *)addr = val)
/* /*
* RX/TX ENETC function prototypes * RX/TX ENETC function prototypes
*/ */

55
drivers/net/enetc/enetc_ethdev.c

@ -131,28 +131,31 @@ enetc_dev_start(struct rte_eth_dev *dev)
{ {
struct enetc_eth_hw *hw = struct enetc_eth_hw *hw =
ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct enetc_hw *enetc_hw = &hw->hw;
uint32_t val; uint32_t val;
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, val = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);
ENETC_PM0_CMD_CFG)); enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG),
val | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN); val | ENETC_PM0_TX_EN | ENETC_PM0_RX_EN);
/* Enable port */ /* Enable port */
val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR)); val = enetc_port_rd(enetc_hw, ENETC_PMR);
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR), enetc_port_wr(enetc_hw, ENETC_PMR, val | ENETC_PMR_EN);
val | ENETC_PMR_EN);
/* set auto-speed for RGMII */ /* set auto-speed for RGMII */
if (enetc_port_rd(&hw->hw, ENETC_PM0_IF_MODE) & ENETC_PMO_IFM_RG) { if (enetc_port_rd(enetc_hw, ENETC_PM0_IF_MODE) & ENETC_PMO_IFM_RG) {
enetc_port_wr(&hw->hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_RGAUTO); enetc_port_wr(enetc_hw, ENETC_PM0_IF_MODE,
enetc_port_wr(&hw->hw, ENETC_PM1_IF_MODE, ENETC_PM0_IFM_RGAUTO); ENETC_PM0_IFM_RGAUTO);
enetc_port_wr(enetc_hw, ENETC_PM1_IF_MODE,
ENETC_PM0_IFM_RGAUTO);
} }
if (enetc_global_rd(&hw->hw, if (enetc_global_rd(enetc_hw,
ENETC_G_EPFBLPR(1)) == ENETC_G_EPFBLPR1_XGMII) { ENETC_G_EPFBLPR(1)) == ENETC_G_EPFBLPR1_XGMII) {
enetc_port_wr(&hw->hw, ENETC_PM0_IF_MODE, ENETC_PM0_IFM_XGMII); enetc_port_wr(enetc_hw, ENETC_PM0_IF_MODE,
enetc_port_wr(&hw->hw, ENETC_PM1_IF_MODE, ENETC_PM0_IFM_XGMII); ENETC_PM0_IFM_XGMII);
enetc_port_wr(enetc_hw, ENETC_PM1_IF_MODE,
ENETC_PM0_IFM_XGMII);
} }
return 0; return 0;
@ -163,17 +166,16 @@ enetc_dev_stop(struct rte_eth_dev *dev)
{ {
struct enetc_eth_hw *hw = struct enetc_eth_hw *hw =
ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct enetc_hw *enetc_hw = &hw->hw;
uint32_t val; uint32_t val;
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
/* Disable port */ /* Disable port */
val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR)); val = enetc_port_rd(enetc_hw, ENETC_PMR);
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PMR), enetc_port_wr(enetc_hw, ENETC_PMR, val & (~ENETC_PMR_EN));
val & (~ENETC_PMR_EN));
val = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, val = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);
ENETC_PM0_CMD_CFG)); enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PM0_CMD_CFG),
val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN))); val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN)));
} }
@ -221,6 +223,7 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
{ {
struct enetc_eth_hw *hw = struct enetc_eth_hw *hw =
ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private); ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct enetc_hw *enetc_hw = &hw->hw;
struct rte_eth_link link; struct rte_eth_link link;
uint32_t status; uint32_t status;
@ -228,8 +231,7 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
memset(&link, 0, sizeof(link)); memset(&link, 0, sizeof(link));
status = ENETC_REG_READ(ENETC_GET_HW_ADDR(hw->hw.port, status = enetc_port_rd(enetc_hw, ENETC_PM0_STATUS);
ENETC_PM0_STATUS));
if (status & ENETC_LINK_MODE) if (status & ENETC_LINK_MODE)
link.link_duplex = ETH_LINK_FULL_DUPLEX; link.link_duplex = ETH_LINK_FULL_DUPLEX;
@ -262,6 +264,7 @@ static int
enetc_hardware_init(struct enetc_eth_hw *hw) enetc_hardware_init(struct enetc_eth_hw *hw)
{ {
uint32_t psipmr = 0; uint32_t psipmr = 0;
struct enetc_hw *enetc_hw = &hw->hw;
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
/* Calculating and storing the base HW addresses */ /* Calculating and storing the base HW addresses */
@ -269,8 +272,7 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
hw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE); hw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE);
/* Enabling Station Interface */ /* Enabling Station Interface */
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.reg, ENETC_SIMR), enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
ENETC_SIMR_EN);
/* Setting to accept broadcast packets for each inetrface */ /* Setting to accept broadcast packets for each inetrface */
psipmr |= ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) | psipmr |= ENETC_PSIPMR_SET_UP(0) | ENETC_PSIPMR_SET_MP(0) |
@ -280,14 +282,11 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
psipmr |= ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) | psipmr |= ENETC_PSIPMR_SET_UP(2) | ENETC_PSIPMR_SET_MP(2) |
ENETC_PSIPMR_SET_VLAN_MP(2); ENETC_PSIPMR_SET_VLAN_MP(2);
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMR), enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
psipmr);
/* Enabling broadcast address */ /* Enabling broadcast address */
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR0(0)), enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), 0xFFFFFFFF);
0xFFFFFFFF); enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), 0xFFFF << 16);
ENETC_REG_WRITE(ENETC_GET_HW_ADDR(hw->hw.port, ENETC_PSIPMAR1(0)),
0xFFFF << 16);
return 0; return 0;
} }