From nobody Tue Dec 16 07:06:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15209831969711002.9630173865464; Tue, 13 Mar 2018 16:19:56 -0700 (PDT) Received: from localhost ([::1]:43452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtD2-0006ba-2s for importer@patchew.org; Tue, 13 Mar 2018 19:19:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiN-00061E-C6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiM-0003oj-Cd for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:15 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiM-0003nW-66 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:14 -0400 Received: by mail-wr0-x241.google.com with SMTP id h2so2480283wre.12 for ; Tue, 13 Mar 2018 15:48:14 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:12 -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=8RuZJSRYSi9JcAVrCNicdklVykQ+67TVPTnceLb5E6w=; b=IMwJ1wub3weVSMqDH83r+Dk4lQehnfQzfHPouvffFFdtrQQiFWrO4p0WducK8DWXyX l4LwsdMvfbY1UXxXVSgM9IWvnhngIZWoT/VbCTKknYKC0x4PQmuPaHLW4UYIPG9PTO6f iSrAJedFbix4JFJ7eL3vwEdfTpZsGkgpqZ7/+5pRyH9xnrQNww5dYIhYaO3xAJja8qro M3CVJpceuFLT+wdHiTDhDbrq3WRyXYqybBEAW6JHAjT65tBWBQMKPaiOjzra/VU8/5ON HS/dUuRRYQqpLtMPJKlq+G81ar1yJGMB4Jqnyjrb/uqC/NkG6ot0Ff4nIt+HlL93txlB utHg== 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=8RuZJSRYSi9JcAVrCNicdklVykQ+67TVPTnceLb5E6w=; b=FrKACOiSQNfLJzj5XZFphvZM6xTn79soqfqPybeUJYBD02uXZK33UpXRem80XBtqWp qzF1+gln4XKwRbdxQh6VLAabYouh8DCS2NkEZMt1nMOcQfu96sCuL189syxKst1UCujU 2J1yl71RM+U72itnaTm3ZO8w/2pkAIqlo8FZPKyUq5PXNUZUUsLj9HbYILWe/dMrPVXy ek+iC+eAV84NEhd6Mj/lIO354AVOPxtjnJDrLu62F6/rys70+RLURB8qjpFDx8K6xSQg D+WXSJSyB2CPzAiJZHQ2Igo2GTWrtB3wLJT+ZVSZ4oRvVuG7eMRhKuCY0PfBEY12/xyM dfpQ== X-Gm-Message-State: AElRT7HR7dbEH0q93NKg9uN4+lxdvxgFyiodeH58/UxtppgZtSixE3p4 UGbmToBy/KaaIhDwhwrQiXb9ns+I X-Google-Smtp-Source: AG47ELsf6tYODz0rrVll4WW9IVFZZ8JaDUjjYRIEniA4j5e82akLC69FaYA0XLy8fzOVRz8+oZ0v9w== X-Received: by 10.223.199.10 with SMTP id k10mr1939126wrg.186.1520981292891; Tue, 13 Mar 2018 15:48:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:51 +0100 Message-Id: <20180313224719.4954-42-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 41/69] hw/mips/malta: Code movement X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?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) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Move the SouthBridge peripherals first, and keep the Super I/O peripherals last. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-16-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/mips/mips_malta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index cd7bd0eef6..9e0724ca5a 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1062,10 +1062,6 @@ void mips_malta_init(MachineState *machine) memory_region_add_subregion(system_memory, 512 << 20, ram_low_post= io); } =20 - /* generate SPD EEPROM data */ - generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); - generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]); - #ifdef TARGET_WORDS_BIGENDIAN be =3D 1; #else @@ -1208,15 +1204,19 @@ void mips_malta_init(MachineState *machine) pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus =3D piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(NULL, 9), NULL, 0, NULL); - smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); - g_free(smbus_eeprom_buf); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); i8257_dma_init(isa_bus, 0); + mc146818_rtc_init(isa_bus, 2000, NULL); + + /* generate SPD EEPROM data */ + generate_eeprom_spd(&smbus_eeprom_buf[0 * 256], ram_size); + generate_eeprom_serial(&smbus_eeprom_buf[6 * 256]); + smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); + g_free(smbus_eeprom_buf); =20 /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); =20 - mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, 2); parallel_hds_isa_init(isa_bus, 1); =20 --=20 2.14.3