From patchwork Thu Feb 18 04:18:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8345431 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 875589F727 for ; Thu, 18 Feb 2016 04:22:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7731201F5 for ; Thu, 18 Feb 2016 04:22:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2549D201DD for ; Thu, 18 Feb 2016 04:22:04 +0000 (UTC) Received: from localhost ([::1]:36545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG6N-0007mB-E4 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 23:22:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2J-00007z-OX for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWG2H-0008KQ-Dw for qemu-devel@nongnu.org; Wed, 17 Feb 2016 23:17:51 -0500 Received: from ozlabs.org ([103.22.144.67]:40860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWG2H-0008IB-2k; Wed, 17 Feb 2016 23:17:49 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 49982140AE0; Thu, 18 Feb 2016 15:17:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1455769067; bh=gMCcO+1PtFq9Ck7XLLJwplwzjmcINsw5t5lj8AQ6U40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Va9fV+AjFSf4d59xbTzFmgeNcJbbXhZZFss0/oipyPvNmB1ZTFS5Zew0mN8t9PEQJ 3/hO3pdq3x7lvF4JHSt42+RCO4hfuNWOgfY/3cxm//lkxM29ehERQYReUf2A1Kv1QY uyjrmF7m2Xsp8MJcBEb6kzmpapyE0P2+Wte6q7dc= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 18 Feb 2016 15:18:33 +1100 Message-Id: <1455769127-26005-13-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> References: <1455769127-26005-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PULL 12/26] cuda: add a framework to handle commands 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hervé Poussineau Next commits will port existing CUDA commands to this framework. Signed-off-by: Hervé Poussineau Reviewed-by: Mark Cave-Ayland Signed-off-by: David Gibson --- hw/misc/macio/cuda.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 316c1ac..8659dc3 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -535,13 +535,47 @@ static void cuda_adb_poll(void *opaque) (get_ticks_per_sec() / CUDA_ADB_POLL_FREQ)); } +/* description of commands */ +typedef struct CudaCommand { + uint8_t command; + const char *name; + bool (*handler)(CUDAState *s, + const uint8_t *in_args, int in_len, + uint8_t *out_args, int *out_len); +} CudaCommand; + +static const CudaCommand handlers[] = { +}; + static void cuda_receive_packet(CUDAState *s, const uint8_t *data, int len) { uint8_t obuf[16] = { CUDA_PACKET, 0, data[0] }; int autopoll; + int i, out_len = 0; uint32_t ti; + for (i = 0; i < ARRAY_SIZE(handlers); i++) { + const CudaCommand *desc = &handlers[i]; + if (desc->command == data[0]) { + CUDA_DPRINTF("handling command %s\n", desc->name); + out_len = 0; + if (desc->handler(s, data + 1, len - 1, obuf + 3, &out_len)) { + cuda_send_packet_to_host(s, obuf, 3 + out_len); + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "CUDA: %s: wrong parameters %d\n", + desc->name, len); + obuf[0] = ERROR_PACKET; + obuf[1] = 0x5; /* bad parameters */ + obuf[2] = CUDA_PACKET; + obuf[3] = data[0]; + cuda_send_packet_to_host(s, obuf, 4); + } + return; + } + } + switch(data[0]) { case CUDA_AUTOPOLL: autopoll = (data[1] != 0);