diff for duplicates of <87eghiuoof.fsf@gamma.ozlabs.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 53a1f0b..3825ed5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- +=2D----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 "Matthew R. Ochs" <mrochs@linux.vnet.ibm.com> writes: @@ -23,81 +23,87 @@ Reviewed-by: Daniel Axtens <dja@axtens.net> > drivers/scsi/cxlflash/superpipe.c | 14 +++++++------- > 3 files changed, 22 insertions(+), 22 deletions(-) > -> diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/common.h +> diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/commo= +n.h > index 1abe4e0..11318de 100644 > --- a/drivers/scsi/cxlflash/common.h > +++ b/drivers/scsi/cxlflash/common.h > @@ -79,7 +79,7 @@ enum cxlflash_init_state { -> +>=20=20 > enum cxlflash_state { > STATE_NORMAL, /* Normal running state, everything good */ > - STATE_LIMBO, /* Limbo running state, trying to reset/recover */ > + STATE_RESET, /* Reset state, trying to reset/recover */ > STATE_FAILTERM /* Failed/terminating state, error out users/threads */ > }; -> +>=20=20 > @@ -125,7 +125,7 @@ struct cxlflash_cfg { -> +>=20=20 > wait_queue_head_t tmf_waitq; > bool tmf_active; > - wait_queue_head_t limbo_waitq; > + wait_queue_head_t reset_waitq; > enum cxlflash_state state; > }; -> +>=20=20 > diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c > index 6e85c77..8940336 100644 > --- a/drivers/scsi/cxlflash/main.c > +++ b/drivers/scsi/cxlflash/main.c -> @@ -382,8 +382,8 @@ static int cxlflash_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scp) +> @@ -382,8 +382,8 @@ static int cxlflash_queuecommand(struct Scsi_Host *ho= +st, struct scsi_cmnd *scp) > spin_unlock_irqrestore(&cfg->tmf_waitq.lock, lock_flags); -> +>=20=20 > switch (cfg->state) { > - case STATE_LIMBO: > - dev_dbg_ratelimited(&cfg->dev->dev, "%s: device in limbo!\n", > + case STATE_RESET: > + dev_dbg_ratelimited(&cfg->dev->dev, "%s: device is in reset!\n", > __func__); -> rc = SCSI_MLQUEUE_HOST_BUSY; +> rc =3D SCSI_MLQUEUE_HOST_BUSY; > goto out; -> @@ -479,8 +479,8 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp) +> @@ -479,8 +479,8 @@ static int cxlflash_eh_device_reset_handler(struct sc= +si_cmnd *scp) > if (unlikely(rcr)) -> rc = FAILED; +> rc =3D FAILED; > break; > - case STATE_LIMBO: -> - wait_event(cfg->limbo_waitq, cfg->state != STATE_LIMBO); +> - wait_event(cfg->limbo_waitq, cfg->state !=3D STATE_LIMBO); > + case STATE_RESET: -> + wait_event(cfg->reset_waitq, cfg->state != STATE_RESET); -> if (cfg->state == STATE_NORMAL) +> + wait_event(cfg->reset_waitq, cfg->state !=3D STATE_RESET); +> if (cfg->state =3D=3D STATE_NORMAL) > break; > /* fall through */ -> @@ -519,7 +519,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp) -> +> @@ -519,7 +519,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi= +_cmnd *scp) +>=20=20 > switch (cfg->state) { > case STATE_NORMAL: -> - cfg->state = STATE_LIMBO; -> + cfg->state = STATE_RESET; +> - cfg->state =3D STATE_LIMBO; +> + cfg->state =3D STATE_RESET; > scsi_block_requests(cfg->host); > cxlflash_mark_contexts_error(cfg); -> rcr = cxlflash_afu_reset(cfg); -> @@ -528,11 +528,11 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp) -> cfg->state = STATE_FAILTERM; +> rcr =3D cxlflash_afu_reset(cfg); +> @@ -528,11 +528,11 @@ static int cxlflash_eh_host_reset_handler(struct sc= +si_cmnd *scp) +> cfg->state =3D STATE_FAILTERM; > } else -> cfg->state = STATE_NORMAL; +> cfg->state =3D STATE_NORMAL; > - wake_up_all(&cfg->limbo_waitq); > + wake_up_all(&cfg->reset_waitq); > scsi_unblock_requests(cfg->host); > break; > - case STATE_LIMBO: -> - wait_event(cfg->limbo_waitq, cfg->state != STATE_LIMBO); +> - wait_event(cfg->limbo_waitq, cfg->state !=3D STATE_LIMBO); > + case STATE_RESET: -> + wait_event(cfg->reset_waitq, cfg->state != STATE_RESET); -> if (cfg->state == STATE_NORMAL) +> + wait_event(cfg->reset_waitq, cfg->state !=3D STATE_RESET); +> if (cfg->state =3D=3D STATE_NORMAL) > break; > /* fall through */ -> @@ -705,7 +705,7 @@ static void cxlflash_wait_for_pci_err_recovery(struct cxlflash_cfg *cfg) -> struct pci_dev *pdev = cfg->dev; -> +> @@ -705,7 +705,7 @@ static void cxlflash_wait_for_pci_err_recovery(struct= + cxlflash_cfg *cfg) +> struct pci_dev *pdev =3D cfg->dev; +>=20=20 > if (pci_channel_offline(pdev)) > - wait_event_timeout(cfg->limbo_waitq, > + wait_event_timeout(cfg->reset_waitq, @@ -105,47 +111,52 @@ Reviewed-by: Daniel Axtens <dja@axtens.net> > CXLFLASH_PCI_ERROR_RECOVERY_TIMEOUT); > } > @@ -2304,7 +2304,7 @@ static int cxlflash_probe(struct pci_dev *pdev, -> cfg->mcctx = NULL; -> +> cfg->mcctx =3D NULL; +>=20=20 > init_waitqueue_head(&cfg->tmf_waitq); > - init_waitqueue_head(&cfg->limbo_waitq); > + init_waitqueue_head(&cfg->reset_waitq); -> +>=20=20 > INIT_WORK(&cfg->work_q, cxlflash_worker_thread); -> cfg->lr_state = LINK_RESET_INVALID; -> @@ -2396,7 +2396,7 @@ static pci_ers_result_t cxlflash_pci_error_detected(struct pci_dev *pdev, -> +> cfg->lr_state =3D LINK_RESET_INVALID; +> @@ -2396,7 +2396,7 @@ static pci_ers_result_t cxlflash_pci_error_detected= +(struct pci_dev *pdev, +>=20=20 > switch (state) { > case pci_channel_io_frozen: -> - cfg->state = STATE_LIMBO; -> + cfg->state = STATE_RESET; +> - cfg->state =3D STATE_LIMBO; +> + cfg->state =3D STATE_RESET; > scsi_block_requests(cfg->host); > drain_ioctls(cfg); -> rc = cxlflash_mark_contexts_error(cfg); -> @@ -2408,7 +2408,7 @@ static pci_ers_result_t cxlflash_pci_error_detected(struct pci_dev *pdev, +> rc =3D cxlflash_mark_contexts_error(cfg); +> @@ -2408,7 +2408,7 @@ static pci_ers_result_t cxlflash_pci_error_detected= +(struct pci_dev *pdev, > return PCI_ERS_RESULT_NEED_RESET; > case pci_channel_io_perm_failure: -> cfg->state = STATE_FAILTERM; +> cfg->state =3D STATE_FAILTERM; > - wake_up_all(&cfg->limbo_waitq); > + wake_up_all(&cfg->reset_waitq); > scsi_unblock_requests(cfg->host); > return PCI_ERS_RESULT_DISCONNECT; > default: -> @@ -2455,7 +2455,7 @@ static void cxlflash_pci_resume(struct pci_dev *pdev) -> dev_dbg(dev, "%s: pdev=%p\n", __func__, pdev); -> -> cfg->state = STATE_NORMAL; +> @@ -2455,7 +2455,7 @@ static void cxlflash_pci_resume(struct pci_dev *pde= +v) +> dev_dbg(dev, "%s: pdev=3D%p\n", __func__, pdev); +>=20=20 +> cfg->state =3D STATE_NORMAL; > - wake_up_all(&cfg->limbo_waitq); > + wake_up_all(&cfg->reset_waitq); > scsi_unblock_requests(cfg->host); > } -> -> diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c +>=20=20 +> diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/su= +perpipe.c > index 655cbf1..8a7ec5d 100644 > --- a/drivers/scsi/cxlflash/superpipe.c > +++ b/drivers/scsi/cxlflash/superpipe.c -> @@ -100,7 +100,7 @@ void cxlflash_stop_term_user_contexts(struct cxlflash_cfg *cfg) -> +> @@ -100,7 +100,7 @@ void cxlflash_stop_term_user_contexts(struct cxlflash= +_cfg *cfg) +>=20=20 > dev_dbg(dev, "%s: Wait for user contexts to quiesce...\n", > __func__); > - wake_up_all(&cfg->limbo_waitq); @@ -154,7 +165,7 @@ Reviewed-by: Daniel Axtens <dja@axtens.net> > } > } > @@ -1233,11 +1233,11 @@ static int check_state(struct cxlflash_cfg *cfg) -> +>=20=20 > retry: > switch (cfg->state) { > - case STATE_LIMBO: @@ -162,10 +173,10 @@ Reviewed-by: Daniel Axtens <dja@axtens.net> > + case STATE_RESET: > + dev_dbg(dev, "%s: Reset state, going to wait...\n", __func__); > up_read(&cfg->ioctl_rwsem); -> - rc = wait_event_interruptible(cfg->limbo_waitq, -> - cfg->state != STATE_LIMBO); -> + rc = wait_event_interruptible(cfg->reset_waitq, -> + cfg->state != STATE_RESET); +> - rc =3D wait_event_interruptible(cfg->limbo_waitq, +> - cfg->state !=3D STATE_LIMBO); +> + rc =3D wait_event_interruptible(cfg->reset_waitq, +> + cfg->state !=3D STATE_RESET); > down_read(&cfg->ioctl_rwsem); > if (unlikely(rc)) > break; @@ -175,16 +186,18 @@ Reviewed-by: Daniel Axtens <dja@axtens.net> > * time where an EEH might have been detected but not yet 'serviced' > - * (callback invoked, causing the device to enter limbo state). To avoid > + * (callback invoked, causing the device to enter reset state). To avoid -> * looping in this routine during that window, a 1 second sleep is in place -> * between the time the MMIO failure is detected and the time a wait on the +> * looping in this routine during that window, a 1 second sleep is in pl= +ace +> * between the time the MMIO failure is detected and the time a wait on = +the > - * limbo wait queue is attempted via check_state(). > + * reset wait queue is attempted via check_state(). > * > * Return: 0 on success, -errno on failure > */ -> -- +> --=20 > 2.1.0 ------BEGIN PGP SIGNATURE----- +=2D----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: GPGTools - https://gpgtools.org @@ -200,5 +213,5 @@ W2XlxHvP6wuGx8XKjsmcI0UFK5qpy9UPHzgt9Xkwu1RVfao05YTW/vF3IOwMZ9d1 uY48zSy8JDL+WCcQe/CN4joyVo/Tuak5sblIwtjV5rO6KIHZXnXNVZlaYKxj/qhZ GqwyFRATe2SDC9SvkXlnFsiBWFBArWTJ4wJ+4/QwaXTAU9ZbYNHRZW8MN+7jbgyx dp6S5H2KjZrrMRU528mb -=D6L8 ------END PGP SIGNATURE----- +=3DD6L8 +=2D----END PGP SIGNATURE----- diff --git a/a/content_digest b/N1/content_digest index 0b33940..1932b12 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -17,7 +17,7 @@ " Manoj N. Kumar <manoj@linux.vnet.ibm.com>\0" "\00:1\0" "b\0" - "-----BEGIN PGP SIGNED MESSAGE-----\n" + "=2D----BEGIN PGP SIGNED MESSAGE-----\n" "Hash: SHA512\n" "\n" "\"Matthew R. Ochs\" <mrochs@linux.vnet.ibm.com> writes:\n" @@ -42,81 +42,87 @@ "> drivers/scsi/cxlflash/superpipe.c | 14 +++++++-------\n" "> 3 files changed, 22 insertions(+), 22 deletions(-)\n" ">\n" - "> diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/common.h\n" + "> diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/commo=\n" + "n.h\n" "> index 1abe4e0..11318de 100644\n" "> --- a/drivers/scsi/cxlflash/common.h\n" "> +++ b/drivers/scsi/cxlflash/common.h\n" "> @@ -79,7 +79,7 @@ enum cxlflash_init_state {\n" - "> \n" + ">=20=20\n" "> enum cxlflash_state {\n" "> \tSTATE_NORMAL,\t/* Normal running state, everything good */\n" "> -\tSTATE_LIMBO,\t/* Limbo running state, trying to reset/recover */\n" "> +\tSTATE_RESET,\t/* Reset state, trying to reset/recover */\n" "> \tSTATE_FAILTERM\t/* Failed/terminating state, error out users/threads */\n" "> };\n" - "> \n" + ">=20=20\n" "> @@ -125,7 +125,7 @@ struct cxlflash_cfg {\n" - "> \n" + ">=20=20\n" "> \twait_queue_head_t tmf_waitq;\n" "> \tbool tmf_active;\n" "> -\twait_queue_head_t limbo_waitq;\n" "> +\twait_queue_head_t reset_waitq;\n" "> \tenum cxlflash_state state;\n" "> };\n" - "> \n" + ">=20=20\n" "> diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c\n" "> index 6e85c77..8940336 100644\n" "> --- a/drivers/scsi/cxlflash/main.c\n" "> +++ b/drivers/scsi/cxlflash/main.c\n" - "> @@ -382,8 +382,8 @@ static int cxlflash_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scp)\n" + "> @@ -382,8 +382,8 @@ static int cxlflash_queuecommand(struct Scsi_Host *ho=\n" + "st, struct scsi_cmnd *scp)\n" "> \tspin_unlock_irqrestore(&cfg->tmf_waitq.lock, lock_flags);\n" - "> \n" + ">=20=20\n" "> \tswitch (cfg->state) {\n" "> -\tcase STATE_LIMBO:\n" "> -\t\tdev_dbg_ratelimited(&cfg->dev->dev, \"%s: device in limbo!\\n\",\n" "> +\tcase STATE_RESET:\n" "> +\t\tdev_dbg_ratelimited(&cfg->dev->dev, \"%s: device is in reset!\\n\",\n" "> \t\t\t\t __func__);\n" - "> \t\trc = SCSI_MLQUEUE_HOST_BUSY;\n" + "> \t\trc =3D SCSI_MLQUEUE_HOST_BUSY;\n" "> \t\tgoto out;\n" - "> @@ -479,8 +479,8 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)\n" + "> @@ -479,8 +479,8 @@ static int cxlflash_eh_device_reset_handler(struct sc=\n" + "si_cmnd *scp)\n" "> \t\tif (unlikely(rcr))\n" - "> \t\t\trc = FAILED;\n" + "> \t\t\trc =3D FAILED;\n" "> \t\tbreak;\n" "> -\tcase STATE_LIMBO:\n" - "> -\t\twait_event(cfg->limbo_waitq, cfg->state != STATE_LIMBO);\n" + "> -\t\twait_event(cfg->limbo_waitq, cfg->state !=3D STATE_LIMBO);\n" "> +\tcase STATE_RESET:\n" - "> +\t\twait_event(cfg->reset_waitq, cfg->state != STATE_RESET);\n" - "> \t\tif (cfg->state == STATE_NORMAL)\n" + "> +\t\twait_event(cfg->reset_waitq, cfg->state !=3D STATE_RESET);\n" + "> \t\tif (cfg->state =3D=3D STATE_NORMAL)\n" "> \t\t\tbreak;\n" "> \t\t/* fall through */\n" - "> @@ -519,7 +519,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp)\n" - "> \n" + "> @@ -519,7 +519,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi=\n" + "_cmnd *scp)\n" + ">=20=20\n" "> \tswitch (cfg->state) {\n" "> \tcase STATE_NORMAL:\n" - "> -\t\tcfg->state = STATE_LIMBO;\n" - "> +\t\tcfg->state = STATE_RESET;\n" + "> -\t\tcfg->state =3D STATE_LIMBO;\n" + "> +\t\tcfg->state =3D STATE_RESET;\n" "> \t\tscsi_block_requests(cfg->host);\n" "> \t\tcxlflash_mark_contexts_error(cfg);\n" - "> \t\trcr = cxlflash_afu_reset(cfg);\n" - "> @@ -528,11 +528,11 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp)\n" - "> \t\t\tcfg->state = STATE_FAILTERM;\n" + "> \t\trcr =3D cxlflash_afu_reset(cfg);\n" + "> @@ -528,11 +528,11 @@ static int cxlflash_eh_host_reset_handler(struct sc=\n" + "si_cmnd *scp)\n" + "> \t\t\tcfg->state =3D STATE_FAILTERM;\n" "> \t\t} else\n" - "> \t\t\tcfg->state = STATE_NORMAL;\n" + "> \t\t\tcfg->state =3D STATE_NORMAL;\n" "> -\t\twake_up_all(&cfg->limbo_waitq);\n" "> +\t\twake_up_all(&cfg->reset_waitq);\n" "> \t\tscsi_unblock_requests(cfg->host);\n" "> \t\tbreak;\n" "> -\tcase STATE_LIMBO:\n" - "> -\t\twait_event(cfg->limbo_waitq, cfg->state != STATE_LIMBO);\n" + "> -\t\twait_event(cfg->limbo_waitq, cfg->state !=3D STATE_LIMBO);\n" "> +\tcase STATE_RESET:\n" - "> +\t\twait_event(cfg->reset_waitq, cfg->state != STATE_RESET);\n" - "> \t\tif (cfg->state == STATE_NORMAL)\n" + "> +\t\twait_event(cfg->reset_waitq, cfg->state !=3D STATE_RESET);\n" + "> \t\tif (cfg->state =3D=3D STATE_NORMAL)\n" "> \t\t\tbreak;\n" "> \t\t/* fall through */\n" - "> @@ -705,7 +705,7 @@ static void cxlflash_wait_for_pci_err_recovery(struct cxlflash_cfg *cfg)\n" - "> \tstruct pci_dev *pdev = cfg->dev;\n" - "> \n" + "> @@ -705,7 +705,7 @@ static void cxlflash_wait_for_pci_err_recovery(struct=\n" + " cxlflash_cfg *cfg)\n" + "> \tstruct pci_dev *pdev =3D cfg->dev;\n" + ">=20=20\n" "> \tif (pci_channel_offline(pdev))\n" "> -\t\twait_event_timeout(cfg->limbo_waitq,\n" "> +\t\twait_event_timeout(cfg->reset_waitq,\n" @@ -124,47 +130,52 @@ "> \t\t\t\t CXLFLASH_PCI_ERROR_RECOVERY_TIMEOUT);\n" "> }\n" "> @@ -2304,7 +2304,7 @@ static int cxlflash_probe(struct pci_dev *pdev,\n" - "> \tcfg->mcctx = NULL;\n" - "> \n" + "> \tcfg->mcctx =3D NULL;\n" + ">=20=20\n" "> \tinit_waitqueue_head(&cfg->tmf_waitq);\n" "> -\tinit_waitqueue_head(&cfg->limbo_waitq);\n" "> +\tinit_waitqueue_head(&cfg->reset_waitq);\n" - "> \n" + ">=20=20\n" "> \tINIT_WORK(&cfg->work_q, cxlflash_worker_thread);\n" - "> \tcfg->lr_state = LINK_RESET_INVALID;\n" - "> @@ -2396,7 +2396,7 @@ static pci_ers_result_t cxlflash_pci_error_detected(struct pci_dev *pdev,\n" - "> \n" + "> \tcfg->lr_state =3D LINK_RESET_INVALID;\n" + "> @@ -2396,7 +2396,7 @@ static pci_ers_result_t cxlflash_pci_error_detected=\n" + "(struct pci_dev *pdev,\n" + ">=20=20\n" "> \tswitch (state) {\n" "> \tcase pci_channel_io_frozen:\n" - "> -\t\tcfg->state = STATE_LIMBO;\n" - "> +\t\tcfg->state = STATE_RESET;\n" + "> -\t\tcfg->state =3D STATE_LIMBO;\n" + "> +\t\tcfg->state =3D STATE_RESET;\n" "> \t\tscsi_block_requests(cfg->host);\n" "> \t\tdrain_ioctls(cfg);\n" - "> \t\trc = cxlflash_mark_contexts_error(cfg);\n" - "> @@ -2408,7 +2408,7 @@ static pci_ers_result_t cxlflash_pci_error_detected(struct pci_dev *pdev,\n" + "> \t\trc =3D cxlflash_mark_contexts_error(cfg);\n" + "> @@ -2408,7 +2408,7 @@ static pci_ers_result_t cxlflash_pci_error_detected=\n" + "(struct pci_dev *pdev,\n" "> \t\treturn PCI_ERS_RESULT_NEED_RESET;\n" "> \tcase pci_channel_io_perm_failure:\n" - "> \t\tcfg->state = STATE_FAILTERM;\n" + "> \t\tcfg->state =3D STATE_FAILTERM;\n" "> -\t\twake_up_all(&cfg->limbo_waitq);\n" "> +\t\twake_up_all(&cfg->reset_waitq);\n" "> \t\tscsi_unblock_requests(cfg->host);\n" "> \t\treturn PCI_ERS_RESULT_DISCONNECT;\n" "> \tdefault:\n" - "> @@ -2455,7 +2455,7 @@ static void cxlflash_pci_resume(struct pci_dev *pdev)\n" - "> \tdev_dbg(dev, \"%s: pdev=%p\\n\", __func__, pdev);\n" - "> \n" - "> \tcfg->state = STATE_NORMAL;\n" + "> @@ -2455,7 +2455,7 @@ static void cxlflash_pci_resume(struct pci_dev *pde=\n" + "v)\n" + "> \tdev_dbg(dev, \"%s: pdev=3D%p\\n\", __func__, pdev);\n" + ">=20=20\n" + "> \tcfg->state =3D STATE_NORMAL;\n" "> -\twake_up_all(&cfg->limbo_waitq);\n" "> +\twake_up_all(&cfg->reset_waitq);\n" "> \tscsi_unblock_requests(cfg->host);\n" "> }\n" - "> \n" - "> diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c\n" + ">=20=20\n" + "> diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/su=\n" + "perpipe.c\n" "> index 655cbf1..8a7ec5d 100644\n" "> --- a/drivers/scsi/cxlflash/superpipe.c\n" "> +++ b/drivers/scsi/cxlflash/superpipe.c\n" - "> @@ -100,7 +100,7 @@ void cxlflash_stop_term_user_contexts(struct cxlflash_cfg *cfg)\n" - "> \n" + "> @@ -100,7 +100,7 @@ void cxlflash_stop_term_user_contexts(struct cxlflash=\n" + "_cfg *cfg)\n" + ">=20=20\n" "> \t\tdev_dbg(dev, \"%s: Wait for user contexts to quiesce...\\n\",\n" "> \t\t\t__func__);\n" "> -\t\twake_up_all(&cfg->limbo_waitq);\n" @@ -173,7 +184,7 @@ "> \t}\n" "> }\n" "> @@ -1233,11 +1233,11 @@ static int check_state(struct cxlflash_cfg *cfg)\n" - "> \n" + ">=20=20\n" "> retry:\n" "> \tswitch (cfg->state) {\n" "> -\tcase STATE_LIMBO:\n" @@ -181,10 +192,10 @@ "> +\tcase STATE_RESET:\n" "> +\t\tdev_dbg(dev, \"%s: Reset state, going to wait...\\n\", __func__);\n" "> \t\tup_read(&cfg->ioctl_rwsem);\n" - "> -\t\trc = wait_event_interruptible(cfg->limbo_waitq,\n" - "> -\t\t\t\t\t cfg->state != STATE_LIMBO);\n" - "> +\t\trc = wait_event_interruptible(cfg->reset_waitq,\n" - "> +\t\t\t\t\t cfg->state != STATE_RESET);\n" + "> -\t\trc =3D wait_event_interruptible(cfg->limbo_waitq,\n" + "> -\t\t\t\t\t cfg->state !=3D STATE_LIMBO);\n" + "> +\t\trc =3D wait_event_interruptible(cfg->reset_waitq,\n" + "> +\t\t\t\t\t cfg->state !=3D STATE_RESET);\n" "> \t\tdown_read(&cfg->ioctl_rwsem);\n" "> \t\tif (unlikely(rc))\n" "> \t\t\tbreak;\n" @@ -194,16 +205,18 @@ "> * time where an EEH might have been detected but not yet 'serviced'\n" "> - * (callback invoked, causing the device to enter limbo state). To avoid\n" "> + * (callback invoked, causing the device to enter reset state). To avoid\n" - "> * looping in this routine during that window, a 1 second sleep is in place\n" - "> * between the time the MMIO failure is detected and the time a wait on the\n" + "> * looping in this routine during that window, a 1 second sleep is in pl=\n" + "ace\n" + "> * between the time the MMIO failure is detected and the time a wait on =\n" + "the\n" "> - * limbo wait queue is attempted via check_state().\n" "> + * reset wait queue is attempted via check_state().\n" "> *\n" "> * Return: 0 on success, -errno on failure\n" "> */\n" - "> -- \n" + "> --=20\n" "> 2.1.0\n" - "-----BEGIN PGP SIGNATURE-----\n" + "=2D----BEGIN PGP SIGNATURE-----\n" "Version: GnuPG v1\n" "Comment: GPGTools - https://gpgtools.org\n" "\n" @@ -219,7 +232,7 @@ "uY48zSy8JDL+WCcQe/CN4joyVo/Tuak5sblIwtjV5rO6KIHZXnXNVZlaYKxj/qhZ\n" "GqwyFRATe2SDC9SvkXlnFsiBWFBArWTJ4wJ+4/QwaXTAU9ZbYNHRZW8MN+7jbgyx\n" "dp6S5H2KjZrrMRU528mb\n" - "=D6L8\n" - -----END PGP SIGNATURE----- + "=3DD6L8\n" + =2D----END PGP SIGNATURE----- -ed8bb021124ae4a70aef169684c0e1c1e459fc9db52a633d9b72df5233f1ae1d +f4c6307e92435cb2c8e580ab94e7ed8489859d6ac850a5a7479c2a1c77e1fe41
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.