cxgb4: RSS table is 4k for T6

RSS table is 4k for T6 and later cards, add check for the
same.

Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
index d73fb6a85f8ed0268953ff86a01b82cd9796b81d..336670d00a521207cbe22311d2b04feebc59f1a8 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
@@ -1004,9 +1004,10 @@ int cudbg_collect_rss(struct cudbg_init *pdbg_init,
 {
        struct adapter *padap = pdbg_init->adap;
        struct cudbg_buffer temp_buff = { 0 };
-       int rc;
+       int rc, nentries;
 
-       rc = cudbg_get_buff(dbg_buff, RSS_NENTRIES * sizeof(u16), &temp_buff);
+       nentries = t4_chip_rss_size(padap);
+       rc = cudbg_get_buff(dbg_buff, nentries * sizeof(u16), &temp_buff);
        if (rc)
                return rc;
 

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index b1df2aa6be945a74e0f550a4d901a179e8ec9806..69d0b64e698673d78c8e66e466572c3d60e7f3e1 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1528,6 +1528,7 @@ int t4_init_portinfo(struct port_info *pi, int mbox,
                     int port, int pf, int vf, u8 mac[]);
 int t4_port_init(struct adapter *adap, int mbox, int pf, int vf);
 void t4_fatal_err(struct adapter *adapter);
+unsigned int t4_chip_rss_size(struct adapter *adapter);
 int t4_config_rss_range(struct adapter *adapter, int mbox, unsigned int viid,
                        int start, int n, const u16 *rspq, unsigned int nrspq);
 int t4_config_glbl_rss(struct adapter *adapter, int mbox, unsigned int mode,

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
index 41c8736314f8e465edec748227d22a7c046e9785..581d628f01cc5ea62b7f6441c56c4cd69285c11e 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
@@ -179,7 +179,7 @@ static u32 cxgb4_get_entity_length(struct adapter *adap, u32 entity)
                len = cudbg_mbytes_to_bytes(len);
                break;
        case CUDBG_RSS:
-               len = RSS_NENTRIES * sizeof(u16);
+               len = t4_chip_rss_size(adap) * sizeof(u16);
                break;
        case CUDBG_RSS_VF_CONF:
                len = adap->params.arch.vfcount *

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index d8efcd9e55d3958ab16498164891984aadf4509d..d3ced0438474db6afcf3199621bd29b5aa90c9d5 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -2021,11 +2021,12 @@ static int rss_show(struct seq_file *seq, void *v, int idx)
 
 static int rss_open(struct inode *inode, struct file *file)
 {
-       int ret;
-       struct seq_tab *p;
        struct adapter *adap = inode->i_private;
+       int ret, nentries;
+       struct seq_tab *p;
 
-       p = seq_open_tab(file, RSS_NENTRIES / 8, 8 * sizeof(u16), 0, rss_show);
+       nentries = t4_chip_rss_size(adap);
+       p = seq_open_tab(file, nentries / 8, 8 * sizeof(u16), 0, rss_show);
        if (!p)
                return -ENOMEM;
 

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index d18e708c21c5f2d1c0c9ca6b979f9ff8301ef821..44930ca06c4bd1860609fb69da04224739b59e19 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -4927,6 +4927,14 @@ void t4_intr_disable(struct adapter *adapter)
        t4_set_reg_field(adapter, PL_INT_MAP0_A, 1 << pf, 0);
 }
 
+unsigned int t4_chip_rss_size(struct adapter *adap)
+{
+       if (CHELSIO_CHIP_VERSION(adap->params.chip) <= CHELSIO_T5)
+               return RSS_NENTRIES;
+       else
+               return T6_RSS_NENTRIES;
+}
+
 /**
  *     t4_config_rss_range - configure a portion of the RSS mapping table
  *     @adapter: the adapter
@@ -5065,10 +5073,11 @@ static int rd_rss_row(struct adapter *adap, int row, u32 *val)
  */
 int t4_read_rss(struct adapter *adapter, u16 *map)
 {
+       int i, ret, nentries;
        u32 val;
-       int i, ret;
 
-       for (i = 0; i < RSS_NENTRIES / 2; ++i) {
+       nentries = t4_chip_rss_size(adapter);
+       for (i = 0; i < nentries / 2; ++i) {
                ret = rd_rss_row(adapter, i, &val);
                if (ret)
                        return ret;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
index 872a91b1930c04302580d31fa40c4c599528bb1e..361d5032c28849ab2fb6350a2e99d7a229eeaa38 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h
@@ -38,21 +38,22 @@
 #include <linux/types.h>
 
 enum {
-       NCHAN          = 4,     /* # of HW channels */
-       MAX_MTU        = 9600,  /* max MAC MTU, excluding header + FCS */
-       EEPROMSIZE     = 17408, /* Serial EEPROM physical size */
-       EEPROMVSIZE    = 32768, /* Serial EEPROM virtual address space size */
-       EEPROMPFSIZE   = 1024,  /* EEPROM writable area size for PFn, n>0 */
-       RSS_NENTRIES   = 2048,  /* # of entries in RSS mapping table */
-       TCB_SIZE       = 128,   /* TCB size */
-       NMTUS          = 16,    /* size of MTU table */
-       NCCTRL_WIN     = 32,    /* # of congestion control windows */
-       NTX_SCHED      = 8,     /* # of HW Tx scheduling queues */
-       PM_NSTATS      = 5,     /* # of PM stats */
-       T6_PM_NSTATS   = 7,     /* # of PM stats in T6 */
-       MBOX_LEN       = 64,    /* mailbox size in bytes */
-       TRACE_LEN      = 112,   /* length of trace data and mask */
-       FILTER_OPT_LEN = 36,    /* filter tuple width for optional components */
+       NCHAN           = 4,    /* # of HW channels */
+       MAX_MTU         = 9600, /* max MAC MTU, excluding header + FCS */
+       EEPROMSIZE      = 17408,/* Serial EEPROM physical size */
+       EEPROMVSIZE     = 32768,/* Serial EEPROM virtual address space size */
+       EEPROMPFSIZE    = 1024, /* EEPROM writable area size for PFn, n>0 */
+       RSS_NENTRIES    = 2048, /* # of entries in RSS mapping table */
+       T6_RSS_NENTRIES = 4096, /* # of entries in RSS mapping table */
+       TCB_SIZE        = 128,  /* TCB size */
+       NMTUS           = 16,   /* size of MTU table */
+       NCCTRL_WIN      = 32,   /* # of congestion control windows */
+       NTX_SCHED       = 8,    /* # of HW Tx scheduling queues */
+       PM_NSTATS       = 5,    /* # of PM stats */
+       T6_PM_NSTATS    = 7,    /* # of PM stats in T6 */
+       MBOX_LEN        = 64,   /* mailbox size in bytes */
+       TRACE_LEN       = 112,  /* length of trace data and mask */
+       FILTER_OPT_LEN  = 36,   /* filter tuple width for optional components */
 };
 
 enum {