From patchwork Sat Jan 23 20:40:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 8097991 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 E5CB99FE73 for ; Sat, 23 Jan 2016 20:41:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C2F620389 for ; Sat, 23 Jan 2016 20:41:27 +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 7BB0F2038A for ; Sat, 23 Jan 2016 20:41:26 +0000 (UTC) Received: from localhost ([::1]:58439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zt-0006BW-Q9 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Jan 2016 15:41:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zc-00067u-Oj for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aN4za-0005S0-4y for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:08 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:19679) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zZ-0005Rw-Ue; Sat, 23 Jan 2016 15:41:06 -0500 Received: from localhost.localdomain (unknown [78.230.185.200]) by smtp5-g21.free.fr (Postfix) with ESMTP id 5F834D4813F; Sat, 23 Jan 2016 21:39:21 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sat, 23 Jan 2016 21:40:01 +0100 Message-Id: <1453581610-23179-5-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> References: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.5 Cc: Mark Cave-Ayland , Alexander Graf , Alyssa Milburn , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 04/13] cuda: port SET_AUTO_RATE command to new framework 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 Take requested autopoll rate into account Signed-off-by: Hervé Poussineau --- hw/misc/macio/cuda.c | 31 +++++++++++++++++++++++++++---- hw/ppc/mac.h | 1 + 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 37406fc..9ec642f 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -105,7 +105,6 @@ #define CUDA_COMBINED_FORMAT_IIC 0x25 #define CUDA_TIMER_FREQ (4700000 / 6) -#define CUDA_ADB_POLL_FREQ 50 /* CUDA returns time_t's offset from Jan 1, 1904, not 1970 */ #define RTC_OFFSET 2082844800 @@ -531,7 +530,7 @@ static void cuda_adb_poll(void *opaque) } timer_mod(s->adb_poll_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (get_ticks_per_sec() / CUDA_ADB_POLL_FREQ)); + (get_ticks_per_sec() / (1000 / s->auto_rate_ms))); } /* description of commands */ @@ -559,7 +558,7 @@ static bool cuda_cmd_autopoll(CUDAState *s, if (autopoll) { timer_mod(s->adb_poll_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (get_ticks_per_sec() / CUDA_ADB_POLL_FREQ)); + (get_ticks_per_sec() / (1000 / s->auto_rate_ms))); } else { timer_del(s->adb_poll_timer); } @@ -567,8 +566,32 @@ static bool cuda_cmd_autopoll(CUDAState *s, return true; } +static bool cuda_cmd_set_autorate(CUDAState *s, + const uint8_t *in_data, int in_len, + uint8_t *out_data, int *out_len) +{ + if (in_len != 1) { + return false; + } + + /* we don't want a period of 0 ms */ + /* FIXME: check what real hardware does */ + if (in_data[0] == 0) { + return; + } + + s->auto_rate_ms = in_data[0]; + if (s->autopoll) { + timer_mod(s->adb_poll_timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + (get_ticks_per_sec() / (1000 / s->auto_rate_ms))); + } + return true; +} + static const CudaCommand handlers[] = { { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll }, + { CUDA_SET_AUTO_RATE, "SET_AUTO_RATE", cuda_cmd_set_autorate }, }; static void cuda_receive_packet(CUDAState *s, @@ -618,7 +641,6 @@ static void cuda_receive_packet(CUDAState *s, return; case CUDA_FILE_SERVER_FLAG: case CUDA_SET_DEVICE_LIST: - case CUDA_SET_AUTO_RATE: case CUDA_SET_POWER_MESSAGES: cuda_send_packet_to_host(s, obuf, 3); return; @@ -824,6 +846,7 @@ static void cuda_realizefn(DeviceState *dev, Error **errp) s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET; s->adb_poll_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_adb_poll, s); + s->auto_rate_ms = 20; } static void cuda_initfn(Object *obj) diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index e375ed2..90fcb69 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -111,6 +111,7 @@ typedef struct CUDAState { int data_out_index; qemu_irq irq; + uint8_t auto_rate_ms; uint8_t autopoll; uint8_t data_in[128]; uint8_t data_out[16];