| Message ID | 20210407020451.924822-9-kashyap.desai@broadcom.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introducing mpi3mr driver | expand |
On 4/7/21 4:04 AM, Kashyap Desai wrote: > Firmware can report various MPI Events. > Support for certain Events (as listed below) are enabled in the driver > and their processing in driver is covered in this patch. > > MPI3_EVENT_SAS_BROADCAST_PRIMITIVE > MPI3_EVENT_CABLE_MGMT > MPI3_EVENT_ENERGY_PACK_CHANGE > > Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> > Reviewed-by: Hannes Reinecke <hare@suse.de> > Cc: sathya.prakash@broadcom.com > --- > drivers/scsi/mpi3mr/mpi3mr_fw.c | 3 +++ > drivers/scsi/mpi3mr/mpi3mr_os.c | 37 +++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+) > > diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c > index d9ac045428e8..a5c9a0f7cb8e 100644 > --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c > +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c > @@ -2745,8 +2745,11 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) > mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_TOPOLOGY_CHANGE_LIST); > mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DISCOVERY); > mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR); > + mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_BROADCAST_PRIMITIVE); > mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST); > mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_ENUMERATION); > + mpi3mr_unmask_events(mrioc, MPI3_EVENT_CABLE_MGMT); > + mpi3mr_unmask_events(mrioc, MPI3_EVENT_ENERGY_PACK_CHANGE); > > retval = mpi3mr_issue_event_notification(mrioc); > if (retval) { > diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c > index 40b46eadcd32..cd30e26a2225 100644 > --- a/drivers/scsi/mpi3mr/mpi3mr_os.c > +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c > @@ -1497,6 +1497,36 @@ static void mpi3mr_devstatuschg_evt_th(struct mpi3mr_ioc *mrioc, > > } > > +/** > + * mpi3mr_energypackchg_evt_th - Energy pack change evt tophalf > + * @mrioc: Adapter instance reference > + * @event_reply: Event data > + * > + * Identifies the new shutdown timeout value and update. > + * > + * Return: Nothing > + */ > +static void mpi3mr_energypackchg_evt_th(struct mpi3mr_ioc *mrioc, > + Mpi3EventNotificationReply_t *event_reply) > +{ > + Mpi3EventDataEnergyPackChange_t *evtdata = > + (Mpi3EventDataEnergyPackChange_t *)event_reply->EventData; > + u16 shutdown_timeout = le16_to_cpu(evtdata->ShutdownTimeout); > + > + if (shutdown_timeout <= 0) { > + ioc_warn(mrioc, > + "%s :Invalid Shutdown Timeout received = %d\n", > + __func__, shutdown_timeout); > + return; > + } > + > + ioc_info(mrioc, > + "%s :Previous Shutdown Timeout Value = %d New Shutdown Timeout Value = %d\n", > + __func__, mrioc->facts.shutdown_timeout, shutdown_timeout); > + mrioc->facts.shutdown_timeout = shutdown_timeout; > +} > + > + > /** > * mpi3mr_os_handle_events - Firmware event handler > * @mrioc: Adapter instance reference > @@ -1560,9 +1590,16 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, > process_evt_bh = 1; > break; > } > + case MPI3_EVENT_ENERGY_PACK_CHANGE: > + { > + mpi3mr_energypackchg_evt_th(mrioc, event_reply); > + break; > + } > case MPI3_EVENT_ENCL_DEVICE_STATUS_CHANGE: > case MPI3_EVENT_SAS_DISCOVERY: > + case MPI3_EVENT_CABLE_MGMT: > case MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR: > + case MPI3_EVENT_SAS_BROADCAST_PRIMITIVE: > case MPI3_EVENT_PCIE_ENUMERATION: > break; > default: > 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 d9ac045428e8..a5c9a0f7cb8e 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -2745,8 +2745,11 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_TOPOLOGY_CHANGE_LIST); mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DISCOVERY); mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR); + mpi3mr_unmask_events(mrioc, MPI3_EVENT_SAS_BROADCAST_PRIMITIVE); mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_TOPOLOGY_CHANGE_LIST); mpi3mr_unmask_events(mrioc, MPI3_EVENT_PCIE_ENUMERATION); + mpi3mr_unmask_events(mrioc, MPI3_EVENT_CABLE_MGMT); + mpi3mr_unmask_events(mrioc, MPI3_EVENT_ENERGY_PACK_CHANGE); retval = mpi3mr_issue_event_notification(mrioc); if (retval) { diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 40b46eadcd32..cd30e26a2225 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -1497,6 +1497,36 @@ static void mpi3mr_devstatuschg_evt_th(struct mpi3mr_ioc *mrioc, } +/** + * mpi3mr_energypackchg_evt_th - Energy pack change evt tophalf + * @mrioc: Adapter instance reference + * @event_reply: Event data + * + * Identifies the new shutdown timeout value and update. + * + * Return: Nothing + */ +static void mpi3mr_energypackchg_evt_th(struct mpi3mr_ioc *mrioc, + Mpi3EventNotificationReply_t *event_reply) +{ + Mpi3EventDataEnergyPackChange_t *evtdata = + (Mpi3EventDataEnergyPackChange_t *)event_reply->EventData; + u16 shutdown_timeout = le16_to_cpu(evtdata->ShutdownTimeout); + + if (shutdown_timeout <= 0) { + ioc_warn(mrioc, + "%s :Invalid Shutdown Timeout received = %d\n", + __func__, shutdown_timeout); + return; + } + + ioc_info(mrioc, + "%s :Previous Shutdown Timeout Value = %d New Shutdown Timeout Value = %d\n", + __func__, mrioc->facts.shutdown_timeout, shutdown_timeout); + mrioc->facts.shutdown_timeout = shutdown_timeout; +} + + /** * mpi3mr_os_handle_events - Firmware event handler * @mrioc: Adapter instance reference @@ -1560,9 +1590,16 @@ void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc, process_evt_bh = 1; break; } + case MPI3_EVENT_ENERGY_PACK_CHANGE: + { + mpi3mr_energypackchg_evt_th(mrioc, event_reply); + break; + } case MPI3_EVENT_ENCL_DEVICE_STATUS_CHANGE: case MPI3_EVENT_SAS_DISCOVERY: + case MPI3_EVENT_CABLE_MGMT: case MPI3_EVENT_SAS_DEVICE_DISCOVERY_ERROR: + case MPI3_EVENT_SAS_BROADCAST_PRIMITIVE: case MPI3_EVENT_PCIE_ENUMERATION: break; default: