From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152141987909318.49267557277301; Sun, 18 Mar 2018 17:37:59 -0700 (PDT) Received: from localhost ([::1]:39624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exioB-0007t8-Pm for importer@patchew.org; Sun, 18 Mar 2018 20:37:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim6-0006Yr-4p for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim2-0000HO-UO for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:39989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim2-00009M-56; Sun, 18 Mar 2018 20:35:38 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCl3rLkz9sWB; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419731; bh=SvtA6ciWpPXXUOc/pYroiYW0it2wWCb2cmarytnqp54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pat8ZRk93FfTzxwqkrRWo++EUdO1Xnjv3pycjmneU1iTUuf8F5cYnjZKsBDkr8oXf 8k9ZQOoW6Oc+c6vtPD/p6p6twgBItacQsUqE7h+KANImrm8rWt2xLpB71mDE+Mu5oP 7ZKZl7ayLAklxYF9kCzvXczqTyRYAmxCt92+KctE= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:17 +1100 Message-Id: <20180319003524.28143-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 1/8] sii3112: Remove unneeded exit function 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: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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" From: BALATON Zoltan An exit function was mistakenly left here but it's not needed because the PCI bars are organised differently in this device. Calling this exit function during device_del was causing an abort with memory_region_del_subregion: `Assertion subregion->container =3D=3D mr' fai= led. Reported-by: Thomas Huth Signed-off-by: BALATON Zoltan Signed-off-by: David Gibson --- hw/ide/sii3112.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index e3896c65b4..743a50ed51 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -327,17 +327,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error = **errp) qemu_register_reset(sii3112_reset, s); } =20 -static void sii3112_pci_exitfn(PCIDevice *dev) -{ - PCIIDEState *d =3D PCI_IDE(dev); - int i; - - for (i =3D 0; i < 2; ++i) { - memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].extra_io); - memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].addr_iopor= t); - } -} - static void sii3112_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -348,7 +337,6 @@ static void sii3112_pci_class_init(ObjectClass *klass, = void *data) pd->class_id =3D PCI_CLASS_STORAGE_RAID; pd->revision =3D 1; pd->realize =3D sii3112_pci_realize; - pd->exit =3D sii3112_pci_exitfn; dc->desc =3D "SiI3112A SATA controller"; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152142034290023.25436915519367; Sun, 18 Mar 2018 17:45:42 -0700 (PDT) Received: from localhost ([::1]:39677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exivm-0006DB-5D for importer@patchew.org; Sun, 18 Mar 2018 20:45:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim7-0006Z4-6c for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim5-0000N0-UM for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:50203) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000ID-IG; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCl717tz9sWH; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=pW/KbyeNK2EoSCqIfKS6is+9Gif8LVWPm+iJTKdnsoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mp7GD786uORsm7ZdbR1yTYkwgAcGh9AesinHXdqyk3qX5TWvJX8P/hlgTACwVA1Xu tITyiUNQnzQaPwvi+cR7AkBXRJV9bykDruFRwD1Rkoe1U8aGz4yyHlZ1HHH+757gqK eU4zCqAf19/NrTECJ6jbqiwjDor/ZQd3dy79ROTk= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:18 +1100 Message-Id: <20180319003524.28143-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 2/8] tests/boot-serial: Check the 40p machine, too 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: lvivier@redhat.com, Thomas Huth , surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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-Type: text/plain; charset="utf-8" From: Thomas Huth The "40p" machine is using the Open Hack'Ware BIOS, just like the "prep" machine, so we can test it accordingly with the boot-serial tester, too. While we're at it, also change the strings that we are using for the "prep" machine, so that this test now also checks some CLI parameters. Signed-off-by: Thomas Huth Reviewed-by: Herv=C3=A9 Poussineau Signed-off-by: David Gibson --- tests/boot-serial-test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index ece25c694f..5b24cd26c1 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -75,11 +75,13 @@ typedef struct testdef { static testdef_t tests[] =3D { { "alpha", "clipper", "", "PCI:" }, { "ppc", "ppce500", "", "U-Boot" }, - { "ppc", "prep", "", "Open Hack'Ware BIOS" }, + { "ppc", "prep", "-m 96", "Memory size: 96 MB" }, + { "ppc", "40p", "-boot d", "Booting from device d" }, { "ppc", "g3beige", "", "PowerPC,750" }, { "ppc", "mac99", "", "PowerPC,G4" }, { "ppc64", "ppce500", "", "U-Boot" }, - { "ppc64", "prep", "", "Open Hack'Ware BIOS" }, + { "ppc64", "prep", "-boot e", "Booting from device e" }, + { "ppc64", "40p", "-m 192", "Memory size: 192 MB" }, { "ppc64", "mac99", "", "PowerPC,970FX" }, { "ppc64", "pseries", "", "Open Firmware" }, { "ppc64", "powernv", "-cpu POWER8", "OPAL" }, --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521420050401445.93401216865504; Sun, 18 Mar 2018 17:40:50 -0700 (PDT) Received: from localhost ([::1]:39637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exir3-0001sp-Hf for importer@patchew.org; Sun, 18 Mar 2018 20:40:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim6-0006Ys-4y for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim2-0000HM-U4 for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:55989) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim2-00009K-5G; Sun, 18 Mar 2018 20:35:38 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCl66b8z9sW7; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419731; bh=Jyvk50u00DSUrR63qVy0cJvyhdt4ZrJR/hf6xqMOfa0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlFDC5DBoujyPdbE1UHBeT7bd1zaBr64CVYw+Q5Ld9BzFLviD43+rhgE6gt/iWeNE +EQn1kNcPx4oduaFK3Fq7zYExaCdghDMmil03piIpvsJ1KsLhTYnksSa7eW0a7LFSm k3JAOKKMgCmLvMYXclmpXcuv34p3d8pHQ/g3Y9Js= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:19 +1100 Message-Id: <20180319003524.28143-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 3/8] hw/ppc/prep: Fix implicit creation of "-drive if=scsi" devices 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: lvivier@redhat.com, Thomas Huth , surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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" From: Thomas Huth The global hack for creating SCSI devices has recently been removed, but this apparently broke SCSI devices on some boards that were not ready for this change yet. For the 40p machine you now get: $ ppc64-softmmu/qemu-system-ppc64 -M 40p -cdrom x.iso qemu-system-ppc64: -cdrom x.iso: machine type does not support if=3Dscsi,bu= s=3D0,unit=3D2 Fix it by providing a lsi53c810_create() function that takes care of calling scsi_bus_legacy_handle_cmdline() after creating the corresponding SCSI controller. Fixes: 1454509726719e0933c800fad00d6999752688ea Signed-off-by: Thomas Huth Signed-off-by: David Gibson --- hw/ppc/prep.c | 2 +- hw/scsi/lsi53c895a.c | 7 +++++++ include/hw/pci/pci.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 5c78503069..a1e7219db6 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -787,7 +787,7 @@ static void ibm_40p_init(MachineState *machine) qdev_prop_set_uint32(dev, "equipment", 0xc0); qdev_init_nofail(dev); =20 - pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "lsi53c810"); + lsi53c810_create(pci_bus, PCI_DEVFN(1, 0)); =20 /* XXX: s3-trio at PCI_DEVFN(2, 0) */ pci_vga_init(pci_bus); diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index f3d4c4d230..160657f4b9 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2279,3 +2279,10 @@ void lsi53c895a_create(PCIBus *bus) =20 scsi_bus_legacy_handle_cmdline(&s->bus); } + +void lsi53c810_create(PCIBus *bus, int devfn) +{ + LSIState *s =3D LSI53C895A(pci_create_simple(bus, devfn, "lsi53c810")); + + scsi_bus_legacy_handle_cmdline(&s->bus); +} diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index d8c18c7fa4..e255941b5a 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -708,6 +708,7 @@ PCIDevice *pci_create(PCIBus *bus, int devfn, const cha= r *name); PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name); =20 void lsi53c895a_create(PCIBus *bus); +void lsi53c810_create(PCIBus *bus, int devfn); =20 qemu_irq pci_allocate_irq(PCIDevice *pci_dev); void pci_set_irq(PCIDevice *pci_dev, int level); --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521420054480170.40695646101926; Sun, 18 Mar 2018 17:40:54 -0700 (PDT) Received: from localhost ([::1]:39641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exir7-0001yH-Lj for importer@patchew.org; Sun, 18 Mar 2018 20:40:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim6-0006Yu-Jc for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim5-0000Lp-Eu for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:44105) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000I5-3I; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCm0gmYz9sWF; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=APBmlWA0ZLBkMcVHZDJxBebmAE+7wiPq9uCpvbF5AdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V3tyRSKAc7kWs8/rJhblNfeYEaq+eDbCnQtkIikV48tqQGPvrvXkSjiczP0j1RMpH /fMtaYqbxuHdZz9nTdlwoxbX8QwcVygSneLwlxnfZl1zajKwbLuXVZB2g6Z3q+PGBE q0AI2ovWHq1yufQp8P5KS4jAUFRzimwVgq1osf00= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:20 +1100 Message-Id: <20180319003524.28143-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 4/8] hw/misc/macio: Mark the macio devices with user_creatable = false 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: lvivier@redhat.com, Thomas Huth , surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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" From: Thomas Huth The macio devices currently cause a crash when the user tries to instantiate them on a different machine: $ ppc64-softmmu/qemu-system-ppc64 -device macio-newworld Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:222: qemu-system-ppc64: -device macio-newworld: Device 'serial0' is in use Aborted (core dumped) These devices are clearly not intended to be creatable by the user since they are using serial_hds[] directly in their instance_init function. So let's mark them with user_creatable =3D false. Signed-off-by: Thomas Huth Reviewed-by: Mark Cave-Ayland Signed-off-by: David Gibson --- hw/misc/macio/macio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index af1bd46b4b..454244f59e 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -406,6 +406,8 @@ static void macio_class_init(ObjectClass *klass, void *= data) k->class_id =3D PCI_CLASS_OTHERS << 8; dc->props =3D macio_properties; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); + /* Reason: Uses serial_hds in macio_instance_init */ + dc->user_creatable =3D false; } =20 static const TypeInfo macio_oldworld_type_info =3D { --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152141987736372.29743863516967; Sun, 18 Mar 2018 17:37:57 -0700 (PDT) Received: from localhost ([::1]:39623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exioD-0007sv-Fe for importer@patchew.org; Sun, 18 Mar 2018 20:37:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim7-0006Yy-0T for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim5-0000Lv-HP for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:43001) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000I8-5n; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCm1nfKz9sWJ; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=zSCa5OouoYujlrZbcxwbVTJNi9NKirXi3LAlq4IqjOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mUCs7HgUSI6ztNj5pGiG0z+YyHvhNY8YSfIq7QTJ2r/83h/ewSFWzbQF1tamDxSgp Qt2Lhc/cgJ8+7+3DdYQm/7h0npiYGSjdSmQoBzqTsrrJsZQIJABmvO2yKFa6u3DobH xowB2P5adciBmmu5omeoIj3ufFwQ1KHXgovhyDHs= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:21 +1100 Message-Id: <20180319003524.28143-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 5/8] PPC e500: Fix gap between u-boot and kernel 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: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Engraf , David Gibson 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" From: David Engraf This patch moves the gap between u-boot and kernel at the correct location. Signed-off-by: David Engraf Signed-off-by: David Gibson --- hw/ppc/e500.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 2238f963c4..9a85a41362 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1009,6 +1009,10 @@ void ppce500_init(MachineState *machine, PPCE500Para= ms *params) } =20 cur_base =3D loadaddr + payload_size; + if (cur_base < (32 * 1024 * 1024)) { + /* u-boot occupies memory up to 32MB, so load blobs above */ + cur_base =3D (32 * 1024 * 1024); + } =20 /* Load bare kernel only if no bios/u-boot has been provided */ if (machine->kernel_filename && !kernel_as_payload) { @@ -1025,11 +1029,6 @@ void ppce500_init(MachineState *machine, PPCE500Para= ms *params) cur_base +=3D kernel_size; } =20 - if (cur_base < (32 * 1024 * 1024)) { - /* u-boot occupies memory up to 32MB, so load blobs above */ - cur_base =3D (32 * 1024 * 1024); - } - /* Load initrd. */ if (machine->initrd_filename) { initrd_base =3D (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK; --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521420068013811.7262114150864; Sun, 18 Mar 2018 17:41:08 -0700 (PDT) Received: from localhost ([::1]:39642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exirL-0002AS-7u for importer@patchew.org; Sun, 18 Mar 2018 20:41:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim7-0006ZR-Eu for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim6-0000NA-0W for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:58131) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000IH-Ji; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCm3lgSz9sWN; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=Uc9YVTOWm+aux2RAiCNXfRvTfeELgKw0747lgveoD7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGrubYKRGipjYn1GIaNq61OQVnEclBXCvKGaTLBW3a+NlsEB0ykSyQsnnDkl7tY7c mZp35uSDgzdCSko0IteKzOJoxi1ARP4AQy7VKxZiBdrAlpX7TkdKB5UdPH9CwgCW2r T1I7NVyJK3lb4r0uEnyRQ/jQhOw1r+oybfDFYyPQ= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:22 +1100 Message-Id: <20180319003524.28143-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 6/8] hw/ppc/spapr: Allow "spapr-vlan" as NIC model name beside "ibmveth" 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: lvivier@redhat.com, Thomas Huth , surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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" From: Thomas Huth With the new "--nic" command line parameter option, the "old" way of specifying a NIC model via the nd_table[] is becoming more prominent again. But for the pseries "spapr-vlan" device, there is a confusing discrepancy between the model name that is used for "--device" (i.e. "spapr-vlan") and the model name that has to be used for "--net nic" or the new "--nic" parameter (i.e. "ibmveth"). Since "spapr-vlan" is the "real" name of the device, let's allow "spapr-vlan" to be used as model name for the nd_table[] entries, too. Signed-off-by: Thomas Huth Reviewed-by: Greg Kurz Signed-off-by: David Gibson --- hw/ppc/spapr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 032d03423f..fba76abee2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2607,10 +2607,11 @@ static void spapr_machine_init(MachineState *machin= e) NICInfo *nd =3D &nd_table[i]; =20 if (!nd->model) { - nd->model =3D g_strdup("ibmveth"); + nd->model =3D g_strdup("spapr-vlan"); } =20 - if (strcmp(nd->model, "ibmveth") =3D=3D 0) { + if (g_str_equal(nd->model, "spapr-vlan") || + g_str_equal(nd->model, "ibmveth")) { spapr_vlan_create(spapr->vio_bus, nd); } else { pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL); --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521420233179723.4655804522303; Sun, 18 Mar 2018 17:43:53 -0700 (PDT) Received: from localhost ([::1]:39656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exitu-0004N8-S3 for importer@patchew.org; Sun, 18 Mar 2018 20:43:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim7-0006Z0-0r for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim5-0000Mm-RA for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:43 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:48469) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000IG-FQ; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCm36Wsz9sWQ; Mon, 19 Mar 2018 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=w55xhCjXyT/jQgAa04gwtlXbGRP7Gu3txeoxjJI9kkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SouNrlVMPC8D40V1mX/Yw/8saiK2Hk/R+BDkVCPQapDXivlcP63rn9XZKyGKkeja5 rKLJu28p4lzU4ivIXgaN57bSrINWBCfuVh+Gup24uGLo3JV0BgRpMNWIgyhuKfO5rt v0F1AVqYCFSfY7I5qRFapCAqFAEoqfFSg4ghd4Yw= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:23 +1100 Message-Id: <20180319003524.28143-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 7/8] ppc440_pcix: Change some error_report to qemu_log_mask(LOG_UNIMP, ...) 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: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson 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" From: BALATON Zoltan Using log unimp is more appropriate for these messages and this also silences them by default so they won't clobber make check output when tests are added for this board. Signed-off-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: David Gibson --- hw/ppc/ppc440_pcix.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index ab2626a9de..b1307e6477 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -21,6 +21,7 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/log.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" @@ -286,8 +287,9 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr= addr, break; =20 default: - error_report("%s: unhandled PCI internal register 0x%lx", __func__, - (unsigned long)addr); + qemu_log_mask(LOG_UNIMP, + "%s: unhandled PCI internal register 0x%"HWADDR_PRIx= "\n", + __func__, addr); break; } } @@ -377,8 +379,9 @@ static uint64_t ppc440_pcix_reg_read4(void *opaque, hwa= ddr addr, break; =20 default: - error_report("%s: invalid PCI internal register 0x%lx", __func__, - (unsigned long)addr); + qemu_log_mask(LOG_UNIMP, + "%s: invalid PCI internal register 0x%" HWADDR_PRIx = "\n", + __func__, addr); val =3D 0; } =20 --=20 2.14.3 From nobody Sat Oct 25 02:31:11 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521420054481262.0540653334932; Sun, 18 Mar 2018 17:40:54 -0700 (PDT) Received: from localhost ([::1]:39640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exir7-0001x3-Mn for importer@patchew.org; Sun, 18 Mar 2018 20:40:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1exim6-0006Yv-Js for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1exim5-0000M7-J8 for qemu-devel@nongnu.org; Sun, 18 Mar 2018 20:35:42 -0400 Received: from ozlabs.org ([103.22.144.67]:33277) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1exim5-0000I7-7d; Sun, 18 Mar 2018 20:35:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 404HCm2PRlz9sWK; Mon, 19 Mar 2018 11:35:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1521419732; bh=Y5oAYO1Y4pyCBuBeA/32+fcJrJZu9Kifi3/lgr4XYmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BXgLtCaWJKl8qKmhL4bPCJnUGotyDncBndLTcvMxRxfwZx/SRCHBxL6Qa3oMuc6qN uSwIVkhH5zTPopDD2bOLnRoMhOr/JHPe314ahqnmTPHwPKvw6VwiiLxp+0jRGf7Z/A 3oEhTll8U5ZpbDt+1Kzj3yBQ6mmJdffj0DKoEht0= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 19 Mar 2018 11:35:24 +1100 Message-Id: <20180319003524.28143-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180319003524.28143-1-david@gibson.dropbear.id.au> References: <20180319003524.28143-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 8/8] target/ppc: fix tlbsync to check privilege level depending on GTSE 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: lvivier@redhat.com, surajjs@au1.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson 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-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater tlbsync also needs to check the Guest Translation Shootdown Enable (GTSE) bit in the Logical Partition Control Register (LPCR) to determine at which privilege level it is running. See commit c6fd28fd573d ("target/ppc: Update tlbie to check privilege level based on GTSE") Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Suraj Jitindar Singh Signed-off-by: David Gibson --- target/ppc/translate.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 0a0c090c99..218665b408 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -4526,7 +4526,7 @@ static void gen_tlbie(DisasContext *ctx) TCGv_i32 t1; =20 if (ctx->gtse) { - CHK_SV; /* If gtse is set then tblie is supervisor privileged */ + CHK_SV; /* If gtse is set then tlbie is supervisor privileged */ } else { CHK_HV; /* Else hypervisor privileged */ } @@ -4553,7 +4553,12 @@ static void gen_tlbsync(DisasContext *ctx) #if defined(CONFIG_USER_ONLY) GEN_PRIV; #else - CHK_HV; + + if (ctx->gtse) { + CHK_SV; /* If gtse is set then tlbsync is supervisor privileged */ + } else { + CHK_HV; /* Else hypervisor privileged */ + } =20 /* BookS does both ptesync and tlbsync make tlbsync a nop for server */ if (ctx->insns_flags & PPC_BOOKE) { --=20 2.14.3