From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A510BC433FE for ; Fri, 1 Apr 2022 14:50:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348179AbiDAOwe (ORCPT ); Fri, 1 Apr 2022 10:52:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349425AbiDAOp5 (ORCPT ); Fri, 1 Apr 2022 10:45:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BC7429B7DE; Fri, 1 Apr 2022 07:35:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 68D35B824D8; Fri, 1 Apr 2022 14:35:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14FB3C340EE; Fri, 1 Apr 2022 14:35:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823757; bh=rz650yzX6zlru2F0OGZGpmKImpcIennoaZbQcZ+2KYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o/dLgYRGVCU1Tued9sHBQhKweKqYpCkctJcRIz0pg01GIFAHeXmuAHDuqLobxs+dI Ngi7w+uMzBHlhPSsEdrsRlzDNFl7n/X8Si4ATnnB0OzdRyfqK+8IAbeF6HbuaXg/ed hT/mTg2uO7ruemkfTitSDP/hJB+2yOgg95GX48lHFQUwSD+9GmjhRFImpqKHPJSEU7 sZfGrHhvGBxZCpxDB3heAojJB2N0wgCTjzavL7nR+5J1RAi6u9wAioStNus1V+71db Eusx/Ds62wQmwcTr2cTjhe43qI/K/EkOZYUKPenh9ieCuk/MzRkg9D6ojgH3Jnjw35 zi+dY3YgTb1+g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Damien Le Moal , Jack Wang , "Martin K . Petersen" , Sasha Levin , jinpu.wang@cloud.ionos.com, jejb@linux.ibm.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 065/109] scsi: pm8001: Fix pm8001_mpi_task_abort_resp() Date: Fri, 1 Apr 2022 10:32:12 -0400 Message-Id: <20220401143256.1950537-65-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401143256.1950537-1-sashal@kernel.org> References: <20220401143256.1950537-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Damien Le Moal [ Upstream commit 7e6b7e740addcea450041b5be8e42f0a4ceece0f ] The call to pm8001_ccb_task_free() at the end of pm8001_mpi_task_abort_resp() already frees the ccb tag. So when the device NCQ_ABORT_ALL_FLAG is set, the tag should not be freed again. Also change the hardcoded 0xBFFFFFFF value to ~NCQ_ABORT_ALL_FLAG as it ought to be. Link: https://lore.kernel.org/r/20220220031810.738362-19-damien.lemoal@opensource.wdc.com Reviewed-by: Jack Wang Signed-off-by: Damien Le Moal Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/pm8001/pm8001_hwi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 066290dd5756..51d58606da7f 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -3714,12 +3714,11 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) mb(); if (pm8001_dev->id & NCQ_ABORT_ALL_FLAG) { - pm8001_tag_free(pm8001_ha, tag); sas_free_task(t); - /* clear the flag */ - pm8001_dev->id &= 0xBFFFFFFF; - } else + pm8001_dev->id &= ~NCQ_ABORT_ALL_FLAG; + } else { t->task_done(t); + } return 0; } -- 2.34.1