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

Commit 57069386 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: put threshold data in hba trace 



Now that we removed the long messages for the bit error threshold
data, put the data in the hba trace. This way, we get a short warning
for the threshold event from the hardware and have the data in the
trace for further analysis.

Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 0406289e

drivers/s390/scsi/zfcp_dbf.c

+46 −0
Original line number Diff line number Diff line
@@ -318,6 +318,26 @@ void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter, 
	spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);

}



/**

 * zfcp_hba_dbf_event_berr - trace event for bit error threshold

 * @adapter: adapter affected by this QDIO related event

 * @req: fsf request

 */

void zfcp_hba_dbf_event_berr(struct zfcp_adapter *adapter,

			     struct zfcp_fsf_req *req)

{

	struct zfcp_hba_dbf_record *r = &adapter->hba_dbf_buf;

	struct fsf_status_read_buffer *sr_buf = req->data;

	struct fsf_bit_error_payload *err = &sr_buf->payload.bit_error;

	unsigned long flags;



	spin_lock_irqsave(&adapter->hba_dbf_lock, flags);

	memset(r, 0, sizeof(*r));

	strncpy(r->tag, "berr", ZFCP_DBF_TAG_SIZE);

	memcpy(&r->u.berr, err, sizeof(struct fsf_bit_error_payload));

	debug_event(adapter->hba_dbf, 0, r, sizeof(*r));

	spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);

}

static void zfcp_hba_dbf_view_response(char **p,

				       struct zfcp_hba_dbf_record_response *r)

{
@@ -399,6 +419,30 @@ static void zfcp_hba_dbf_view_qdio(char **p, struct zfcp_hba_dbf_record_qdio *r) 
	zfcp_dbf_out(p, "sbal_count", "0x%02x", r->sbal_count);

}



static void zfcp_hba_dbf_view_berr(char **p, struct fsf_bit_error_payload *r)

{

	zfcp_dbf_out(p, "link_failures", "%d", r->link_failure_error_count);

	zfcp_dbf_out(p, "loss_of_sync_err", "%d", r->loss_of_sync_error_count);

	zfcp_dbf_out(p, "loss_of_sig_err", "%d", r->loss_of_signal_error_count);

	zfcp_dbf_out(p, "prim_seq_err", "%d",

		     r->primitive_sequence_error_count);

	zfcp_dbf_out(p, "inval_trans_word_err", "%d",

		     r->invalid_transmission_word_error_count);

	zfcp_dbf_out(p, "CRC_errors", "%d", r->crc_error_count);

	zfcp_dbf_out(p, "prim_seq_event_to", "%d",

		     r->primitive_sequence_event_timeout_count);

	zfcp_dbf_out(p, "elast_buf_overrun_err", "%d",

		     r->elastic_buffer_overrun_error_count);

	zfcp_dbf_out(p, "adv_rec_buf2buf_cred", "%d",

		     r->advertised_receive_b2b_credit);

	zfcp_dbf_out(p, "curr_rec_buf2buf_cred", "%d",

		     r->current_receive_b2b_credit);

	zfcp_dbf_out(p, "adv_trans_buf2buf_cred", "%d",

		     r->advertised_transmit_b2b_credit);

	zfcp_dbf_out(p, "curr_trans_buf2buf_cred", "%d",

		     r->current_transmit_b2b_credit);

}



static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view,

				    char *out_buf, const char *in_buf)

{
@@ -418,6 +462,8 @@ static int zfcp_hba_dbf_view_format(debug_info_t *id, struct debug_view *view, 
		zfcp_hba_dbf_view_status(&p, &r->u.status);

	else if (strncmp(r->tag, "qdio", ZFCP_DBF_TAG_SIZE) == 0)

		zfcp_hba_dbf_view_qdio(&p, &r->u.qdio);

	else if (strncmp(r->tag, "berr", ZFCP_DBF_TAG_SIZE) == 0)

		zfcp_hba_dbf_view_berr(&p, &r->u.berr);



	p += sprintf(p, "\n");

	return p - out_buf;

drivers/s390/scsi/zfcp_dbf.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct zfcp_hba_dbf_record { 
		struct zfcp_hba_dbf_record_response response;

		struct zfcp_hba_dbf_record_status status;

		struct zfcp_hba_dbf_record_qdio qdio;

		struct fsf_bit_error_payload berr;

	} u;

} __attribute__ ((packed));

drivers/s390/scsi/zfcp_ext.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ extern void zfcp_hba_dbf_event_fsf_unsol(const char *, struct zfcp_adapter *, 
					 struct fsf_status_read_buffer *);

extern void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *, unsigned int, int,

				    int);

extern void zfcp_hba_dbf_event_berr(struct zfcp_adapter *,

				    struct zfcp_fsf_req *);

extern void zfcp_san_dbf_event_ct_request(struct zfcp_fsf_req *);

extern void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *);

extern void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *);

drivers/s390/scsi/zfcp_fsf.c

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static void zfcp_fsf_status_read_handler(struct zfcp_fsf_req *req) 
		dev_warn(&adapter->ccw_device->dev,

			 "The error threshold for checksum statistics "

			 "has been exceeded\n");

		zfcp_hba_dbf_event_berr(adapter, req);

		break;

	case FSF_STATUS_READ_LINK_DOWN:

		zfcp_fsf_status_read_link_down(req);