| Message ID | 20210224155802.13292-2-Viswas.G@microchip.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pm80xx updates | expand |
On Wed, Feb 24, 2021 at 4:48 PM Viswas G <Viswas.G@microchip.com> wrote: > > From: Vishakha Channapattan <vishakhavc@google.com> > > A new sysfs variable 'ctl_mpi_state' is being introduced to > check the state of mpi. > > Tested: Using 'ctl_mpi_state' sysfs variable we check the mpi state > mvae14:~# cat /sys/class/scsi_host/host*/ctl_mpi_state > MPI-S=MPI is successfully initialized HMI_ERR=0 > MPI-S=MPI is successfully initialized HMI_ERR=0 > > Signed-off-by: Vishakha Channapattan <vishakhavc@google.com> > Signed-off-by: Viswas G <Viswas.G@microchip.com> > Signed-off-by: Ruksar Devadi <Ruksar.devadi@microchip.com> > Signed-off-by: Ashokkumar N <Ashokkumar.N@microchip.com> > Signed-off-by: Radha Ramachandran <radha@google.com> > --- > drivers/scsi/pm8001/pm8001_ctl.c | 36 +++++++++++++++++++++++++++++++++++- > 1 file changed, 35 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c > index 12035baf0997..035969ed1c2e 100644 > --- a/drivers/scsi/pm8001/pm8001_ctl.c > +++ b/drivers/scsi/pm8001/pm8001_ctl.c > @@ -41,6 +41,7 @@ > #include <linux/slab.h> > #include "pm8001_sas.h" > #include "pm8001_ctl.h" > +#include "pm8001_chips.h" > > /* scsi host attributes */ > > @@ -883,9 +884,41 @@ static ssize_t pm8001_show_update_fw(struct device *cdev, > flash_error_table[i].err_code, > flash_error_table[i].reason); > } > - > static DEVICE_ATTR(update_fw, S_IRUGO|S_IWUSR|S_IWGRP, > pm8001_show_update_fw, pm8001_store_update_fw); > + > +/** > + * ctl_mpi_state_show - controller MPI state check > + * @cdev: pointer to embedded class device > + * @buf: the buffer returned > + * > + * A sysfs 'read-only' shost attribute. > + */ > + > +char mpiStateText[][80] = { > + "MPI is not initialized", > + "MPI is successfully initialized", > + "MPI termination is in progress", > + "MPI initialization failed with error in [31:16]" > +}; > + > +static ssize_t ctl_mpi_state_show(struct device *cdev, > + struct device_attribute *attr, char *buf) > +{ > + struct Scsi_Host *shost = class_to_shost(cdev); > + struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); > + struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; > + unsigned int mpidw0 = 0; > + int c; > + > + pm8001_dbg(pm8001_ha, IOCTL, "%s\n", __func__); > + mpidw0 = pm8001_mr32(pm8001_ha->general_stat_tbl_addr, 0); > + c = sprintf(buf, "MPI-S=%s\t HMI_ERR=%x\n", mpiStateText[mpidw0 & 0x0003], > + ((mpidw0 & 0xff00) >> 16)); > + return c; > +} > +static DEVICE_ATTR_RO(ctl_mpi_state); > + New file should use sysfs_emit instead of sprintf. Thanks!
diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c index 12035baf0997..035969ed1c2e 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.c +++ b/drivers/scsi/pm8001/pm8001_ctl.c @@ -41,6 +41,7 @@ #include <linux/slab.h> #include "pm8001_sas.h" #include "pm8001_ctl.h" +#include "pm8001_chips.h" /* scsi host attributes */ @@ -883,9 +884,41 @@ static ssize_t pm8001_show_update_fw(struct device *cdev, flash_error_table[i].err_code, flash_error_table[i].reason); } - static DEVICE_ATTR(update_fw, S_IRUGO|S_IWUSR|S_IWGRP, pm8001_show_update_fw, pm8001_store_update_fw); + +/** + * ctl_mpi_state_show - controller MPI state check + * @cdev: pointer to embedded class device + * @buf: the buffer returned + * + * A sysfs 'read-only' shost attribute. + */ + +char mpiStateText[][80] = { + "MPI is not initialized", + "MPI is successfully initialized", + "MPI termination is in progress", + "MPI initialization failed with error in [31:16]" +}; + +static ssize_t ctl_mpi_state_show(struct device *cdev, + struct device_attribute *attr, char *buf) +{ + struct Scsi_Host *shost = class_to_shost(cdev); + struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); + struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; + unsigned int mpidw0 = 0; + int c; + + pm8001_dbg(pm8001_ha, IOCTL, "%s\n", __func__); + mpidw0 = pm8001_mr32(pm8001_ha->general_stat_tbl_addr, 0); + c = sprintf(buf, "MPI-S=%s\t HMI_ERR=%x\n", mpiStateText[mpidw0 & 0x0003], + ((mpidw0 & 0xff00) >> 16)); + return c; +} +static DEVICE_ATTR_RO(ctl_mpi_state); + struct device_attribute *pm8001_host_attrs[] = { &dev_attr_interface_rev, &dev_attr_controller_fatal_error, @@ -909,6 +942,7 @@ struct device_attribute *pm8001_host_attrs[] = { &dev_attr_ob_log, &dev_attr_ila_version, &dev_attr_inc_fw_ver, + &dev_attr_ctl_mpi_state, NULL, };