From nobody Thu Dec 18 01:39:14 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7176F1756A for ; Tue, 2 Jul 2024 02:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888464; cv=none; b=pphfvQP3KLQiGM0pMVUjYtzQWATQAKKbIdpMR22jDkO39YKBi8KyMP6z13YhqhFFQpCceeiiCrJR9zjwmnovDB+h2Fv1SbQBmZCrlrv4AEyI3Vo0zLaADBVZmdy3ovkHthhDfaxgBQr4sZf1P4jgwx9/oRGjYSzsuFDNVyQkQt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888464; c=relaxed/simple; bh=HTrgxcWff1OSSYrDj5ylupNG6UKIfx6wTzhICaZOCC4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Tk89fO70LIp9um2Auf4OOAPVk9tGvF3XAODoCXUEfdfbjZQALl3yQU5P/WzXDWfNaoUwutX57dCHbu6+zW/aNsqKqhlv4f5sG+I9zIID0EYB7GXB9Zfa8YOMMO+RH9l6MEV3MkFyIMMdkbi7QX5KBy/DnTyXzg1X4qyVUTsrNzc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HNkcTudQ; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HNkcTudQ" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e0360f8d773so6101640276.3 for ; Mon, 01 Jul 2024 19:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888461; x=1720493261; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=+mbUb6G4m1uUehtvXxBjGbQF+Fq5mFzQsrUm91ddIqA=; b=HNkcTudQ67W1ugZIr7jLT10fu/hvsabY+UBGiMvwXc60jfyXsdde3BNqJN0DmO2qKZ k+M/vHm9hdxExdSRI0czdmPjh4Szr9yQSHitVSOqNJ1LZrZmoDNAM6cFscJ3qeQybx6Z 92IwTcxzbC4Hi5vA5eLOTbKdO376qgS9WVDsOX3UXZXgNwPAXLI5krd+c+Y+066LKM8r YB5fOwiS1QRy+nTJl37gR/67hp6i0iuhn8EsPpDuuaWa9itAgEyBH48lUj01h8ay94lE F/wSMXVsT2g499ewvbqIj3LeLBNpvAalp9ydkTpY1gGXJLJCFzepbBa37pN/gJej/aev SEKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888461; x=1720493261; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=+mbUb6G4m1uUehtvXxBjGbQF+Fq5mFzQsrUm91ddIqA=; b=bLZGHd2tU2NGfwJnVsfVgLPDT/gd0wQl9VuJJirgFDL0GSEpqYFy1Lsxfr6vm/iiNR wi0r9U79eTbe4KyBdEZAJxv3rT+s6swQluiOBWOQK0dFakLhjafxwoq+Ig61wxfMrFlI 2KXekHAnaqkmBmhw0JXdgsyAuZ94n1G2pApiVMjmqgKeOXYD3v1yYdjDg/qGr1AipU9+ 3NRW/2t6O2rrb8obyykuB4JfYTfa8z8EPZGQ6FxliZPrSGhHIp7mqpSB4KM5KokDK91J RU+7nW2pPSH0FZoH5b3JQ0NDPIS2E4II1qoSGWxUUUoGi+bXoeVJbMlkEz2MsNGTWhEJ L4pg== X-Forwarded-Encrypted: i=1; AJvYcCVLcNFUpGrZ4ZK5Dysa+Veyfi4ANoBKuFOjSSfJHdA0p4oz+9+o/jXVyuz8VG8HWW0eYGjhgyUvIxriKOWjU90nl3nCprjVK/bUuI1d X-Gm-Message-State: AOJu0YzXA8sevQxdADsbbSfu278TSGbIIg5rDImbee42janfrb65+FXs 1HH/Rj5yDHSDkCqMqcWDvaO4nFiE34rF5YfxICvLoElCnzrxanX/u1dp+qSlaXdm3P0BUiewnEW PL5Y4x1e+Lw== X-Google-Smtp-Source: AGHT+IElMlsVkkIH/SoAz+8WBYWit8jbyFBfvfQcb/6vfTSYNoTYjYrLAnrzRdUSqlDyem0nhaD9sQJFjV9D8Q== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a05:6902:2b13:b0:dff:ad2:3c13 with SMTP id 3f1490d57ef6-e036ec376bfmr558093276.9.1719888461370; Mon, 01 Jul 2024 19:47:41 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:29 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-2-ipylypiv@google.com> Subject: [PATCH v5 1/7] ata: libata-scsi: Fix offsets for the fixed format sense data From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv , Akshat Jain , stable@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Correct the ATA PASS-THROUGH fixed format sense data offsets to conform to SPC-6 and SAT-5 specifications. Additionally, set the VALID bit to indicate that the INFORMATION field contains valid information. INFORMATION =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D SAT-5 Table 212 =E2=80=94 "Fixed format sense data INFORMATION field for th= e ATA PASS-THROUGH commands" defines the following format: +------+------------+ | Byte | Field | +------+------------+ | 0 | ERROR | | 1 | STATUS | | 2 | DEVICE | | 3 | COUNT(7:0) | +------+------------+ SPC-6 Table 48 - "Fixed format sense data" specifies that the INFORMATION field starts at byte 3 in sense buffer resulting in the following offsets for the ATA PASS-THROUGH commands: +------------+-------------------------+ | Field | Offset in sense buffer | +------------+-------------------------+ | ERROR | 3 | | STATUS | 4 | | DEVICE | 5 | | COUNT(7:0) | 6 | +------------+-------------------------+ COMMAND-SPECIFIC INFORMATION =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D SAT-5 Table 213 - "Fixed format sense data COMMAND-SPECIFIC INFORMATION field for ATA PASS-THROUGH" defines the following format: +------+-------------------+ | Byte | Field | +------+-------------------+ | 0 | FLAGS | LOG INDEX | | 1 | LBA (7:0) | | 2 | LBA (15:8) | | 3 | LBA (23:16) | +------+-------------------+ SPC-6 Table 48 - "Fixed format sense data" specifies that the COMMAND-SPECIFIC-INFORMATION field starts at byte 8 in sense buffer resulting in the following offsets for the ATA PASS-THROUGH commands: Offsets of these fields in the fixed sense format are as follows: +-------------------+-------------------------+ | Field | Offset in sense buffer | +-------------------+-------------------------+ | FLAGS | LOG INDEX | 8 | | LBA (7:0) | 9 | | LBA (15:8) | 10 | | LBA (23:16) | 11 | +-------------------+-------------------------+ Reported-by: Akshat Jain Fixes: 11093cb1ef56 ("libata-scsi: generate correct ATA pass-through sense") Cc: stable@vger.kernel.org Reviewed-by: Hannes Reinecke Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libata-scsi.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index bb4d30d377ae..a9e44ad4c2de 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -855,7 +855,6 @@ static void ata_gen_passthru_sense(struct ata_queued_cm= d *qc) struct scsi_cmnd *cmd =3D qc->scsicmd; struct ata_taskfile *tf =3D &qc->result_tf; unsigned char *sb =3D cmd->sense_buffer; - unsigned char *desc =3D sb + 8; u8 sense_key, asc, ascq; =20 memset(sb, 0, SCSI_SENSE_BUFFERSIZE); @@ -877,7 +876,8 @@ static void ata_gen_passthru_sense(struct ata_queued_cm= d *qc) scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D); } =20 - if ((cmd->sense_buffer[0] & 0x7f) >=3D 0x72) { + if ((sb[0] & 0x7f) >=3D 0x72) { + unsigned char *desc; u8 len; =20 /* descriptor format */ @@ -916,21 +916,21 @@ static void ata_gen_passthru_sense(struct ata_queued_= cmd *qc) } } else { /* Fixed sense format */ - desc[0] =3D tf->error; - desc[1] =3D tf->status; - desc[2] =3D tf->device; - desc[3] =3D tf->nsect; - desc[7] =3D 0; + sb[0] |=3D 0x80; + sb[3] =3D tf->error; + sb[4] =3D tf->status; + sb[5] =3D tf->device; + sb[6] =3D tf->nsect; if (tf->flags & ATA_TFLAG_LBA48) { - desc[8] |=3D 0x80; + sb[8] |=3D 0x80; if (tf->hob_nsect) - desc[8] |=3D 0x40; + sb[8] |=3D 0x40; if (tf->hob_lbal || tf->hob_lbam || tf->hob_lbah) - desc[8] |=3D 0x20; + sb[8] |=3D 0x20; } - desc[9] =3D tf->lbal; - desc[10] =3D tf->lbam; - desc[11] =3D tf->lbah; + sb[9] =3D tf->lbal; + sb[10] =3D tf->lbam; + sb[11] =3D tf->lbah; } } =20 --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E17FC1A286 for ; Tue, 2 Jul 2024 02:47:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888465; cv=none; b=QRvxtZ/th06Sfd96/QaYM6p4ecM7/6uy2XQUZ9wvKX4nazGut5s0hZad8s4wT43LdCc1aKC7bOw2Bn/lastlbwBgzzrjVcL7K3JYQb80SZfo0VK92Lr/oqNICuA7vKlas6WXFcOV/bamsVU9vhQQ33LEW9cT9X+IKMneZs0ePP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888465; c=relaxed/simple; bh=BMiyKMLwYO4ZPYOP19tvEv3Gb8DtBupJrrjIS0a8MKs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hVOVnjBFqBcYNC8z3ismtLBFbEeueQ2r/Xk5+FIHqqxISR2Zpm37dXyjRalvkKItK8CSHtWVZJC0RHoMOFnrmmDrUhdsNgGDjfAfhB2nQ2DwE50ijls+tR0nxNcB3k/AlEtZSEUdFyDdODcmjgIu50+v15VkPFj2fNQLRbv2NWY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jmQNRHd1; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jmQNRHd1" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-71ac764062eso3416563a12.0 for ; Mon, 01 Jul 2024 19:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888463; x=1720493263; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4oDyu1t8Xgx68nOCglw7QJXgCM7MJOxOJdmoGHyawoE=; b=jmQNRHd1h2gdjbHaftwZc3f7TqhCnGEl9fuKWmjLdTS7mx4vUn6rhehSw3gA0fyKv0 cDaCfCbXp1ty/TsnfSbfaPdznVpq2p+24CMRhngpJYt8QtcKf8V+3KhSXaUKumUsnyKN zDfC++oauGoKaihvRUbuyGDaImK5UlW+VB5A27+9E6aqglWxpW+zXx5uB9t760Eta+d9 QLPDpK7dq0O/gB/DKqJWYDDQiJmLifQFYUm6wB3JeFTryw2Tjnr9lbY/Tfk0zubuA5+T apLxAxEuNvrMpQ502H9vFOXUohn5VV6vW4ynZ8C8n4gOx4EsxFE3wWYxOon5l2eXRNhe judQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888463; x=1720493263; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4oDyu1t8Xgx68nOCglw7QJXgCM7MJOxOJdmoGHyawoE=; b=fDDnPdfdzm4bP2w9Hm2weWxKKOGF9mdh8Lr38b6NcEntKROG3i7fI9oEh+1B2Rwa3v Yf0m6+FiEqgTAlGfhLOnL6B4ZdQ7w+FDlZUeT8Dw+Nq5Xe0QmN044j3lE/W/ozoHuURh zLhEJN86vZCkV2WESS0La5a11mFy1vheIWtQ1E9vlMrYBAEuoGsr4q5qjhJXOjeh4bL6 Fvum94JAX6pj4trnV+WeSkvH1jdsrHUT4R/E2TNJ71EDoLLGfYFIt8/8L3dyMSSPSM37 /erD3G92GhecrFG+KlXb1dq2qH6cS1QevTOmqs3X/q30T0fmJTsdp6w0HBtBq9dHZ2nI JS5w== X-Forwarded-Encrypted: i=1; AJvYcCWzCPTfiHKQGrLoUD31qKnRs6sLiDaTebFba4vTDbrFd7+0V3ZWldkkDbMZHk931CeGTgavlGaIGPzXoWcbeLkv2mqiDExwFSuIyRi6 X-Gm-Message-State: AOJu0YzMYYI0YTAM5NjzQJiPXbygaEI2Gfj8Ul0HkvkMb/8roQGsdmDR zkd227vDA6hpXj1agf3T1wo2jH9Z+wsteujaoFk0AKQSA0PiYk2RbvWlSYJlE+xs2Cq/XvbklJI Op7EqIa6QBQ== X-Google-Smtp-Source: AGHT+IFBvwUGGAdmLQ5Bq25tNXwFEG7MnA2qkz6mLuAQxc8eTODP7wPfu4gagCH1EcQOqtBjBzmTe9QdVanGhw== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a63:6384:0:b0:6ea:a4f3:14a3 with SMTP id 41be03b00d2f7-74ceedd8de4mr5115a12.4.1719888463253; Mon, 01 Jul 2024 19:47:43 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:30 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-3-ipylypiv@google.com> Subject: [PATCH v5 2/7] ata: libata-scsi: Do not overwrite valid sense data when CK_COND=1 From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv , stable@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current ata_gen_passthru_sense() code performs two actions: 1. Generates sense data based on the ATA 'status' and ATA 'error' fields. 2. Populates "ATA Status Return sense data descriptor" / "Fixed format sense data" with ATA taskfile fields. The problem is that #1 generates sense data even when a valid sense data is already present (ATA_QCFLAG_SENSE_VALID is set). Factoring out #2 into a separate function allows us to generate sense data only when there is no valid sense data (ATA_QCFLAG_SENSE_VALID is not set). As a bonus, we can now delete a FIXME comment in atapi_qc_complete() which states that we don't want to translate taskfile registers into sense descriptors for ATAPI. Additionally, always set SAM_STAT_CHECK_CONDITION when CK_COND=3D1 because SAT specification mandates that SATL shall return CHECK CONDITION if the CK_COND bit is set. The ATA PASS-THROUGH handling logic in ata_scsi_qc_complete() is hard to read/understand. Improve the readability of the code by moving checks into self-explanatory boolean variables. Cc: stable@vger.kernel.org # 4.19+ Co-developed-by: Niklas Cassel Signed-off-by: Niklas Cassel Reviewed-by: Hannes Reinecke Reviewed-by: Damien Le Moal Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libata-scsi.c | 169 +++++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 77 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index a9e44ad4c2de..b59cbb5ce5a6 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -230,6 +230,80 @@ void ata_scsi_set_sense_information(struct ata_device = *dev, SCSI_SENSE_BUFFERSIZE, information); } =20 +/** + * ata_scsi_set_passthru_sense_fields - Set ATA fields in sense buffer + * @qc: ATA PASS-THROUGH command. + * + * Populates "ATA Status Return sense data descriptor" / "Fixed format + * sense data" with ATA taskfile fields. + * + * LOCKING: + * None. + */ +static void ata_scsi_set_passthru_sense_fields(struct ata_queued_cmd *qc) +{ + struct scsi_cmnd *cmd =3D qc->scsicmd; + struct ata_taskfile *tf =3D &qc->result_tf; + unsigned char *sb =3D cmd->sense_buffer; + + if ((sb[0] & 0x7f) >=3D 0x72) { + unsigned char *desc; + u8 len; + + /* descriptor format */ + len =3D sb[7]; + desc =3D (char *)scsi_sense_desc_find(sb, len + 8, 9); + if (!desc) { + if (SCSI_SENSE_BUFFERSIZE < len + 14) + return; + sb[7] =3D len + 14; + desc =3D sb + 8 + len; + } + desc[0] =3D 9; + desc[1] =3D 12; + /* + * Copy registers into sense buffer. + */ + desc[2] =3D 0x00; + desc[3] =3D tf->error; + desc[5] =3D tf->nsect; + desc[7] =3D tf->lbal; + desc[9] =3D tf->lbam; + desc[11] =3D tf->lbah; + desc[12] =3D tf->device; + desc[13] =3D tf->status; + + /* + * Fill in Extend bit, and the high order bytes + * if applicable. + */ + if (tf->flags & ATA_TFLAG_LBA48) { + desc[2] |=3D 0x01; + desc[4] =3D tf->hob_nsect; + desc[6] =3D tf->hob_lbal; + desc[8] =3D tf->hob_lbam; + desc[10] =3D tf->hob_lbah; + } + } else { + /* Fixed sense format */ + sb[0] |=3D 0x80; + sb[3] =3D tf->error; + sb[4] =3D tf->status; + sb[5] =3D tf->device; + sb[6] =3D tf->nsect; + if (tf->flags & ATA_TFLAG_LBA48) { + sb[8] |=3D 0x80; + if (tf->hob_nsect) + sb[8] |=3D 0x40; + if (tf->hob_lbal || tf->hob_lbam || tf->hob_lbah) + sb[8] |=3D 0x20; + } + sb[9] =3D tf->lbal; + sb[10] =3D tf->lbam; + sb[11] =3D tf->lbah; + } +} + static void ata_scsi_set_invalid_field(struct ata_device *dev, struct scsi_cmnd *cmd, u16 field, u8 bit) { @@ -837,10 +911,8 @@ static void ata_to_sense_error(unsigned id, u8 drv_sta= t, u8 drv_err, u8 *sk, * ata_gen_passthru_sense - Generate check condition sense block. * @qc: Command that completed. * - * This function is specific to the ATA descriptor format sense - * block specified for the ATA pass through commands. Regardless - * of whether the command errored or not, return a sense - * block. Copy all controller registers into the sense + * This function is specific to the ATA pass through commands. + * Regardless of whether the command errored or not, return a sense * block. If there was no error, we get the request from an ATA * passthrough command, so we use the following sense data: * sk =3D RECOVERED ERROR @@ -875,63 +947,6 @@ static void ata_gen_passthru_sense(struct ata_queued_c= md *qc) */ scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D); } - - if ((sb[0] & 0x7f) >=3D 0x72) { - unsigned char *desc; - u8 len; - - /* descriptor format */ - len =3D sb[7]; - desc =3D (char *)scsi_sense_desc_find(sb, len + 8, 9); - if (!desc) { - if (SCSI_SENSE_BUFFERSIZE < len + 14) - return; - sb[7] =3D len + 14; - desc =3D sb + 8 + len; - } - desc[0] =3D 9; - desc[1] =3D 12; - /* - * Copy registers into sense buffer. - */ - desc[2] =3D 0x00; - desc[3] =3D tf->error; - desc[5] =3D tf->nsect; - desc[7] =3D tf->lbal; - desc[9] =3D tf->lbam; - desc[11] =3D tf->lbah; - desc[12] =3D tf->device; - desc[13] =3D tf->status; - - /* - * Fill in Extend bit, and the high order bytes - * if applicable. - */ - if (tf->flags & ATA_TFLAG_LBA48) { - desc[2] |=3D 0x01; - desc[4] =3D tf->hob_nsect; - desc[6] =3D tf->hob_lbal; - desc[8] =3D tf->hob_lbam; - desc[10] =3D tf->hob_lbah; - } - } else { - /* Fixed sense format */ - sb[0] |=3D 0x80; - sb[3] =3D tf->error; - sb[4] =3D tf->status; - sb[5] =3D tf->device; - sb[6] =3D tf->nsect; - if (tf->flags & ATA_TFLAG_LBA48) { - sb[8] |=3D 0x80; - if (tf->hob_nsect) - sb[8] |=3D 0x40; - if (tf->hob_lbal || tf->hob_lbam || tf->hob_lbah) - sb[8] |=3D 0x20; - } - sb[9] =3D tf->lbal; - sb[10] =3D tf->lbam; - sb[11] =3D tf->lbah; - } } =20 /** @@ -1632,26 +1647,32 @@ static void ata_scsi_qc_complete(struct ata_queued_= cmd *qc) { struct scsi_cmnd *cmd =3D qc->scsicmd; u8 *cdb =3D cmd->cmnd; - int need_sense =3D (qc->err_mask !=3D 0) && - !(qc->flags & ATA_QCFLAG_SENSE_VALID); + bool have_sense =3D qc->flags & ATA_QCFLAG_SENSE_VALID; + bool is_ata_passthru =3D cdb[0] =3D=3D ATA_16 || cdb[0] =3D=3D ATA_12; + bool is_ck_cond_request =3D cdb[2] & 0x20; + bool is_error =3D qc->err_mask !=3D 0; =20 /* For ATA pass thru (SAT) commands, generate a sense block if * user mandated it or if there's an error. Note that if we - * generate because the user forced us to [CK_COND =3D1], a check + * generate because the user forced us to [CK_COND=3D1], a check * condition is generated and the ATA register values are returned * whether the command completed successfully or not. If there - * was no error, we use the following sense data: + * was no error, and CK_COND=3D1, we use the following sense data: * sk =3D RECOVERED ERROR * asc,ascq =3D ATA PASS-THROUGH INFORMATION AVAILABLE */ - if (((cdb[0] =3D=3D ATA_16) || (cdb[0] =3D=3D ATA_12)) && - ((cdb[2] & 0x20) || need_sense)) - ata_gen_passthru_sense(qc); - else if (need_sense) + if (is_ata_passthru && (is_ck_cond_request || is_error || have_sense)) { + if (!have_sense) + ata_gen_passthru_sense(qc); + ata_scsi_set_passthru_sense_fields(qc); + if (is_ck_cond_request) + set_status_byte(qc->scsicmd, SAM_STAT_CHECK_CONDITION); + } else if (is_error && !have_sense) { ata_gen_ata_sense(qc); - else + } else { /* Keep the SCSI ML and status byte, clear host byte. */ cmd->result &=3D 0x0000ffff; + } =20 ata_qc_done(qc); } @@ -2590,14 +2611,8 @@ static void atapi_qc_complete(struct ata_queued_cmd = *qc) /* handle completion from EH */ if (unlikely(err_mask || qc->flags & ATA_QCFLAG_SENSE_VALID)) { =20 - if (!(qc->flags & ATA_QCFLAG_SENSE_VALID)) { - /* FIXME: not quite right; we don't want the - * translation of taskfile registers into a - * sense descriptors, since that's only - * correct for ATA, not ATAPI - */ + if (!(qc->flags & ATA_QCFLAG_SENSE_VALID)) ata_gen_passthru_sense(qc); - } =20 /* SCSI EH automatically locks door if sdev->locked is * set. Sometimes door lock request continues to --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E37441C686 for ; Tue, 2 Jul 2024 02:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888467; cv=none; b=bx0Qax3eGRBZ5hy//ClplQu1DAM1BN4P2X0Ga8880OnEED2vzLL2C1mzUO0F/n0a6KCl3LADidNt35CVq0+U5ZZkWWYBw79xcK1WoQrrHSO6Q0FfIYGy4WPM9DtIhqL/jW+LV1wy0+ifllgnIidF30vrpNtqbWl/f2ZmXjdyBDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888467; c=relaxed/simple; bh=UQZTNgxuo/nQ4A40i4CKkg/R6rQqJGLMQemrM+QDYEI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=koWYU5OZ3i05ftXYcYU8Bqf06ymu5eio2o81rkZ5R7aGNcCAQbZ5wmfMvYF0Vp4WPQRNJhi3lM6kSmtdM+FBLEIE1DcbT8pN5xEh4FphDRRAWFSwFp6S+xvYYgUcysOU/epuDd/2SWP0ToYKDKbOVyukGNuU9rffd83VTxQyjYk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=E/y/Zik2; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="E/y/Zik2" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e02b8c0c2c9so6700813276.1 for ; Mon, 01 Jul 2024 19:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888465; x=1720493265; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=w00QSz187T1KSvOH92zkWn3h1qrakV8FNdVfs8AN5w0=; b=E/y/Zik2Y4fQQm2Xc+17rXiBV52nI6BWL3bE2wodmL6A1SnHxUTMAnDhCsdta9/Z+0 gtcF+zEmEe5DHYRcTR3iayRrwdTQLUm7sHYeCMFsOsYjUQ0qzLLpArqxJTzfFpBdPt0c VXryAc162Y1wmcsEg73UP48XQq8E40HkbYIZJm2qjEi8yXVvQb/jLvngKeCoxCHr19M/ 20mxqtxEX+6yogcMVoI0fbIYhky2v+6VltyJFTBNov5pxdXnK6F8H9oel6D4Be/zPtYt pRcVxppH63gMfpsf0STrMdG/mS/oG/fjXXErZ5+LAKwX0sX4fLFd7QGXRozrve17W7Kc IFkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888465; x=1720493265; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w00QSz187T1KSvOH92zkWn3h1qrakV8FNdVfs8AN5w0=; b=qiFVyC5zT0uZ4BVseyfrChZi0w/6BIq/dIDGfHmRxLJP3QbBsWFK47RYHdX3g29lE3 M5V9igHeyMs5/w7I/hXAsh+8BEk8IjNE2H0uYmGTarT29y5Sz/oj3uqG1IqEJXV2C1TO /7hKbRGLUV9CivUIimNoTRcx/zHCamwrUe5qyTxuwvbV09nnt4llWwdgruWf4Okhn3zY jj+irLp0mlwkZMLwrEOJQ0znXB3S4YULIhn7BOmCk/aSno0C7lCoVwC3AZYYMZOHr2RP yUxyOz5H+VRqryTx9HDEPBCkhbPca7ak2XNWHY5OE/xGPrUfym2OaLgPd3k6fxvY1zQC S3hg== X-Forwarded-Encrypted: i=1; AJvYcCVNulifR3S8uPzeSQaKXd3HscxOc54U3GRtLev9nmM8njPUfQA43LEO1BFBuoGM+i1AMV+j2sqBKFsUR4DiJwN+D0VmO60B4gyuIHEa X-Gm-Message-State: AOJu0YyQ8pUNCBhT/DvzKgO7QhB+BgOaqPalCH20sZYcZe5AOHNLeFgW XpGd9hUP5qo9zvJd/vOFHYJsEiSkU1Dn0j/pfZBiEoQcM0TirKL3opf5rC9lE8r5HHlfczSR8TJ gELZYae9rYw== X-Google-Smtp-Source: AGHT+IEvUTFIgKCzrTE5ovL08iBb/D3RskDQu4+yIlR5yKTtxFavno3Ikw8Oljg6ZVkQd+fpyujDnQ6yQRlZtg== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a25:9206:0:b0:e03:4d2d:b0df with SMTP id 3f1490d57ef6-e036eb573b9mr201128276.6.1719888464966; Mon, 01 Jul 2024 19:47:44 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:31 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-4-ipylypiv@google.com> Subject: [PATCH v5 3/7] ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv , stable@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SAT-5 revision 8 specification removed the text about the ANSI INCITS 431-2007 compliance which was requiring SCSI/ATA Translation (SAT) to return descriptor format sense data for the ATA PASS-THROUGH commands regardless of the setting of the D_SENSE bit. Let's honor the D_SENSE bit for ATA PASS-THROUGH commands while generating the "ATA PASS-THROUGH INFORMATION AVAILABLE" sense data. SAT-5 revision 7 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 12.2.2.8 Fixed format sense data Table 212 shows the fields returned in the fixed format sense data (see SPC-5) for ATA PASS-THROUGH commands. SATLs compliant with ANSI INCITS 431-2007, SCSI/ATA Translation (SAT) return descriptor format sense data for the ATA PASS-THROUGH commands regardless of the setting of the D_SENSE bit. SAT-5 revision 8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 12.2.2.8 Fixed format sense data Table 211 shows the fields returned in the fixed format sense data (see SPC-5) for ATA PASS-THROUGH commands. Cc: stable@vger.kernel.org # 4.19+ Reported-by: Niklas Cassel Closes: https://lore.kernel.org/linux-ide/Zn1WUhmLglM4iais@ryzen.lan Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv Reviewed-by: Hannes Reinecke --- drivers/ata/libata-scsi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index b59cbb5ce5a6..076fbeadce01 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -941,11 +941,8 @@ static void ata_gen_passthru_sense(struct ata_queued_c= md *qc) &sense_key, &asc, &ascq); ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq); } else { - /* - * ATA PASS-THROUGH INFORMATION AVAILABLE - * Always in descriptor format sense. - */ - scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D); + /* ATA PASS-THROUGH INFORMATION AVAILABLE */ + ata_scsi_set_sense(qc->dev, cmd, RECOVERED_ERROR, 0, 0x1D); } } =20 --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F04D347C2 for ; Tue, 2 Jul 2024 02:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888469; cv=none; b=pt8sbVdU8wJSfm/p0zUfSG+ZWr7i+QO0XgWHRJ3jNj94Ci/uIK4dNh+dfAIWj1RdE8bsHojBgw543/tgJ3IQII4mCIAO/HtwWB/lwIsBfRERhnxDf2/6qh23IngypvJQ5S/H+0TEGEmRlyULqe992VUK6HqypPi7wUhYeemF2qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888469; c=relaxed/simple; bh=doFIBDqtTa5Mu/2uxDG8Al0PrGigMDt7dbzK5fiISpc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PrZEcH6+Xmnu27Ww09pzXEqKwkVAigNe3JZTGbfZ6NZWe7wI2689YxSoyzZutDvsoBY+fb7vF4a2kYX4I2xDDqQI+eSEawdLUQWXKzdaCaRnh8girY3ruWCIv7vQBuCcIwWSrCiflpZEbEYpmoZXYt4BwkN+uwwporYjSd4PBZs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HWDOynoi; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HWDOynoi" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-706698fe5b4so3408072b3a.2 for ; Mon, 01 Jul 2024 19:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888467; x=1720493267; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vWYD3CFi0xqKyZt66+JpR9ECkv5q52fY5lPhimPSxvE=; b=HWDOynoiXExHm+o81NswJuT6jt4dLHJkGrzmV1J/1fgAlSlpzd1sJqH7A4I7ad4p2a XMpdTZGHTKo5/LENxLUsMgUvcByS1uLIt7ppT14U3+0b5LanWuF0CxVdc/3GSJz07iP4 psxGwklnYhrRrfSNG/Dp0AGEvPgjXjNrJT7tvy/cDAjXx7xGlVmP3yB6IVfuayrh5o3M I9ZneRMpTICHUozu/qV/URgyBkRM7YPSn6XEZNb8bXlgxyjAX+gclQ2oIdio7TBU8+hP dd+Cvq84YidQbU6+90c+5sSmnLOJxXL37vDErB2EyZCsL2lM5gk31/qykiFi+vro3MV1 8BQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888467; x=1720493267; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vWYD3CFi0xqKyZt66+JpR9ECkv5q52fY5lPhimPSxvE=; b=HlR+CHrwUbsv/8O4GYH/uug/mnU9+AbXk3A50GcQWZA7MTr02CthfC4P1kURrLJB0y fjhOgsZoOtVjdYv1UwkoX7RTVKntwvbJZDfQ5OqSuYE1sxBk+hCfUCVWT4KS04RzkfW/ ptGcMgcm5yd+u4zB1Cc0xWxEtsbD4sl2zrUeJULraxqZCmrxx6Vd4jayXWP4tLoAaCSB ZOlr5NK4NDB9YHRTGlbLX1XGx5hFLNz/LY2YEiFDQPjmcxUcsiREV1mOtyxjGjaJx7V7 db22y/8bfuKRZn0Gy7sbARhf9v0sSVkP5i0UXmClS0oyetG0UbyZPP3fe/v4wtD3UBjJ KgGg== X-Forwarded-Encrypted: i=1; AJvYcCU/fEoy1GF+v4QbVtzQrubiG4MVmZyMhwk1DKfAb/JLgYans+Elvy+znRPS+d+3pgCvA0lPuYhWBo9uOlQLUdDamtZaCYCzUMyg1pYH X-Gm-Message-State: AOJu0YzqkaBpwtznaiiNxEwzfGc2qA1oTyhjX1Z4EC/hC+f1NS1TEdhP AHOmCoODqH5FfK5jPHmZYRf5DqH0aFzb6W+tWDqPIf6Xo3c3GGGJzT5xejO3oSkRlywMe5Gx8DN Mcn0HNvZ+QA== X-Google-Smtp-Source: AGHT+IEnUZWAIySfE2wBFSt1tDNvCahMYriM4Y6yt/rtcfr0+yUwTcq1HyF/y24/NusyTaAevhRKjh5UEFw5Yw== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a05:6a00:1304:b0:708:2033:63e with SMTP id d2e1a72fcca58-70aaaf6e482mr474635b3a.5.1719888466711; Mon, 01 Jul 2024 19:47:46 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:32 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-5-ipylypiv@google.com> Subject: [PATCH v5 4/7] ata: libata-scsi: Remove redundant sense_buffer memsets From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SCSI layer clears sense_buffer in scsi_queue_rq() so there is no need for libata to clear it again. Reviewed-by: Hannes Reinecke Reviewed-by: Damien Le Moal Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libata-scsi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 076fbeadce01..145319874c1a 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -926,11 +926,8 @@ static void ata_gen_passthru_sense(struct ata_queued_c= md *qc) { struct scsi_cmnd *cmd =3D qc->scsicmd; struct ata_taskfile *tf =3D &qc->result_tf; - unsigned char *sb =3D cmd->sense_buffer; u8 sense_key, asc, ascq; =20 - memset(sb, 0, SCSI_SENSE_BUFFERSIZE); - /* * Use ata_to_sense_error() to map status register bits * onto sense key, asc & ascq. @@ -965,8 +962,6 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc) u64 block; u8 sense_key, asc, ascq; =20 - memset(sb, 0, SCSI_SENSE_BUFFERSIZE); - if (ata_dev_disabled(dev)) { /* Device disabled after error recovery */ /* LOGICAL UNIT NOT READY, HARD RESET REQUIRED */ --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61EA047F7F for ; Tue, 2 Jul 2024 02:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888470; cv=none; b=NqiRrhL8kzOi6bHpEBYDOCUKfAb6ilzm/MFoZntht6/kjDmnIlr1td5kMvJ/szcG0BqVyLKgzEajXpeaL7MM6KaiJrbGzxwcpznejCsHq7+3nPAbyz9Su1l6txUvr6C8dWluTIqH+VDMgULCLjhINGq4N/ZPKR++eZ/CUoRNOGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888470; c=relaxed/simple; bh=6q2XtXMfjJDSePaQ2bcHelVvF3WWc13ttlQWb34qK9w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QF6HNmqDV2nPwJc20gzm4eeTxzBwWoZ4A976dqkpx0YKoKpFPR0AQ2K2sQUjxgZp/VCMhOn2V85PX4qyXOpG2Z0afq01/wH8lxCyr2mx4NPUZTuEMigRUzbDRqHEUvtd/IlEDYHxJ43Ny5vyWQr1+y1WKB2BMmpc5vsAIan4ors= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=FO6mIwiX; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FO6mIwiX" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e0364085c67so3693737276.0 for ; Mon, 01 Jul 2024 19:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888468; x=1720493268; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xnHqVDC7cuQpLJUncoQ6Ep2IcWycGGYxv6pv9bVVUIw=; b=FO6mIwiXsrRJ98UYgS22BYCUAIrahYfdjh9wlDL8uHwe95r4lriQIzfpbJr/YwuoBV gN1X57PuoOSqRX4gz++zOREuqTpWQRTIKGWnMeCepk6OK+l9o3YtiTDYru5zJ6pXjl7x TPOXRDF61KSUf0pez/frw0QDsR6gB7PQU3ckRXwUtF7oX5vUENwif46XXC/Jxq0NzTna yKvEtb9equ6KO+ZjqRFPdDJUC70PatIf6/VUFm8D2g6fbaTboQZAzi0bT7oWk9peXG9N LEpQd/VeXXZ07iy1w28Q8AwJhC11gPwoM8+8GnoxzXvcnzAiD7Nn9iY0AFESLZnz3Qdv 8tmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888468; x=1720493268; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xnHqVDC7cuQpLJUncoQ6Ep2IcWycGGYxv6pv9bVVUIw=; b=C3XXOdyyzqUADLWdxJRwC82ZvtYtQgjN86YAnJw9lxMp+eybFHnwFUCzu5iE50pFo6 4ABDOlyEBpS5M2Bf0WjzA8514/25QjkqLH5ih5G9fUiojUmlB7Js5OzDUAFwilvOebgX TQPHSMpLGtQ7CTaWcVVQEGPDmOYjrgkb6Q4ZDDDWKAMp15RIeNebF/kh96n/MnPw2ag+ Ng26al3UlTFI5KgSuFq0j4/TOm+pb4oBbLXqhjBjDRKTiHn/FGz/lvepWE/B5522Irq2 rHZ7vrIRxnDGzuaerrNyqRAmFqRcHgdgTBjBTpN85JwTp2JxWkcecq7LhvL9bepJCnhQ a+FQ== X-Forwarded-Encrypted: i=1; AJvYcCWGcU3RwsR5ZzDD8r1d0NHApXhve+EXtuBWN1AA9UD5a2AGTtDeuUwk4K1PnLCDmNbXw/AokUu0q/wAZzUCMfwlEByIT6DMpcqA0yEy X-Gm-Message-State: AOJu0YyD04D9zFxaEayKczwzDnfZkycXZ2kKvRrfHNCYJ26mZNxb6qZG Ao3r0jD0geOdhZPLh5sP8Y85E0dyp/VGy2tE1XqrrCDFtMtCY1PjZi6kvZYiDRqrUT0c7d/7zDL 9dgPs5kHcNQ== X-Google-Smtp-Source: AGHT+IE8BuvEAubldm7affIT7w5nUKEMKVB8uiyHBceDURelDM4xrZugLTZA2bjl0xdR+Tk5nDY+2O8OWgfkmA== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a05:6902:f12:b0:e03:5e58:489b with SMTP id 3f1490d57ef6-e035e585039mr152667276.3.1719888468352; Mon, 01 Jul 2024 19:47:48 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:33 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-6-ipylypiv@google.com> Subject: [PATCH v5 5/7] ata: libata-scsi: Do not pass ATA device id to ata_to_sense_error() From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ATA device id is not used in ata_to_sense_error(). Reviewed-by: Hannes Reinecke Reviewed-by: Damien Le Moal Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libata-scsi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 145319874c1a..226a36c9504b 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -785,7 +785,6 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd = *qc) =20 /** * ata_to_sense_error - convert ATA error to SCSI error - * @id: ATA device number * @drv_stat: value contained in ATA status register * @drv_err: value contained in ATA error register * @sk: the sense key we'll fill out @@ -799,8 +798,8 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd = *qc) * LOCKING: * spin_lock_irqsave(host lock) */ -static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *s= k, - u8 *asc, u8 *ascq) +static void ata_to_sense_error(u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, + u8 *ascq) { int i; =20 @@ -934,7 +933,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cm= d *qc) */ if (qc->err_mask || tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) { - ata_to_sense_error(qc->ap->print_id, tf->status, tf->error, + ata_to_sense_error(tf->status, tf->error, &sense_key, &asc, &ascq); ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq); } else { @@ -973,7 +972,7 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc) */ if (qc->err_mask || tf->status & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) { - ata_to_sense_error(qc->ap->print_id, tf->status, tf->error, + ata_to_sense_error(tf->status, tf->error, &sense_key, &asc, &ascq); ata_scsi_set_sense(dev, cmd, sense_key, asc, ascq); } else { --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCFF85A4E9 for ; Tue, 2 Jul 2024 02:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888473; cv=none; b=Z2T+yNmZgWy6h9Yz4zmOHXV5YAnq2ZQKnld0D3F+TevLYDkkP8zGI0T0oCZ76ePGc+B4Ml7Wif+fWeXiz1ISzHDKUDPOOXLIKMoKdZXVoldDYSbXMUh+vnR92veuAkBDG9NG+3Mt3d+iVRDo9wtCCbfg4YghG1y23FO927CjpcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888473; c=relaxed/simple; bh=armYVp6bALgwlq3EStO19rEjX4MhF4wYcg/Vy9Y+1tk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HIzj264QzHCrSDIVI1jdbt7NkhD0rvcJoO1DajQroOFlUDVMPLUxuRDOr1JeYCmcMagbnjpd2hHCrYbQndciNl7DEfo4Q8iA56xTbfuVWfj5/oqNKWlJbQTnTJvlYRxNfUJ8YSdeZKeRCqTi3RljJDcml+R9xni5BHpMUrtGxtE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bRg7OFZm; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bRg7OFZm" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-70667ccb623so2867377b3a.2 for ; Mon, 01 Jul 2024 19:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888470; x=1720493270; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=FuQ8E2r4ig1tVpjaudUDpj4znPX45jR9JD1FPJMHy0c=; b=bRg7OFZmffSqCswrGWe0AU1LRYEKjnQQGM9hIYF+L6zlczUS1b8QTENjMbyySA2mzu /+OGySHjhOFbPNmR1DHFxH+WPaN2zxWarwS7PjTuxKhHiyVTRFvkjOQYR4o9tOzH3/fG tC0oi146ZOL4YvR9XUJmmgUtRUMY2Ciq7TaSHH8yzH3GYCPHgZts99E7DJVOCj9fQT1f KZ8ZMRrGNXoUzv5CoK598TL0e/EVmHfp3tWxtg/TGl1gd4LjVnm80QNgg9152yV+3bb5 HnjrhfFUEHJHgNUx1P9/Tm6vkmHHMdOYPuNciztMKlFwRwKkZ/GvY+gqqcZ5OM1KmguQ 1UqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888470; x=1720493270; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FuQ8E2r4ig1tVpjaudUDpj4znPX45jR9JD1FPJMHy0c=; b=nHdabZwWC5d48EXAJTca4S1igqjKSdiBvGKYGkvpz8SamvElwTcextSP/QCLP1xDNh EdsF/MNL+3xTL/9ysFs5UWyRhRea+2WOQtDs2zP+GxW6gTJNoKzv++LfOwUNhf3rhk/n mV9xUfvIpiGJnLMuj4jQ8jWS/c7dCZeGC45ha/MC4l6MJIGabjArhnAV9+5wenyk5Rez BV9EPxUywBr2vvUuBh0icGTGiSKeuRcqR74zimzrYE0Np1ugrynspkg1nbKPjaPInCtx nmDJsIHM/Tcc/B2Iw9Hfczqv5lJ4YZHt4WHGXMyyWr2JBxCnXiN6vrEI+HJiJdTzI53/ oOmQ== X-Forwarded-Encrypted: i=1; AJvYcCVr1mpyjhbJ/KXJrT53K/W5mj/XzXFMct+DkugIjL1VIep1hAdms+fn+mJ0uWzmqBXF4/FbzriXO7E2I5tjNPDYa0/IhrcK+xZ1dhoF X-Gm-Message-State: AOJu0YzN6nO8hBUHSiqlK9CpiwmVtapGu3sz0yK9ILO6FbS0grw76UCz IJLEYSrfIhyCXADdV142E6+oQv2Fzdp67HldgeFHTwwi+eQJHBdgQDUYcAHC3JX5QttNJA1EVwj TvJX2/kxT0g== X-Google-Smtp-Source: AGHT+IH+lL6r5VzGA0HxS1DdbBK4xw6ZsH2Sc+qAySIDyF6GkpVg26LKJoL3DppsDXBiRCJiVxykE5vl471l4w== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a05:6a00:1255:b0:706:6b52:43a7 with SMTP id d2e1a72fcca58-70aaaf0e3c0mr296701b3a.3.1719888470043; Mon, 01 Jul 2024 19:47:50 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:34 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-7-ipylypiv@google.com> Subject: [PATCH v5 6/7] ata: libata-core: Set ATA_QCFLAG_RTF_FILLED in fill_result_tf() From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ATA_QCFLAG_RTF_FILLED is not specific to ahci and can be used generally to check if qc->result_tf contains valid data. Reviewed-by: Hannes Reinecke Reviewed-by: Damien Le Moal Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libahci.c | 12 ++---------- drivers/ata/libata-core.c | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 83431aae74d8..fdfa7b266218 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2075,13 +2075,6 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd *= qc) struct ahci_port_priv *pp =3D qc->ap->private_data; u8 *rx_fis =3D pp->rx_fis; =20 - /* - * rtf may already be filled (e.g. for successful NCQ commands). - * If that is the case, we have nothing to do. - */ - if (qc->flags & ATA_QCFLAG_RTF_FILLED) - return; - if (pp->fbs_enabled) rx_fis +=3D qc->dev->link->pmp * AHCI_RX_FIS_SZ; =20 @@ -2095,7 +2088,6 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd *q= c) !(qc->flags & ATA_QCFLAG_EH)) { ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf); qc->result_tf.status =3D (rx_fis + RX_FIS_PIO_SETUP)[15]; - qc->flags |=3D ATA_QCFLAG_RTF_FILLED; return; } =20 @@ -2118,12 +2110,10 @@ static void ahci_qc_fill_rtf(struct ata_queued_cmd = *qc) */ qc->result_tf.status =3D fis[2]; qc->result_tf.error =3D fis[3]; - qc->flags |=3D ATA_QCFLAG_RTF_FILLED; return; } =20 ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf); - qc->flags |=3D ATA_QCFLAG_RTF_FILLED; } =20 static void ahci_qc_ncq_fill_rtf(struct ata_port *ap, u64 done_mask) @@ -2158,6 +2148,7 @@ static void ahci_qc_ncq_fill_rtf(struct ata_port *ap,= u64 done_mask) if (qc && ata_is_ncq(qc->tf.protocol)) { qc->result_tf.status =3D status; qc->result_tf.error =3D error; + qc->result_tf.flags =3D qc->tf.flags; qc->flags |=3D ATA_QCFLAG_RTF_FILLED; } done_mask &=3D ~(1ULL << tag); @@ -2182,6 +2173,7 @@ static void ahci_qc_ncq_fill_rtf(struct ata_port *ap,= u64 done_mask) fis +=3D RX_FIS_SDB; qc->result_tf.status =3D fis[2]; qc->result_tf.error =3D fis[3]; + qc->result_tf.flags =3D qc->tf.flags; qc->flags |=3D ATA_QCFLAG_RTF_FILLED; } done_mask &=3D ~(1ULL << tag); diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 74b59b78d278..949662bc50e4 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4800,8 +4800,16 @@ static void fill_result_tf(struct ata_queued_cmd *qc) { struct ata_port *ap =3D qc->ap; =20 + /* + * rtf may already be filled (e.g. for successful NCQ commands). + * If that is the case, we have nothing to do. + */ + if (qc->flags & ATA_QCFLAG_RTF_FILLED) + return; + qc->result_tf.flags =3D qc->tf.flags; ap->ops->qc_fill_rtf(qc); + qc->flags |=3D ATA_QCFLAG_RTF_FILLED; } =20 static void ata_verify_xfer(struct ata_queued_cmd *qc) --=20 2.45.2.803.g4e1b14247a-goog From nobody Thu Dec 18 01:39:14 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B493182DA for ; Tue, 2 Jul 2024 02:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888474; cv=none; b=G5dWncOf97le/vGehMnbxUSPo7KGOPZBCgV2XVkExyyouLuxG7FNT09rx4ZhF4ifMCxJRDsfDTTYwyfTY4Pk/72zcI090jfII3DFlvh0oiifFviUpl+sF/H86vPEjgA/cqKtoUYPTre7etw0oeJ3yPikbGZKVVFRaZ2JNVa+/mw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719888474; c=relaxed/simple; bh=DNUVAyv47k38434cyzshYGZfiQCUuvKrQV4LMhKazxc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pLUc8oX+y5EFz03WOuj4bXXZ4ANrwa96vkPFg+U6EZxGqJie+CfFnwIFw2X38jR4PAvZGQVHzvj858qDfBU3j1sZCyic2ept3VhxvSwJ/2ryqitA+Aw2LmEFv+c8JTzrbGLVahjSfzvYDHTud5xAkMryyE1JyEqBCjLFZLIRM0c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=j+rm9ksd; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ipylypiv.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="j+rm9ksd" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfa7a8147c3so6383672276.3 for ; Mon, 01 Jul 2024 19:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719888471; x=1720493271; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3MNHowcTUXzmf64pvPdyG2MLqdUXcPdrWLseGnurKJE=; b=j+rm9ksdzdgSAUbKc/pFbe+Rof518Kmp5lV05UDJoHNHDQ43//QoDdeMFDnzxZZ819 pKz1ccJuz1MRQIkNQboL5Txyeb6KZHCxtFC8XLF3+WO5ghpQze4dheHb0GZWuBpIWaZy 23QmZgPx1OmqyZCF92gaglnJaB8m+hHu5bWX+CmsLefjNFN9KNmyorJvExjuHb8PEmfL 1oMbUOhwb6Qy86eVAtebekL5+Zmf+xux2ZSOmJsra15fC+PoOWA+ij0KcuPJGtHg4/NS FdyPZVTIWQYix0e+wSEWeuTR5cATS3WnAC+gMupmDKHB5d4ijnSorr21AELjYS/dq9bA L7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719888471; x=1720493271; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3MNHowcTUXzmf64pvPdyG2MLqdUXcPdrWLseGnurKJE=; b=Iqi9ULVS0QAwTNESr1OS0dQxqXHkQ896dAPdNbfL/NhIieexH8HMAUS+X/V268Zq/c MMai2xUEZdBGsPZWv9uXLUpkMuc3NKMpi9llbTG8BkgW+RlJ/IIJUxt/J2GiDK1da1yB 1wMscK7B1m6CS/ptFKp3KaRTKSoKaEx+ubmttGz1fD2fP05e5I0KifBbpqz8LaFj/N3F ddeo4A31ZT3CnENK//F9a5G1S2Dr6WZG8JvdpOj6bGRlULmxK08RDU52XqCaLXzpDpJU 0FE2UCzUdRrUrr+2q+DWRC+ntBZnCvxDq2XKc9Lppj/zq2mtrBmuEXMdjSuDkKJOBNIo TYow== X-Forwarded-Encrypted: i=1; AJvYcCVXlsSz2RMntymNS+Re/3f2JszfvYcEDbdrYVif1nK8GoKeqxRUYcUrLiqfXt0VfMmNQR5TapAS5n5QqvMqpf0CMdwusGgpvFJ0ECIt X-Gm-Message-State: AOJu0Yy9DognUxikMdz0CKeM/lggsvRL6HYmLLNib6UDh4HtOX0+hAcR BFF3rOro4v4Gd0m9BOgK0YxzsFLpNov7iX4xRE7H+i940srpRXHIpVZUShr1YT4tNk7Zo254xg5 0F/beDo2Tww== X-Google-Smtp-Source: AGHT+IFI/SVSIyN6BwKOfwv+gERTLL4AsKvZU1MITQc3NOrEJnH3r1eYrd/ssXsWI6jJqzXGObMENfBEDs9jVw== X-Received: from ip.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:57f3]) (user=ipylypiv job=sendgmr) by 2002:a05:6902:2d91:b0:e03:250f:c1ee with SMTP id 3f1490d57ef6-e036eb5e687mr63261276.5.1719888471621; Mon, 01 Jul 2024 19:47:51 -0700 (PDT) Date: Tue, 2 Jul 2024 02:47:35 +0000 In-Reply-To: <20240702024735.1152293-1-ipylypiv@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240702024735.1152293-1-ipylypiv@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240702024735.1152293-8-ipylypiv@google.com> Subject: [PATCH v5 7/7] ata: libata-scsi: Check ATA_QCFLAG_RTF_FILLED before using result_tf From: Igor Pylypiv To: Damien Le Moal , Niklas Cassel Cc: Tejun Heo , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Pylypiv Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" qc->result_tf contents are only valid when the ATA_QCFLAG_RTF_FILLED flag is set. The ATA_QCFLAG_RTF_FILLED flag should be always set for commands that failed or for commands that have the ATA_QCFLAG_RESULT_TF flag set. Reviewed-by: Hannes Reinecke Reviewed-by: Damien Le Moal Reviewed-by: Niklas Cassel Signed-off-by: Igor Pylypiv --- drivers/ata/libata-scsi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 226a36c9504b..8f21b3b0bc75 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -242,10 +242,17 @@ void ata_scsi_set_sense_information(struct ata_device= *dev, */ static void ata_scsi_set_passthru_sense_fields(struct ata_queued_cmd *qc) { + struct ata_device *dev =3D qc->dev; struct scsi_cmnd *cmd =3D qc->scsicmd; struct ata_taskfile *tf =3D &qc->result_tf; unsigned char *sb =3D cmd->sense_buffer; =20 + if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) { + ata_dev_dbg(dev, + "missing result TF: can't set ATA PT sense fields\n"); + return; + } + if ((sb[0] & 0x7f) >=3D 0x72) { unsigned char *desc; u8 len; @@ -923,10 +930,17 @@ static void ata_to_sense_error(u8 drv_stat, u8 drv_er= r, u8 *sk, u8 *asc, */ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc) { + struct ata_device *dev =3D qc->dev; struct scsi_cmnd *cmd =3D qc->scsicmd; struct ata_taskfile *tf =3D &qc->result_tf; u8 sense_key, asc, ascq; =20 + if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) { + ata_dev_dbg(dev, + "missing result TF: can't generate ATA PT sense data\n"); + return; + } + /* * Use ata_to_sense_error() to map status register bits * onto sense key, asc & ascq. @@ -967,6 +981,13 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *q= c) ata_scsi_set_sense(dev, cmd, NOT_READY, 0x04, 0x21); return; } + + if (!(qc->flags & ATA_QCFLAG_RTF_FILLED)) { + ata_dev_dbg(dev, + "missing result TF: can't generate sense data\n"); + return; + } + /* Use ata_to_sense_error() to map status register bits * onto sense key, asc & ascq. */ --=20 2.45.2.803.g4e1b14247a-goog