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

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>

diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h
index 9b0be527909bf9a794989d7a7fa8deaeb8d4ea8e..4f426db54e42e6d922a08b6e308467d74830a64d 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic.h
+++ b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -11,6 +11,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
 #include "thunder_bgx.h"
 
 /* PCI device IDs */
@@ -398,6 +399,15 @@ union nic_mbx {
        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 tx_queues, int rx_queues);
 int nicvf_open(struct net_device *netdev);

diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 0f1f58b54bf1e2bfa89e6aacb74cad762754c931..3ca7ad882c103aa00abd97a2d59156d13302cc46 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -23,8 +23,6 @@
 struct nicpf {
        struct pci_dev          *pdev;
        u8                      rev_id;
-#define NIC_NODE_ID_MASK       0x300000000000
-#define NIC_NODE_ID(x)         ((x & NODE_ID_MASK) >> 44)
        u8                      node;
        unsigned int            flags;
        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);
 
-       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);
 

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 020e11cf3fddd9c701b9186d9dcc73d64ee3883f..cde604a93d5d85ff7212568aedad2fc1b5f1534c 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -894,8 +894,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto err_release_regions;
        }
        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))
-                                                       * MAX_BGX_PER_CN88XX;
+       bgx->bgx_id += nic_get_node_id(pdev) * MAX_BGX_PER_CN88XX;
+
        bgx_vnic[bgx->bgx_id] = bgx;
        bgx_get_qlm_mode(bgx);
 

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
index 9d91ce44f8d7616f7a40c37d68d97947ab910f0e..f9e2170c488a86730c1416a93657b899a5807360 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
@@ -20,9 +20,6 @@
 
 #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 */
 #define BGX_CMRX_CFG                   0x00
 #define  CMR_PKT_TX_EN                         BIT_ULL(13)