Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32827995 authored by Asai Thambi SP's avatar Asai Thambi SP Committed by Sasha Levin
Browse files

mtip32xx: Fix broken service thread handling 



[ Upstream commit cfc05bd31384c4898bf2437a4de5557f3cf9803a ]

Service thread does not detect the need for taskfile error hanlding. Fixed the
flag condition to process taskfile error.

Signed-off-by: default avatarSelvan Mani <smani@micron.com>
Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 59872e56

drivers/block/mtip32xx/mtip32xx.c

+10 −2
Original line number Diff line number Diff line
@@ -2946,9 +2946,15 @@ static int mtip_service_thread(void *data) 
		 * is in progress nor error handling is active

		 */

		wait_event_interruptible(port->svc_wait, (port->flags) &&

			!(port->flags & MTIP_PF_PAUSE_IO));

			(port->flags & MTIP_PF_SVC_THD_WORK));



		set_bit(MTIP_PF_SVC_THD_ACTIVE_BIT, &port->flags);

		if (kthread_should_stop() ||

			test_bit(MTIP_PF_SVC_THD_STOP_BIT, &port->flags))

			goto st_out;



		if (unlikely(test_bit(MTIP_DDF_REMOVE_PENDING_BIT,

				&dd->dd_flag)))

			goto st_out;



		if (kthread_should_stop() ||

			test_bit(MTIP_PF_SVC_THD_STOP_BIT, &port->flags))
@@ -2962,6 +2968,8 @@ static int mtip_service_thread(void *data) 
				&dd->dd_flag)))

			goto st_out;



		set_bit(MTIP_PF_SVC_THD_ACTIVE_BIT, &port->flags);



restart_eh:

		/* Demux bits: start with error handling */

		if (test_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags)) {

drivers/block/mtip32xx/mtip32xx.h

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ enum { 
	MTIP_PF_SR_CLEANUP_BIT      = 7,

	MTIP_PF_SVC_THD_STOP_BIT    = 8,



	MTIP_PF_SVC_THD_WORK	= ((1 << MTIP_PF_EH_ACTIVE_BIT) |

				  (1 << MTIP_PF_ISSUE_CMDS_BIT) |

				  (1 << MTIP_PF_REBUILD_BIT) |

				  (1 << MTIP_PF_SVC_THD_STOP_BIT)),



	/* below are bit numbers in 'dd_flag' defined in driver_data */

	MTIP_DDF_SEC_LOCK_BIT	    = 0,

	MTIP_DDF_REMOVE_PENDING_BIT = 1,