Skip to content

Commit 0da6634

Browse files
kadesai16martinkpetersen
kadesai16
authored and
martinkpetersen
committed
scsi: mpi3mr: Set up IRQs in resume path
Driver is not setting up IRQs in the resume path. As a result, hibernation path is broken and controller will not be operational after system is resumed. Set up IRQs to handle the hibernation case. Link: https://lore.kernel.org/r/20210818081755.1274470-1-kashyap.desai@broadcom.com Cc: sathya.prakash@broadcom.com Cc: thenzl@redhat.com Reported-by: Marco Patalano <mpatalan@redhat.com> Tested-by: Marco Patalano <mpatalan@redhat.com> Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 04a71cd commit 0da6634

3 files changed

Lines changed: 44 additions & 25 deletions

File tree

‎drivers/scsi/mpi3mr/mpi3mr.h‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,20 @@ enum mpi3mr_iocstate {
183183
MRIOC_STATE_UNRECOVERABLE,
184184
};
185185

186+
/* Init type definitions */
187+
enum mpi3mr_init_type {
188+
MPI3MR_IT_INIT = 0,
189+
MPI3MR_IT_RESET,
190+
MPI3MR_IT_RESUME,
191+
};
192+
193+
/* Cleanup reason definitions */
194+
enum mpi3mr_cleanup_reason {
195+
MPI3MR_COMPLETE_CLEANUP = 0,
196+
MPI3MR_REINIT_FAILURE,
197+
MPI3MR_SUSPEND,
198+
};
199+
186200
/* Reset reason code definitions*/
187201
enum mpi3mr_reset_reason {
188202
MPI3MR_RESET_FROM_BRINGUP = 1,
@@ -855,8 +869,8 @@ struct delayed_dev_rmhs_node {
855869

856870
int mpi3mr_setup_resources(struct mpi3mr_ioc *mrioc);
857871
void mpi3mr_cleanup_resources(struct mpi3mr_ioc *mrioc);
858-
int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init);
859-
void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc, u8 re_init);
872+
int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 init_type);
873+
void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc, u8 reason);
860874
int mpi3mr_issue_port_enable(struct mpi3mr_ioc *mrioc, u8 async);
861875
int mpi3mr_admin_request_post(struct mpi3mr_ioc *mrioc, void *admin_req,
862876
u16 admin_req_sz, u8 ignore_reset);
@@ -872,6 +886,7 @@ void *mpi3mr_get_reply_virt_addr(struct mpi3mr_ioc *mrioc,
872886
void mpi3mr_repost_sense_buf(struct mpi3mr_ioc *mrioc,
873887
u64 sense_buf_dma);
874888

889+
void mpi3mr_memset_buffers(struct mpi3mr_ioc *mrioc);
875890
void mpi3mr_os_handle_events(struct mpi3mr_ioc *mrioc,
876891
struct mpi3_event_notification_reply *event_reply);
877892
void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc,

‎drivers/scsi/mpi3mr/mpi3mr_fw.c‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3205,7 +3205,7 @@ int mpi3mr_setup_resources(struct mpi3mr_ioc *mrioc)
32053205
/**
32063206
* mpi3mr_init_ioc - Initialize the controller
32073207
* @mrioc: Adapter instance reference
3208-
* @re_init: Flag to indicate is this fresh init or re-init
3208+
* @init_type: Flag to indicate is the init_type
32093209
*
32103210
* This the controller initialization routine, executed either
32113211
* after soft reset or from pci probe callback.
@@ -3218,7 +3218,7 @@ int mpi3mr_setup_resources(struct mpi3mr_ioc *mrioc)
32183218
*
32193219
* Return: 0 on success and non-zero on failure.
32203220
*/
3221-
int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
3221+
int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 init_type)
32223222
{
32233223
int retval = 0;
32243224
enum mpi3mr_iocstate ioc_state;
@@ -3229,7 +3229,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
32293229

32303230
mrioc->irqpoll_sleep = MPI3MR_IRQ_POLL_SLEEP;
32313231
mrioc->change_count = 0;
3232-
if (!re_init) {
3232+
if (init_type == MPI3MR_IT_INIT) {
32333233
mrioc->cpu_count = num_online_cpus();
32343234
retval = mpi3mr_setup_resources(mrioc);
32353235
if (retval) {
@@ -3314,7 +3314,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
33143314
goto out_failed;
33153315
}
33163316

3317-
if (!re_init) {
3317+
if (init_type != MPI3MR_IT_RESET) {
33183318
retval = mpi3mr_setup_isr(mrioc, 1);
33193319
if (retval) {
33203320
ioc_err(mrioc, "Failed to setup ISR error %d\n",
@@ -3332,7 +3332,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
33323332
}
33333333

33343334
mpi3mr_process_factsdata(mrioc, &facts_data);
3335-
if (!re_init) {
3335+
if (init_type == MPI3MR_IT_INIT) {
33363336
retval = mpi3mr_check_reset_dma_mask(mrioc);
33373337
if (retval) {
33383338
ioc_err(mrioc, "Resetting dma mask failed %d\n",
@@ -3351,7 +3351,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
33513351
goto out_failed;
33523352
}
33533353

3354-
if (!re_init) {
3354+
if (init_type == MPI3MR_IT_INIT) {
33553355
retval = mpi3mr_alloc_chain_bufs(mrioc);
33563356
if (retval) {
33573357
ioc_err(mrioc, "Failed to allocated chain buffers %d\n",
@@ -3374,7 +3374,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
33743374
writel(mrioc->sbq_host_index,
33753375
&mrioc->sysif_regs->sense_buffer_free_host_index);
33763376

3377-
if (!re_init) {
3377+
if (init_type != MPI3MR_IT_RESET) {
33783378
retval = mpi3mr_setup_isr(mrioc, 0);
33793379
if (retval) {
33803380
ioc_err(mrioc, "Failed to re-setup ISR, error %d\n",
@@ -3390,7 +3390,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
33903390
goto out_failed;
33913391
}
33923392

3393-
if (re_init &&
3393+
if ((init_type != MPI3MR_IT_INIT) &&
33943394
(mrioc->shost->nr_hw_queues > mrioc->num_op_reply_q)) {
33953395
retval = -1;
33963396
ioc_err(mrioc,
@@ -3422,7 +3422,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
34223422
goto out_failed;
34233423
}
34243424

3425-
if (re_init) {
3425+
if (init_type != MPI3MR_IT_INIT) {
34263426
ioc_info(mrioc, "Issuing Port Enable\n");
34273427
retval = mpi3mr_issue_port_enable(mrioc, 0);
34283428
if (retval) {
@@ -3434,7 +3434,10 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
34343434
return retval;
34353435

34363436
out_failed:
3437-
mpi3mr_cleanup_ioc(mrioc, re_init);
3437+
if (init_type == MPI3MR_IT_INIT)
3438+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_COMPLETE_CLEANUP);
3439+
else
3440+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_REINIT_FAILURE);
34383441
out_nocleanup:
34393442
return retval;
34403443
}
@@ -3495,7 +3498,7 @@ static void mpi3mr_memset_op_req_q_buffers(struct mpi3mr_ioc *mrioc, u16 qidx)
34953498
*
34963499
* Return: Nothing.
34973500
*/
3498-
static void mpi3mr_memset_buffers(struct mpi3mr_ioc *mrioc)
3501+
void mpi3mr_memset_buffers(struct mpi3mr_ioc *mrioc)
34993502
{
35003503
u16 i;
35013504

@@ -3710,19 +3713,19 @@ static void mpi3mr_issue_ioc_shutdown(struct mpi3mr_ioc *mrioc)
37103713
/**
37113714
* mpi3mr_cleanup_ioc - Cleanup controller
37123715
* @mrioc: Adapter instance reference
3713-
* @re_init: Cleanup due to a reinit or not
3716+
* @reason: Cleanup reason
37143717
*
37153718
* controller cleanup handler, Message unit reset or soft reset
37163719
* and shutdown notification is issued to the controller and the
37173720
* associated memory resources are freed.
37183721
*
37193722
* Return: Nothing.
37203723
*/
3721-
void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
3724+
void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc, u8 reason)
37223725
{
37233726
enum mpi3mr_iocstate ioc_state;
37243727

3725-
if (!re_init)
3728+
if (reason == MPI3MR_COMPLETE_CLEANUP)
37263729
mpi3mr_stop_watchdog(mrioc);
37273730

37283731
mpi3mr_ioc_disable_intr(mrioc);
@@ -3737,11 +3740,11 @@ void mpi3mr_cleanup_ioc(struct mpi3mr_ioc *mrioc, u8 re_init)
37373740
MPI3_SYSIF_HOST_DIAG_RESET_ACTION_SOFT_RESET,
37383741
MPI3MR_RESET_FROM_MUR_FAILURE);
37393742

3740-
if (!re_init)
3743+
if (reason != MPI3MR_REINIT_FAILURE)
37413744
mpi3mr_issue_ioc_shutdown(mrioc);
37423745
}
37433746

3744-
if (!re_init) {
3747+
if (reason == MPI3MR_COMPLETE_CLEANUP) {
37453748
mpi3mr_free_mem(mrioc);
37463749
mpi3mr_cleanup_resources(mrioc);
37473750
}
@@ -3923,7 +3926,7 @@ int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc,
39233926
mpi3mr_flush_host_io(mrioc);
39243927
mpi3mr_invalidate_devhandles(mrioc);
39253928
mpi3mr_memset_buffers(mrioc);
3926-
retval = mpi3mr_init_ioc(mrioc, 1);
3929+
retval = mpi3mr_init_ioc(mrioc, MPI3MR_IT_RESET);
39273930
if (retval) {
39283931
pr_err(IOCNAME "reinit after soft reset failed: reason %d\n",
39293932
mrioc->name, reset_reason);

‎drivers/scsi/mpi3mr/mpi3mr_os.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3776,7 +3776,7 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
37763776
}
37773777

37783778
mrioc->is_driver_loading = 1;
3779-
if (mpi3mr_init_ioc(mrioc, 0)) {
3779+
if (mpi3mr_init_ioc(mrioc, MPI3MR_IT_INIT)) {
37803780
ioc_err(mrioc, "failure at %s:%d/%s()!\n",
37813781
__FILE__, __LINE__, __func__);
37823782
retval = -ENODEV;
@@ -3799,7 +3799,7 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
37993799
return retval;
38003800

38013801
addhost_failed:
3802-
mpi3mr_cleanup_ioc(mrioc, 0);
3802+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_COMPLETE_CLEANUP);
38033803
out_iocinit_failed:
38043804
destroy_workqueue(mrioc->fwevt_worker_thread);
38053805
out_fwevtthread_failed:
@@ -3851,7 +3851,7 @@ static void mpi3mr_remove(struct pci_dev *pdev)
38513851
mpi3mr_tgtdev_del_from_list(mrioc, tgtdev);
38523852
mpi3mr_tgtdev_put(tgtdev);
38533853
}
3854-
mpi3mr_cleanup_ioc(mrioc, 0);
3854+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_COMPLETE_CLEANUP);
38553855

38563856
spin_lock(&mrioc_list_lock);
38573857
list_del(&mrioc->list);
@@ -3891,7 +3891,7 @@ static void mpi3mr_shutdown(struct pci_dev *pdev)
38913891
spin_unlock_irqrestore(&mrioc->fwevt_lock, flags);
38923892
if (wq)
38933893
destroy_workqueue(wq);
3894-
mpi3mr_cleanup_ioc(mrioc, 0);
3894+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_COMPLETE_CLEANUP);
38953895
}
38963896

38973897
#ifdef CONFIG_PM
@@ -3921,7 +3921,7 @@ static int mpi3mr_suspend(struct pci_dev *pdev, pm_message_t state)
39213921
mpi3mr_cleanup_fwevt_list(mrioc);
39223922
scsi_block_requests(shost);
39233923
mpi3mr_stop_watchdog(mrioc);
3924-
mpi3mr_cleanup_ioc(mrioc, 1);
3924+
mpi3mr_cleanup_ioc(mrioc, MPI3MR_SUSPEND);
39253925

39263926
device_state = pci_choose_state(pdev, state);
39273927
ioc_info(mrioc, "pdev=0x%p, slot=%s, entering operating state [D%d]\n",
@@ -3969,7 +3969,8 @@ static int mpi3mr_resume(struct pci_dev *pdev)
39693969
}
39703970

39713971
mrioc->stop_drv_processing = 0;
3972-
mpi3mr_init_ioc(mrioc, 1);
3972+
mpi3mr_memset_buffers(mrioc);
3973+
mpi3mr_init_ioc(mrioc, MPI3MR_IT_RESUME);
39733974
scsi_unblock_requests(shost);
39743975
mpi3mr_start_watchdog(mrioc);
39753976

0 commit comments

Comments
 (0)