From nobody Mon Apr 29 07:36:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593547128; cv=none; d=zohomail.com; s=zohoarc; b=HUnihCW13OL3ttXv+/IBV67xJ1+F0CHUb0aR//nKyFf/1VZzg1wTz/rXPJeMA2oSclZIJPkDBHz3KjbMy+tX4QzROjWmRJGxuVpPYBFFumcpumLfxLbX21tLfQWwlSaWBrNrcWcvPSwG0G4hdZSsNwqkrzWRU+vs0CqYb/uCbMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593547128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=QHtAF2o/QLzxqAzHkwXCqh3CaY88FfIjzIghXu59h5z+IZ/G79FcFHG4e3lAS84aRZ0APNVpcIdau0i3dspdvW4d0rTOljUUCKob7E+RFgskmKKBafnd0onaYtLIHP7+zkmw+6aZW/OGuv17001Yz3S7Qd3RKoYQnGt7ZCAVaq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593547128823572.2002398359842; Tue, 30 Jun 2020 12:58:48 -0700 (PDT) Received: from localhost ([::1]:39822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMP1-000196-JH for importer@patchew.org; Tue, 30 Jun 2020 15:58:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNm-00089N-9J; Tue, 30 Jun 2020 15:57:30 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNl-00044X-1U; Tue, 30 Jun 2020 15:57:30 -0400 Received: by mail-wr1-x443.google.com with SMTP id q5so21326445wru.6; Tue, 30 Jun 2020 12:57:28 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=EkBDPDfm41QjdCyNFfSY3uO9T/oVk/BxIFYE0qDNx+tazx1A4MerVH4FuVtKqPYRAk HPgkYhV0xwggFAYHGpuW1hRR1ZJ2ENpqci1WoNwpu6seNx6nMaegjFFeQnt+BJhLsLay RBpdDcMJmxijtCkxTbnDDa6ciL2TYlvxcDMxwePlKFNRMqiFzJR/ZY/P9LRA0evleq7B 8gPlOXojQZasRhB2eh0vwmIjhAJiJvXqw9EXX3y4+wqsHqWxuTH6Zdl4GtZoJPQuuHaf LbJuqP/EjPR/uS8YUV9M7h6HVX8dRYVy0wa3Sp/Mhf68Z6e1UNPjWm9NKs0OyZA1vwuZ wj6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=RyshWyFOkuXxlTbFEjrf5OgHXwaOXi7HMoC6uv6NYzDOT6tj4uIWy+NPkywbZifQXJ DnJtvhCMBCuNauwS69/RluUA2Y+F0xnsddXeldnywbCOMo/1uX2BP44mr0Ly3QQQ8XQc iv4NqK6Yy09X0B5/MR1VOYIy2haQs5vBT9L1xLUD0bLH4ctG0WClh/KaWju8hleJ+lkS 6wjwF/cbOFrBIYVwkywFf65LGGTvTHMgZfHpL5DeB/s2ZVTF9Za2NHZ3/tC68UIEfZ6/ Cr9K8PIliDRi/qV1VE+BthW9P+RKi988EhmJHHAEH7OHjc9ZEOmzW/QnglNIxnTMpdPm 1Zjw== X-Gm-Message-State: AOAM530fvCVCxaPBKEB4Y0xMT0dMAzSRW/7fcgFESqVG2yEfWzye5yJn 8rkPfqRjUDzFTmkxsRssOtBqKpRcg5o= X-Google-Smtp-Source: ABdhPJx2wD5QVQlaXTpGyvQCGyqHMszfdzf6bxNLksOfafCeVC68Eut2P33k2F5fh5WY+mPzFlTdXQ== X-Received: by 2002:adf:f5ce:: with SMTP id k14mr22106264wrp.234.1593547046627; Tue, 30 Jun 2020 12:57:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 1/5] hw/mips/malta: Trivial code movement Date: Tue, 30 Jun 2020 21:57:19 +0200 Message-Id: <20200630195723.1359-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Trivial code movement to make the next patch easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index d95926a89c..5b371c1e34 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1426,6 +1426,13 @@ static const TypeInfo mips_malta_device =3D { .instance_size =3D sizeof(MaltaState), }; =20 +static void mips_malta_register_types(void) +{ + type_register_static(&mips_malta_device); +} + +type_init(mips_malta_register_types) + static void mips_malta_machine_init(MachineClass *mc) { mc->desc =3D "MIPS Malta Core LV"; @@ -1442,10 +1449,3 @@ static void mips_malta_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE("malta", mips_malta_machine_init) - -static void mips_malta_register_types(void) -{ - type_register_static(&mips_malta_device); -} - -type_init(mips_malta_register_types) --=20 2.21.3 From nobody Mon Apr 29 07:36:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593547164; cv=none; d=zohomail.com; s=zohoarc; b=lEdcfb+pVWkAq9yUO3aegpyoIaSCslpYiRpzBfXQ9YXJko/11oq0RNKAyvXcHd3re7VKtRKzu041PT5CT+oyRkFaGtRk9WBWfxEM97SodQ+LpMZ5cuI8+fC8JSjYG2gOW7yRz+9hyTT7a//NMJ82TmS+hfYiS7x2Fv/0dC1qXSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593547164; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=GsE2AycUwFdGOwVFvbRfCzY3YmciZnXyQlTxiUw8inaKcAgl5MoAKVrY5dAWzTfhegD2OC45XZEhL3IcA7jIJYM7TvzT2wmucDeAlr3NNEPQ1gclcYce5tXdeekXMRXbBKHxIm9vAcTqA7tHmodxu+u6K+25HZajfkXzBBj2yfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593547164216500.83247212551566; Tue, 30 Jun 2020 12:59:24 -0700 (PDT) Received: from localhost ([::1]:42848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMPb-0002Np-10 for importer@patchew.org; Tue, 30 Jun 2020 15:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNn-0008AM-M8; Tue, 30 Jun 2020 15:57:31 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNm-00044i-AK; Tue, 30 Jun 2020 15:57:31 -0400 Received: by mail-wr1-x443.google.com with SMTP id j4so18891574wrp.10; Tue, 30 Jun 2020 12:57:29 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=st2f5jHzkDXtLpQRrsqw/Nr0au22+Hdqty+Sj1rUZUlkByIlm5UxySsRXE4QecpDl1 3yC6nkdPB0yxtjsKgLjPoM9rWEtR2RYXHA4pkb402QDvruf0kBjITYP8VMDcqAMdP/sT /N+lZPWOXm5IOeN73Zq7eSb5UC8xKSoGvsW/8jCGi2tkWpWPQCWjX/ayc7Fsts0YwnVZ wwCwwlS/Ld8LnMNZ7FbbEr+QmeNKgUQV+Zj3sJVerCcjOOnrczYDxVdxgvQk2dkCg75e xVBLnXNmch0synTEGYkp3y8wUsWrf3SfaHNHxtLGKyj53ic7wIBQJZJUaP0E855BAg7j KxWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=HJFff45MUg8yVTRchZp2fkkHbpcckFGX2+jod35naTesP+gkQKE0ZaraAIA9HewWhd 87bGTzSZPO7icakhYwSTu0DB9TU2E5Q0BCNMWv89nVYJKZNcodCIwKfsbWUD7sVTdf0E hM/LRg1avg5RpEy+Fmei/+6PfnaKYCEcdXJytkOQ+iHMQZ5oPfJ3O9ghnhtPv795Q/TL j2eUGcNyp5pxHc7+MNidKlozzlteI1ZpTuWwh5RTlwy2GMorvQ+srM9b49lVmxhxZ9Jj qP/hFk6hCdyVMpAfwK/SLMISpXGpVH7XjRFTDmn8pujrBRYwMG4JF9XznIt/3l9hDdHx 12tg== X-Gm-Message-State: AOAM53325eS4zY4KOd04vzUyHoE9wsR4hruGw8W7UGh+Cli+7ZGwk6Io 9fxy0gQkXVzbYLHehW+SQCBPnVHPts0= X-Google-Smtp-Source: ABdhPJyQzCZFXnMGjlUTPWJ4NXnTAWmt4OquinCnriFMwmLd/IVcN2uWfkcnNko4rReRPbO2FBOAjQ== X-Received: by 2002:a5d:68cc:: with SMTP id p12mr22903305wrw.111.1593547047790; Tue, 30 Jun 2020 12:57:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 2/5] hw/mips/malta: Register the machine as a TypeInfo Date: Tue, 30 Jun 2020 21:57:20 +0200 Message-Id: <20200630195723.1359-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , qemu-trivial@nongnu.org, Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We want to add more machines. First convert from the old DEFINE_MACHINE() API to the more recent DEFINE_TYPES(TypeInfo[]) one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 5b371c1e34..2c363fe099 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -70,6 +70,8 @@ =20 #define MAX_IDE_BUS 2 =20 +#define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta-base") + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ @@ -1433,10 +1435,19 @@ static void mips_malta_register_types(void) =20 type_init(mips_malta_register_types) =20 -static void mips_malta_machine_init(MachineClass *mc) +static void malta_machine_common_class_init(ObjectClass *oc, void *data) { - mc->desc =3D "MIPS Malta Core LV"; + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->init =3D mips_malta_init; + mc->default_ram_id =3D "mips_malta.ram"; +} + +static void malta_machine_default_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "MIPS Malta Core LV"; mc->block_default_type =3D IF_IDE; mc->max_cpus =3D 16; mc->is_default =3D true; @@ -1445,7 +1456,20 @@ static void mips_malta_machine_init(MachineClass *mc) #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); #endif - mc->default_ram_id =3D "mips_malta.ram"; } =20 -DEFINE_MACHINE("malta", mips_malta_machine_init) +static const TypeInfo malta_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("malta"), + .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_default_class_init, + }, + { + .name =3D TYPE_MALTA_MACHINE, + .parent =3D TYPE_MACHINE, + .class_init =3D malta_machine_common_class_init, + .abstract =3D true, + } +}; + +DEFINE_TYPES(malta_machine_types) --=20 2.21.3 From nobody Mon Apr 29 07:36:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593547237; cv=none; d=zohomail.com; s=zohoarc; b=GFKVBYVA+AzlecnpQS4N54SInaTH6l5ngYr5xJ6yLU+Vgo6zyEQDR1sQlEbh5xor2nrQfQMRK/xWKTfeNWjnoUEf0Djv78Dqxo1K84/QmtY6kWkY7mOO+buy6e+zHZkR3RtONGVqQDd84nqxfeV7Lbxia05fU9KLdANx4zhpbSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593547237; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lGgsVeM7xoHM5WlT4+jBVtk67mhg6dUQrt0VXLrUTZc=; b=bdE6jKyy4UOhbqKmFSGUsOsMeq6p1j1ETX9Tll9LFH27kR0rZVuxtj4QhVmxV13pSy1auHROlWOf4+2StvUsyLOMpQz3zvYcUQOwwCOd0wq+Nd/kxfv9SBxQ3vVyMfJ81HXn6yBld0GjLFet/orhrzRHIjF9YurkVt6IBtBvzHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159354723679988.48983975091517; Tue, 30 Jun 2020 13:00:36 -0700 (PDT) Received: from localhost ([::1]:45992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMQj-0003eE-Qf for importer@patchew.org; Tue, 30 Jun 2020 16:00:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNq-0008HK-Gp; Tue, 30 Jun 2020 15:57:34 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNo-000454-Tg; Tue, 30 Jun 2020 15:57:34 -0400 Received: by mail-wr1-x444.google.com with SMTP id a6so21339531wrm.4; Tue, 30 Jun 2020 12:57:32 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lGgsVeM7xoHM5WlT4+jBVtk67mhg6dUQrt0VXLrUTZc=; b=KuOdhOlSzpdz+8R7fTn/jjj5b3nIMecaYResNGEaEOqYaSzQtALmDdwllASsDVATxi l3H4y39wFNfJBtFjWlx1n6VjOq91YcCZ+yRbELRaCGI7pamKAKIn0eg8yB8wQRPMYQtV ut/ABmVo1dTLuaXFA/EV79ZlzgdYLgeVkE99hoVFQSBGmxVIsIVhDlP6jneCPzGhYEIf ObYYgmj7jvDKmvebl2iwVwNR0tW1zDhGAvHuU2jUc9flzEVBCp6TB2LlUUmmaq2rxh71 kSWnrpw3ZBL6TRA7Aaq/kJhpCNK+Xb/fBYqxE/4UXB+cC+RwIdE/GqfgG9cr4H1eDCv8 ccmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lGgsVeM7xoHM5WlT4+jBVtk67mhg6dUQrt0VXLrUTZc=; b=ROny5cgFjeD0m0NbwBka39BXNpgwujJmNnKSc3FxC7j93gdtPrvan3np95Znb7oRA4 3IoJpGsOvC+LQTDfo0rQgNypQF+SsbmuE64pAqjxIWvnSc0/CAhGeupRNtoTZH+NUxET g9x/nqqth1SKsBQf5Lh5B8Q48TnMoRIl5aZpitVDc614f8gbcm5KnGKILregw6DK83dK jXn0wR+Uaw3zTOTnbz4A//QwzfoOtZPU/Mw9fLCx229Bk5Yn+hB9eURXQxzG3Q5DKCvz Htb8VRkIuLsnwPjkSEcW5P50E9LKLZsrxeOVV5HMZTN12Dy5bfEpKE9myVp+oyd3ASw8 S4qQ== X-Gm-Message-State: AOAM5302hjJS1ZTN2wKIWBpVeooC7+yyvULLcJD/SzpJFDr+ljUMCD/j HLM06UNVj5CZu7fUGOsLyTIEK1Hjg3E= X-Google-Smtp-Source: ABdhPJwbWdNuJ/eygtiCiSvlcovQYHtvYLu1uBvKsSQYPFhmUIxz+gJPdOAkuD7o1aKETkSpSObRzA== X-Received: by 2002:adf:a111:: with SMTP id o17mr22820045wro.257.1593547049065; Tue, 30 Jun 2020 12:57:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 3/5] hw/mips/malta: Introduce MaltaMachineClass::max_ramsize Date: Tue, 30 Jun 2020 21:57:21 +0200 Message-Id: <20200630195723.1359-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , qemu-trivial@nongnu.org, Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The maximum RAM size is tied to the machine. First add the MaltaMachineClass, and add 'max_ramsize' to it. Set it to the current value of 2 GB, and adapt the code checking for the requested RAM is usable by the machine. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 2c363fe099..fd4964e8b0 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -56,6 +56,7 @@ #include "sysemu/kvm.h" #include "hw/semihosting/semihost.h" #include "hw/mips/cps.h" +#include "qemu/cutils.h" =20 #define ENVP_ADDR 0x80002000l #define ENVP_NB_ENTRIES 16 @@ -71,6 +72,17 @@ #define MAX_IDE_BUS 2 =20 #define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta-base") +#define MALTA_MACHINE_CLASS(klass) \ + OBJECT_CLASS_CHECK(MaltaMachineClass, (klass), TYPE_MALTA_MACHINE) +#define MALTA_MACHINE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MaltaMachineClass, (obj), TYPE_MALTA_MACHINE) + +typedef struct MaltaMachineClass { + /* Private */ + MachineClass parent_obj; + /* Public */ + ram_addr_t max_ramsize; +} MaltaMachineClass; =20 typedef struct { MemoryRegion iomem; @@ -1232,7 +1244,7 @@ void mips_malta_init(MachineState *machine) DriveInfo *dinfo; int fl_idx =3D 0; int be; - + MaltaMachineClass *mmc =3D MALTA_MACHINE_GET_CLASS(machine); DeviceState *dev =3D qdev_new(TYPE_MIPS_MALTA); MaltaState *s =3D MIPS_MALTA(dev); =20 @@ -1248,10 +1260,16 @@ void mips_malta_init(MachineState *machine) /* create CPU */ mips_create_cpu(machine, s, &cbus_irq, &i8259_irq); =20 - /* allocate RAM */ - if (ram_size > 2 * GiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 2048MB", ram_size / MiB); + /* + * The GT-64120A north bridge accepts at most 256 MiB per SCS for + * address decoding, so we have a maximum of 1 GiB. We deliberately + * ignore this physical limitation. + */ + if (ram_size > mmc->max_ramsize) { + char *maxsize_str =3D size_to_str(mmc->max_ramsize); + error_report("Too much memory for this machine: %" PRId64 " MiB," + " maximum %s", ram_size / MiB, maxsize_str); + g_free(maxsize_str); exit(1); } =20 @@ -1446,6 +1464,7 @@ static void malta_machine_common_class_init(ObjectCla= ss *oc, void *data) static void malta_machine_default_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); + MaltaMachineClass *mmc =3D MALTA_MACHINE_CLASS(oc); =20 mc->desc =3D "MIPS Malta Core LV"; mc->block_default_type =3D IF_IDE; @@ -1456,6 +1475,7 @@ static void malta_machine_default_class_init(ObjectCl= ass *oc, void *data) #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); #endif + mmc->max_ramsize =3D 2 * GiB; } =20 static const TypeInfo malta_machine_types[] =3D { @@ -1468,6 +1488,7 @@ static const TypeInfo malta_machine_types[] =3D { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, .class_init =3D malta_machine_common_class_init, + .class_size =3D sizeof(MaltaMachineClass), .abstract =3D true, } }; --=20 2.21.3 From nobody Mon Apr 29 07:36:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593547306; cv=none; d=zohomail.com; s=zohoarc; b=U0j514/Aw3PJbJao+JUPl4nvgpAv7uRSzI09Hc3xnZjKth2Ok4JOvjDzMKGEN62x7wsADRTISL6g6btco9v+10/yROAESKK1pPt96pvgKkti7U+b9yxxepvq2tKO2dcsziuMGvkZpH2nsVk2sQ7iOk6QuBCZU4jO7Mdb+iElt74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593547306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iFQg1LbB7oBkec8SsW9c8MK3l/Vx4TGs6vo4R9ShZxw=; b=dpZLY0IOj2X8vWRb5PGij7diIk4Oy0uwnGs4q3yvDoBO3f/H8p1r8DDDfHPGExd3YtTCpM4JcdPSOcalp3BI+enYFUdfYAmh8UXbUwGGJ5v3XZzGS9kP8e5oCPsvfAbGnNm0zC2vWm8GMiK0ih9ijuAsYPLEcJ/bps0v1BmRRlM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593547306345991.9574220146725; Tue, 30 Jun 2020 13:01:46 -0700 (PDT) Received: from localhost ([::1]:48126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMRt-0004c1-63 for importer@patchew.org; Tue, 30 Jun 2020 16:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNq-0008IH-UU; Tue, 30 Jun 2020 15:57:34 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNp-000459-Aw; Tue, 30 Jun 2020 15:57:34 -0400 Received: by mail-wm1-x343.google.com with SMTP id f139so20772138wmf.5; Tue, 30 Jun 2020 12:57:32 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iFQg1LbB7oBkec8SsW9c8MK3l/Vx4TGs6vo4R9ShZxw=; b=FPDsQL2xp+oHqcUjDOd1EGwxl0TNI6zelCf94c9ssNR0ni2Gj+sKEzXAacn4qMHNNl dD8qOBMs7O6xolYUaztQpFdjLFM90Rdh15hEtLQzR+A/N69wvfXtWIflA8y9dhF+2f7N RJHRB+8pij5SURMVoAQGJOHGVG1GjW2zN50cg+yT07QxQtU/gq70erYpTnHDnl0yvLIC kTsnTP2mNpxdwiI7MOzbYRld+UzpHmln6vJqLv4VG9MUjmxkgOv5r5Oy41PDogQ/bV78 QExHJ2h/Pf2LIjASHeJpfHf923MEeaeZZIUv7N3Ya+6Di+7E05nL8imFT2MZkRt1bbeh oAvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iFQg1LbB7oBkec8SsW9c8MK3l/Vx4TGs6vo4R9ShZxw=; b=VetMNtfUh4Kj77WrY2FhhMQyRuU5mnlvgw9L7I5K3yFT7Y3v+X7Mr2TmEcsp6vpsyC E6EQi9cyztvJg/LQCvanH8wgZcWp/luzCEOhB3kHkX7hkocH/QhKUQRg6Ll0TOqbhLNr 3UJhHpOZhao9VHJ2UAE7mTJV4FjNzXcvCp+8B4s+ZprHRuwtr3jogiMvUDR8WifK7G7S Gv1bJVyfpCPGD8qcs4CJ6PdU9FdhzI9kh+V/NTneslNVmgpa+gysUfNcmTWoZqn0P3+8 YRl1Wf+7YnbNaVAt3lkw0gsldKGbKwUr/z8tcTv4ZT7eyGnd1umqcU0lb/0jnyrBMBAM 7tLw== X-Gm-Message-State: AOAM532Vbir3EFGmhOSR1NqwxXrCvvthlnAvljP0TjCknMKGUVspqDGU WPicPUDvtgVx/dJ5mNMmGSJGoJN6ogs= X-Google-Smtp-Source: ABdhPJyZD8J1RdqAOXU6Zegu7pmBx7Jmt8x99Z+U8qagNZgEX7gN3VgTkCF1LLJjVlSkM/GyBXEJLg== X-Received: by 2002:a05:600c:241:: with SMTP id 1mr18833233wmj.119.1593547050191; Tue, 30 Jun 2020 12:57:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 4/5] hw/mips/malta: Introduce the 'malta-strict' machine Date: Tue, 30 Jun 2020 21:57:22 +0200 Message-Id: <20200630195723.1359-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , qemu-trivial@nongnu.org, Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Introduce the 'malta-strict' machine, aiming to have the same limitations as real hardware. Start with 32 MB which is the default on the CoreLV, and allow up to 256 MB which is the maximum this card can accept. See datasheet 'MIPS Document Number: MD00051 Revision 01.07'. Example when asking a too big amount of memory: $ qemu-system-mips -M malta-strict -bios /dev/null -m 512 qemu-system-mips: Too much memory for this machine: 512 MiB, maximum 256 = MiB Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index fd4964e8b0..ac4a618751 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1478,12 +1478,34 @@ static void malta_machine_default_class_init(Object= Class *oc, void *data) mmc->max_ramsize =3D 2 * GiB; } =20 +static void malta_machine_strict_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + MaltaMachineClass *mmc =3D MALTA_MACHINE_CLASS(oc); + + mc->desc =3D "MIPS Malta Core LV (physically limited as real hardware)= "; + mc->block_default_type =3D IF_PFLASH; + mc->max_cpus =3D 1; +#ifdef TARGET_MIPS64 + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("5Kc"); +#else + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("4Kc"); +#endif + mc->default_ram_size =3D 32 * MiB; + mmc->max_ramsize =3D 256 * MiB; /* 32 MByte PC100 SDRAM DIMMs x 4 slot= s */ +}; + static const TypeInfo malta_machine_types[] =3D { { .name =3D MACHINE_TYPE_NAME("malta"), .parent =3D TYPE_MALTA_MACHINE, .class_init =3D malta_machine_default_class_init, }, + { + .name =3D MACHINE_TYPE_NAME("malta-strict"), + .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_strict_class_init, + }, { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, --=20 2.21.3 From nobody Mon Apr 29 07:36:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593547390; cv=none; d=zohomail.com; s=zohoarc; b=HZyq2BfK+Rm8XCLzu00Fh8W9zHo7/79Sf/AiYIaGedPtlzTwo6Gxs5W2dvNyPeCYemtAEYCTaIw2rm4TCiFERWizc/heYDLc4v7EjR+jtenDv0aawATzoSkskToCaXT2IlNCJxsVDZpCOLS5Tbo5/tbBN8w+cFdeHJ22B6raHYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593547390; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nCLgw9mQp+ua1T7qd5IhM0F5v0NpMBrPaJh73a54bRE=; b=QKvxijGO7WgURYuNaYzT6TBM4h9enm/xjmLTbiU41K06s790pemlelWQLgV7HHLWttvcXt989K9JYMIr0/HVId15m7sHH+O5tUvvRYpvGn34VrXdq57Eb2pTwJtzABqxd887+qbItJGKAxLb9ttiX3mIF8W2s7Lc0KHS+/Nv+/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159354739042779.25723787582808; Tue, 30 Jun 2020 13:03:10 -0700 (PDT) Received: from localhost ([::1]:50640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMTE-0005uG-Pn for importer@patchew.org; Tue, 30 Jun 2020 16:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNr-0008LM-Vq; Tue, 30 Jun 2020 15:57:36 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNq-00045P-DE; Tue, 30 Jun 2020 15:57:35 -0400 Received: by mail-wr1-x441.google.com with SMTP id a6so21339600wrm.4; Tue, 30 Jun 2020 12:57:33 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nCLgw9mQp+ua1T7qd5IhM0F5v0NpMBrPaJh73a54bRE=; b=AEs0BuyEXZ9RJeamwrF5xxzbXzcrkKyRkUalsvgurBeAWQoxrkqvz8hIy8DlYw/MCF /XPuqmSk9nw18tRL3jOcTFRF1YBrScSyrlbSxbIkadbLdC6sOzX0mJqXRvEqjymudgSi GyGloSYJqKL8A1m+vWlAjZl4NbdJuJ0nhcqfekPZylbLQJ8BLyBsZCRFGKrrH6YUkZ4b VzzF9O4pCCAI9J1dICuZ3iztv6lMtUW1uELzG1g40muQhu+ZUk1OpzAtrkCqzPfASjBV sRU63pCLIKW8oz2dnFOFC+Q/dSjhXaMdyqcRwPGs1p+n/R70t3HbaJ20WYo0OPUa+jh2 Y0kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nCLgw9mQp+ua1T7qd5IhM0F5v0NpMBrPaJh73a54bRE=; b=tCK+FMlcTsdyfKga4CmOpEukNvutiLEB5wpid7gXWhRc8447rk9S+Cj82nyekZ+IDg JyV2P79JmvpQZolZKRoe1ylsTq823MmrYBPiPTVGVxkA/FRAF/nqMLU4YZiexdmcb2mT k4fst7G3X4RO84uMSn1Wf8c9OpA44YAGFo597+0x9k2SNnMv7OpIOcGmnO7c8ukkhAuM TNr1zZnVVcmFbR86BpeQnP3XY+12GOAc7eh/+vQS9CwU+LbzP3XbMkR51LrMkORCDucM ZRh7CEUN2DdiFFDdAWC+Dgcx/vg9AAcZorv1ErGQA+9DRynqiasooHy90fdmcZLV5b1Q L4mA== X-Gm-Message-State: AOAM532ea7wThQQwe/4F7utf07KIQj+rq43x+gVi9s/35BSDvLRmke5d XvL1PeGwqNtnI1SSrMjmk0oh+1FSfLk= X-Google-Smtp-Source: ABdhPJwXCQTVM8a4o8RulKkr4VZJe/q3S+ws33vjOgb3Fjsn7A8QuR5r8Acv6p4/8OpiigMUK17R1w== X-Received: by 2002:adf:aad3:: with SMTP id i19mr23380514wrc.359.1593547051296; Tue, 30 Jun 2020 12:57:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 5/5] hw/mips/malta: Verify malta-strict machine uses correct DIMM sizes Date: Tue, 30 Jun 2020 21:57:23 +0200 Message-Id: <20200630195723.1359-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , qemu-trivial@nongnu.org, Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The machine has 4 DIMM slots. Each DIMM must be a power of 2. Add a check the total RAM is a good combination of DIMMs. Example when asking a combination not power of 2: $ qemu-system-mips -M malta-strict -bios /dev/null -m 252 qemu-system-mips: RAM size must be the combination of 4 powers of 2 Working example (as 100 =3D 64 + 32 + 2 + 2): $ qemu-system-mips -M malta-strict -monitor stdio -S -bios /dev/null -m 1= 00 QEMU 5.0.50 monitor - type 'help' for more information (qemu) info mtree address-space: memory 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-00000000063fffff (prio 0, ram): alias mips_malta_low= _preio.ram @mips_malta.ram 0000000000000000-00000000063fffff Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index ac4a618751..17f5833a94 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -71,6 +71,8 @@ =20 #define MAX_IDE_BUS 2 =20 +#define DIMM_SLOTS_COUNT 4 + #define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta-base") #define MALTA_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MaltaMachineClass, (klass), TYPE_MALTA_MACHINE) @@ -82,6 +84,7 @@ typedef struct MaltaMachineClass { MachineClass parent_obj; /* Public */ ram_addr_t max_ramsize; + bool verify_dimm_sizes; } MaltaMachineClass; =20 typedef struct { @@ -1260,6 +1263,12 @@ void mips_malta_init(MachineState *machine) /* create CPU */ mips_create_cpu(machine, s, &cbus_irq, &i8259_irq); =20 + if (mmc->verify_dimm_sizes && ctpop64(ram_size) > DIMM_SLOTS_COUNT) { + error_report("RAM size must be the combination of %d powers of 2", + DIMM_SLOTS_COUNT); + exit(1); + } + /* * The GT-64120A north bridge accepts at most 256 MiB per SCS for * address decoding, so we have a maximum of 1 GiB. We deliberately @@ -1493,6 +1502,7 @@ static void malta_machine_strict_class_init(ObjectCla= ss *oc, void *data) #endif mc->default_ram_size =3D 32 * MiB; mmc->max_ramsize =3D 256 * MiB; /* 32 MByte PC100 SDRAM DIMMs x 4 slot= s */ + mmc->verify_dimm_sizes =3D true; }; =20 static const TypeInfo malta_machine_types[] =3D { --=20 2.21.3