Commit f4fbf4ac authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Update stat accounting for READ_STATUS mbox command 

READ_STATUS tx/rx byte count fields are now expanded to 64 bit wide
counters.  This patch updates logic for the READ_STATUS mbox command when
displaying tx_word and rx_word statistics in sysfs.

Link: https://lore.kernel.org/r/20220412222008.126521-24-jsmart2021@gmail.com


Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1b6f71f7

drivers/scsi/lpfc/lpfc_attr.c

+26 −9
Original line number Diff line number Diff line
@@ -6888,17 +6888,34 @@ lpfc_get_stats(struct Scsi_Host *shost) 
	memset(hs, 0, sizeof (struct fc_host_statistics));



	hs->tx_frames = pmb->un.varRdStatus.xmitFrameCnt;

	hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;



	/*

	 * The MBX_READ_STATUS returns tx_k_bytes which has to

	 * converted to words

	 * The MBX_READ_STATUS returns tx_k_bytes which has to be

	 * converted to words.

	 *

	 * Check if extended byte flag is set, to know when to collect upper

	 * bits of 64 bit wide statistics counter.

	 */

	if (pmb->un.varRdStatus.xkb & RD_ST_XKB) {

		hs->tx_words = (u64)

			       ((((u64)(pmb->un.varRdStatus.xmit_xkb &

					RD_ST_XMIT_XKB_MASK) << 32) |

				(u64)pmb->un.varRdStatus.xmitByteCnt) *

				(u64)256);

		hs->rx_words = (u64)

			       ((((u64)(pmb->un.varRdStatus.rcv_xkb &

					RD_ST_RCV_XKB_MASK) << 32) |

				(u64)pmb->un.varRdStatus.rcvByteCnt) *

				(u64)256);

	} else {

		hs->tx_words = (uint64_t)

				((uint64_t)pmb->un.varRdStatus.xmitByteCnt

				* (uint64_t)256);

	hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;

		hs->rx_words = (uint64_t)

				((uint64_t)pmb->un.varRdStatus.rcvByteCnt

				 * (uint64_t)256);

	}



	memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));

	pmb->mbxCommand = MBX_READ_LNK_STAT;

drivers/scsi/lpfc/lpfc_hw.h

+26 −11
Original line number Diff line number Diff line
@@ -2648,19 +2648,26 @@ typedef struct { 
} READ_SPARM_VAR;



/* Structure for MB Command READ_STATUS (14) */

enum read_status_word1 {

	RD_ST_CC	= 0x01,

	RD_ST_XKB	= 0x80,

};



enum read_status_word17 {

	RD_ST_XMIT_XKB_MASK = 0x3fffff,

};



enum read_status_word18 {

	RD_ST_RCV_XKB_MASK = 0x3fffff,

};



typedef struct {

#ifdef __BIG_ENDIAN_BITFIELD

	uint32_t rsvd1:31;

	uint32_t clrCounters:1;

	uint16_t activeXriCnt;

	uint16_t activeRpiCnt;

#else	/*  __LITTLE_ENDIAN_BITFIELD */

	uint32_t clrCounters:1;

	uint32_t rsvd1:31;

	uint16_t activeRpiCnt;

	uint16_t activeXriCnt;

#endif

	u8 clear_counters; /* rsvd 7:1, cc 0 */

	u8 rsvd5;

	u8 rsvd6;

	u8 xkb; /* xkb 7, rsvd 6:0 */



	u32 rsvd8;



	uint32_t xmitByteCnt;

	uint32_t rcvByteCnt;
@@ -2672,6 +2679,14 @@ typedef struct { 
	uint32_t totalRespExchanges;

	uint32_t rcvPbsyCnt;

	uint32_t rcvFbsyCnt;



	u32 drop_frame_no_rq;

	u32 empty_rq;

	u32 drop_frame_no_xri;

	u32 empty_xri;



	u32 xmit_xkb; /* rsvd 31:22, xmit_xkb 21:0 */

	u32 rcv_xkb; /* rsvd 31:22, rcv_xkb 21:0 */

} READ_STATUS_VAR;



/* Structure for MB Command READ_RPI (15) */