From patchwork Thu Oct 24 17:15:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 285990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5CCD2C00E0 for ; Fri, 25 Oct 2013 04:18:17 +1100 (EST) Received: from localhost ([::1]:55509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOY3-0006MA-Pl for incoming@patchwork.ozlabs.org; Thu, 24 Oct 2013 13:18:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOW6-0003wA-07 for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZOVw-0006XI-5j for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOVv-0006X3-Si for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:04 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9OHG2rp013233 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Oct 2013 13:16:03 -0400 Received: from localhost.localdomain.com (vpn1-7-29.ams2.redhat.com [10.36.7.29]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9OHFwBG001960; Thu, 24 Oct 2013 13:16:01 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 24 Oct 2013 18:15:50 +0100 Message-Id: <1382634953-9240-3-git-send-email-hdegoede@redhat.com> In-Reply-To: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> References: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/5] uas: Only use report iu-s for task_mgmt status reporting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Regular scsi cmds should always report their status using a sense-iu, using the sense code to report any errors. Signed-off-by: Hans de Goede --- hw/usb/dev-uas.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 70ed2d1..36a75b2 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -420,6 +420,24 @@ static void usb_uas_queue_sense(UASRequest *req, uint8_t status) usb_uas_queue_status(req->uas, st, len); } +static void usb_uas_queue_fake_sense(UASDevice *uas, uint16_t tag, + struct SCSISense sense) +{ + UASStatus *st = usb_uas_alloc_status(uas, UAS_UI_SENSE, tag); + int len, slen = 0; + + st->status.sense.status = CHECK_CONDITION; + st->status.sense.status_qualifier = cpu_to_be16(0); + st->status.sense.sense_data[0] = 0x70; + st->status.sense.sense_data[2] = sense.key; + st->status.sense.sense_data[7] = 10; + st->status.sense.sense_data[12] = sense.asc; + st->status.sense.sense_data[13] = sense.ascq; + slen = 18; + len = sizeof(uas_ui_sense) - sizeof(st->status.sense.sense_data) + slen; + usb_uas_queue_status(uas, st, len); +} + static void usb_uas_queue_read_ready(UASRequest *req) { UASStatus *st = usb_uas_alloc_status(req->uas, UAS_UI_READ_READY, @@ -672,8 +690,9 @@ static void usb_uas_command(UASDevice *uas, uas_ui *ui) { UASRequest *req; uint32_t len; + uint16_t tag = be16_to_cpu(ui->hdr.tag); - req = usb_uas_find_request(uas, be16_to_cpu(ui->hdr.tag)); + req = usb_uas_find_request(uas, tag); if (req) { goto overlapped_tag; } @@ -706,16 +725,11 @@ static void usb_uas_command(UASDevice *uas, uas_ui *ui) return; overlapped_tag: - usb_uas_queue_response(uas, req->tag, UAS_RC_OVERLAPPED_TAG, 0); + usb_uas_queue_fake_sense(uas, tag, sense_code_OVERLAPPED_COMMANDS); return; bad_target: - /* - * FIXME: Seems to upset linux, is this wrong? - * NOTE: Happens only with no scsi devices at the bus, not sure - * this is a valid UAS setup in the first place. - */ - usb_uas_queue_response(uas, req->tag, UAS_RC_INVALID_INFO_UNIT, 0); + usb_uas_queue_fake_sense(uas, tag, sense_code_LUN_NOT_SUPPORTED); g_free(req); }