Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4ef85da authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cxgb4-collect-free-Tx-Rx-pages-and-page-pointers' 



Rahul Lakkireddy says:

====================
cxgb4: collect free Tx/Rx pages and page pointers

Patch 1 collects number of free PSTRUCT page pointers in context
memory.

Patch 2 moves the collection logic for Tx/Rx free pages to common
code, since this information needs to be collected in vmcore device
dump as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6eb5e652 ae2a922f

drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h

+5 −0
Original line number Diff line number Diff line
@@ -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,9 @@ struct cudbg_meminfo { 
	u32 port_alloc[4];

	u32 loopback_used[NCHAN];

	u32 loopback_alloc[NCHAN];

	u32 p_structs_free_cnt;

	u32 free_rx_cnt;

	u32 free_tx_cnt;

};



struct cudbg_cim_pif_la {

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c

+23 −2
Original line number Diff line number Diff line
@@ -349,6 +349,11 @@ int cudbg_fill_meminfo(struct adapter *padap, 
	meminfo_buff->up_extmem2_hi = hi;



	lo = t4_read_reg(padap, TP_PMM_RX_MAX_PAGE_A);

	for (i = 0, meminfo_buff->free_rx_cnt = 0; i < 2; i++)

		meminfo_buff->free_rx_cnt +=

			FREERXPAGECOUNT_G(t4_read_reg(padap,

						      TP_FLM_FREE_RX_CNT_A));



	meminfo_buff->rx_pages_data[0] =  PMRXMAXPAGE_G(lo);

	meminfo_buff->rx_pages_data[1] =

		t4_read_reg(padap, TP_PMM_RX_PAGE_SIZE_A) >> 10;
@@ -356,6 +361,11 @@ int cudbg_fill_meminfo(struct adapter *padap, 


	lo = t4_read_reg(padap, TP_PMM_TX_MAX_PAGE_A);

	hi = t4_read_reg(padap, TP_PMM_TX_PAGE_SIZE_A);

	for (i = 0, meminfo_buff->free_tx_cnt = 0; i < 4; i++)

		meminfo_buff->free_tx_cnt +=

			FREETXPAGECOUNT_G(t4_read_reg(padap,

						      TP_FLM_FREE_TX_CNT_A));



	meminfo_buff->tx_pages_data[0] = PMTXMAXPAGE_G(lo);

	meminfo_buff->tx_pages_data[1] =

		hi >= (1 << 20) ? (hi >> 20) : (hi >> 10);
@@ -364,6 +374,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 +1477,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;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c

+4 −10
Original line number Diff line number Diff line
@@ -2858,7 +2858,6 @@ static int meminfo_show(struct seq_file *seq, void *v) 
{

	static const char * const memory[] = { "EDC0:", "EDC1:", "MC:",

					       "MC0:", "MC1:", "HMA:"};

	unsigned int free_rx_cnt, free_tx_cnt;

	struct adapter *adap = seq->private;

	struct cudbg_meminfo meminfo;

	int i, rc;
@@ -2890,22 +2889,17 @@ static int meminfo_show(struct seq_file *seq, void *v) 
	mem_region_show(seq, "uP Extmem2:", meminfo.up_extmem2_lo,

			meminfo.up_extmem2_hi);



	for (i = 0, free_rx_cnt = 0; i < 2; i++)

		free_rx_cnt += FREERXPAGECOUNT_G

				      (t4_read_reg(adap, TP_FLM_FREE_RX_CNT_A));

	seq_printf(seq, "\n%u Rx pages (%u free) of size %uKiB for %u channels\n",

		   meminfo.rx_pages_data[0], free_rx_cnt,

		   meminfo.rx_pages_data[0], meminfo.free_rx_cnt,

		   meminfo.rx_pages_data[1], meminfo.rx_pages_data[2]);



	for (i = 0, free_tx_cnt = 0; i < 4; i++)

		free_tx_cnt += FREETXPAGECOUNT_G

				      (t4_read_reg(adap, TP_FLM_FREE_TX_CNT_A));

	seq_printf(seq, "%u Tx pages (%u free) of size %u%ciB for %u channels\n",

		   meminfo.tx_pages_data[0], free_tx_cnt,

		   meminfo.tx_pages_data[0], meminfo.free_tx_cnt,

		   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 */

drivers/net/ethernet/chelsio/cxgb4/t4_regs.h

+5 −0
Original line number Diff line number Diff line
@@ -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)