From patchwork Sat Jan 16 01:14:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8047691 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16B7CBEEE5 for ; Sat, 16 Jan 2016 01:15:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67E0A202F2 for ; Sat, 16 Jan 2016 01:15:05 +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 A4F1A202EC for ; Sat, 16 Jan 2016 01:15:04 +0000 (UTC) Received: from localhost ([::1]:49572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKFSK-0000Pu-19 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Jan 2016 20:15:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKFRF-00078i-V1 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 20:13:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aKFRE-0002IE-Vh for qemu-devel@nongnu.org; Fri, 15 Jan 2016 20:13:57 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:54801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKFRE-0002Hk-LF; Fri, 15 Jan 2016 20:13:56 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 2DA33140D6D; Sat, 16 Jan 2016 12:13:52 +1100 (AEDT) From: David Gibson To: aik@ozlabs.ru Date: Sat, 16 Jan 2016 12:14:44 +1100 Message-Id: <1452906886-806-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452906886-806-1-git-send-email-david@gibson.dropbear.id.au> References: <1452906886-806-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2401:3900:2:1::2 Cc: agraf@suse.de, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 1/3] spapr: Small fixes to rtas_ibm_get_system_parameter, remove rtas_st_buffer 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 rtas_st_buffer() appears in spapr.h as though it were a widely used helper, but in fact it is only used for saving data in a format used by rtas_ibm_get_system_parameter(). We can fold it into that caller just as simply. While we're there fix a couple of small defects in rtas_ibm_get_system_parameter: - For the string value SPLPAR_CHARACTERISTICS, it wasn't including the terminating \0 in the length which it should according to LoPAPR 7.3.16.1 - It now checks that the supplied buffer has at least enough space for the length of the returned data, and returns an error if it does not. Signed-off-by: David Gibson --- hw/ppc/spapr_rtas.c | 28 ++++++++++++++++++++-------- include/hw/ppc/spapr.h | 11 ----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 34b12a3..f4fb9ba 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -235,9 +235,15 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, uint32_t nret, target_ulong rets) { target_ulong parameter = rtas_ld(args, 0); - target_ulong buffer = rtas_ld(args, 1); + target_ulong buffer = ppc64_phys_to_real(rtas_ld(args, 1)); target_ulong length = rtas_ld(args, 2); - target_ulong ret = RTAS_OUT_SUCCESS; + void *val; + size_t vallen; + + if (length < 2) { + rtas_st(rets, 0, -9999); /* Parameter error */ + return; + } switch (parameter) { case RTAS_SYSPARM_SPLPAR_CHARACTERISTICS: { @@ -249,24 +255,30 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, current_machine->ram_size / M_BYTE, smp_cpus, max_cpus); - rtas_st_buffer(buffer, length, (uint8_t *)param_val, strlen(param_val)); + val = param_val; + vallen = strlen(param_val) + 1; g_free(param_val); break; } case RTAS_SYSPARM_DIAGNOSTICS_RUN_MODE: { - uint8_t param_val = DIAGNOSTICS_RUN_MODE_DISABLED; + uint8_t diagnostics_run_mode = DIAGNOSTICS_RUN_MODE_DISABLED; - rtas_st_buffer(buffer, length, ¶m_val, sizeof(param_val)); + val = &diagnostics_run_mode; + vallen = sizeof(diagnostics_run_mode); break; } case RTAS_SYSPARM_UUID: - rtas_st_buffer(buffer, length, qemu_uuid, (qemu_uuid_set ? 16 : 0)); + val = qemu_uuid; + vallen = qemu_uuid_set ? 16 : 0; break; default: - ret = RTAS_OUT_NOT_SUPPORTED; + rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED); + return; } - rtas_st(rets, 0, ret); + stw_be_phys(&address_space_memory, buffer, vallen); + cpu_physical_memory_write(buffer + 2, val, MIN(vallen, length - 2)); + rtas_st(rets, 0, 0); /* Success */ } static void rtas_ibm_set_system_parameter(PowerPCCPU *cpu, diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 53af76a..ec9e7ea 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -513,17 +513,6 @@ static inline void rtas_st_buffer_direct(target_ulong phys, MIN(buffer_len, phys_len)); } -static inline void rtas_st_buffer(target_ulong phys, target_ulong phys_len, - uint8_t *buffer, uint16_t buffer_len) -{ - if (phys_len < 2) { - return; - } - stw_be_phys(&address_space_memory, - ppc64_phys_to_real(phys), buffer_len); - rtas_st_buffer_direct(phys + 2, phys_len - 2, buffer, buffer_len); -} - typedef void (*spapr_rtas_fn)(PowerPCCPU *cpu, sPAPRMachineState *sm, uint32_t token, uint32_t nargs, target_ulong args,