From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759340Ab2BJNms (ORCPT ); Fri, 10 Feb 2012 08:42:48 -0500 Received: from kamaji.grokhost.net ([87.117.218.43]:46449 "EHLO kamaji.grokhost.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759297Ab2BJNmf (ORCPT ); Fri, 10 Feb 2012 08:42:35 -0500 From: Chris Boot To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, Chris Boot , Stefan Richter Subject: [PATCH 3/3] firewire-sbp2: Fix SCSI sense data mangling Date: Fri, 10 Feb 2012 13:41:54 +0000 Message-Id: <1328881314-26544-4-git-send-email-bootc@bootc.net> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328881314-26544-1-git-send-email-bootc@bootc.net> References: <1328881314-26544-1-git-send-email-bootc@bootc.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SCSI sense data in SBP-2/3 is carried in an unusual format that means we have to un-mangle it on our end before we pass it to the SCSI subsystem. Currently our un-mangling code doesn't quite follow the SBP-2 standard in that we always assume Current and never Deferred error types, we never set the VALID bit, and we mishandle the FILEMARK, EOM and ILI bits. This patch fixes the sense un-mangling to correctly handle those and follow the spec. Signed-off-by: Chris Boot Cc: Stefan Richter --- drivers/firewire/sbp2.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 1572a79..ff632c2 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1318,10 +1318,19 @@ static void sbp2_unmap_scatterlist(struct device *card_device, static unsigned int sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data) { int sam_status; + int sfmt = (sbp2_status[0] >> 6) & 0x03; - sense_data[0] = 0x70; + if (sfmt == 2 || sfmt == 3) { + /* + * Reserved for future standardization (2) or + * Status block format vendor-dependent (3) + */ + return DID_ERROR << 16; + } + + sense_data[0] = 0x70 | sfmt | (sbp2_status[1] & 0x80); sense_data[1] = 0x0; - sense_data[2] = sbp2_status[1]; + sense_data[2] = ((sbp2_status[1] << 1) & 0xe0) | (sbp2_status[1] & 0x0f); sense_data[3] = sbp2_status[4]; sense_data[4] = sbp2_status[5]; sense_data[5] = sbp2_status[6]; -- 1.7.8.3