From nobody Fri Apr 19 02:09:22 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=1593528838; cv=none; d=zohomail.com; s=zohoarc; b=eL/HSHOR1zMNWu14RZeRvBX97PnOboSvXLMWBBwFnKux28pwRrr+Hg3Ee1tCMh2qWLMRn5byXmwMpJi9aBLk6TjfsAZA28BVxP9gt4qDva393lFM7TV5/L5tIIbMaw700mSlkSihxLEsCR8rDMRmrFraU5ItbGYn2MQRdjGeTMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528838; 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=F5EHA4k9pMmrYH4DAEWo9nj7e6rxElOy5uZfz/IbqiSgpeN9lcK7YHWR7VtoNM8IWHZhd+ukY0jkYBe39423/66goz+m9prgYZBozu8E8MTDaiNE6y135Fp1fpg9u6w5QiE/sQDtRZmx23oh/8iSQQAM27DsnuSZ6vQupYw9I1E= 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 1593528838007114.95963286221854; Tue, 30 Jun 2020 07:53:58 -0700 (PDT) Received: from localhost ([::1]:32976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHe0-0002h7-3V for importer@patchew.org; Tue, 30 Jun 2020 10:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcp-0000Nh-1T; Tue, 30 Jun 2020 10:52:43 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:35243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHcn-0002TN-L3; Tue, 30 Jun 2020 10:52:42 -0400 Received: by mail-ej1-x644.google.com with SMTP id rk21so20967361ejb.2; Tue, 30 Jun 2020 07:52:40 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:39 -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=Itp09bPnnE+v0QZj7CqVxLdfeoIdNB18dIzkFW+fquQUkVr4y9bCRdInMqHprcouzs 58Uk30JXnoEpgtiCq8zldQbrsXAGGf00a5GBPTXkRvt3kJmbUM2Wc9m6qm+2AK3N0uCp JF0AXD4wx4LvFbGFkeGAHD5zBiHEoy320fzPglBK2FaRLgs+6t2EnMHyv+ZDfWNwTrD1 Lm+Xg9PhXY08mFDRLHDvJviOzaHwGPm4RWrDLhJ3KWe9B4v6LrJZpohEpEaPaSChsy6P vdhe3iwaDN6LDcymWDSheBQloe2L0tVIB9reITQskXZ6E42hX7rPFSZLNty/xfAB73vn 4pSA== 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=ehgvnfj93GRa8JyvhBwPXm8pBWSlpx2ZvcbfFsMcnxb5jjf507xdf34Ql+VO2OaQw5 F5ZWqPBhrV8RHF5q43A/8VmeX6RUbKA6nWUA9JRQHs8IU4mPgrcFYJxbYPV+mnT/zkvP lJBr+hEHjXvi9CdL/3OzDfcADbefTNWDZ47ThxdyfVquV/6YKLK/zCwHropoDZnG7+X5 vSioN3owo+27qttjW7n2CijGMcuhqW1Wd1dbHGAzxoMww7HEC1dyHCqrVCwmQneWX1fL /H6l+dAIS+SHxuhKfmSAEd3e6a/7BmoUfO3aEw2saPdiodlkpJtAPcdJ4hH/xrslVr41 UoJA== X-Gm-Message-State: AOAM532kv8yRk7OrrplBiYI2xZfhGnpuG4R4i2lPtuY8J2tg1dK9dfZB h0e2xNvYghSU7boFeO0jAIBNYxtm1dQ= X-Google-Smtp-Source: ABdhPJwzklpD4/ZaV2FA7KY678EJmrW0ES5j3FR4K1U4OAM9BvgdsDfvwkbsjhq47NL9yKGRmqVUNg== X-Received: by 2002:a17:906:35cd:: with SMTP id p13mr18575164ejb.172.1593528759703; Tue, 30 Jun 2020 07:52:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 1/6] hw/mips/malta: Trivial code movement Date: Tue, 30 Jun 2020 16:52:31 +0200 Message-Id: <20200630145236.27529-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.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 , "open list:Trivial patches" , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Laurent Vivier , 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 Fri Apr 19 02:09:22 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=1593528838; cv=none; d=zohomail.com; s=zohoarc; b=I28jtwBnWNSOsn/RTCnWJ61QWXwCx/rClhbJyQyb3KiMzBkJqElwnrjDPb7Sf8mAnVbmNIo9bbFGHapVujOP6inMle7rXmuVwJb322ipDq+h9SJslkX2IikpLSygRQZPhHSLiCV5w9tY1b/POXBqrSuwX95+Yc5ce5V+qhwh4Sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528838; 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=lTJNI0F+mqdrboM3CbWTMvG2cwFaWVBqdpB0YZa1yJbOEK1xNDq5GR1d3JzBRXQvs/H4PE0V0Oq+4Ed2ZNxVy0hOHoFHqY+jsDocIzQCF28PqYQ2XKeenAQCfKaIF/md3RHWfFglz+fhEwIdXIVCLVZ4UFvgQirpBHUgZ7g7Y8s= 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 1593528838025998.1428564784873; Tue, 30 Jun 2020 07:53:58 -0700 (PDT) Received: from localhost ([::1]:33008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHe0-0002hu-CU for importer@patchew.org; Tue, 30 Jun 2020 10:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcp-0000Nx-WC for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:44 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:41919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHco-0002TU-52 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:43 -0400 Received: by mail-ej1-x643.google.com with SMTP id dp18so20955949ejc.8 for ; Tue, 30 Jun 2020 07:52:41 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:40 -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=BzrqMhyfyWJmJYb6+hLmV4UlnhaVaMRNqER4QghTe3FZ7e9Np6XMWC2WoW0lLNWeSB toKe2sx8h15wmDFnQMDZkj5JntKSzxpHgxbfL8q0BaAnNw8/qGMG3JQwW42jgKMAaKUw QzJvqP6YjVnGfds2/12XqovfegXzLJP8jNnC8PTiItK/nqL4d6t49+mxZYpUQRzPDHMO WLhUhu5ixupvvUdJktuoJEWeMTHQnIWy9yDF6uQ5RwSbjQ4F3h1sUrHPTxgZoo4OxYnE 6mecL7utyT3XWxfYuzoy5jht6kOKWWmR5HzskHqhes5LZ/hqYe70YEq9bVOqzPDktxfs EN5A== 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=DqDtFR4mVGi0CWqefq6GX/Rd3ew6k8kM5ubpEFOScCWGzwBvOUOnsoSn3xq7y4xaZi fhEUZHirQLffqhbGEVeF9VPQRLe+LaO+VmyKLe505yED0Nwcuzub1L3mLksfS4V/Ho+v hLYq9aAb5xB8QVNyokIx+Tai0WbHImKfPc5Dl5XsR7ZsS6BQxR5lM5gfAGQcE33Mg3Cr aqkqHZRc5LO46tjYA8jaqr6oAlZpOxPLnOFTkxXy5Kf5kGm1Re+TAT1bbvAx6CplzSbd 5NzwY8B21s8I1e3DiE1K2ULqVb5weq96duACVcUkrld5SKY+5C3m5igVxHoR+bz7n4T9 Zu3A== X-Gm-Message-State: AOAM531eGKQ2xjuwNWwz7psAHLVsQLQR9Dl/PPNuR2rcBX73KaVl45U6 7KuVCUQCQ4s2YK1oEA+gBvI= X-Google-Smtp-Source: ABdhPJxNkjSwEEXJY1xkSwZuBCZjf9MjJ5eLKqJJ4M358aSBGYn241bkEzH5hf+ZAPQwY8vwguIUEA== X-Received: by 2002:a17:907:7294:: with SMTP id dt20mr18194278ejc.355.1593528760882; Tue, 30 Jun 2020 07:52:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 2/6] hw/mips/malta: Register the machine as a TypeInfo Date: Tue, 30 Jun 2020 16:52:32 +0200 Message-Id: <20200630145236.27529-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::643; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x643.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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , 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 Fri Apr 19 02:09:22 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=1593528950; cv=none; d=zohomail.com; s=zohoarc; b=IYohkJSYzvDX/6r0bxyiLeXmfHWOpyVXHse0haXRqB4pMkrg+jRlxpMdL/7GzyQzmdRr/nGaCHl8gSrowhSJeBExpq5pHXp0J/FFXEELOCKZsaMkvpj0DLbJexLvy30ZjvVrNZrskDTsnSLcoLRrt0MVDOrBK6jnrZwHan2y2FU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528950; 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=+XdB10fDCEobjO8hrSk/rJBQM+FoznsNt4hVzvCyAVM=; b=BAwJ6QefqtM1lBSK3boecOergVs+iI+o9g3xIYdANqvM1XwULst2I65KMTIRvhYKQlgl6k2Kc0vPFDvxPpcs4+z94NOOJyZB86m0288tt2eSYZ7e49KjGrIdwSOXDapvJAV2G7CDmUFgIJb5N6n5SkKdGf4TAwDbjAZOGvSacEQ= 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 1593528950277251.6768395978835; Tue, 30 Jun 2020 07:55:50 -0700 (PDT) Received: from localhost ([::1]:41392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHfo-0006F2-Uh for importer@patchew.org; Tue, 30 Jun 2020 10:55:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcr-0000OS-1K for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:45 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:40473) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHcp-0002Te-BY for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:44 -0400 Received: by mail-ej1-x644.google.com with SMTP id o18so16511394eje.7 for ; Tue, 30 Jun 2020 07:52:42 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:41 -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=+XdB10fDCEobjO8hrSk/rJBQM+FoznsNt4hVzvCyAVM=; b=QiBY/4q7Uim+d5m45BVnCiTEvXbOiIjEmKdeycrBxhooK1xxKAyjVuyC8FN+ITBZIC 9OtmUi0sbBUEoZb8ezRY16U+LG5o5v9xac5EXXkK0evYUwFU7MhzTl9NyFvOCRf6VOLm atKhErnIobBtv3BdGHWMrzJY5ycpPKArbscYQPZFedTd/WatzCnhLCjCmxXXF1ApJrhE ad4ICft4kXdrTUvvTgbIdbwu6T6y9D4mLQi9SDwUpxs8nqqUM/JkY38wi9nWfSxtboML bzhhfk+8Rh18xXLcqiEFv2CTWrhAtfRuwppQKvS77S7TIfFgnVCZOGywNjmkZkLJeSv6 M1+Q== 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=+XdB10fDCEobjO8hrSk/rJBQM+FoznsNt4hVzvCyAVM=; b=i+7RVp21itzyOjP0hZNI3Nnfz4EIId7snQZTPWwE3dX7qQeX6xr+V6yQAwC6ihBPpb S1gtNz0as1gobImHzb59KaZdAAar0ebYzln9hNGav6MGIJQ86NC/d4gRpN/1yBHMIDTr u3dlfDhQf8dALPZn1gcX4AvS+F/qeN7s27PqXhMvqs9mU2RgdBAdiWmJwvAFEQxm86Yg IQ+EkMC2i4TjX1//bDWhtPJZZpH+A7Wv3wSv3QryKDZ2tIw+lX6fAgm3xXkXXRiJ7tpd zGbwCJXqnHrdaOh9kK1KRxNJ7hHFdpSVplEEhaUx+LL01jr8WUBZd1yGiGmptIBNvN+K 4BGg== X-Gm-Message-State: AOAM533OU+hGDj1r5UKPfEpmPG16ST0V0VG3JVToNmaUoRENzgHWeX+k 3ud9ULZV5K9+GVL5DgvOUlg= X-Google-Smtp-Source: ABdhPJwahDqyF3BAbfem5FAVU+Z28XZQo0AETSsrmu7CH/QhbMD6e7H3Xk6sZ5sFDGCNqOSPEodR3A== X-Received: by 2002:a17:906:b0d:: with SMTP id u13mr17135404ejg.342.1593528762160; Tue, 30 Jun 2020 07:52:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 3/6] hw/mips/malta: Introduce MaltaMachineClass::max_ramsize Date: Tue, 30 Jun 2020 16:52:33 +0200 Message-Id: <20200630145236.27529-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , 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 | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 2c363fe099..17a1c0d1c4 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 { --=20 2.21.3 From nobody Fri Apr 19 02:09:22 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=1593528935; cv=none; d=zohomail.com; s=zohoarc; b=B/4wU+Mz1F4WfTcelI0Cdkw75thuEuXVK67SNuAVERKvVDzlz5XHjppaCcQWgzO0+CfZT83DDLVDlM+Ts6uX1y7+iPymBhPF7aUQpaNzoPbdSnZR3Mlm4/8q9gN6JoQNL9W+6Qfd56qdQhQmRf8GNFaRYVMykv3EUdEMyvrY0E0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528935; 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=OmTsclZ69krbHFkGlVdVDCpgvstqHpOQutI2E4eWTJE=; b=MKnUksB9ZNstB8pjXiUJWGgvXzDVf1yaFAAB3DPZElEJhZ3hwvD6s+JO43KTLTvPRtUao+maTRC5+DwoTdeQIlkPlPR/phIxZWnslZ31IcNTDDA8JSrda2ewvjzyFwIZlTXInK+U+ScInjMsfquR3EBPbkM6qt094phFz5vTIdI= 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 1593528935305471.971218629027; Tue, 30 Jun 2020 07:55:35 -0700 (PDT) Received: from localhost ([::1]:40480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHfa-0005rU-2Q for importer@patchew.org; Tue, 30 Jun 2020 10:55:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcs-0000Ql-8F for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:46 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:46610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHcq-0002Tq-G4 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:45 -0400 Received: by mail-ej1-x643.google.com with SMTP id p20so20912700ejd.13 for ; Tue, 30 Jun 2020 07:52:44 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:42 -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=OmTsclZ69krbHFkGlVdVDCpgvstqHpOQutI2E4eWTJE=; b=fZopjwytNwyQsTLUd/UOL9mfsfLzLQJET/2L8bvvhoJMyYcPtA0tK1hljSpi9UrWdp UNc28Pa1otI9tRQ+NF8LR/elqjtLB95fmt+gQlsjnVn9e/Cr8O4DOlhKr5zW4yGLozN0 cKyvdMFnE8qvVYXaSPLPZMHH9FvsasgFFkprQ8NDS8BXHnsXiNoCqAJckvkhMkJ+u4vU HaKO5TC9NDOwy4XB4IxZfYUeueeliGBWdwR/fbGDB/mifkSMRHJ4VDV82pOp0wJCNRj1 wy5R20A17UJY5/ilk1Ox9FMQYuFjfSZv6PVePTnI+PxJ6+LfX7qEHEDkFb4Wr6MSFGDq AkPA== 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=OmTsclZ69krbHFkGlVdVDCpgvstqHpOQutI2E4eWTJE=; b=QN6rsdfiaB2ZoS/rB7LFNNfHBJN2oS3VUUdmJ0bWcEChOpc2LQ3pFIPwP6DwTXE8q/ +EHEU0Zrq/CxzmVzwiViQiXiqaa2BzpwDctbSz1aQ3MEooH7ikUYEKxI0LpLoc89n5VZ qQysA8LbKLf71GGvdsxPK9kDPUUHpDhA1prBQf1ICnYTLF8UD2QkUjQ+OmkaxlwhcZRh 7TLaO2ISTs4H5hmI1WmJeZWNnDY4KSFJVkpFOPntp1XkELFE1aDAbRW9aYCTtxE0uYcj iIbCZityLjZ6QBb855/ZgYfcULPwRNnXBpnCiM0VjPUU1SRglmiewSv5EkmaCw4NnpT8 Bbbg== X-Gm-Message-State: AOAM532jlfcBfEwoglcW0R/lx7K4LgS5KR+mtdwb7QOaVguD+P0FlZUp MjVg6Pqo0L9vQjk6S75Kz1TTffnH/9I= X-Google-Smtp-Source: ABdhPJz18CMp0sTk7YgIRkVpirhMUHapCk3D8bc9H5ytvQqVrsaPZfICH8x6x+fbeZf2IPqx10gTjg== X-Received: by 2002:a17:907:9484:: with SMTP id dm4mr19631272ejc.56.1593528763349; Tue, 30 Jun 2020 07:52:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 4/6] hw/mips/malta: Introduce the 'malta-strict' machine Date: Tue, 30 Jun 2020 16:52:34 +0200 Message-Id: <20200630145236.27529-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::643; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x643.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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , 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'. 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 17a1c0d1c4..209237d066 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 Fri Apr 19 02:09:22 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=1593528869; cv=none; d=zohomail.com; s=zohoarc; b=Q7IYhLnfDj2zvP83G/QZ2fQnmMwTGv1lk+2RprnSZE1MWpmiTQenoa6W3icPRETp4fEkSRGS1M9dGLYK2z77JpRnX9jv8eqmnAISNSlVNA6qDLdBXGt0yp0Nzi8BGtPpWzC1fQ9KcGYkGipN5F/K+77mHx3ljJkmp8q1+rs1l6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528869; 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=TakACgpmN29DQ1JWs/1VSOQ1s/5rYVVO7B6tdCzInUU=; b=G42/OoV3A80TOupwGbO9ZKwGz4ASk931Sk6zDkvhmVzo/Sp3l4eVRoaTsoSbL7FjsBnma4wZmDhV9NCqqwn/c4pj8IjkvY1yK8uW1UmJaeGWLWuWZT7CnqpNJpcZVTRpldQt30A7pFerT0yrtGqRWPsDXgmYbR8TEmrK5Ji8GXw= 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 1593528869481742.2662092625952; Tue, 30 Jun 2020 07:54:29 -0700 (PDT) Received: from localhost ([::1]:36180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHeW-00047s-0u for importer@patchew.org; Tue, 30 Jun 2020 10:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHct-0000TV-Ea for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:47 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:40471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHcr-0002U5-V3 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:47 -0400 Received: by mail-ej1-x641.google.com with SMTP id o18so16511520eje.7 for ; Tue, 30 Jun 2020 07:52:45 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:43 -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=TakACgpmN29DQ1JWs/1VSOQ1s/5rYVVO7B6tdCzInUU=; b=EKI1u9S4EBWzEy5MueWfeTKGdD5ZYLr8eCgyE32/7IE5e/AZDXYDg8rU70eaEKlLvx NPsTV7joVA/zHQl0XuRO56fhzHeA5XOSKH6rFwuOKnz33GK/XOCozd+BDc6/C5htQXEq qTXNtZ5DVahxWZJ+p80+C/JXwEE5xqt+yWLMc7asS0yLvZGMDrUgHeGwV4zkh+tXSNtv zht/nAc6RMRlfjlEngYsVqXrnBDluIvowfUcHgpZo81JRRTCxJgu2ZKhJ3gOOGZOOCyz FRxQRIG9YWeRV46lPSyq1XLv86yh9E7uT/6PvtA/rc6DvMrKtPSDDTEZd/8mVkiCwOD9 i27Q== 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=TakACgpmN29DQ1JWs/1VSOQ1s/5rYVVO7B6tdCzInUU=; b=sWtklX1hRVubl5sF4PnoGBGixVxuKs7cr2H7b8yOgYeZKlaS+8w9AT4UMPxRlmUWtt +qTpmAbm3hT5dsPHKqLejYy29d0esqHzB7SlXB0BKcp7gUXJt62hwfQ8c8s5cHJd8ugT 5KyGgxNr6ZFeVv4hGSBfW9zPJv372NQHC5ydKxmPaAvqk66U31EspVM0NYoNzGAUtha2 lz8YYItVypTnULtpa6AFcORJAL+bsHZzTPXvUJSPS3DqiZmrcAb/uiBDKNZiLVZRxrR2 8L3vTP6WG0dR1iGl5mPcrlAUuIi6OvXXHnpQOsKe48RscFppIohzHdrQpsJcTI+tC/Yr Sz0g== X-Gm-Message-State: AOAM533jjhKZXFs8nitlnI6zfWjT/BddkZ3ZN9+TjhiZI0CR7Mqs+aAK CZNk3nOt1bl+41OqKROEXdE= X-Google-Smtp-Source: ABdhPJwdbi7yRKtak+Y65S2GSQ6LgCMdhdPPOl6ilArvFqUGANMiPeKgZbibhfUPEvEniZo3toXIAQ== X-Received: by 2002:a17:906:8401:: with SMTP id n1mr18395959ejx.479.1593528764491; Tue, 30 Jun 2020 07:52:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 5/6] hw/mips/malta: Verify malta-strict machine uses correct DIMM sizes Date: Tue, 30 Jun 2020 16:52:35 +0200 Message-Id: <20200630145236.27529-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , 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. 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 209237d066..63c1d5ea5f 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 From nobody Fri Apr 19 02:09:22 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=1593528968; cv=none; d=zohomail.com; s=zohoarc; b=ZAQTzbwh3aDNYIoeYEtz1IBSIIOB1F6s8LWMuRyJ9FmWxn7BzTY7cXrZQIg0uKrJ043SM2MgfSPUDSE1UMmNORtN1CahnZNjEGZOYNFy1WRBNBZcFDRB2em3roGCTBjBtdGIsQuRav8Jk8LEF38Q3SaURfH8J54rnQncSF2ikeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528968; 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=eR9kP7Fz+9gQhaNg+BX9SC6Oil6Qv/iwmZJA+m/P2z8=; b=lyBzeISiX4Z6xeqI54uNN1CqpvmvYkj/7GtEz1o3cG5m6v5QPt59GCBMZcd0KZ7O/bgOyTA2Iw6YYk9zS2Shc5fI6oCeEY5oprHV8ekOlgl5m79zCO2QJkT5DO3+rFWPgT+pTmv0J+jLTZLMUezYGvq76dmKvwgTzHpyNTy/wJI= 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 1593528968599179.00282547591814; Tue, 30 Jun 2020 07:56:08 -0700 (PDT) Received: from localhost ([::1]:42930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHg7-0006wZ-CH for importer@patchew.org; Tue, 30 Jun 2020 10:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcu-0000XO-Ra for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:48 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:35244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHct-0002UH-6t for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:48 -0400 Received: by mail-ej1-x643.google.com with SMTP id rk21so20967759ejb.2 for ; Tue, 30 Jun 2020 07:52:46 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:45 -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=eR9kP7Fz+9gQhaNg+BX9SC6Oil6Qv/iwmZJA+m/P2z8=; b=IM0VIel6TLMIbnilKQNCq4GpNnsYnQ82Q7PxyiiTSGVg47BXqTyELVHldTJu9KZno0 Y1K/fvRaxrL7WtiQK0efSuTsdjEC2b28V8Fdt+g29FLqlDbhvhu/wm2Lo3Ni/3BJzDbg hbNtrYoAKsR8rLrQdWxcbAHKo3zmMYuTtQCpFlYJ4SbD3xgITx6h0cfiOicplr34Emjr IW8++ef9FATKI4ptQUcNItTEjkMDs1blP08XPZJKxxIjzhLxN1g7ymobamcjfWiEsJVp 4rdW5vr4nQS6BspglmyZwFwRqwaCkUlbph9RZ7vDCSVNhVV6C23xPQYw+FmMjDxF/kN9 p/5w== 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=eR9kP7Fz+9gQhaNg+BX9SC6Oil6Qv/iwmZJA+m/P2z8=; b=pA4F7wbXKobEQW+W5g4aL4etl7ionjfWcxZde48PKdyn7/QQ4iSrDzdz6SMpGfiSd7 IRzjmGfwoI8pn0l/0X3C1xPF6fZqpAzsdnhVwKUbsitg7aJnfejeeAv6fbeBVBYgYfMN GGQMRJPzqpPGlH4ki4MepXGQigp2ELYdEx5FIZxdbEQFkhUQru9APaBVlngQlIbrlKGN BVRDw9We0GdePBdxoY9fzze1i2hl1tVbcFZGRWpz8okIOPo1DgmHEQqNWP9FqYLZKMcX R1exZTM9Ogc4HJ6ei3rYpAH98sKz+92YQEqI1477b8iyI7UElXo5FKlj8BPBy4wMm9tH 9T7Q== X-Gm-Message-State: AOAM533YZARuKy7TeTCs18EJKnv/Pt5XS772DL03JKA0KPbTzRxZhQym jKxGClI+2pLQ19hR/epMRNU= X-Google-Smtp-Source: ABdhPJz0l1FpXALqfLJPKtaGdB5u40cuqgm4dPaanc+7JJ+HKznRm1eb43W+9b50iK49+2RSzbPS4A== X-Received: by 2002:a17:906:33ca:: with SMTP id w10mr10996175eja.171.1593528765911; Tue, 30 Jun 2020 07:52:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 6/6] hw/mips/malta: Introduce the 'malta-unleashed' 64-bit machine Date: Tue, 30 Jun 2020 16:52:36 +0200 Message-Id: <20200630145236.27529-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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::643; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x643.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, URIBL_BLOCKED=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 , Ximin Luo , debian-mips@lists.debian.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Jonathan Jackson , Aleksandar Markovic , Martin Quinson , 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-unleashed' machine. This machine does not model any existing hardware (as the default 'malta' neither model a real hardware). The purpose of this machine is to allow user of the current 'malta' machine to use more RAM, as it has been reported to be useful for build farms. References: - https://www.mail-archive.com/debian-mips@lists.debian.org/msg10912.html - https://alioth-lists.debian.net/pipermail/pkg-rust-maintainers/2019-Janua= ry/004844.html - https://www.mail-archive.com/qemu-devel@nongnu.org/msg691406.html Cc: debian-mips@lists.debian.org Cc: Ximin Luo Cc: Martin Quinson Cc: Aurelien Jarno Cc: Jonathan Jackson Suggested-by: Yunqiang Su Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- This patch is RFC because an upstream QEMU maintainer disagree with this approach, but I'm sending it so interested folks in the community (Debian or other) can test it. Previous discussion on Jiaxun Yang's patch: https://patchwork.kernel.org/patch/11416915/ --- hw/mips/malta.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 63c1d5ea5f..1695994493 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1505,6 +1505,20 @@ static void malta_machine_strict_class_init(ObjectCl= ass *oc, void *data) mmc->verify_dimm_sizes =3D true; }; =20 +#ifdef TARGET_MIPS64 +static void malta_machine_unleashed_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 unlimited)"; + mc->block_default_type =3D IF_IDE; + mc->max_cpus =3D 16; + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("20Kc"); + mmc->max_ramsize =3D 3 * GiB; +} +#endif /* TARGET_MIPS64 */ + static const TypeInfo malta_machine_types[] =3D { { .name =3D MACHINE_TYPE_NAME("malta"), @@ -1516,6 +1530,13 @@ static const TypeInfo malta_machine_types[] =3D { .parent =3D TYPE_MALTA_MACHINE, .class_init =3D malta_machine_strict_class_init, }, +#ifdef TARGET_MIPS64 + { + .name =3D MACHINE_TYPE_NAME("malta-unleashed"), + .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_unleashed_class_init, + }, +#endif /* TARGET_MIPS64 */ { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, --=20 2.21.3