From patchwork Mon Mar 21 07:17:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Education Directorate X-Patchwork-Id: 8629771 Return-Path: X-Original-To: patchwork-kvm@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 9352BC0553 for ; Mon, 21 Mar 2016 07:18:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D22820272 for ; Mon, 21 Mar 2016 07:18:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9714320279 for ; Mon, 21 Mar 2016 07:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752653AbcCUHSO (ORCPT ); Mon, 21 Mar 2016 03:18:14 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35530 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752306AbcCUHSL (ORCPT ); Mon, 21 Mar 2016 03:18:11 -0400 Received: by mail-pf0-f195.google.com with SMTP id u190so28781913pfb.2 for ; Mon, 21 Mar 2016 00:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RvuQ2MJ5bcYZaDtY6ipT8W8oycFypdBVluV1edzrpow=; b=vUvtIxCX0G0EQApenr78TrkumaKaMzH7qNox7eW97AlHbhmMBdQ66E83UvZUHasQSh 0i4+QgIgYTrGv8eTQKCz/9ffsSzX0ls2cJEG7JQ/FY8qMZ8IF1FzYRMvOh7KdZ3qQBZD L+8bQKF5FHZBI4oVUVXDA1G6jbq8KsBzQ+nt9+G3sx8KI7bDSRqHVgTSIlbVEn1ny3hC 4eaOQC33mwOo8I0hja/cz8hxebrQJxC0CD+B2rcEFHewYkRSQx1Q/LqzgGBOg1WAdN54 3WIj7ShyznHJ0zSc+cE0jcazQi8V6pS6FvG/gR8Y3TIfCDk6/Ugtc+cqPaQPTciS2AMv mOZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RvuQ2MJ5bcYZaDtY6ipT8W8oycFypdBVluV1edzrpow=; b=MmH2g/8Wr8ftesk6glL8I+AYl8VMJngfHN28LfAs/Agw8+oRHEorlqPp9cwufe+9gh 86pAQIEaEwWQq3Ll8HH2RmwjYTL/JdK3g4wr0hkY9cbwxyrQajn1BxTEvxKSIPv81vN5 rjOxoPMbd+7tzEB8v2dlPHhkfhZt6fzwDpNXA8jy+GbZSBr2ZDZIBm8mMnp02WUoNe90 UNsp/sSp/clgCBn96/4zLG/Dom2UwRrwK/gBXHJLFhZ2F6cUL3Z7HzlBvbnZmHua3b+N F3lEEzCSUpJtyFcUu25LXDjMK40xJEVnAK5cn0p4SOt+sTx8oyfV70VEpX8N9gS/pGP1 lSfg== X-Gm-Message-State: AD7BkJJEMGGejTzHhgcYrGspWjVKAkRkNDTMDOSyrfehPgCbCE3u7LqOUrdMHhCJa9XAlA== X-Received: by 10.66.102.8 with SMTP id fk8mr43397223pab.12.1458544690488; Mon, 21 Mar 2016 00:18:10 -0700 (PDT) Received: from cotter.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id wb7sm37969152pab.3.2016.03.21.00.18.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Mar 2016 00:18:09 -0700 (PDT) Received: by cotter.ozlabs.ibm.com (Postfix, from userid 1000) id A6CE3C01E3; Mon, 21 Mar 2016 18:18:05 +1100 (AEDT) From: Balbir Singh To: will.deacon@arm.com, kvm@vger.kernel.org Cc: penberg@kernel.org, mpe@ellerman.id.au, mikey@neuling.org, aik@ozlabs.ru, Balbir Singh Subject: [PATCH 1/4] Add basic little endian support. Date: Mon, 21 Mar 2016 18:17:27 +1100 Message-Id: <1458544650-31416-2-git-send-email-bsingharora@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458544650-31416-1-git-send-email-bsingharora@gmail.com> References: <1458544650-31416-1-git-send-email-bsingharora@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Currently kvmtool works well/was designed for big endian ppc64 systems. This patch adds support for little endian systems The system does not yet boot as support for h_set_mode is required to help with exceptions in big endian mode -- first page fault. The support comes in the next patch of the series Signed-off-by: Balbir Singh --- powerpc/kvm.c | 24 ++++++++++++------------ powerpc/spapr.h | 5 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/powerpc/kvm.c b/powerpc/kvm.c index b4c3310..d147e0c 100644 --- a/powerpc/kvm.c +++ b/powerpc/kvm.c @@ -253,21 +253,21 @@ static void generate_segment_page_sizes(struct kvm_ppc_smmu_info *info, struct f if (sps->page_shift == 0) break; - *p++ = sps->page_shift; - *p++ = sps->slb_enc; + *p++ = cpu_to_be32(sps->page_shift); + *p++ = cpu_to_be32(sps->slb_enc); for (j = 0; j < KVM_PPC_PAGE_SIZES_MAX_SZ; j++) if (!info->sps[i].enc[j].page_shift) break; - *p++ = j; /* count of enc */ + *p++ = cpu_to_be32(j); /* count of enc */ for (j = 0; j < KVM_PPC_PAGE_SIZES_MAX_SZ; j++) { if (!info->sps[i].enc[j].page_shift) break; - *p++ = info->sps[i].enc[j].page_shift; - *p++ = info->sps[i].enc[j].pte_enc; + *p++ = cpu_to_be32(info->sps[i].enc[j].page_shift); + *p++ = cpu_to_be32(info->sps[i].enc[j].pte_enc); } } } @@ -292,7 +292,7 @@ static int setup_fdt(struct kvm *kvm) u8 staging_fdt[FDT_MAX_SIZE]; struct cpu_info *cpu_info = find_cpu_info(kvm); struct fdt_prop segment_page_sizes; - u32 segment_sizes_1T[] = {0x1c, 0x28, 0xffffffff, 0xffffffff}; + u32 segment_sizes_1T[] = {cpu_to_be32(0x1c), cpu_to_be32(0x28), 0xffffffff, 0xffffffff}; /* Generate an appropriate DT at kvm->arch.fdt_gra */ void *fdt_dest = guest_flat_to_host(kvm, kvm->arch.fdt_gra); @@ -364,7 +364,7 @@ static int setup_fdt(struct kvm *kvm) _FDT(fdt_property_cell(fdt, "#size-cells", 0x0)); for (i = 0; i < smp_cpus; i += SMT_THREADS) { - int32_t pft_size_prop[] = { 0, HPT_ORDER }; + int32_t pft_size_prop[] = { 0, cpu_to_be32(HPT_ORDER) }; uint32_t servers_prop[SMT_THREADS]; uint32_t gservers_prop[SMT_THREADS * 2]; int threads = (smp_cpus - i) >= SMT_THREADS ? SMT_THREADS : @@ -503,11 +503,11 @@ int kvm__arch_setup_firmware(struct kvm *kvm) */ uint32_t *rtas = guest_flat_to_host(kvm, kvm->arch.rtas_gra); - rtas[0] = 0x7c641b78; - rtas[1] = 0x3c600000; - rtas[2] = 0x6063f000; - rtas[3] = 0x44000022; - rtas[4] = 0x4e800020; + rtas[0] = cpu_to_be32(0x7c641b78); + rtas[1] = cpu_to_be32(0x3c600000); + rtas[2] = cpu_to_be32(0x6063f000); + rtas[3] = cpu_to_be32(0x44000022); + rtas[4] = cpu_to_be32(0x4e800020); kvm->arch.rtas_size = 20; pr_info("Set up %ld bytes of RTAS at 0x%lx\n", diff --git a/powerpc/spapr.h b/powerpc/spapr.h index 7a377d0..8b294d1 100644 --- a/powerpc/spapr.h +++ b/powerpc/spapr.h @@ -15,6 +15,7 @@ #define __HW_SPAPR_H__ #include +#include #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" @@ -80,12 +81,12 @@ int spapr_rtas_fdt_setup(struct kvm *kvm, void *fdt); static inline uint32_t rtas_ld(struct kvm *kvm, target_ulong phys, int n) { - return *((uint32_t *)guest_flat_to_host(kvm, phys + 4*n)); + return cpu_to_be32(*((uint32_t *)guest_flat_to_host(kvm, phys + 4*n))); } static inline void rtas_st(struct kvm *kvm, target_ulong phys, int n, uint32_t val) { - *((uint32_t *)guest_flat_to_host(kvm, phys + 4*n)) = val; + *((uint32_t *)guest_flat_to_host(kvm, phys + 4*n)) = cpu_to_be32(val); } typedef void (*spapr_rtas_fn)(struct kvm_cpu *vcpu, uint32_t token,