From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Chen, Tiejun" Subject: Re: =?UTF-8?B?W8OeQVRDSCB2Ml0ga3ZtdG9vbCwgbWlwczogU3VwcG9ydCBtb3I=?= =?UTF-8?B?ZSB0aGFuIDI1NiBNQiBndWVzdCBtZW1vcnk=?= Date: Wed, 14 Jan 2015 11:08:32 +0800 Message-ID: <54B5DDB0.9080702@intel.com> References: <20150106131512.GG4194@alberich> <54ACFEAD.2040901@intel.com> <20150107140610.GI4194@alberich> <20150113101928.GA30360@alberich> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: David Daney , kvm@vger.kernel.org, linux-mips@linux-mips.org To: Andreas Herrmann , Pekka Enberg Return-path: Received: from mga01.intel.com ([192.55.52.88]:14113 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751202AbbANDIe (ORCPT ); Tue, 13 Jan 2015 22:08:34 -0500 In-Reply-To: <20150113101928.GA30360@alberich> Sender: kvm-owner@vger.kernel.org List-ID: On 2015/1/13 18:19, Andreas Herrmann wrote: > Two guest memory regions need to be defined and two "mem=" parameters > need to be passed to guest kernel to support more than 256 MB. > > Cc: Chen, Tiejun Looks fine to me. Thanks Tiejun > Signed-off-by: Andreas Herrmann > --- > tools/kvm/mips/include/kvm/kvm-arch.h | 10 +++++++++ > tools/kvm/mips/kvm.c | 36 +++++++++++++++++++++++++++------ > 2 files changed, 40 insertions(+), 6 deletions(-) > > This version uses correct macros during calculation of memory > parameters. > > > Andreas > > > diff --git a/tools/kvm/mips/include/kvm/kvm-arch.h b/tools/kvm/mips/include/kvm/kvm-arch.h > index 7eadbf4..97bbf34 100644 > --- a/tools/kvm/mips/include/kvm/kvm-arch.h > +++ b/tools/kvm/mips/include/kvm/kvm-arch.h > @@ -1,10 +1,20 @@ > #ifndef KVM__KVM_ARCH_H > #define KVM__KVM_ARCH_H > > + > +/* > + * Guest memory map is: > + * 0x00000000-0x0fffffff : System RAM > + * 0x10000000-0x1fffffff : I/O (defined by KVM_MMIO_START and KVM_MMIO_SIZE) > + * 0x20000000- ... : System RAM > + * See also kvm__init_ram(). > + */ > + > #define KVM_MMIO_START 0x10000000 > #define KVM_PCI_CFG_AREA KVM_MMIO_START > #define KVM_PCI_MMIO_AREA (KVM_MMIO_START + 0x1000000) > #define KVM_VIRTIO_MMIO_AREA (KVM_MMIO_START + 0x2000000) > +#define KVM_MMIO_SIZE 0x10000000 > > /* > * Just for reference. This and the above corresponds to what's used > diff --git a/tools/kvm/mips/kvm.c b/tools/kvm/mips/kvm.c > index fc0428b..1925f38 100644 > --- a/tools/kvm/mips/kvm.c > +++ b/tools/kvm/mips/kvm.c > @@ -22,11 +22,28 @@ void kvm__init_ram(struct kvm *kvm) > u64 phys_start, phys_size; > void *host_mem; > > - phys_start = 0; > - phys_size = kvm->ram_size; > - host_mem = kvm->ram_start; > + if (kvm->ram_size <= KVM_MMIO_START) { > + /* one region for all memory */ > + phys_start = 0; > + phys_size = kvm->ram_size; > + host_mem = kvm->ram_start; > > - kvm__register_mem(kvm, phys_start, phys_size, host_mem); > + kvm__register_mem(kvm, phys_start, phys_size, host_mem); > + } else { > + /* one region for memory that fits below MMIO range */ > + phys_start = 0; > + phys_size = KVM_MMIO_START; > + host_mem = kvm->ram_start; > + > + kvm__register_mem(kvm, phys_start, phys_size, host_mem); > + > + /* one region for rest of memory */ > + phys_start = KVM_MMIO_START + KVM_MMIO_SIZE; > + phys_size = kvm->ram_size - KVM_MMIO_START; > + host_mem = kvm->ram_start + KVM_MMIO_START; > + > + kvm__register_mem(kvm, phys_start, phys_size, host_mem); > + } > } > > void kvm__arch_delete_ram(struct kvm *kvm) > @@ -108,8 +125,15 @@ static void kvm__mips_install_cmdline(struct kvm *kvm) > u64 argv_offset = argv_start; > u64 argc = 0; > > - sprintf(p + cmdline_offset, "mem=0x%llx@0 ", > - (unsigned long long)kvm->ram_size); > + > + if ((u64) kvm->ram_size <= KVM_MMIO_START) > + sprintf(p + cmdline_offset, "mem=0x%llx@0 ", > + (unsigned long long)kvm->ram_size); > + else > + sprintf(p + cmdline_offset, "mem=0x%llx@0 mem=0x%llx@0x%llx ", > + (unsigned long long)KVM_MMIO_START, > + (unsigned long long)kvm->ram_size - KVM_MMIO_START, > + (unsigned long long)(KVM_MMIO_START + KVM_MMIO_SIZE)); > > strcat(p + cmdline_offset, kvm->cfg.real_cmdline); /* maximum size is 2K */ > >