| Message ID | 20210407020451.924822-12-kashyap.desai@broadcom.com |
|---|---|
| State | New |
| Headers | show |
| Series | Introducing mpi3mr driver | expand |
On 4/7/21 4:04 AM, Kashyap Desai wrote: > Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> > Cc: sathya.prakash@broadcom.com > --- > drivers/scsi/mpi3mr/mpi3mr_fw.c | 80 +++++++++++++++++++++++++++++++++ > 1 file changed, 80 insertions(+) > > diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c > index d47031d05322..c3882fef2d2a 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) { > Looks good Reviewed-by: Tomas Henzl <thenzl@redhat.com>
diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index d47031d05322..c3882fef2d2a 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) {
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> Cc: sathya.prakash@broadcom.com --- drivers/scsi/mpi3mr/mpi3mr_fw.c | 80 +++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+)