leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: thunderx: Cleanup duplicate NODE_ID macros, add nic_get_node_id()

Browse Source 
There are duplicate NODE_ID macro definitions. Move all of them to
nic.h for usage in nic and bgx driver and introduce nic_get_node_id()
helper function.

This patch also fixes 64bit mask which should have been ULL by
reworking the node calculation.

Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Robert Richter 2015-06-02 11:00:18 -07:00 committed by David S. Miller
parent dda922c831
commit d768b678a8
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/cavium/thunder/nic.h
View File

@ -11,6 +11,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/pci.h>
#include "thunder_bgx.h" #include "thunder_bgx.h"
/* PCI device IDs */ /* PCI device IDs */
@ -398,6 +399,15 @@ union nic_mbx {
struct bgx_link_status link_status; struct bgx_link_status link_status;
}; };
#define NIC_NODE_ID_MASK 0x03
#define NIC_NODE_ID_SHIFT 44
static inline int nic_get_node_id(struct pci_dev *pdev)
{
u64 addr = pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM);
return ((addr >> NIC_NODE_ID_SHIFT) & NIC_NODE_ID_MASK);
}
int nicvf_set_real_num_queues(struct net_device *netdev, int nicvf_set_real_num_queues(struct net_device *netdev,
int tx_queues, int rx_queues); int tx_queues, int rx_queues);
int nicvf_open(struct net_device *netdev); int nicvf_open(struct net_device *netdev);

4
drivers/net/ethernet/cavium/thunder/nic_main.c
View File

@ -23,8 +23,6 @@
struct nicpf { struct nicpf {
struct pci_dev *pdev; struct pci_dev *pdev;
u8 rev_id; u8 rev_id;
#define NIC_NODE_ID_MASK 0x300000000000
#define NIC_NODE_ID(x) ((x & NODE_ID_MASK) >> 44)
u8 node; u8 node;
unsigned int flags; unsigned int flags;
u8 num_vf_en; /* No of VF enabled */ u8 num_vf_en; /* No of VF enabled */
@ -851,7 +849,7 @@ static int nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_read_config_byte(pdev, PCI_REVISION_ID, &nic->rev_id); pci_read_config_byte(pdev, PCI_REVISION_ID, &nic->rev_id);
nic->node = NIC_NODE_ID(pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM)); nic->node = nic_get_node_id(pdev);
nic_set_lmac_vf_mapping(nic); nic_set_lmac_vf_mapping(nic);

4
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
View File

@ -894,8 +894,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_release_regions; goto err_release_regions;
} }
bgx->bgx_id = (pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM) >> 24) & 1; bgx->bgx_id = (pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM) >> 24) & 1;
bgx->bgx_id += NODE_ID(pci_resource_start(pdev, PCI_CFG_REG_BAR_NUM)) bgx->bgx_id += nic_get_node_id(pdev) * MAX_BGX_PER_CN88XX;
* MAX_BGX_PER_CN88XX;
bgx_vnic[bgx->bgx_id] = bgx; bgx_vnic[bgx->bgx_id] = bgx;
bgx_get_qlm_mode(bgx); bgx_get_qlm_mode(bgx);

3
drivers/net/ethernet/cavium/thunder/thunder_bgx.h
View File

@ -20,9 +20,6 @@
#define MAX_LMAC (MAX_BGX_PER_CN88XX * MAX_LMAC_PER_BGX) #define MAX_LMAC (MAX_BGX_PER_CN88XX * MAX_LMAC_PER_BGX)
#define NODE_ID_MASK 0x300000000000
#define NODE_ID(x) ((x & NODE_ID_MASK) >> 44)
/* Registers */ /* Registers */
#define BGX_CMRX_CFG 0x00 #define BGX_CMRX_CFG 0x00
#define CMR_PKT_TX_EN BIT_ULL(13) #define CMR_PKT_TX_EN BIT_ULL(13)