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

Commit 56cf2635 authored by Rahul Lakkireddy's avatar Rahul Lakkireddy Committed by David S. Miller
Browse files

cxgb4: update dump collection logic to use compression 



Update firmware dump collection logic to use compression when available.
Let collection logic attempt to do compression, instead of returning out
of memory early.

Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarVishal Kulkarni <vishal@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5165674f

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

+19 −5
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
#include "cudbg_if.h"

#include "cudbg_lib_common.h"



int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size,

int cudbg_get_buff(struct cudbg_init *pdbg_init,

		   struct cudbg_buffer *pdbg_buff, u32 size,

		   struct cudbg_buffer *pin_buff)

{

	u32 offset;
@@ -28,17 +29,30 @@ int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size, 
	if (offset + size > pdbg_buff->size)

		return CUDBG_STATUS_NO_MEM;



	if (pdbg_init->compress_type != CUDBG_COMPRESSION_NONE) {

		if (size > pdbg_init->compress_buff_size)

			return CUDBG_STATUS_NO_MEM;



		pin_buff->data = (char *)pdbg_init->compress_buff;

		pin_buff->offset = 0;

		pin_buff->size = size;

		return 0;

	}



	pin_buff->data = (char *)pdbg_buff->data + offset;

	pin_buff->offset = offset;

	pin_buff->size = size;

	pdbg_buff->size -= size;

	return 0;

}



void cudbg_put_buff(struct cudbg_buffer *pin_buff,

		    struct cudbg_buffer *pdbg_buff)

void cudbg_put_buff(struct cudbg_init *pdbg_init,

		    struct cudbg_buffer *pin_buff)

{

	pdbg_buff->size += pin_buff->size;

	/* Clear compression buffer for re-use */

	if (pdbg_init->compress_type != CUDBG_COMPRESSION_NONE)

		memset(pdbg_init->compress_buff, 0,

		       pdbg_init->compress_buff_size);



	pin_buff->data = NULL;

	pin_buff->offset = 0;

	pin_buff->size = 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ struct cudbg_init { 
	struct adapter *adap; /* Pointer to adapter structure */

	void *outbuf; /* Output buffer */

	u32 outbuf_size;  /* Output buffer size */

	u8 compress_type; /* Type of compression to use */

	void *compress_buff; /* Compression buffer */

	u32 compress_buff_size; /* Compression buffer size */

};



static inline unsigned int cudbg_mbytes_to_bytes(unsigned int size)

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

+151 −129

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −3
Original line number Diff line number Diff line
@@ -78,10 +78,11 @@ struct cudbg_error { 
#define CDUMP_MAX_COMP_BUF_SIZE ((64 * 1024) - 1)

#define CUDBG_CHUNK_SIZE ((CDUMP_MAX_COMP_BUF_SIZE / 1024) * 1024)



int cudbg_get_buff(struct cudbg_buffer *pdbg_buff, u32 size,

int cudbg_get_buff(struct cudbg_init *pdbg_init,

		   struct cudbg_buffer *pdbg_buff, u32 size,

		   struct cudbg_buffer *pin_buff);

void cudbg_put_buff(struct cudbg_init *pdbg_init,

		    struct cudbg_buffer *pin_buff);

void cudbg_put_buff(struct cudbg_buffer *pin_buff,

		    struct cudbg_buffer *pdbg_buff);

void cudbg_update_buff(struct cudbg_buffer *pin_buff,

		       struct cudbg_buffer *pout_buff);

#endif /* __CUDBG_LIB_COMMON_H__ */

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

0 → 100644
+27 −0

File added.

Preview size limit exceeded, changes collapsed.