From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C823C2D0C2 for ; Sat, 4 Jan 2020 15:01:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 599A322B48 for ; Sat, 4 Jan 2020 15:01:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KindEMs5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 599A322B48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inkvb-0004qk-Ei for qemu-devel@archiver.kernel.org; Sat, 04 Jan 2020 10:01:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55695) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inkul-0004Lz-AM for qemu-devel@nongnu.org; Sat, 04 Jan 2020 10:00:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inkug-0003Hh-HT for qemu-devel@nongnu.org; Sat, 04 Jan 2020 10:00:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52899 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1inkug-0003D6-94 for qemu-devel@nongnu.org; Sat, 04 Jan 2020 10:00:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578150024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4AZtwPz7YvV30zG88KGatoMWXyvUGPvR2HtAljezWjM=; b=KindEMs5cGvbq8ks+6G5Bu4Zw3+cEFOI/sR5NoLsHRpoMktkEI1TEYiGi9UPgJVAkFWUZZ u8B1kyVdl+J1lvhwutCBf1y6SXsOdOgFP8ol3W0D3nJvYoD0JQzQgO8Tzw5JY7DzQXQoDJ 7mX+CE0wgvmxtnoP2PMNq25FytOHodc= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-tgTQ3HV7M56zjjLAydCmNw-1; Sat, 04 Jan 2020 10:00:23 -0500 Received: by mail-wr1-f71.google.com with SMTP id h30so15811078wrh.5 for ; Sat, 04 Jan 2020 07:00:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=4AZtwPz7YvV30zG88KGatoMWXyvUGPvR2HtAljezWjM=; b=S13plqvf10NLZciWrU22ia9v1dk25J39stcOC01I83Ol30gRlG0zOOUJw6MWHgvaJg a90hRNCWtC6ZfeRfKMQaLdmEEd9EKG8IKMmmXNd08W6ncOB2V1plHwIRi28E8EyRNVfe X5jPVTL1AwhM7tbAwB5x+W1gxKPAzBSZpZ/GjDccw/zrYTSo3lIsHronL5MO3YSuPrAT fm5o5c3dpnllpba2PogXcCjKfXREwcW52e6HfeXBmdTiNFbNMSZnVY+GSfceobn4huTE Wf5SI+TdVzc75vDXn+ihLYbWVSDzsLWCKq/ixmZ7tL5rG1PfMT+vadpgb7hel0a+XbsK w0ew== X-Gm-Message-State: APjAAAUli4HpHLHMV2RhR0Syq9j9g0fPUfAIrR2MczeYuNNPVarBa7VN wA5URMx3VFCqhDcI3yMk0bdjPda5FMnbDltp+70drhrPVjfmTW4ReZtTIjPTmAtKNM03HAA2paL sDxGO0FVAz3FUHOs= X-Received: by 2002:a5d:65c5:: with SMTP id e5mr93423710wrw.311.1578150021344; Sat, 04 Jan 2020 07:00:21 -0800 (PST) X-Google-Smtp-Source: APXvYqxq5G7nAcsGSSUAWY/5q4rW5BiGQ6IoKNZqVi108JeJmbT0yZ4jX0YtG/SOnAkwpF1poZzeHg== X-Received: by 2002:a5d:65c5:: with SMTP id e5mr93423692wrw.311.1578150021058; Sat, 04 Jan 2020 07:00:21 -0800 (PST) Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id x10sm64463816wrp.58.2020.01.04.07.00.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Jan 2020 07:00:20 -0800 (PST) Subject: Re: [PATCH v2] hppa: allow max ram size upto 4Gb To: Igor Mammedov , Helge Deller References: <27c3e31d-82ae-e62f-caba-a0a3fbd55e7c@redhat.com> <1577987162-150529-1-git-send-email-imammedo@redhat.com> <2f226aa4-5f61-6e6d-d6b9-a98685a79e8c@gmx.de> <20200103105434.050d28ea@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <6fa7bcd3-ee67-cc84-fd4e-d3677e3ae51a@redhat.com> Date: Sat, 4 Jan 2020 16:00:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200103105434.050d28ea@redhat.com> Content-Language: en-US X-MC-Unique: tgTQ3HV7M56zjjLAydCmNw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Schnelle , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/3/20 10:54 AM, Igor Mammedov wrote: > On Thu, 2 Jan 2020 21:22:12 +0100 > Helge Deller wrote: > >> On 02.01.20 18:46, Igor Mammedov wrote: >>> Previous patch drops silent ram_size fixup and makes >>> QEMU error out with: >>> >>> "RAM size more than 3840m is not supported" >>> >>> when user specified -m X more than supported value. >>> >>> User shouldn't be bothered with starting QEMU with valid CLI, >>> so for the sake of user convenience allow using -m 4G vs -m 3840M. >>> >>> Requested-by: Helge Deller >>> Signed-off-by: Igor Mammedov >>> --- >>> v2: >>> - make main ram -1 prio, so it wouldn't conflict with other regions >>> starting from 0xf9000000 >>> >>> I dislike it but if you feel it's really necessary feel free to ack it. Hard to find the v2 buried in the other series with my email client. >>> >>> should be applied on top of: >>> "hppa: drop RAM size fixup" >> >> Hello Igor, >> I appreciate that you are trying to make it more cleaner. >> But, can't you merge both of your patches to one patch? >> Right now you have one patch "hppa: drop RAM size fixup", which is >> what I think is wrong. Then you add another one which somehow >> fixes it up again and adds other stuff. > 1st patch bring it in line with other boards adding > proper error check but without changing RAM size. > While 2nd is changing device model (mapped RAM size) and > clearly documents that it's a hack for user convenience, > Hence I'd prefer to keep both separated. > >> Having everything in one single patch makes your full change more >> understandable. >> >> Is it necessary to introduce clamped_ram_size and not continue with >> ram_size (even if you would add it as static local variable)? > it's necessary since ram_size is global which should be kept == MachineState::ram_size. > Later on I plan to remove the former altogether and maybe > MachineState::ram_size aa well, since it could be read with > memory_region_size(MachineState::ram). Why insist on clamping the ram? We recommend to model what the hardware does, and the hardware uses a full DIMM of DRAM, so 4GB, not less. What are the new problem introduced by using 4GB? I only see advantages doing so. This doesn't break your series. This doesn't break the CLI. Am I missing something? >>> --- >>> hw/hppa/machine.c | 21 +++++++++++---------- >>> 1 file changed, 11 insertions(+), 10 deletions(-) >>> >>> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c >>> index ebbf44f..0302983 100644 >>> --- a/hw/hppa/machine.c >>> +++ b/hw/hppa/machine.c >>> @@ -54,6 +54,7 @@ static uint64_t cpu_hppa_to_phys(void *opaque, uint64_t addr) >>> >>> static HPPACPU *cpu[HPPA_MAX_CPUS]; >>> static uint64_t firmware_entry; >>> +static ram_addr_t clamped_ram_size; >>> >>> static void machine_hppa_init(MachineState *machine) >>> { >>> @@ -74,8 +75,6 @@ static void machine_hppa_init(MachineState *machine) >>> long i; >>> unsigned int smp_cpus = machine->smp.cpus; >>> >>> - ram_size = machine->ram_size; >>> - >>> /* Create CPUs. */ >>> for (i = 0; i < smp_cpus; i++) { >>> char *name = g_strdup_printf("cpu%ld-io-eir", i); >>> @@ -90,12 +89,14 @@ static void machine_hppa_init(MachineState *machine) >>> } >>> >>> /* Limit main memory. */ >>> - if (ram_size > FIRMWARE_START) { >>> - error_report("RAM size more than %d is not supported", FIRMWARE_START); >>> + if (machine->ram_size > 4 * GiB) { >>> + error_report("RAM size more than 4Gb is not supported"); >>> exit(EXIT_FAILURE); >>> } >>> + clamped_ram_size = machine->ram_size > FIRMWARE_START ? >>> + FIRMWARE_START : machine->ram_size; >>> >>> - memory_region_add_subregion(addr_space, 0, machine->ram); >>> + memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1); >>> >>> /* Init Dino (PCI host bus chip). */ >>> pci_bus = dino_init(addr_space, &rtc_irq, &serial_irq); >>> @@ -151,7 +152,7 @@ static void machine_hppa_init(MachineState *machine) >>> qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64 >>> "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n", >>> firmware_low, firmware_high, firmware_entry); >>> - if (firmware_low < ram_size || firmware_high >= FIRMWARE_END) { >>> + if (firmware_low < clamped_ram_size || firmware_high >= FIRMWARE_END) { >>> error_report("Firmware overlaps with memory or IO space"); >>> exit(1); >>> } >>> @@ -204,7 +205,7 @@ static void machine_hppa_init(MachineState *machine) >>> (1) Due to sign-extension problems and PDC, >>> put the initrd no higher than 1G. >>> (2) Reserve 64k for stack. */ >>> - initrd_base = MIN(ram_size, 1 * GiB); >>> + initrd_base = MIN(clamped_ram_size, 1 * GiB); >>> initrd_base = initrd_base - 64 * KiB; >>> initrd_base = (initrd_base - initrd_size) & TARGET_PAGE_MASK; >>> >>> @@ -232,7 +233,7 @@ static void machine_hppa_init(MachineState *machine) >>> * various parameters in registers. After firmware initialization, >>> * firmware will start the Linux kernel with ramdisk and cmdline. >>> */ >>> - cpu[0]->env.gr[26] = ram_size; >>> + cpu[0]->env.gr[26] = clamped_ram_size; Helge, is this the code using this register? https://github.com/hdeller/seabios-hppa/blob/parisc-qemu-5.0/src/parisc/head.S#L139 >>> cpu[0]->env.gr[25] = kernel_entry; >>> >>> /* tell firmware how many SMP CPUs to present in inventory table */ >>> @@ -255,11 +256,11 @@ static void hppa_machine_reset(MachineState *ms) >>> } >>> >>> /* already initialized by machine_hppa_init()? */ >>> - if (cpu[0]->env.gr[26] == ram_size) { >>> + if (cpu[0]->env.gr[26] == clamped_ram_size) { >>> return; >>> } >>> >>> - cpu[0]->env.gr[26] = ram_size; >>> + cpu[0]->env.gr[26] = clamped_ram_size; >>> cpu[0]->env.gr[25] = 0; /* no firmware boot menu */ >>> cpu[0]->env.gr[24] = 'c'; >>> /* gr22/gr23 unused, no initrd while reboot. */ >>> >> >