Skip to content

Commit

Permalink
net: wangxun: Rename private structure in libwx
Browse files Browse the repository at this point in the history 
In order to move the total members in struct adapter to struct wx_hw
to keep the code clean, it's a bad name of 'wx_hw' only for hardware.
Rename 'wx_hw' to 'wx', and rename the pointers at use.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jiawen Wu authored and Jakub Kicinski committed Jan 7, 2023
1 parent 79625f4 commit 9607a3e
Show file tree
Hide file tree
Showing 10 changed files with 432 additions and 432 deletions.
474 changes: 237 additions & 237 deletions drivers/net/ethernet/wangxun/libwx/wx_hw.c
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions drivers/net/ethernet/wangxun/libwx/wx_hw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
#ifndef _WX_HW_H_
#define _WX_HW_H_

int wx_check_flash_load(struct wx_hw *hw, u32 check_bit);
void wx_control_hw(struct wx_hw *wxhw, bool drv);
int wx_mng_present(struct wx_hw *wxhw);
int wx_host_interface_command(struct wx_hw *wxhw, u32 *buffer,
int wx_check_flash_load(struct wx *wx, u32 check_bit);
void wx_control_hw(struct wx *wx, bool drv);
int wx_mng_present(struct wx *wx);
int wx_host_interface_command(struct wx *wx, u32 *buffer,
u32 length, u32 timeout, bool return_data);
int wx_read_ee_hostif(struct wx_hw *wxhw, u16 offset, u16 *data);
int wx_read_ee_hostif_buffer(struct wx_hw *wxhw,
int wx_read_ee_hostif(struct wx *wx, u16 offset, u16 *data);
int wx_read_ee_hostif_buffer(struct wx *wx,
u16 offset, u16 words, u16 *data);
int wx_reset_hostif(struct wx_hw *wxhw);
void wx_init_eeprom_params(struct wx_hw *wxhw);
void wx_get_mac_addr(struct wx_hw *wxhw, u8 *mac_addr);
void wx_init_rx_addrs(struct wx_hw *wxhw);
void wx_mac_set_default_filter(struct wx_hw *wxhw, u8 *addr);
void wx_flush_sw_mac_table(struct wx_hw *wxhw);
int wx_reset_hostif(struct wx *wx);
void wx_init_eeprom_params(struct wx *wx);
void wx_get_mac_addr(struct wx *wx, u8 *mac_addr);
void wx_init_rx_addrs(struct wx *wx);
void wx_mac_set_default_filter(struct wx *wx, u8 *addr);
void wx_flush_sw_mac_table(struct wx *wx);
int wx_set_mac(struct net_device *netdev, void *p);
void wx_disable_rx(struct wx_hw *wxhw);
int wx_disable_pcie_master(struct wx_hw *wxhw);
int wx_stop_adapter(struct wx_hw *wxhw);
void wx_reset_misc(struct wx_hw *wxhw);
int wx_get_pcie_msix_counts(struct wx_hw *wxhw, u16 *msix_count, u16 max_msix_count);
int wx_sw_init(struct wx_hw *wxhw);
void wx_disable_rx(struct wx *wx);
int wx_disable_pcie_master(struct wx *wx);
int wx_stop_adapter(struct wx *wx);
void wx_reset_misc(struct wx *wx);
int wx_get_pcie_msix_counts(struct wx *wx, u16 *msix_count, u16 max_msix_count);
int wx_sw_init(struct wx *wx);

#endif /* _WX_HW_H_ */
20 changes: 10 additions & 10 deletions drivers/net/ethernet/wangxun/libwx/wx_type.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ enum wx_reset_type {
WX_GLOBAL_RESET
};

struct wx_hw {
struct wx {
u8 __iomem *hw_addr;
struct pci_dev *pdev;
struct net_device *netdev;
Expand Down Expand Up @@ -331,34 +331,34 @@ struct wx_hw {
wr32((a), (reg) + ((off) << 2), (val))

static inline u32
rd32m(struct wx_hw *wxhw, u32 reg, u32 mask)
rd32m(struct wx *wx, u32 reg, u32 mask)
{
u32 val;

val = rd32(wxhw, reg);
val = rd32(wx, reg);
return val & mask;
}

static inline void
wr32m(struct wx_hw *wxhw, u32 reg, u32 mask, u32 field)
wr32m(struct wx *wx, u32 reg, u32 mask, u32 field)
{
u32 val;

val = rd32(wxhw, reg);
val = rd32(wx, reg);
val = ((val & ~mask) | (field & mask));

wr32(wxhw, reg, val);
wr32(wx, reg, val);
}

/* On some domestic CPU platforms, sometimes IO is not synchronized with
* flushing memory, here use readl() to flush PCI read and write.
*/
#define WX_WRITE_FLUSH(H) rd32(H, WX_MIS_PWR)

#define wx_err(wxhw, fmt, arg...) \
dev_err(&(wxhw)->pdev->dev, fmt, ##arg)
#define wx_err(wx, fmt, arg...) \
dev_err(&(wx)->pdev->dev, fmt, ##arg)

#define wx_dbg(wxhw, fmt, arg...) \
dev_dbg(&(wxhw)->pdev->dev, fmt, ##arg)
#define wx_dbg(wx, fmt, arg...) \
dev_dbg(&(wx)->pdev->dev, fmt, ##arg)

#endif /* _WX_TYPE_H_ */
32 changes: 16 additions & 16 deletions drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
int ngbe_eeprom_chksum_hostif(struct ngbe_adapter *adapter)
{
struct wx_hic_read_shadow_ram buffer;
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;
int status;
int tmp;

Expand All @@ -26,28 +26,28 @@ int ngbe_eeprom_chksum_hostif(struct ngbe_adapter *adapter)
/* one word */
buffer.length = 0;

status = wx_host_interface_command(wxhw, (u32 *)&buffer, sizeof(buffer),
status = wx_host_interface_command(wx, (u32 *)&buffer, sizeof(buffer),
WX_HI_COMMAND_TIMEOUT, false);

if (status < 0)
return status;
tmp = rd32a(wxhw, WX_MNG_MBOX, 1);
tmp = rd32a(wx, WX_MNG_MBOX, 1);
if (tmp == NGBE_FW_CMD_ST_PASS)
return 0;
return -EIO;
}

static int ngbe_reset_misc(struct ngbe_adapter *adapter)
{
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;

wx_reset_misc(wxhw);
wx_reset_misc(wx);
if (adapter->mac_type == ngbe_mac_type_rgmii)
wr32(wxhw, NGBE_MDIO_CLAUSE_SELECT, 0xF);
wr32(wx, NGBE_MDIO_CLAUSE_SELECT, 0xF);
if (adapter->gpio_ctrl) {
/* gpio0 is used to power on/off control*/
wr32(wxhw, NGBE_GPIO_DDR, 0x1);
wr32(wxhw, NGBE_GPIO_DR, NGBE_GPIO_DR_0);
wr32(wx, NGBE_GPIO_DDR, 0x1);
wr32(wx, NGBE_GPIO_DR, NGBE_GPIO_DR_0);
}
return 0;
}
Expand All @@ -62,25 +62,25 @@ static int ngbe_reset_misc(struct ngbe_adapter *adapter)
**/
int ngbe_reset_hw(struct ngbe_adapter *adapter)
{
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;
int status = 0;
u32 reset = 0;

/* Call adapter stop to disable tx/rx and clear interrupts */
status = wx_stop_adapter(wxhw);
status = wx_stop_adapter(wx);
if (status != 0)
return status;
reset = WX_MIS_RST_LAN_RST(wxhw->bus.func);
wr32(wxhw, WX_MIS_RST, reset | rd32(wxhw, WX_MIS_RST));
reset = WX_MIS_RST_LAN_RST(wx->bus.func);
wr32(wx, WX_MIS_RST, reset | rd32(wx, WX_MIS_RST));
ngbe_reset_misc(adapter);

/* Store the permanent mac address */
wx_get_mac_addr(wxhw, wxhw->mac.perm_addr);
wx_get_mac_addr(wx, wx->mac.perm_addr);

/* reset num_rar_entries to 128 */
wxhw->mac.num_rar_entries = NGBE_RAR_ENTRIES;
wx_init_rx_addrs(wxhw);
pci_set_master(wxhw->pdev);
wx->mac.num_rar_entries = NGBE_RAR_ENTRIES;
wx_init_rx_addrs(wx);
pci_set_master(wx->pdev);

return 0;
}
86 changes: 43 additions & 43 deletions drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ static const struct pci_device_id ngbe_pci_tbl[] = {
**/
static void ngbe_init_type_code(struct ngbe_adapter *adapter)
{
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;
int wol_mask = 0, ncsi_mask = 0;
u16 type_mask = 0;

wxhw->mac.type = wx_mac_em;
type_mask = (u16)(wxhw->subsystem_device_id & NGBE_OEM_MASK);
ncsi_mask = wxhw->subsystem_device_id & NGBE_NCSI_MASK;
wol_mask = wxhw->subsystem_device_id & NGBE_WOL_MASK;
wx->mac.type = wx_mac_em;
type_mask = (u16)(wx->subsystem_device_id & NGBE_OEM_MASK);
ncsi_mask = wx->subsystem_device_id & NGBE_NCSI_MASK;
wol_mask = wx->subsystem_device_id & NGBE_WOL_MASK;

switch (type_mask) {
case NGBE_SUBID_M88E1512_SFP:
Expand Down Expand Up @@ -134,19 +134,19 @@ static inline int ngbe_init_rss_key(struct ngbe_adapter *adapter)
static int ngbe_sw_init(struct ngbe_adapter *adapter)
{
struct pci_dev *pdev = adapter->pdev;
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;
u16 msix_count = 0;
int err = 0;

wxhw->hw_addr = adapter->io_addr;
wxhw->pdev = pdev;
wx->hw_addr = adapter->io_addr;
wx->pdev = pdev;

wxhw->mac.num_rar_entries = NGBE_RAR_ENTRIES;
wxhw->mac.max_rx_queues = NGBE_MAX_RX_QUEUES;
wxhw->mac.max_tx_queues = NGBE_MAX_TX_QUEUES;
wx->mac.num_rar_entries = NGBE_RAR_ENTRIES;
wx->mac.max_rx_queues = NGBE_MAX_RX_QUEUES;
wx->mac.max_tx_queues = NGBE_MAX_TX_QUEUES;

/* PCI config space info */
err = wx_sw_init(wxhw);
err = wx_sw_init(wx);
if (err < 0) {
netif_err(adapter, probe, adapter->netdev,
"Read of internal subsystem device id failed\n");
Expand All @@ -158,10 +158,10 @@ static int ngbe_sw_init(struct ngbe_adapter *adapter)

/* Set common capability flags and settings */
adapter->max_q_vectors = NGBE_MAX_MSIX_VECTORS;
err = wx_get_pcie_msix_counts(wxhw, &msix_count, NGBE_MAX_MSIX_VECTORS);
err = wx_get_pcie_msix_counts(wx, &msix_count, NGBE_MAX_MSIX_VECTORS);
if (err)
dev_err(&pdev->dev, "Do not support MSI-X\n");
wxhw->mac.max_msix_vectors = msix_count;
wx->mac.max_msix_vectors = msix_count;

if (ngbe_init_rss_key(adapter))
return -ENOMEM;
Expand Down Expand Up @@ -199,9 +199,9 @@ static void ngbe_down(struct ngbe_adapter *adapter)
static int ngbe_open(struct net_device *netdev)
{
struct ngbe_adapter *adapter = netdev_priv(netdev);
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;

wx_control_hw(wxhw, true);
wx_control_hw(wx, true);

return 0;
}
Expand All @@ -222,7 +222,7 @@ static int ngbe_close(struct net_device *netdev)
struct ngbe_adapter *adapter = netdev_priv(netdev);

ngbe_down(adapter);
wx_control_hw(&adapter->wxhw, false);
wx_control_hw(&adapter->wx, false);

return 0;
}
Expand All @@ -244,7 +244,7 @@ static void ngbe_dev_shutdown(struct pci_dev *pdev, bool *enable_wake)
if (netif_running(netdev))
ngbe_down(adapter);
rtnl_unlock();
wx_control_hw(&adapter->wxhw, false);
wx_control_hw(&adapter->wx, false);

pci_disable_device(pdev);
}
Expand Down Expand Up @@ -287,7 +287,7 @@ static int ngbe_probe(struct pci_dev *pdev,
const struct pci_device_id __always_unused *ent)
{
struct ngbe_adapter *adapter = NULL;
struct wx_hw *wxhw = NULL;
struct wx *wx = NULL;
struct net_device *netdev;
u32 e2rom_cksum_cap = 0;
static int func_nums;
Expand Down Expand Up @@ -333,8 +333,8 @@ static int ngbe_probe(struct pci_dev *pdev,
adapter = netdev_priv(netdev);
adapter->netdev = netdev;
adapter->pdev = pdev;
wxhw = &adapter->wxhw;
wxhw->netdev = netdev;
wx = &adapter->wx;
wx->netdev = netdev;
adapter->msg_enable = BIT(3) - 1;

adapter->io_addr = devm_ioremap(&pdev->dev,
Expand All @@ -356,14 +356,14 @@ static int ngbe_probe(struct pci_dev *pdev,
goto err_free_mac_table;

/* check if flash load is done after hw power up */
err = wx_check_flash_load(wxhw, NGBE_SPI_ILDR_STATUS_PERST);
err = wx_check_flash_load(wx, NGBE_SPI_ILDR_STATUS_PERST);
if (err)
goto err_free_mac_table;
err = wx_check_flash_load(wxhw, NGBE_SPI_ILDR_STATUS_PWRRST);
err = wx_check_flash_load(wx, NGBE_SPI_ILDR_STATUS_PWRRST);
if (err)
goto err_free_mac_table;

err = wx_mng_present(wxhw);
err = wx_mng_present(wx);
if (err) {
dev_err(&pdev->dev, "Management capability is not present\n");
goto err_free_mac_table;
Expand All @@ -375,16 +375,16 @@ static int ngbe_probe(struct pci_dev *pdev,
goto err_free_mac_table;
}

if (wxhw->bus.func == 0) {
wr32(wxhw, NGBE_CALSUM_CAP_STATUS, 0x0);
wr32(wxhw, NGBE_EEPROM_VERSION_STORE_REG, 0x0);
if (wx->bus.func == 0) {
wr32(wx, NGBE_CALSUM_CAP_STATUS, 0x0);
wr32(wx, NGBE_EEPROM_VERSION_STORE_REG, 0x0);
} else {
e2rom_cksum_cap = rd32(wxhw, NGBE_CALSUM_CAP_STATUS);
saved_ver = rd32(wxhw, NGBE_EEPROM_VERSION_STORE_REG);
e2rom_cksum_cap = rd32(wx, NGBE_CALSUM_CAP_STATUS);
saved_ver = rd32(wx, NGBE_EEPROM_VERSION_STORE_REG);
}

wx_init_eeprom_params(wxhw);
if (wxhw->bus.func == 0 || e2rom_cksum_cap == 0) {
wx_init_eeprom_params(wx);
if (wx->bus.func == 0 || e2rom_cksum_cap == 0) {
/* make sure the EEPROM is ready */
err = ngbe_eeprom_chksum_hostif(adapter);
if (err) {
Expand All @@ -399,7 +399,7 @@ static int ngbe_probe(struct pci_dev *pdev,
adapter->wol = NGBE_PSR_WKUP_CTL_MAG;

adapter->wol_enabled = !!(adapter->wol);
wr32(wxhw, NGBE_PSR_WKUP_CTL, adapter->wol);
wr32(wx, NGBE_PSR_WKUP_CTL, adapter->wol);

device_set_wakeup_enable(&pdev->dev, adapter->wol);

Expand All @@ -409,19 +409,19 @@ static int ngbe_probe(struct pci_dev *pdev,
if (saved_ver) {
etrack_id = saved_ver;
} else {
wx_read_ee_hostif(wxhw,
wxhw->eeprom.sw_region_offset + NGBE_EEPROM_VERSION_H,
wx_read_ee_hostif(wx,
wx->eeprom.sw_region_offset + NGBE_EEPROM_VERSION_H,
&e2rom_ver);
etrack_id = e2rom_ver << 16;
wx_read_ee_hostif(wxhw,
wxhw->eeprom.sw_region_offset + NGBE_EEPROM_VERSION_L,
wx_read_ee_hostif(wx,
wx->eeprom.sw_region_offset + NGBE_EEPROM_VERSION_L,
&e2rom_ver);
etrack_id |= e2rom_ver;
wr32(wxhw, NGBE_EEPROM_VERSION_STORE_REG, etrack_id);
wr32(wx, NGBE_EEPROM_VERSION_STORE_REG, etrack_id);
}

eth_hw_addr_set(netdev, wxhw->mac.perm_addr);
wx_mac_set_default_filter(wxhw, wxhw->mac.perm_addr);
eth_hw_addr_set(netdev, wx->mac.perm_addr);
wx_mac_set_default_filter(wx, wx->mac.perm_addr);

err = register_netdev(netdev);
if (err)
Expand All @@ -437,9 +437,9 @@ static int ngbe_probe(struct pci_dev *pdev,
return 0;

err_register:
wx_control_hw(wxhw, false);
wx_control_hw(wx, false);
err_free_mac_table:
kfree(wxhw->mac_table);
kfree(wx->mac_table);
err_pci_release_regions:
pci_disable_pcie_error_reporting(pdev);
pci_release_selected_regions(pdev,
Expand All @@ -461,15 +461,15 @@ static int ngbe_probe(struct pci_dev *pdev,
static void ngbe_remove(struct pci_dev *pdev)
{
struct ngbe_adapter *adapter = pci_get_drvdata(pdev);
struct wx_hw *wxhw = &adapter->wxhw;
struct wx *wx = &adapter->wx;
struct net_device *netdev;

netdev = adapter->netdev;
unregister_netdev(netdev);
pci_release_selected_regions(pdev,
pci_select_bars(pdev, IORESOURCE_MEM));

kfree(wxhw->mac_table);
kfree(wx->mac_table);
pci_disable_pcie_error_reporting(pdev);

pci_disable_device(pdev);
Expand Down
Loading

0 comments on commit 9607a3e

Please sign in to comment.