diff mbox series

[v3,11/24] mpi3mr: print ioc info for debugging

Message ID 20210419110156.1786882-12-kashyap.desai@broadcom.com (mailing list archive)
State Superseded
Headers show
Series Introducing mpi3mr driver | expand

Commit Message

Kashyap Desai April 19, 2021, 11:01 a.m. UTC 
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>

Cc: sathya.prakash@broadcom.com
---
 drivers/scsi/mpi3mr/mpi3mr_fw.c | 80 +++++++++++++++++++++++++++++++++
 drivers/scsi/mpi3mr/mpi3mr_os.c |  1 +
 2 files changed, 81 insertions(+)

Comments

Himanshu Madhani April 22, 2021, 2:24 a.m. UTC | #1 
> On Apr 19, 2021, at 6:01 AM, Kashyap Desai <kashyap.desai@broadcom.com> wrote:
> 
> Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
> Reviewed-by: Tomas Henzl <thenzl@redhat.com>
> 
> Cc: sathya.prakash@broadcom.com
> ---
> drivers/scsi/mpi3mr/mpi3mr_fw.c | 80 +++++++++++++++++++++++++++++++++
> drivers/scsi/mpi3mr/mpi3mr_os.c |  1 +
> 2 files changed, 81 insertions(+)
> 
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> index 4e28a0efb082..3df689410c8f 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> @@ -2550,6 +2550,85 @@ int mpi3mr_issue_port_enable(struct mpi3mr_ioc *mrioc, u8 async)
> 	return retval;
> }
> 
> +/* Protocol type to name mapper structure*/
> +static const struct {
> +	u8 protocol;
> +	char *name;
> +} mpi3mr_protocols[] = {
> +	{ MPI3_IOCFACTS_PROTOCOL_SCSI_INITIATOR, "Initiator" },
> +	{ MPI3_IOCFACTS_PROTOCOL_SCSI_TARGET, "Target" },
> +	{ MPI3_IOCFACTS_PROTOCOL_NVME, "NVMe attachment" },
> +};
> +
> +/* Capability to name mapper structure*/
> +static const struct {
> +	u32 capability;
> +	char *name;
> +} mpi3mr_capabilities[] = {
> +	{ MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE, "RAID" },
> +};
> +
> +/**
> + * mpi3mr_print_ioc_info - Display controller information
> + * @mrioc: Adapter instance reference
> + *
> + * Display controller personalit, capability, supported
> + * protocols etc.
> + *
> + * Return: Nothing
> + */
> +static void
> +mpi3mr_print_ioc_info(struct mpi3mr_ioc *mrioc)
> +{
> +	int i = 0;
> +	char personality[16];
> +	char protocol[50] = {0};
> +	char capabilities[100] = {0};
> +	bool is_string_nonempty = false;
> +	struct mpi3mr_compimg_ver *fwver = &mrioc->facts.fw_ver;
> +
> +	switch (mrioc->facts.personality) {
> +	case MPI3_IOCFACTS_FLAGS_PERSONALITY_EHBA:
> +		strcpy(personality, "Enhanced HBA");
> +		break;
> +	case MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR:
> +		strcpy(personality, "RAID");
> +		break;
> +	default:
> +		strcpy(personality, "Unknown");
> +		break;
> +	}
> +
> +	ioc_info(mrioc, "Running in %s Personality", personality);
> +
> +	ioc_info(mrioc, "FW Version(%d.%d.%d.%d.%d.%d)\n",
> +	fwver->gen_major, fwver->gen_minor, fwver->ph_major,
> +	    fwver->ph_minor, fwver->cust_id, fwver->build_num);
> +
> +	for (i = 0; i < ARRAY_SIZE(mpi3mr_protocols); i++) {
> +		if (mrioc->facts.protocol_flags &
> +		    mpi3mr_protocols[i].protocol) {
> +			if (is_string_nonempty)
> +				strcat(protocol, ",");
> +			strcat(protocol, mpi3mr_protocols[i].name);
> +			is_string_nonempty = true;
> +		}
> +	}
> +
> +	is_string_nonempty = false;
> +	for (i = 0; i < ARRAY_SIZE(mpi3mr_capabilities); i++) {
> +		if (mrioc->facts.protocol_flags &
> +		    mpi3mr_capabilities[i].capability) {
> +			if (is_string_nonempty)
> +				strcat(capabilities, ",");
> +			strcat(capabilities, mpi3mr_capabilities[i].name);
> +			is_string_nonempty = true;
> +		}
> +	}
> +
> +	ioc_info(mrioc, "Protocol=(%s), Capabilities=(%s)\n",
> +	    protocol, capabilities);
> +}
> 
> /**
>  * mpi3mr_cleanup_resources - Free PCI resources
> @@ -2808,6 +2887,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
> 		}
> 
> 	}
> +	mpi3mr_print_ioc_info(mrioc);
> 
> 	retval = mpi3mr_alloc_reply_sense_bufs(mrioc);
> 	if (retval) {
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
> index d82581ec73e1..39928e2997ba 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_os.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
> @@ -339,6 +339,7 @@ void mpi3mr_invalidate_devhandles(struct mpi3mr_ioc *mrioc)
>  * mpi3mr_flush_scmd - Flush individual SCSI command
>  * @rq: Block request
>  * @data: Adapter instance reference
> + * @reserved: N/A. Currently not used
>  *
>  * Return the SCSI command to the upper layers if it is in LLD
>  * scope.
> -- 
> 2.18.1
> 

Looks Good.

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

--
Himanshu Madhani	 Oracle Linux Engineering
Hannes Reinecke April 26, 2021, 4:06 p.m. UTC | #2 
On 4/19/21 1:01 PM, Kashyap Desai wrote:
> Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
> Reviewed-by: Tomas Henzl <thenzl@redhat.com>
> 
> Cc: sathya.prakash@broadcom.com
> ---
>  drivers/scsi/mpi3mr/mpi3mr_fw.c | 80 +++++++++++++++++++++++++++++++++
>  drivers/scsi/mpi3mr/mpi3mr_os.c |  1 +
>  2 files changed, 81 insertions(+)
> 
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> index 4e28a0efb082..3df689410c8f 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
> @@ -2550,6 +2550,85 @@ int mpi3mr_issue_port_enable(struct mpi3mr_ioc *mrioc, u8 async)
>  	return retval;
>  }
>  
> +/* Protocol type to name mapper structure*/
> +static const struct {
> +	u8 protocol;
> +	char *name;
> +} mpi3mr_protocols[] = {
> +	{ MPI3_IOCFACTS_PROTOCOL_SCSI_INITIATOR, "Initiator" },
> +	{ MPI3_IOCFACTS_PROTOCOL_SCSI_TARGET, "Target" },
> +	{ MPI3_IOCFACTS_PROTOCOL_NVME, "NVMe attachment" },
> +};
> +
> +/* Capability to name mapper structure*/
> +static const struct {
> +	u32 capability;
> +	char *name;
> +} mpi3mr_capabilities[] = {
> +	{ MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE, "RAID" },
> +};
> +
> +/**
> + * mpi3mr_print_ioc_info - Display controller information
> + * @mrioc: Adapter instance reference
> + *
> + * Display controller personalit, capability, supported
> + * protocols etc.
> + *
> + * Return: Nothing
> + */
> +static void
> +mpi3mr_print_ioc_info(struct mpi3mr_ioc *mrioc)
> +{
> +	int i = 0;
> +	char personality[16];
> +	char protocol[50] = {0};
> +	char capabilities[100] = {0};
> +	bool is_string_nonempty = false;
> +	struct mpi3mr_compimg_ver *fwver = &mrioc->facts.fw_ver;
> +
> +	switch (mrioc->facts.personality) {
> +	case MPI3_IOCFACTS_FLAGS_PERSONALITY_EHBA:
> +		strcpy(personality, "Enhanced HBA");
> +		break;
> +	case MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR:
> +		strcpy(personality, "RAID");
> +		break;
> +	default:
> +		strcpy(personality, "Unknown");
> +		break;
> +	}
> +
> +	ioc_info(mrioc, "Running in %s Personality", personality);
> +
> +	ioc_info(mrioc, "FW Version(%d.%d.%d.%d.%d.%d)\n",
> +	fwver->gen_major, fwver->gen_minor, fwver->ph_major,
> +	    fwver->ph_minor, fwver->cust_id, fwver->build_num);
> +
> +	for (i = 0; i < ARRAY_SIZE(mpi3mr_protocols); i++) {
> +		if (mrioc->facts.protocol_flags &
> +		    mpi3mr_protocols[i].protocol) {
> +			if (is_string_nonempty)
> +				strcat(protocol, ",");
> +			strcat(protocol, mpi3mr_protocols[i].name);
> +			is_string_nonempty = true;

Please check for string overflows here.

> +		}
> +	}
> +
> +	is_string_nonempty = false;
> +	for (i = 0; i < ARRAY_SIZE(mpi3mr_capabilities); i++) {
> +		if (mrioc->facts.protocol_flags &
> +		    mpi3mr_capabilities[i].capability) {
> +			if (is_string_nonempty)
> +				strcat(capabilities, ",");
> +			strcat(capabilities, mpi3mr_capabilities[i].name);
> +			is_string_nonempty = true;

Same here.

> +		}
> +	}
> +
> +	ioc_info(mrioc, "Protocol=(%s), Capabilities=(%s)\n",
> +	    protocol, capabilities);
> +}
>  
>  /**
>   * mpi3mr_cleanup_resources - Free PCI resources
> @@ -2808,6 +2887,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
>  		}
>  
>  	}
> +	mpi3mr_print_ioc_info(mrioc);
>  
>  	retval = mpi3mr_alloc_reply_sense_bufs(mrioc);
>  	if (retval) {
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
> index d82581ec73e1..39928e2997ba 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_os.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
> @@ -339,6 +339,7 @@ void mpi3mr_invalidate_devhandles(struct mpi3mr_ioc *mrioc)
>   * mpi3mr_flush_scmd - Flush individual SCSI command
>   * @rq: Block request
>   * @data: Adapter instance reference
> + * @reserved: N/A. Currently not used
>   *
>   * Return the SCSI command to the upper layers if it is in LLD
>   * scope.
> 
Cheers,

Hannes
Kashyap Desai May 11, 2021, 6:35 p.m. UTC | #3 
> > +
> > +	for (i = 0; i < ARRAY_SIZE(mpi3mr_protocols); i++) {
> > +		if (mrioc->facts.protocol_flags &
> > +		    mpi3mr_protocols[i].protocol) {
> > +			if (is_string_nonempty)
> > +				strcat(protocol, ",");
> > +			strcat(protocol, mpi3mr_protocols[i].name);
> > +			is_string_nonempty = true;
>
> Please check for string overflows here.

Hannes - This is fixed in V4. Please review V4. Planning to post V4 today.

>
> > +		}
> > +	}
> > +
> > +	is_string_nonempty = false;
> > +	for (i = 0; i < ARRAY_SIZE(mpi3mr_capabilities); i++) {
> > +		if (mrioc->facts.protocol_flags &
> > +		    mpi3mr_capabilities[i].capability) {
> > +			if (is_string_nonempty)
> > +				strcat(capabilities, ",");
> > +			strcat(capabilities, mpi3mr_capabilities[i].name);
> > +			is_string_nonempty = true;
>
> Same here.
>
> > +		}
> > +	}
> > +
> > +	ioc_info(mrioc, "Protocol=(%s), Capabilities=(%s)\n",
> > +	    protocol, capabilities);
> > +}
> >
> >  /**
> >   * mpi3mr_cleanup_resources - Free PCI resources @@ -2808,6 +2887,7
> > @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
> >  		}
> >
> >  	}
> > +	mpi3mr_print_ioc_info(mrioc);
> >
> >  	retval = mpi3mr_alloc_reply_sense_bufs(mrioc);
> >  	if (retval) {
> > diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c
> > b/drivers/scsi/mpi3mr/mpi3mr_os.c index d82581ec73e1..39928e2997ba
> > 100644
> > --- a/drivers/scsi/mpi3mr/mpi3mr_os.c
> > +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
> > @@ -339,6 +339,7 @@ void mpi3mr_invalidate_devhandles(struct
> mpi3mr_ioc *mrioc)
> >   * mpi3mr_flush_scmd - Flush individual SCSI command
> >   * @rq: Block request
> >   * @data: Adapter instance reference
> > + * @reserved: N/A. Currently not used
> >   *
> >   * Return the SCSI command to the upper layers if it is in LLD
> >   * scope.
> >
> Cheers,
>
> Hannes
> --
> Dr. Hannes Reinecke		        Kernel Storage Architect
> hare@suse.de			               +49 911 74053 688
> SUSE Software Solutions Germany GmbH, 90409 Nürnberg
> GF: F. Imendörffer, HRB 36809 (AG Nürnberg)
diff mbox series

Patch

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index 4e28a0efb082..3df689410c8f 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -2550,6 +2550,85 @@  int mpi3mr_issue_port_enable(struct mpi3mr_ioc *mrioc, u8 async)
 	return retval;
 }
 
+/* Protocol type to name mapper structure*/
+static const struct {
+	u8 protocol;
+	char *name;
+} mpi3mr_protocols[] = {
+	{ MPI3_IOCFACTS_PROTOCOL_SCSI_INITIATOR, "Initiator" },
+	{ MPI3_IOCFACTS_PROTOCOL_SCSI_TARGET, "Target" },
+	{ MPI3_IOCFACTS_PROTOCOL_NVME, "NVMe attachment" },
+};
+
+/* Capability to name mapper structure*/
+static const struct {
+	u32 capability;
+	char *name;
+} mpi3mr_capabilities[] = {
+	{ MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE, "RAID" },
+};
+
+/**
+ * mpi3mr_print_ioc_info - Display controller information
+ * @mrioc: Adapter instance reference
+ *
+ * Display controller personalit, capability, supported
+ * protocols etc.
+ *
+ * Return: Nothing
+ */
+static void
+mpi3mr_print_ioc_info(struct mpi3mr_ioc *mrioc)
+{
+	int i = 0;
+	char personality[16];
+	char protocol[50] = {0};
+	char capabilities[100] = {0};
+	bool is_string_nonempty = false;
+	struct mpi3mr_compimg_ver *fwver = &mrioc->facts.fw_ver;
+
+	switch (mrioc->facts.personality) {
+	case MPI3_IOCFACTS_FLAGS_PERSONALITY_EHBA:
+		strcpy(personality, "Enhanced HBA");
+		break;
+	case MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR:
+		strcpy(personality, "RAID");
+		break;
+	default:
+		strcpy(personality, "Unknown");
+		break;
+	}
+
+	ioc_info(mrioc, "Running in %s Personality", personality);
+
+	ioc_info(mrioc, "FW Version(%d.%d.%d.%d.%d.%d)\n",
+	fwver->gen_major, fwver->gen_minor, fwver->ph_major,
+	    fwver->ph_minor, fwver->cust_id, fwver->build_num);
+
+	for (i = 0; i < ARRAY_SIZE(mpi3mr_protocols); i++) {
+		if (mrioc->facts.protocol_flags &
+		    mpi3mr_protocols[i].protocol) {
+			if (is_string_nonempty)
+				strcat(protocol, ",");
+			strcat(protocol, mpi3mr_protocols[i].name);
+			is_string_nonempty = true;
+		}
+	}
+
+	is_string_nonempty = false;
+	for (i = 0; i < ARRAY_SIZE(mpi3mr_capabilities); i++) {
+		if (mrioc->facts.protocol_flags &
+		    mpi3mr_capabilities[i].capability) {
+			if (is_string_nonempty)
+				strcat(capabilities, ",");
+			strcat(capabilities, mpi3mr_capabilities[i].name);
+			is_string_nonempty = true;
+		}
+	}
+
+	ioc_info(mrioc, "Protocol=(%s), Capabilities=(%s)\n",
+	    protocol, capabilities);
+}
 
 /**
  * mpi3mr_cleanup_resources - Free PCI resources
@@ -2808,6 +2887,7 @@  int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
 		}
 
 	}
+	mpi3mr_print_ioc_info(mrioc);
 
 	retval = mpi3mr_alloc_reply_sense_bufs(mrioc);
 	if (retval) {
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index d82581ec73e1..39928e2997ba 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -339,6 +339,7 @@  void mpi3mr_invalidate_devhandles(struct mpi3mr_ioc *mrioc)
  * mpi3mr_flush_scmd - Flush individual SCSI command
  * @rq: Block request
  * @data: Adapter instance reference
+ * @reserved: N/A. Currently not used
  *
  * Return the SCSI command to the upper layers if it is in LLD
  * scope.