From patchwork Thu Mar 31 19:44:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 89121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ACAC2B6EDD for ; Fri, 1 Apr 2011 06:46:26 +1100 (EST) Received: from localhost ([127.0.0.1]:36795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5NoT-0007U1-S7 for incoming@patchwork.ozlabs.org; Thu, 31 Mar 2011 15:45:49 -0400 Received: from [140.186.70.92] (port=56517 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5NnG-0007SS-BM for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5NnE-0001f9-Kw for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5NnE-0001ev-BT for qemu-devel@nongnu.org; Thu, 31 Mar 2011 15:44:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2VJiTTl026983 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Mar 2011 15:44:29 -0400 Received: from localhost (ovpn-113-107.phx2.redhat.com [10.3.113.107]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2VJiOYN015065; Thu, 31 Mar 2011 15:44:25 -0400 From: Amit Shah To: qemu list Date: Fri, 1 Apr 2011 01:14:07 +0530 Message-Id: In-Reply-To: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> References: <20110331095325.GA13226@amit-x200.redhat.com> <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> In-Reply-To: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> References: <2a24c3a3e75c383de13b87d064fb958ea9f268ff.1301600598.git.amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gleb Natapov , Juan Quintela , Stefan Hajnoczi , Markus Armbruster , Amit Shah Subject: [Qemu-devel] [RFC PATCH 2/3] atapi: implement GET_EVENT_STATUS_NOTIFICATION command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This commit could be split further; but the main thing it does is implement this command. Linux kernels (at least upto 2.6.38.2) need a fix to the media change handling to recognise size changes. Signed-off-by: Amit Shah --- hw/ide/core.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++---- hw/ide/internal.h | 6 ++ 2 files changed, 133 insertions(+), 11 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index e14f2d3..89e212b 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1084,27 +1084,142 @@ static int ide_dvd_read_structure(IDEState *s, int format, } } +static unsigned int event_status_media(IDEState *s, + uint8_t *buf, + unsigned int max_len) +{ + enum media_event_code { + no_change = 0, /* Status unchanged */ + eject_requested, /* received a request from user to eject */ + new_media, /* new media inserted and ready for access */ + media_removal, /* only for media changers */ + media_changed, /* only for media changers */ + bg_format_completed, /* MRW or DVD+RW b/g format completed */ + bg_format_restarted, /* MRW or DVD+RW b/g format restarted */ + }; + uint8_t event_code, media_status; + + /* TODO: ensure max_len is >= 6 */ + + /* Event notification descriptor */ + event_code = no_change; + if (s->events.new_media) { + event_code = new_media; + s->events.new_media = false; + } + /* + * We never report a 'door or tray opened' state; it's assumed + * always closed. + */ + media_status = bdrv_is_inserted(s->bs) ? 2 : 0; + + buf[4] = event_code; + buf[5] = media_status; + + return 6; /* We wrote to just 2 extra bytes from the header */ +} + +static unsigned int event_status_nea(uint8_t *buf, unsigned int max_len) +{ + unsigned int used_len; + + /* + * Ensure we don't write on memory we don't have. + * max_len of 0 should not produce an error as well. + */ + used_len = 0; + + /* No event descriptor returned */ + if (max_len > 0) { + buf[0] = 0; + used_len++; + } + if (max_len > 1) { + buf[1] = 0; + used_len++; + } + + if (max_len > 3) { + buf[2] = 0x80; /* No Event Available (NEA) */ + used_len++; + } + if (max_len > 3) { + buf[3] = 0x00; /* Empty supported event classes */ + used_len++; + } + return used_len; +} + static void handle_get_event_status_notification(IDEState *s, uint8_t *buf, const uint8_t *packet) { - unsigned int max_len; - - max_len = ube16_to_cpu(packet + 7); - - if (!(packet[1] & 0x01)) { /* asynchronous mode */ + enum cdb { + polled = 1, + request = 4, + allocation_length_msb = 7, + allocation_length_lsb = 8, + control = 9, + }; + enum notification_class_request_type { + reserved1 = 1 << 0, + operational_change = 1 << 1, + power_management = 1 << 2, + external_request = 1 << 3, + media = 1 << 4, + multi_host = 1 << 5, + device_busy = 1 << 6, + reserved2 = 1 << 7, + }; + enum event_notification_class_field { + enc_no_events = 0, + enc_operational_change, + enc_power_management, + enc_external_request, + enc_media, + enc_multiple_hosts, + enc_device_busy, + enc_reserved, + }; + unsigned int max_len, used_len; + unsigned int supported_events; + + max_len = ube16_to_cpu(packet + allocation_length_msb); + + /* It is fine by the MMC spec to not support async mode operations */ + if (!(packet[polled] & 0x01)) { /* asynchronous mode */ /* Only polling is supported, asynchronous mode is not. */ ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET); return; } - /* polling */ - /* We don't support any event class (yet). */ - cpu_to_ube16(buf, 0x00); /* No event descriptor returned */ - buf[2] = 0x80; /* No Event Available (NEA) */ - buf[3] = 0x00; /* Empty supported event classes */ - ide_atapi_cmd_reply(s, 4, max_len); + /* polling mode operation */ + + /* + * These are the supported events. + * + * We currently only support requests of the 'media' type. + */ + supported_events = media; + + /* + * Responses to requests are to be based on request priority. The + * notification_class_request_type enum above specifies the + * priority: upper elements are higher prio than lower ones. + */ + if (packet[request] & media) { + + /* Event notification header */ + cpu_to_ube16(buf, max_len); + buf[2] = enc_media; + buf[3] = supported_events; + + used_len = event_status_media(s, buf, max_len); + } else { + used_len = event_status_nea(buf, max_len); + } + ide_atapi_cmd_reply(s, used_len, max_len); } static void ide_atapi_cmd(IDEState *s) @@ -1623,6 +1738,7 @@ static void cdrom_change_cb(void *opaque, int reason) s->sense_key = SENSE_UNIT_ATTENTION; s->asc = ASC_MEDIUM_MAY_HAVE_CHANGED; s->cdrom_changed = 1; + s->events.new_media = true; ide_set_irq(s->bus); } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index d533fb6..ba7e9a8 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -373,6 +373,11 @@ typedef int DMAFunc(IDEDMA *); typedef int DMAIntFunc(IDEDMA *, int); typedef void DMARestartFunc(void *, int, int); +struct unreported_events { + bool eject_request; + bool new_media; +}; + /* NOTE: IDEState represents in fact one drive */ struct IDEState { IDEBus *bus; @@ -408,6 +413,7 @@ struct IDEState { BlockDriverState *bs; char version[9]; /* ATAPI specific */ + struct unreported_events events; uint8_t sense_key; uint8_t asc; uint8_t cdrom_changed;