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

Commit 55c009b4 authored by Deepak Ukey's avatar Deepak Ukey Committed by Greg Kroah-Hartman
Browse files

scsi: pm80xx: Fixed kernel panic during error recovery for SATA drive 



commit 196ba6629cf95e51403337235d09742fcdc3febd upstream.

Disabling the SATA drive interface cause kernel panic. When the drive
Interface is disabled, device should be deregistered after aborting all
pending I/Os. Also changed the port recovery timeout to 10000 ms for
PM8006 controller.

Signed-off-by: default avatarDeepak Ukey <deepak.ukey@microchip.com>
Signed-off-by: default avatarViswas G <Viswas.G@microchip.com>
Reviewed-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd68d220

drivers/scsi/pm8001/pm8001_sas.c

+5 −1
Original line number Diff line number Diff line
@@ -866,6 +866,8 @@ static void pm8001_dev_gone_notify(struct domain_device *dev) 
			spin_unlock_irqrestore(&pm8001_ha->lock, flags);

			pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev ,

				dev, 1, 0);

			while (pm8001_dev->running_req)

				msleep(20);

			spin_lock_irqsave(&pm8001_ha->lock, flags);

		}

		PM8001_CHIP_DISP->dereg_dev_req(pm8001_ha, device_id);
@@ -1238,8 +1240,10 @@ int pm8001_abort_task(struct sas_task *task) 
			PM8001_MSG_DBG(pm8001_ha,

				pm8001_printk("Waiting for Port reset\n"));

			wait_for_completion(&completion_reset);

			if (phy->port_reset_status)

			if (phy->port_reset_status) {

				pm8001_dev_gone_notify(dev);

				goto out;

			}



			/*

			 * 4. SATA Abort ALL

drivers/scsi/pm8001/pm80xx_hwi.c

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static void update_main_config_table(struct pm8001_hba_info *pm8001_ha) 
		pm8001_ha->main_cfg_tbl.pm80xx_tbl.port_recovery_timer &=

					0x0000ffff;

		pm8001_ha->main_cfg_tbl.pm80xx_tbl.port_recovery_timer |=

					0x140000;

					CHIP_8006_PORT_RECOVERY_TIMEOUT;

	}

	pm8001_mw32(address, MAIN_PORT_RECOVERY_TIMER,

			pm8001_ha->main_cfg_tbl.pm80xx_tbl.port_recovery_timer);

drivers/scsi/pm8001/pm80xx_hwi.h

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ 
#define SAS_MAX_AIP                     0x200000

#define IT_NEXUS_TIMEOUT       0x7D0

#define PORT_RECOVERY_TIMEOUT  ((IT_NEXUS_TIMEOUT/100) + 30)

/* Port recovery timeout, 10000 ms for PM8006 controller */

#define CHIP_8006_PORT_RECOVERY_TIMEOUT 0x640000



#ifdef __LITTLE_ENDIAN_BITFIELD

struct sas_identify_frame_local {