cxgb4: collect number of free PSTRUCT page pointers

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
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_entity.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
index aaf7985..84e0e71 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
@@ -120,6 +120,8 @@ struct cudbg_mem_desc {
        u32 idx;
 };
 
+#define CUDBG_MEMINFO_REV 1
+
 struct cudbg_meminfo {
        struct cudbg_mem_desc avail[4];
        struct cudbg_mem_desc mem[ARRAY_SIZE(cudbg_region) + 3];
@@ -137,6 +139,7 @@ struct cudbg_meminfo {
        u32 port_alloc[4];
        u32 loopback_used[NCHAN];
        u32 loopback_alloc[NCHAN];
+       u32 p_structs_free_cnt;
 };
 
 struct cudbg_cim_pif_la {

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
index b1eb843..e3ad733 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
@@ -364,6 +364,8 @@ int cudbg_fill_meminfo(struct adapter *padap,
        meminfo_buff->tx_pages_data[3] = 1 << PMTXNUMCHN_G(lo);
 
        meminfo_buff->p_structs = t4_read_reg(padap, TP_CMM_MM_MAX_PSTRUCT_A);
+       meminfo_buff->p_structs_free_cnt =
+               FREEPSTRUCTCOUNT_G(t4_read_reg(padap, TP_FLM_FREE_PS_CNT_A));
 
        for (i = 0; i < 4; i++) {
                if (CHELSIO_CHIP_VERSION(padap->params.chip) > CHELSIO_T5)
@@ -1465,14 +1467,23 @@ int cudbg_collect_meminfo(struct cudbg_init *pdbg_init,
        struct adapter *padap = pdbg_init->adap;
        struct cudbg_buffer temp_buff = { 0 };
        struct cudbg_meminfo *meminfo_buff;
+       struct cudbg_ver_hdr *ver_hdr;
        int rc;
 
-       rc = cudbg_get_buff(pdbg_init, dbg_buff, sizeof(struct cudbg_meminfo),
+       rc = cudbg_get_buff(pdbg_init, dbg_buff,
+                           sizeof(struct cudbg_ver_hdr) +
+                           sizeof(struct cudbg_meminfo),
                            &temp_buff);
        if (rc)
                return rc;
 
-       meminfo_buff = (struct cudbg_meminfo *)temp_buff.data;
+       ver_hdr = (struct cudbg_ver_hdr *)temp_buff.data;
+       ver_hdr->signature = CUDBG_ENTITY_SIGNATURE;
+       ver_hdr->revision = CUDBG_MEMINFO_REV;
+       ver_hdr->size = sizeof(struct cudbg_meminfo);
+
+       meminfo_buff = (struct cudbg_meminfo *)(temp_buff.data +
+                                               sizeof(*ver_hdr));
        rc = cudbg_fill_meminfo(padap, meminfo_buff);
        if (rc) {
                cudbg_err->sys_err = rc;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
index 55b4659..5f01c0a 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
@@ -224,7 +224,8 @@ static u32 cxgb4_get_entity_length(struct adapter *adap, u32 entity)
                len = sizeof(struct cudbg_tp_la) + TPLA_SIZE * sizeof(u64);
                break;
        case CUDBG_MEMINFO:
-               len = sizeof(struct cudbg_meminfo);
+               len = sizeof(struct cudbg_ver_hdr) +
+                     sizeof(struct cudbg_meminfo);
                break;
        case CUDBG_CIM_PIF_LA:
                len = sizeof(struct cudbg_cim_pif_la);

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 631b78b..218ee8e 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -2905,7 +2905,8 @@ static int meminfo_show(struct seq_file *seq, void *v)
                   meminfo.tx_pages_data[1], meminfo.tx_pages_data[2],
                   meminfo.tx_pages_data[3]);
 
-       seq_printf(seq, "%u p-structs\n\n", meminfo.p_structs);
+       seq_printf(seq, "%u p-structs (%u free)\n\n",
+                  meminfo.p_structs, meminfo.p_structs_free_cnt);
 
        for (i = 0; i < 4; i++)
                /* For T6 these are MAC buffer groups */

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
index da88588..eb222d4 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
@@ -1502,8 +1502,13 @@
 #define TP_MIB_DATA_A  0x7e54
 #define TP_INT_CAUSE_A 0x7e74
 
+#define TP_FLM_FREE_PS_CNT_A 0x7e80
 #define TP_FLM_FREE_RX_CNT_A 0x7e84
 
+#define FREEPSTRUCTCOUNT_S    0
+#define FREEPSTRUCTCOUNT_M    0x1fffffU
+#define FREEPSTRUCTCOUNT_G(x) (((x) >> FREEPSTRUCTCOUNT_S) & FREEPSTRUCTCOUNT_M)
+
 #define FREERXPAGECOUNT_S    0
 #define FREERXPAGECOUNT_M    0x1fffffU
 #define FREERXPAGECOUNT_V(x) ((x) << FREERXPAGECOUNT_S)