From nobody Sat Feb 7 05:20:11 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511148424133477.5353527210018; Sun, 19 Nov 2017 19:27:04 -0800 (PST) Received: from localhost ([::1]:55206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGcjW-0002wA-QU for importer@patchew.org; Sun, 19 Nov 2017 22:26:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGchU-0001df-55 for qemu-devel@nongnu.org; Sun, 19 Nov 2017 22:24:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGchT-0006R3-5U for qemu-devel@nongnu.org; Sun, 19 Nov 2017 22:24:48 -0500 Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]:44955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eGchO-0006OX-QL; Sun, 19 Nov 2017 22:24:42 -0500 Received: by mail-io0-x244.google.com with SMTP id w127so14301860iow.11; Sun, 19 Nov 2017 19:24:42 -0800 (PST) Received: from localhost.localdomain (173-29-146-33.client.mchsi.com. [173.29.146.33]) by smtp.gmail.com with ESMTPSA id o207sm4476119itc.27.2017.11.19.19.24.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Nov 2017 19:24:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XcwkVsaCLxQPr05Qj1Y5/fQm3uLY1/vIUl/p7wGaITk=; b=E6uV8UAgxYRFfMhzy2Uo7718vX9J9uYAwtJzU7XuZPnAVntBBJA1aVivXkFlYx1FDo Nk0Bd3rNWU4yNsw4JQcuaLSLNOP1R7D22QNuHy6L0v+Ko/PZBJxBTr4tcsLGorXmxnXt wizQSQOAKHFsDPOJboqRfg7HsxHaUcoMqY0WE3jWa4bxyJwBhOT6uuZGhfW4CXnOuSTV qL1uyK0GXGlqzxrmUVZ+AKu7c4oWEwTfIcUohh6IHZHOORcF4b/s0zXrE63LLH6vHNJY yoYFoPBzrSXsw9b2oKHrXesx/KabmvDiiD04+31fYoWjYAfknIzaxlSOYoBkQPPbWJ7o f4zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XcwkVsaCLxQPr05Qj1Y5/fQm3uLY1/vIUl/p7wGaITk=; b=SpQJkXznnj2GLFHpoxN0uwDC/Q4W68q9lRibBvqKMLlFDnMQUdMg6b55ySEzJYKcIJ QHQ7dzeDg1/h18RTpNycicRppESCrWCzgKkaq1gnBJF/uVy924jdPmpprwRdQ/dG+Ld4 IQC6H2o2irDPAIk0XI4UIU1PoUoDJ7JH2wfujShbWiK/JzztUVWLSNg00bitOcHtrdf8 BF4F0cSju4Z890RBA/Qfsx3b2vnn5ONpD1xrtN0WJpnNun6df2wM7fwgXPX/ouIMaZpc +RAWWmi6tjYZG41Gtk2fjmkZs044D391a4VZ//1bIuWoXUvrQPVxYpiP58G3dSez2QUX 0P4w== X-Gm-Message-State: AJaThX4/NGgI3lIFhxez5yeHazcSGAd+tzTZlcqESiQR+n8pbdZd7uNe uwVLAzx4ZJa01yDGX6C4FCM= X-Google-Smtp-Source: AGs4zMbfPzr3BouC1lp6EkG7Ta9ORqLMHr7vikKBtqYvNqxnSkXDWoZ14+9OUGFpbrgOOKrnHKwjKQ== X-Received: by 10.107.132.19 with SMTP id g19mr11440578iod.47.1511148281926; Sun, 19 Nov 2017 19:24:41 -0800 (PST) From: Michael Davidsaver To: Alexander Graf , David Gibson , qemu-ppc@nongnu.org Date: Sun, 19 Nov 2017 21:24:09 -0600 Message-Id: <20171120032420.9134-2-mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171120032420.9134-1-mdavidsaver@gmail.com> References: <20171120032420.9134-1-mdavidsaver@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::244 Subject: [Qemu-devel] [PATCH 01/12] e500: add board config options 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: Michael Davidsaver , qemu-devel@nongnu.org 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" allow board code to skip common NIC and guest image setup and configure decrementor frequency. Existing boards unchanged. Signed-off-by: Michael Davidsaver --- hw/ppc/e500.c | 8 ++++++-- hw/ppc/e500.h | 3 +++ hw/ppc/e500plat.c | 1 + hw/ppc/mpc8544ds.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 5cf0dabef3..9e7e1b29c4 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -826,7 +826,7 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) env->mpic_iack =3D params->ccsrbar_base + MPC8544_MPIC_REGS_OFFSET + 0xa0; =20 - ppc_booke_timers_init(cpu, 400000000, PPC_TIMER_E500); + ppc_booke_timers_init(cpu, params->decrementor_freq, PPC_TIMER_E50= 0); =20 /* Register reset handler */ if (!i) { @@ -899,7 +899,7 @@ void ppce500_init(MachineState *machine, PPCE500Params = *params) if (!pci_bus) printf("couldn't create PCI controller!\n"); =20 - if (pci_bus) { + if (pci_bus && !params->tsec_nic) { /* Register network interfaces. */ for (i =3D 0; i < nb_nics; i++) { pci_nic_init_nofail(&nd_table[i], pci_bus, "virtio", NULL); @@ -948,6 +948,10 @@ void ppce500_init(MachineState *machine, PPCE500Params= *params) sysbus_mmio_get_region(s, 0)); } =20 + if (params->skip_load) { + return; + } + /* Load kernel. */ if (machine->kernel_filename) { kernel_base =3D cur_base; diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h index 70ba1d8f4f..40f72f2de2 100644 --- a/hw/ppc/e500.h +++ b/hw/ppc/e500.h @@ -22,6 +22,9 @@ typedef struct PPCE500Params { hwaddr pci_mmio_base; hwaddr pci_mmio_bus_base; hwaddr spin_base; + uint32_t decrementor_freq; /* in Hz */ + bool skip_load; + bool tsec_nic; } PPCE500Params; =20 void ppce500_init(MachineState *machine, PPCE500Params *params); diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index e59e80fb9e..3d07987bd1 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -47,6 +47,7 @@ static void e500plat_init(MachineState *machine) .pci_mmio_base =3D 0xC00000000ULL, .pci_mmio_bus_base =3D 0xE0000000ULL, .spin_base =3D 0xFEF000000ULL, + .decrementor_freq =3D 400000000, }; =20 /* Older KVM versions don't support EPR which breaks guests when we an= nounce diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 1717953ec7..6d9931c475 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -40,6 +40,7 @@ static void mpc8544ds_init(MachineState *machine) .pci_mmio_bus_base =3D 0xC0000000ULL, .pci_pio_base =3D 0xE1000000ULL, .spin_base =3D 0xEF000000ULL, + .decrementor_freq =3D 400000000, }; =20 if (machine->ram_size > 0xc0000000) { --=20 2.11.0