tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mtip32xx: fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT

Fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT

Signed-off-by: Selvan Mani <smani@micron.com>
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

authored by

Asai Thambi SP and committed by
Jens Axboe ee04bed6 a7806fad

+1 -4
+1 -4
drivers/block/mtip32xx/mtip32xx.c
··· 990 990 reply = port->rxfis + RX_FIS_D2H_REG; 991 991 task_file_data = readl(port->mmio+PORT_TFDATA); 992 992 993 - if (fis->command == ATA_CMD_SEC_ERASE_UNIT) 994 - clear_bit(MTIP_DDF_SEC_LOCK_BIT, &port->dd->dd_flag); 995 - 996 993 if ((task_file_data & 1)) 997 994 return false; 998 995 999 996 if (fis->command == ATA_CMD_SEC_ERASE_PREP) { 1000 997 set_bit(MTIP_PF_SE_ACTIVE_BIT, &port->flags); 1001 - set_bit(MTIP_DDF_SEC_LOCK_BIT, &port->dd->dd_flag); 1002 998 port->ic_pause_timer = jiffies; 1003 999 return true; 1004 1000 } else if ((fis->command == ATA_CMD_DOWNLOAD_MICRO) && ··· 1006 1010 ((fis->command == 0xFC) && 1007 1011 (fis->features == 0x27 || fis->features == 0x72 || 1008 1012 fis->features == 0x62 || fis->features == 0x26))) { 1013 + clear_bit(MTIP_DDF_SEC_LOCK_BIT, &port->dd->dd_flag); 1009 1014 /* Com reset after secure erase or lowlevel format */ 1010 1015 mtip_restart_port(port); 1011 1016 return false;