From nobody Mon May 6 20:43:25 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=1611037582; cv=none; d=zohomail.com; s=zohoarc; b=DAl6EUEMc9LSi2mcFzPO4R0I3c11mQnl/TxzWtRR8liq4weUTStohjgj68q0ZGRdEmGaq+mue5wMGfGb4r133rtVERA/DP92adJ7Y/9ZZDMQyryPdbs/kAauTt3yX/bdtACpoZuuI0QaBnA7j+2s4+HOIfIX2YQdq12Zve0nDlI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037582; h=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=6f+IGnXCA0pS/E+QSe43kbe7zJobR0tfiX7cYq+Hi9U=; b=c5bHdq73F13mFbJsJSL5D3C4cQBkg8rusJo5zYlYjanSh7ppgCDp1297m3y3rp/A300wqvD03dQVHFIKYWr4pxfN24Dvy5RLraU5Z3eq5tcy/aB9tg3rNibUGqACLS7ewMhq3mcIKI+FQJRh+UCmLVRLZikq315DWRiLWfNDcPE= 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 1611037582495550.0324161023003; Mon, 18 Jan 2021 22:26:22 -0800 (PST) Received: from localhost ([::1]:33966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kT7-000355-GX for importer@patchew.org; Tue, 19 Jan 2021 01:26:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQb-0001DF-RX; Tue, 19 Jan 2021 01:23:45 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:47519 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQW-0000LU-3s; Tue, 19 Jan 2021 01:23:45 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrV70Jdz9sSC; Tue, 19 Jan 2021 17:23:22 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037402; bh=xQU3OM2yaLJZCG+m+5OllcQ+jG51crSRIodao1lQ83I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VEPZslta+QUlRoDKO3F+WcZCUPVDLmGJhkJXQERaM3GQhU9OTIEMctpMDTyzbcxZZ dNnaBPzY9XbKAjrwEzn/5/yxhSmq4QzyKbTUXxDs7f7CE7ddGSIl3CyrC4Xk0JdKU5 D4SMgyv2B03XpmPvTXFjUiandptgrMcEpe7skeIg= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 01/13] hw/ppc/sam460ex: Drop use of ppcuic_init() Date: Tue, 19 Jan 2021 17:23:06 +1100 Message-Id: <20210119062318.13857-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Peter Maydell Switch the sam460ex board to directly creating and configuring the UIC, rather than doing it via the old ppcuic_init() helper function. Signed-off-by: Peter Maydell Message-Id: <20210108171212.16500-2-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/ppc/sam460ex.c | 69 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 14e6583eb0..45721ad6c7 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -39,6 +39,7 @@ #include "hw/usb/hcd-ehci.h" #include "hw/ppc/fdt.h" #include "hw/qdev-properties.h" +#include "hw/intc/ppc-uic.h" =20 #include =20 @@ -281,7 +282,9 @@ static void sam460ex_init(MachineState *machine) hwaddr ram_bases[SDRAM_NR_BANKS] =3D {0}; hwaddr ram_sizes[SDRAM_NR_BANKS] =3D {0}; MemoryRegion *l2cache_ram =3D g_new(MemoryRegion, 1); - qemu_irq *irqs, *uic[4]; + DeviceState *uic[4]; + qemu_irq mal_irqs[4]; + int i; PCIBus *pci_bus; PowerPCCPU *cpu; CPUPPCState *env; @@ -312,13 +315,38 @@ static void sam460ex_init(MachineState *machine) ppc4xx_plb_init(env); =20 /* interrupt controllers */ - irqs =3D g_new0(qemu_irq, PPCUIC_OUTPUT_NB); - irqs[PPCUIC_OUTPUT_INT] =3D ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT= _INT]; - irqs[PPCUIC_OUTPUT_CINT] =3D ((qemu_irq *)env->irq_inputs)[PPC40x_INPU= T_CINT]; - uic[0] =3D ppcuic_init(env, irqs, 0xc0, 0, 1); - uic[1] =3D ppcuic_init(env, &uic[0][30], 0xd0, 0, 1); - uic[2] =3D ppcuic_init(env, &uic[0][10], 0xe0, 0, 1); - uic[3] =3D ppcuic_init(env, &uic[0][16], 0xf0, 0, 1); + for (i =3D 0; i < ARRAY_SIZE(uic); i++) { + SysBusDevice *sbd; + /* + * UICs 1, 2 and 3 are cascaded through UIC 0. + * input_ints[n] is the interrupt number on UIC 0 which + * the INT output of UIC n is connected to. The CINT output + * of UIC n connects to input_ints[n] + 1. + * The entry in input_ints[] for UIC 0 is ignored, because UIC 0's + * INT and CINT outputs are connected to the CPU. + */ + const int input_ints[] =3D { -1, 30, 10, 16 }; + + uic[i] =3D qdev_new(TYPE_PPC_UIC); + sbd =3D SYS_BUS_DEVICE(uic[i]); + + qdev_prop_set_uint32(uic[i], "dcr-base", 0xc0 + i * 0x10); + object_property_set_link(OBJECT(uic[i]), "cpu", OBJECT(cpu), + &error_fatal); + sysbus_realize_and_unref(sbd, &error_fatal); + + if (i =3D=3D 0) { + sysbus_connect_irq(sbd, PPCUIC_OUTPUT_INT, + ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_= INT]); + sysbus_connect_irq(sbd, PPCUIC_OUTPUT_CINT, + ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_= CINT]); + } else { + sysbus_connect_irq(sbd, PPCUIC_OUTPUT_INT, + qdev_get_gpio_in(uic[0], input_ints[i])); + sysbus_connect_irq(sbd, PPCUIC_OUTPUT_CINT, + qdev_get_gpio_in(uic[0], input_ints[i] + 1)= ); + } + } =20 /* SDRAM controller */ /* put all RAM on first bank because board has one slot @@ -331,7 +359,8 @@ static void sam460ex_init(MachineState *machine) ram_bases, ram_sizes, 1); =20 /* IIC controllers and devices */ - dev =3D sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700, uic[0][2]); + dev =3D sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700, + qdev_get_gpio_in(uic[0], 2)); i2c =3D PPC4xx_I2C(dev)->bus; /* SPD EEPROM on RAM module */ spd_data =3D spd_data_generate(ram_sizes[0] < 128 * MiB ? DDR : DDR2, @@ -341,7 +370,8 @@ static void sam460ex_init(MachineState *machine) /* RTC */ i2c_slave_create_simple(i2c, "m41t80", 0x68); =20 - dev =3D sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600800, uic[0][3]); + dev =3D sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600800, + qdev_get_gpio_in(uic[0], 3)); =20 /* External bus controller */ ppc405_ebc_init(env); @@ -356,7 +386,10 @@ static void sam460ex_init(MachineState *machine) ppc4xx_sdr_init(env); =20 /* MAL */ - ppc4xx_mal_init(env, 4, 16, &uic[2][3]); + for (i =3D 0; i < ARRAY_SIZE(mal_irqs); i++) { + mal_irqs[0] =3D qdev_get_gpio_in(uic[2], 3 + i); + } + ppc4xx_mal_init(env, 4, 16, mal_irqs); =20 /* DMA */ ppc4xx_dma_init(env, 0x200); @@ -369,21 +402,23 @@ static void sam460ex_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_= ram); =20 /* USB */ - sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400, uic[2][29]); + sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400, + qdev_get_gpio_in(uic[2], 29)); dev =3D qdev_new("sysbus-ohci"); qdev_prop_set_string(dev, "masterbus", "usb-bus.0"); qdev_prop_set_uint32(dev, "num-ports", 6); sbdev =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(sbdev, &error_fatal); sysbus_mmio_map(sbdev, 0, 0x4bffd0000); - sysbus_connect_irq(sbdev, 0, uic[2][30]); + sysbus_connect_irq(sbdev, 0, qdev_get_gpio_in(uic[2], 30)); usb_create_simple(usb_bus_find(-1), "usb-kbd"); usb_create_simple(usb_bus_find(-1), "usb-mouse"); =20 /* PCI bus */ ppc460ex_pcie_init(env); /* All PCI irqs are connected to the same UIC pin (cf. UBoot source) */ - dev =3D sysbus_create_simple("ppc440-pcix-host", 0xc0ec00000, uic[1][0= ]); + dev =3D sysbus_create_simple("ppc440-pcix-host", 0xc0ec00000, + qdev_get_gpio_in(uic[1], 0)); pci_bus =3D (PCIBus *)qdev_get_child_bus(dev, "pci.0"); if (!pci_bus) { error_report("couldn't create PCI controller!"); @@ -405,12 +440,14 @@ static void sam460ex_init(MachineState *machine) /* SoC has 4 UARTs * but board has only one wired and two are present in fdt */ if (serial_hd(0) !=3D NULL) { - serial_mm_init(address_space_mem, 0x4ef600300, 0, uic[1][1], + serial_mm_init(address_space_mem, 0x4ef600300, 0, + qdev_get_gpio_in(uic[1], 1), PPC_SERIAL_MM_BAUDBASE, serial_hd(0), DEVICE_BIG_ENDIAN); } if (serial_hd(1) !=3D NULL) { - serial_mm_init(address_space_mem, 0x4ef600400, 0, uic[0][1], + serial_mm_init(address_space_mem, 0x4ef600400, 0, + qdev_get_gpio_in(uic[0], 1), PPC_SERIAL_MM_BAUDBASE, serial_hd(1), DEVICE_BIG_ENDIAN); } --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037763; cv=none; d=zohomail.com; s=zohoarc; b=ENPk6U2t/QeLDo0Men/NMreOaO6vDZ7RgMsYZP/Y3CAg9nQmkLwBu9fqNHHXZ0XMkEKs+51BttEuU9Y/Ysb9rshlyQ1PFaMbiujwSbbNWaNbk/ZnUWJ/VO7vfBZj9mNkjR9yZNLKo9N/0QP8v7JfYsvHnLlHD2S9S9fvD7Es7es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037763; h=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=NyFOxPY7j53Ul2ZEs+A49glBBui1uvl7CYUF18/Hcis=; b=Dlvc7sHLbDRLgHIVyrm7WXc08+5EbkBi/E58w9cUJHAPr0WcnZPUA1lLK20Kc9Mojp3u1PtnZ9HvHqeTcpu9PwNXI/NGJRwpCSJkJVlAug6qE2D1qx+1/zp0TFbdeN4qjB2Y408m1JWRUxrc65e04Jnqhi6vkGzlYdFLKJZIfpQ= 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 1611037763360462.19394316968715; Mon, 18 Jan 2021 22:29:23 -0800 (PST) Received: from localhost ([::1]:43564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kW2-00074x-6p for importer@patchew.org; Tue, 19 Jan 2021 01:29:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQb-0001DG-Ry; Tue, 19 Jan 2021 01:23:45 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:60315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQV-0000LR-RJ; Tue, 19 Jan 2021 01:23:45 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW1NxRz9sW8; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=oc8zydRdf0k5cpiSgWjiKvaxbIPTS3ta+BRVO58NPRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zn8ZIGmOOpoKyeK6fwh9O01huDxmx38uIGDcXp5ZILtORYiPIfk92kZESjP20bxxp UYaPeqWht06CaieCLDU8pghmH/TAF3SWo9MtG5ghbqLfCLI9w1WrNxr9TPJE98CQSr R6qVrCxK0xmwU2q5T4m+4fmslWAKZmod+yAOBqTI= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 02/13] hw/ppc: Delete unused ppc405cr_init() code Date: Tue, 19 Jan 2021 17:23:07 +1100 Message-Id: <20210119062318.13857-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Peter Maydell The function ppc405cr_init() has apparently been unused since it was added in commit 8ecc7913525ecb in 2007. Remove this dead code, so we don't have to convert it away from using ppcuic_init(). Signed-off-by: Peter Maydell Message-Id: <20210108171212.16500-3-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/ppc/ppc405.h | 6 - hw/ppc/ppc405_uc.c | 345 --------------------------------------------- 2 files changed, 351 deletions(-) diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h index 7ed25cfa1b..e6c702f7e0 100644 --- a/hw/ppc/ppc405.h +++ b/hw/ppc/ppc405.h @@ -62,12 +62,6 @@ ram_addr_t ppc405_set_bootinfo (CPUPPCState *env, ppc4xx= _bd_info_t *bd, void ppc4xx_plb_init(CPUPPCState *env); void ppc405_ebc_init(CPUPPCState *env); =20 -CPUPPCState *ppc405cr_init(MemoryRegion *address_space_mem, - MemoryRegion ram_memories[4], - hwaddr ram_bases[4], - hwaddr ram_sizes[4], - uint32_t sysclk, qemu_irq **picp, - int do_init); CPUPPCState *ppc405ep_init(MemoryRegion *address_space_mem, MemoryRegion ram_memories[2], hwaddr ram_bases[2], diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 381720aced..3e191ae4af 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -1155,351 +1155,6 @@ static void ppc4xx_gpt_init(hwaddr base, qemu_irq i= rqs[5]) qemu_register_reset(ppc4xx_gpt_reset, gpt); } =20 -/*************************************************************************= ****/ -/* PowerPC 405CR */ -enum { - PPC405CR_CPC0_PLLMR =3D 0x0B0, - PPC405CR_CPC0_CR0 =3D 0x0B1, - PPC405CR_CPC0_CR1 =3D 0x0B2, - PPC405CR_CPC0_PSR =3D 0x0B4, - PPC405CR_CPC0_JTAGID =3D 0x0B5, - PPC405CR_CPC0_ER =3D 0x0B9, - PPC405CR_CPC0_FR =3D 0x0BA, - PPC405CR_CPC0_SR =3D 0x0BB, -}; - -enum { - PPC405CR_CPU_CLK =3D 0, - PPC405CR_TMR_CLK =3D 1, - PPC405CR_PLB_CLK =3D 2, - PPC405CR_SDRAM_CLK =3D 3, - PPC405CR_OPB_CLK =3D 4, - PPC405CR_EXT_CLK =3D 5, - PPC405CR_UART_CLK =3D 6, - PPC405CR_CLK_NB =3D 7, -}; - -typedef struct ppc405cr_cpc_t ppc405cr_cpc_t; -struct ppc405cr_cpc_t { - clk_setup_t clk_setup[PPC405CR_CLK_NB]; - uint32_t sysclk; - uint32_t psr; - uint32_t cr0; - uint32_t cr1; - uint32_t jtagid; - uint32_t pllmr; - uint32_t er; - uint32_t fr; -}; - -static void ppc405cr_clk_setup (ppc405cr_cpc_t *cpc) -{ - uint64_t VCO_out, PLL_out; - uint32_t CPU_clk, TMR_clk, SDRAM_clk, PLB_clk, OPB_clk, EXT_clk, UART_= clk; - int M, D0, D1, D2; - - D0 =3D ((cpc->pllmr >> 26) & 0x3) + 1; /* CBDV */ - if (cpc->pllmr & 0x80000000) { - D1 =3D (((cpc->pllmr >> 20) - 1) & 0xF) + 1; /* FBDV */ - D2 =3D 8 - ((cpc->pllmr >> 16) & 0x7); /* FWDVA */ - M =3D D0 * D1 * D2; - VCO_out =3D (uint64_t)cpc->sysclk * M; - if (VCO_out < 400000000 || VCO_out > 800000000) { - /* PLL cannot lock */ - cpc->pllmr &=3D ~0x80000000; - goto bypass_pll; - } - PLL_out =3D VCO_out / D2; - } else { - /* Bypass PLL */ - bypass_pll: - M =3D D0; - PLL_out =3D (uint64_t)cpc->sysclk * M; - } - CPU_clk =3D PLL_out; - if (cpc->cr1 & 0x00800000) - TMR_clk =3D cpc->sysclk; /* Should have a separate clock */ - else - TMR_clk =3D CPU_clk; - PLB_clk =3D CPU_clk / D0; - SDRAM_clk =3D PLB_clk; - D0 =3D ((cpc->pllmr >> 10) & 0x3) + 1; - OPB_clk =3D PLB_clk / D0; - D0 =3D ((cpc->pllmr >> 24) & 0x3) + 2; - EXT_clk =3D PLB_clk / D0; - D0 =3D ((cpc->cr0 >> 1) & 0x1F) + 1; - UART_clk =3D CPU_clk / D0; - /* Setup CPU clocks */ - clk_setup(&cpc->clk_setup[PPC405CR_CPU_CLK], CPU_clk); - /* Setup time-base clock */ - clk_setup(&cpc->clk_setup[PPC405CR_TMR_CLK], TMR_clk); - /* Setup PLB clock */ - clk_setup(&cpc->clk_setup[PPC405CR_PLB_CLK], PLB_clk); - /* Setup SDRAM clock */ - clk_setup(&cpc->clk_setup[PPC405CR_SDRAM_CLK], SDRAM_clk); - /* Setup OPB clock */ - clk_setup(&cpc->clk_setup[PPC405CR_OPB_CLK], OPB_clk); - /* Setup external clock */ - clk_setup(&cpc->clk_setup[PPC405CR_EXT_CLK], EXT_clk); - /* Setup UART clock */ - clk_setup(&cpc->clk_setup[PPC405CR_UART_CLK], UART_clk); -} - -static uint32_t dcr_read_crcpc (void *opaque, int dcrn) -{ - ppc405cr_cpc_t *cpc; - uint32_t ret; - - cpc =3D opaque; - switch (dcrn) { - case PPC405CR_CPC0_PLLMR: - ret =3D cpc->pllmr; - break; - case PPC405CR_CPC0_CR0: - ret =3D cpc->cr0; - break; - case PPC405CR_CPC0_CR1: - ret =3D cpc->cr1; - break; - case PPC405CR_CPC0_PSR: - ret =3D cpc->psr; - break; - case PPC405CR_CPC0_JTAGID: - ret =3D cpc->jtagid; - break; - case PPC405CR_CPC0_ER: - ret =3D cpc->er; - break; - case PPC405CR_CPC0_FR: - ret =3D cpc->fr; - break; - case PPC405CR_CPC0_SR: - ret =3D ~(cpc->er | cpc->fr) & 0xFFFF0000; - break; - default: - /* Avoid gcc warning */ - ret =3D 0; - break; - } - - return ret; -} - -static void dcr_write_crcpc (void *opaque, int dcrn, uint32_t val) -{ - ppc405cr_cpc_t *cpc; - - cpc =3D opaque; - switch (dcrn) { - case PPC405CR_CPC0_PLLMR: - cpc->pllmr =3D val & 0xFFF77C3F; - break; - case PPC405CR_CPC0_CR0: - cpc->cr0 =3D val & 0x0FFFFFFE; - break; - case PPC405CR_CPC0_CR1: - cpc->cr1 =3D val & 0x00800000; - break; - case PPC405CR_CPC0_PSR: - /* Read-only */ - break; - case PPC405CR_CPC0_JTAGID: - /* Read-only */ - break; - case PPC405CR_CPC0_ER: - cpc->er =3D val & 0xBFFC0000; - break; - case PPC405CR_CPC0_FR: - cpc->fr =3D val & 0xBFFC0000; - break; - case PPC405CR_CPC0_SR: - /* Read-only */ - break; - } -} - -static void ppc405cr_cpc_reset (void *opaque) -{ - ppc405cr_cpc_t *cpc; - int D; - - cpc =3D opaque; - /* Compute PLLMR value from PSR settings */ - cpc->pllmr =3D 0x80000000; - /* PFWD */ - switch ((cpc->psr >> 30) & 3) { - case 0: - /* Bypass */ - cpc->pllmr &=3D ~0x80000000; - break; - case 1: - /* Divide by 3 */ - cpc->pllmr |=3D 5 << 16; - break; - case 2: - /* Divide by 4 */ - cpc->pllmr |=3D 4 << 16; - break; - case 3: - /* Divide by 6 */ - cpc->pllmr |=3D 2 << 16; - break; - } - /* PFBD */ - D =3D (cpc->psr >> 28) & 3; - cpc->pllmr |=3D (D + 1) << 20; - /* PT */ - D =3D (cpc->psr >> 25) & 7; - switch (D) { - case 0x2: - cpc->pllmr |=3D 0x13; - break; - case 0x4: - cpc->pllmr |=3D 0x15; - break; - case 0x5: - cpc->pllmr |=3D 0x16; - break; - default: - break; - } - /* PDC */ - D =3D (cpc->psr >> 23) & 3; - cpc->pllmr |=3D D << 26; - /* ODP */ - D =3D (cpc->psr >> 21) & 3; - cpc->pllmr |=3D D << 10; - /* EBPD */ - D =3D (cpc->psr >> 17) & 3; - cpc->pllmr |=3D D << 24; - cpc->cr0 =3D 0x0000003C; - cpc->cr1 =3D 0x2B0D8800; - cpc->er =3D 0x00000000; - cpc->fr =3D 0x00000000; - ppc405cr_clk_setup(cpc); -} - -static void ppc405cr_clk_init (ppc405cr_cpc_t *cpc) -{ - int D; - - /* XXX: this should be read from IO pins */ - cpc->psr =3D 0x00000000; /* 8 bits ROM */ - /* PFWD */ - D =3D 0x2; /* Divide by 4 */ - cpc->psr |=3D D << 30; - /* PFBD */ - D =3D 0x1; /* Divide by 2 */ - cpc->psr |=3D D << 28; - /* PDC */ - D =3D 0x1; /* Divide by 2 */ - cpc->psr |=3D D << 23; - /* PT */ - D =3D 0x5; /* M =3D 16 */ - cpc->psr |=3D D << 25; - /* ODP */ - D =3D 0x1; /* Divide by 2 */ - cpc->psr |=3D D << 21; - /* EBDP */ - D =3D 0x2; /* Divide by 4 */ - cpc->psr |=3D D << 17; -} - -static void ppc405cr_cpc_init (CPUPPCState *env, clk_setup_t clk_setup[7], - uint32_t sysclk) -{ - ppc405cr_cpc_t *cpc; - - cpc =3D g_malloc0(sizeof(ppc405cr_cpc_t)); - memcpy(cpc->clk_setup, clk_setup, - PPC405CR_CLK_NB * sizeof(clk_setup_t)); - cpc->sysclk =3D sysclk; - cpc->jtagid =3D 0x42051049; - ppc_dcr_register(env, PPC405CR_CPC0_PSR, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_CR0, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_CR1, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_JTAGID, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_PLLMR, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_ER, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_FR, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc_dcr_register(env, PPC405CR_CPC0_SR, cpc, - &dcr_read_crcpc, &dcr_write_crcpc); - ppc405cr_clk_init(cpc); - qemu_register_reset(ppc405cr_cpc_reset, cpc); -} - -CPUPPCState *ppc405cr_init(MemoryRegion *address_space_mem, - MemoryRegion ram_memories[4], - hwaddr ram_bases[4], - hwaddr ram_sizes[4], - uint32_t sysclk, qemu_irq **picp, - int do_init) -{ - clk_setup_t clk_setup[PPC405CR_CLK_NB]; - qemu_irq dma_irqs[4]; - PowerPCCPU *cpu; - CPUPPCState *env; - qemu_irq *pic, *irqs; - - memset(clk_setup, 0, sizeof(clk_setup)); - cpu =3D ppc4xx_init(POWERPC_CPU_TYPE_NAME("405crc"), - &clk_setup[PPC405CR_CPU_CLK], - &clk_setup[PPC405CR_TMR_CLK], sysclk); - env =3D &cpu->env; - /* Memory mapped devices registers */ - /* PLB arbitrer */ - ppc4xx_plb_init(env); - /* PLB to OPB bridge */ - ppc4xx_pob_init(env); - /* OBP arbitrer */ - ppc4xx_opba_init(0xef600600); - /* Universal interrupt controller */ - irqs =3D g_new0(qemu_irq, PPCUIC_OUTPUT_NB); - irqs[PPCUIC_OUTPUT_INT] =3D - ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]; - irqs[PPCUIC_OUTPUT_CINT] =3D - ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]; - pic =3D ppcuic_init(env, irqs, 0x0C0, 0, 1); - *picp =3D pic; - /* SDRAM controller */ - ppc4xx_sdram_init(env, pic[14], 1, ram_memories, - ram_bases, ram_sizes, do_init); - /* External bus controller */ - ppc405_ebc_init(env); - /* DMA controller */ - dma_irqs[0] =3D pic[26]; - dma_irqs[1] =3D pic[25]; - dma_irqs[2] =3D pic[24]; - dma_irqs[3] =3D pic[23]; - ppc405_dma_init(env, dma_irqs); - /* Serial ports */ - if (serial_hd(0) !=3D NULL) { - serial_mm_init(address_space_mem, 0xef600300, 0, pic[0], - PPC_SERIAL_MM_BAUDBASE, serial_hd(0), - DEVICE_BIG_ENDIAN); - } - if (serial_hd(1) !=3D NULL) { - serial_mm_init(address_space_mem, 0xef600400, 0, pic[1], - PPC_SERIAL_MM_BAUDBASE, serial_hd(1), - DEVICE_BIG_ENDIAN); - } - /* IIC controller */ - sysbus_create_simple(TYPE_PPC4xx_I2C, 0xef600500, pic[2]); - /* GPIO */ - ppc405_gpio_init(0xef600700); - /* CPU control */ - ppc405cr_cpc_init(env, clk_setup, sysclk); - - return env; -} - /*************************************************************************= ****/ /* PowerPC 405EP */ /* CPU control */ --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037582; cv=none; d=zohomail.com; s=zohoarc; b=j3Vy3BhpQyNFXl9UDLE+e0uCzRyVfTMLPRaJsVKAFotZXme6LLX7BJQrE6vbRUCI12MbJydKhRNqU/LJ9Rj7ywofsbZWuk4ELY5MEQJYNs3f45CB1heG/PPhkAwcvNA+4ubIO0pH96CzogkAPJxkoUmqrCDJC/zdo1m9FC79/Js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037582; h=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=BCsSx34zg7/Oku2U1zUWWvdDneM9dlXX9wyiIe4hYWw=; b=JQtB5hqx944Ywmn7BJdVpDro215WL7iTyiTRoPBvdsFi5bv+cbKkV0Uhu003XRhLnAxdHSfx44QgyEyd23tKH6FeTCY4cbR8CU6dbTqRIN7eV/Ddl2rgWUlngOrWvLCIk/nwwCd4hWRmFMroDd9TSspLci77BbWT6Eki36RDwIY= 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 1611037581969284.1965833875545; Mon, 18 Jan 2021 22:26:21 -0800 (PST) Received: from localhost ([::1]:33872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kT5-00032q-VK for importer@patchew.org; Tue, 19 Jan 2021 01:26:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQb-0001D6-Dh; Tue, 19 Jan 2021 01:23:45 -0500 Received: from ozlabs.org ([203.11.71.1]:36789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQW-0000LS-A3; Tue, 19 Jan 2021 01:23:45 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW37SDz9sWV; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=xxmvz4OB5N2cFqIicRajYQ8j7Dwknrym5stSSTgyNMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MSpQhUPx3pS26iGfF5kF8z2fVVCvDI3LY9EEXmJ8FKJ6Am9RpY+sAcUCGQuWxZc37 bhw6GpAgzqt+o26wtM1cGWwIwE1zMepMaSSWrET/tNvlhrbXwRi9f88feGBvLjzRtj eS3bud1KxANymPTf9keQ5IwVC428HX8s/uIhBfl8= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 03/13] hw/intc/ppc-uic: Make default dcr-base 0xc0, not 0x30 Date: Tue, 19 Jan 2021 17:23:08 +1100 Message-Id: <20210119062318.13857-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Nathan Chancellor , David Gibson , qemu-ppc@nongnu.org, 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) Content-Type: text/plain; charset="utf-8" From: Peter Maydell In commit 34d0831f38fd8 the ppc-uic device was added, with a dcr-base property. The intention was that the default value of dcr-base should be the one that most of our boards need, so that in the common case they don't need to specify a property value. All QEMU boards with a UIC use a dcr-base of 0xc0, with the exception of sam460ex which has four UICs and so puts them at 0xc0, 0xd0, 0xe0, 0xf0. So 0xc0 is the obvious right choice for the default dcr-base. The board code conversions in commits 0270d74ef88623505 (bamboo) and c5ac9dc64fa552a6 (virtex_ml507) assumed that default was 0xc0. Unfortunately the actual default in 34d0831f38fd8 was 0x30, by mistake, so the bamboo and virtex_ml507 boards were broken as they were converted away from ppcuic_init() (which always specifies the dcr_base property value explicitly). Set the default dcr-base to 0xc0 as was intended, fixing bamboo and virtex_ml507. Fixes: 34d0831f38fd8 Reported-by: Nathan Chancellor Suggested-by: BALATON Zoltan Signed-off-by: Peter Maydell Message-Id: <20210111213007.7381-1-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/intc/ppc-uic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c index b21951eea8..7171de7b35 100644 --- a/hw/intc/ppc-uic.c +++ b/hw/intc/ppc-uic.c @@ -274,7 +274,7 @@ static void ppc_uic_realize(DeviceState *dev, Error **e= rrp) =20 static Property ppc_uic_properties[] =3D { DEFINE_PROP_LINK("cpu", PPCUIC, cpu, TYPE_CPU, CPUState *), - DEFINE_PROP_UINT32("dcr-base", PPCUIC, dcr_base, 0x30), + DEFINE_PROP_UINT32("dcr-base", PPCUIC, dcr_base, 0xc0), DEFINE_PROP_BOOL("use-vectors", PPCUIC, use_vectors, true), DEFINE_PROP_END_OF_LIST() }; --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037583; cv=none; d=zohomail.com; s=zohoarc; b=fKdFPfUuczCw8DQtIT+txd0waAJ9GksC0NTTZInOgra+pwzJFU1P/fkf0Jd4phjHGiY6hRHA/KVG/lnK0wj1Try6XyXzKx63puG4xwQA2hlecoCVgdpZpQVuG8bAUklc8K1EZBZzP/et3Mtzw2Lynnah5ThEZnnSHYrqQBf3aWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037583; h=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=LpwamPoEyxQBk3/9ekbxUZcBB0G7F05kpVv2X/ZpAio=; b=Tdb+njrdRkc7Oge5gkAw+oU9kufoOZ4xBmwiBiMNoI51+LMwcNMSDL2BGIEaUsMj6mEuqr0ujnOxi9+E2eJDWo6v+W3PzAseY+vXAXqWWvG47sdCmrDrmC1lspuE/CPPsE6dfjvGzIVkTBizw83bq7F5sVH+Xmu2cLR7PG5gqUg= 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 1611037583361246.83922881306592; Mon, 18 Jan 2021 22:26:23 -0800 (PST) Received: from localhost ([::1]:33978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kT8-00035G-8a for importer@patchew.org; Tue, 19 Jan 2021 01:26:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQb-0001DH-Rl; Tue, 19 Jan 2021 01:23:45 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:41441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQV-0000LX-Vd; Tue, 19 Jan 2021 01:23:45 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW49NRz9sWX; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=wkVjszF7bWC4kdibLSdiwQ/ggfyLM6xOqEL97y29hEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AfinrRfP76HNJuMUPTHEvUojxluj+KYAD463L5spwvMuLA8X3wFLeVfnKGPaPvrvA GuDY6ugBtUHLTJ3OPEO3giguYrGzofuKOqDJZQOpfaDt1IPQuoJBNGe9PIotf4JuDd NYk5FZ0y7pkZ5w0tqPxjiwjRxRr9Z9+Gdcs9Wz+g= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 04/13] hw/ppc/ppc405_uc: Drop use of ppcuic_init() Date: Tue, 19 Jan 2021 17:23:09 +1100 Message-Id: <20210119062318.13857-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Peter Maydell Switch the ppc405_uc boards to directly creating and configuring the UIC, rather than doing it via the old ppcuic_init() helper function. We retain the API feature of ppc405ep_init() where it passes back something allowing the callers to wire up devices to the UIC if they need to, even though neither of the callsites currently makes use of this ability -- instead of passing back the qemu_irq array we pass back the UIC DeviceState. This fixes a trivial Coverity-detected memory leak where we were leaking the array of IRQs returned by ppcuic_init(). Fixes: Coverity CID 1421922 Signed-off-by: Peter Maydell Message-Id: <20210108171212.16500-4-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/ppc/ppc405.h | 2 +- hw/ppc/ppc405_boards.c | 8 ++--- hw/ppc/ppc405_uc.c | 70 +++++++++++++++++++++++++----------------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h index e6c702f7e0..c58f739886 100644 --- a/hw/ppc/ppc405.h +++ b/hw/ppc/ppc405.h @@ -66,7 +66,7 @@ CPUPPCState *ppc405ep_init(MemoryRegion *address_space_me= m, MemoryRegion ram_memories[2], hwaddr ram_bases[2], hwaddr ram_sizes[2], - uint32_t sysclk, qemu_irq **picp, + uint32_t sysclk, DeviceState **uicdev, int do_init); =20 #endif /* PPC405_H */ diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index b7249f21cf..8f77887fb1 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -151,7 +151,6 @@ static void ref405ep_init(MachineState *machine) CPUPPCState *env; DeviceState *dev; SysBusDevice *s; - qemu_irq *pic; MemoryRegion *bios; MemoryRegion *sram =3D g_new(MemoryRegion, 1); ram_addr_t bdloc; @@ -167,6 +166,7 @@ static void ref405ep_init(MachineState *machine) int len; DriveInfo *dinfo; MemoryRegion *sysmem =3D get_system_memory(); + DeviceState *uicdev; =20 if (machine->ram_size !=3D mc->default_ram_size) { char *sz =3D size_to_str(mc->default_ram_size); @@ -184,7 +184,7 @@ static void ref405ep_init(MachineState *machine) ram_bases[1] =3D 0x00000000; ram_sizes[1] =3D 0x00000000; env =3D ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, - 33333333, &pic, kernel_filename =3D=3D NULL ? 0 : = 1); + 33333333, &uicdev, kernel_filename =3D=3D NULL ? 0= : 1); /* allocate SRAM */ sram_size =3D 512 * KiB; memory_region_init_ram(sram, NULL, "ef405ep.sram", sram_size, @@ -429,7 +429,6 @@ static void taihu_405ep_init(MachineState *machine) const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; char *filename; - qemu_irq *pic; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *bios; MemoryRegion *ram_memories =3D g_new(MemoryRegion, 2); @@ -440,6 +439,7 @@ static void taihu_405ep_init(MachineState *machine) int linux_boot; int fl_idx; DriveInfo *dinfo; + DeviceState *uicdev; =20 if (machine->ram_size !=3D mc->default_ram_size) { char *sz =3D size_to_str(mc->default_ram_size); @@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine) "taihu_405ep.ram-1", machine->ram, ram_bases[= 1], ram_sizes[1]); ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, - 33333333, &pic, kernel_filename =3D=3D NULL ? 0 : 1); + 33333333, &uicdev, kernel_filename =3D=3D NULL ? 0 : 1); /* allocate and load BIOS */ fl_idx =3D 0; #if defined(USE_FLASH_BIOS) diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 3e191ae4af..fe047074a1 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -36,6 +36,9 @@ #include "sysemu/sysemu.h" #include "qemu/log.h" #include "exec/address-spaces.h" +#include "hw/intc/ppc-uic.h" +#include "hw/qdev-properties.h" +#include "qapi/error.h" =20 //#define DEBUG_OPBA //#define DEBUG_SDRAM @@ -1446,14 +1449,15 @@ CPUPPCState *ppc405ep_init(MemoryRegion *address_sp= ace_mem, MemoryRegion ram_memories[2], hwaddr ram_bases[2], hwaddr ram_sizes[2], - uint32_t sysclk, qemu_irq **picp, + uint32_t sysclk, DeviceState **uicdevp, int do_init) { clk_setup_t clk_setup[PPC405EP_CLK_NB], tlb_clk_setup; qemu_irq dma_irqs[4], gpt_irqs[5], mal_irqs[4]; PowerPCCPU *cpu; CPUPPCState *env; - qemu_irq *pic, *irqs; + DeviceState *uicdev; + SysBusDevice *uicsbd; =20 memset(clk_setup, 0, sizeof(clk_setup)); /* init CPUs */ @@ -1474,59 +1478,69 @@ CPUPPCState *ppc405ep_init(MemoryRegion *address_sp= ace_mem, /* Initialize timers */ ppc_booke_timers_init(cpu, sysclk, 0); /* Universal interrupt controller */ - irqs =3D g_new0(qemu_irq, PPCUIC_OUTPUT_NB); - irqs[PPCUIC_OUTPUT_INT] =3D - ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]; - irqs[PPCUIC_OUTPUT_CINT] =3D - ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]; - pic =3D ppcuic_init(env, irqs, 0x0C0, 0, 1); - *picp =3D pic; + uicdev =3D qdev_new(TYPE_PPC_UIC); + uicsbd =3D SYS_BUS_DEVICE(uicdev); + + object_property_set_link(OBJECT(uicdev), "cpu", OBJECT(cpu), + &error_fatal); + sysbus_realize_and_unref(uicsbd, &error_fatal); + + sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_INT, + ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]); + sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_CINT, + ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]); + + *uicdevp =3D uicdev; + /* SDRAM controller */ /* XXX 405EP has no ECC interrupt */ - ppc4xx_sdram_init(env, pic[17], 2, ram_memories, + ppc4xx_sdram_init(env, qdev_get_gpio_in(uicdev, 17), 2, ram_memories, ram_bases, ram_sizes, do_init); /* External bus controller */ ppc405_ebc_init(env); /* DMA controller */ - dma_irqs[0] =3D pic[5]; - dma_irqs[1] =3D pic[6]; - dma_irqs[2] =3D pic[7]; - dma_irqs[3] =3D pic[8]; + dma_irqs[0] =3D qdev_get_gpio_in(uicdev, 5); + dma_irqs[1] =3D qdev_get_gpio_in(uicdev, 6); + dma_irqs[2] =3D qdev_get_gpio_in(uicdev, 7); + dma_irqs[3] =3D qdev_get_gpio_in(uicdev, 8); ppc405_dma_init(env, dma_irqs); /* IIC controller */ - sysbus_create_simple(TYPE_PPC4xx_I2C, 0xef600500, pic[2]); + sysbus_create_simple(TYPE_PPC4xx_I2C, 0xef600500, + qdev_get_gpio_in(uicdev, 2)); /* GPIO */ ppc405_gpio_init(0xef600700); /* Serial ports */ if (serial_hd(0) !=3D NULL) { - serial_mm_init(address_space_mem, 0xef600300, 0, pic[0], + serial_mm_init(address_space_mem, 0xef600300, 0, + qdev_get_gpio_in(uicdev, 0), PPC_SERIAL_MM_BAUDBASE, serial_hd(0), DEVICE_BIG_ENDIAN); } if (serial_hd(1) !=3D NULL) { - serial_mm_init(address_space_mem, 0xef600400, 0, pic[1], + serial_mm_init(address_space_mem, 0xef600400, 0, + qdev_get_gpio_in(uicdev, 1), PPC_SERIAL_MM_BAUDBASE, serial_hd(1), DEVICE_BIG_ENDIAN); } /* OCM */ ppc405_ocm_init(env); /* GPT */ - gpt_irqs[0] =3D pic[19]; - gpt_irqs[1] =3D pic[20]; - gpt_irqs[2] =3D pic[21]; - gpt_irqs[3] =3D pic[22]; - gpt_irqs[4] =3D pic[23]; + gpt_irqs[0] =3D qdev_get_gpio_in(uicdev, 19); + gpt_irqs[1] =3D qdev_get_gpio_in(uicdev, 20); + gpt_irqs[2] =3D qdev_get_gpio_in(uicdev, 21); + gpt_irqs[3] =3D qdev_get_gpio_in(uicdev, 22); + gpt_irqs[4] =3D qdev_get_gpio_in(uicdev, 23); ppc4xx_gpt_init(0xef600000, gpt_irqs); /* PCI */ - /* Uses pic[3], pic[16], pic[18] */ + /* Uses UIC IRQs 3, 16, 18 */ /* MAL */ - mal_irqs[0] =3D pic[11]; - mal_irqs[1] =3D pic[12]; - mal_irqs[2] =3D pic[13]; - mal_irqs[3] =3D pic[14]; + mal_irqs[0] =3D qdev_get_gpio_in(uicdev, 11); + mal_irqs[1] =3D qdev_get_gpio_in(uicdev, 12); + mal_irqs[2] =3D qdev_get_gpio_in(uicdev, 13); + mal_irqs[3] =3D qdev_get_gpio_in(uicdev, 14); ppc4xx_mal_init(env, 4, 2, mal_irqs); /* Ethernet */ - /* Uses pic[9], pic[15], pic[17] */ + /* Uses UIC IRQs 9, 15, 17 */ /* CPU control */ ppc405ep_cpc_init(env, clk_setup, sysclk); =20 --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037969; cv=none; d=zohomail.com; s=zohoarc; b=BEj50jf6OkNXLsvWnTZDH7oC3nvmZKh2h42eVwh8QgJDXpBlz3VFQB8052Gc1mqukIQSBB5j1ctPNNqpIe02Orwc7s8RuLQg1Tg0TF9AYFXgdRTcm1vbTG05oAclKGkSes3Nupcz+wc88EXLU6if1n1c1KAwIQp+47SxELjrPF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037969; h=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=m7RpXjXTfWsqDJRZ2CS9T409ZIPMKaSpCXaanMojTuE=; b=K7bCqePImUR3jy9yo54AEV+zt4SqkxPhpADsrPEFFkM5s/ciGLpHmePkLsG+HvdnWYEUayK8/Gh0Vc12Zp+gzrzbLkujT6h9rV9ehIl7PPzUVO06Z1M8c+MPbFcqtIWwX/XtRkHBg+XdwVI12cLKURbdwQOPwpicCeaUwDwhvSY= 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 1611037969600336.1010242747717; Mon, 18 Jan 2021 22:32:49 -0800 (PST) Received: from localhost ([::1]:52544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kZM-0002Xf-HU for importer@patchew.org; Tue, 19 Jan 2021 01:32:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQh-0001OZ-Pa; Tue, 19 Jan 2021 01:23:51 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:34789 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000Si-JK; Tue, 19 Jan 2021 01:23:51 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW5Dhvz9sWY; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=0gvNDW/viLsiaGew9ibOeqS0VFKvWCy1PNxkmx6DF5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oDiooSZLqQSSoUay+10tlB/Yia+rUNl1CxoyFDPsBgbCelToXRqkMKQ2gmMvkrxdZ AsvSARQwuc3/oPCZyz9SL32TQI7Px8L6DKjRDIN+ORcweYDWHWo44ByW/OFEfJNdhe o2zi6AmxsvFnzLHtV85pBxaUZ+QSkrDmurXwJb2o= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 05/13] hw/ppc: Remove unused ppcuic_init() Date: Tue, 19 Jan 2021 17:23:10 +1100 Message-Id: <20210119062318.13857-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: "Edgar E . Iglesias" , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Peter Maydell Now we've converted all the callsites to directly create the QOM UIC device themselves, the ppcuic_init() function is unused and can be removed. The enum defining PPCUIC symbolic constants can be moved to the ppc-uic.h header where it more naturally belongs. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias Message-Id: <20210108171212.16500-5-peter.maydell@linaro.org> Signed-off-by: David Gibson --- hw/ppc/ppc4xx_devs.c | 38 -------------------------------------- include/hw/intc/ppc-uic.h | 7 +++++++ include/hw/ppc/ppc4xx.h | 9 --------- 3 files changed, 7 insertions(+), 47 deletions(-) diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index ffe4cf43e8..fe9d4f7155 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -77,44 +77,6 @@ PowerPCCPU *ppc4xx_init(const char *cpu_type, return cpu; } =20 -/*************************************************************************= ****/ -/* "Universal" Interrupt controller */ - -qemu_irq *ppcuic_init (CPUPPCState *env, qemu_irq *irqs, - uint32_t dcr_base, int has_ssr, int has_vr) -{ - DeviceState *uicdev =3D qdev_new(TYPE_PPC_UIC); - SysBusDevice *uicsbd =3D SYS_BUS_DEVICE(uicdev); - qemu_irq *uic_irqs; - int i; - - qdev_prop_set_uint32(uicdev, "dcr-base", dcr_base); - qdev_prop_set_bit(uicdev, "use-vectors", has_vr); - object_property_set_link(OBJECT(uicdev), "cpu", OBJECT(env_cpu(env)), - &error_fatal); - sysbus_realize_and_unref(uicsbd, &error_fatal); - - sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_INT, irqs[PPCUIC_OUTPUT_INT]); - sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_CINT, irqs[PPCUIC_OUTPUT_CINT= ]); - - /* - * Return an allocated array of the UIC's input IRQ lines. - * This is an ugly temporary API to retain compatibility with - * the ppcuic_init() interface from the pre-QOM-conversion UIC. - * None of the callers free this array, so it is leaked -- but - * so was the array allocated by qemu_allocate_irqs() in the - * old code. - * - * The callers should just instantiate the UIC and wire it up - * themselves rather than passing qemu_irq* in and out of this functio= n. - */ - uic_irqs =3D g_new0(qemu_irq, UIC_MAX_IRQ); - for (i =3D 0; i < UIC_MAX_IRQ; i++) { - uic_irqs[i] =3D qdev_get_gpio_in(uicdev, i); - } - return uic_irqs; -} - /*************************************************************************= ****/ /* SDRAM controller */ typedef struct ppc4xx_sdram_t ppc4xx_sdram_t; diff --git a/include/hw/intc/ppc-uic.h b/include/hw/intc/ppc-uic.h index e614e2ffd8..22dd5e5ac2 100644 --- a/include/hw/intc/ppc-uic.h +++ b/include/hw/intc/ppc-uic.h @@ -47,6 +47,13 @@ OBJECT_DECLARE_SIMPLE_TYPE(PPCUIC, PPC_UIC) =20 #define UIC_MAX_IRQ 32 =20 +/* Symbolic constants for the sysbus IRQ outputs */ +enum { + PPCUIC_OUTPUT_INT =3D 0, + PPCUIC_OUTPUT_CINT =3D 1, + PPCUIC_OUTPUT_NB, +}; + struct PPCUIC { /*< private >*/ SysBusDevice parent_obj; diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index cc19c8da5b..980f964b5a 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -33,15 +33,6 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk, uint32_t sysclk); =20 -/* PowerPC 4xx universal interrupt controller */ -enum { - PPCUIC_OUTPUT_INT =3D 0, - PPCUIC_OUTPUT_CINT =3D 1, - PPCUIC_OUTPUT_NB, -}; -qemu_irq *ppcuic_init (CPUPPCState *env, qemu_irq *irqs, - uint32_t dcr_base, int has_ssr, int has_vr); - void ppc4xx_sdram_banks(MemoryRegion *ram, int nr_banks, MemoryRegion ram_memories[], hwaddr ram_bases[], hwaddr ram_sizes[], --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037761; cv=none; d=zohomail.com; s=zohoarc; b=Q1rH1pggAsNYGLlQV12abtyxAHvpkwSlB2mIgDMqgNFNqkJLaot++/Asijm4GherRQgHMiCbuo6Q4PlAl0iHepZkGnCpTs5tRv56swoQXb4ANt4p2zvxaECvO1O066y9+usH/zSv/EKq7AihLgpJTnQF8rXYcJXRpttrEu8Odn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037761; h=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=vX6WqYOwQtWG9thHbZzPwE7a8thzvgczXJBBk4wH6UU=; b=MlVB1e6mXsCQwdbmQKxPlV7lhTHS07WMZQfz7M/gwmhWqUMV4MwV+aZcnAfHPc0luMKppm4tRRWF+2Iq6E0A3sPWzp/ZA8M3SlILykAaIAcFvTC+PhtH1kozFkjMCj7akfnN5XFizXIsdYiJADz2XSWMAZuQfosNRzS2SsmP7yI= 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 161103776160220.233017976344968; Mon, 18 Jan 2021 22:29:21 -0800 (PST) Received: from localhost ([::1]:43452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kW0-000729-HJ for importer@patchew.org; Tue, 19 Jan 2021 01:29:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQh-0001Nj-Eo; Tue, 19 Jan 2021 01:23:51 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:45407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000Sn-Hq; Tue, 19 Jan 2021 01:23:51 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW5wFfz9sWg; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=veP5joMMQ+anFS7DuKxkR5ffEoQuwYk8RJZst3QTy+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKNEt+PZR9T361lGaRqLxXeIKuWJrUKJAuPahyDwROq+dlsiKEMJc3OAM1OdKvNLs QXut1gRMujAtGTKXwMaLxL6T60UvXVJxJtrmvdyfCCHQoFkwyTX3lTiFICH7HwIhVm IE1SPUzgNol7UnjGuRB2dTjlzeEN5iTZ0RL0aJSs= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 06/13] Revert "sam460ex: Remove FDT_PPC dependency from KConfig" Date: Tue, 19 Jan 2021 17:23:11 +1100 Message-Id: <20210119062318.13857-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: David Gibson , qemu-ppc@nongnu.org, 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) Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan This reverts commit 038da2adf that was mistakenly added, this dependency is still needed to get libfdt dependencies even if fdt.o is not needed by sam460ex. Signed-off-by: BALATON Zoltan Message-Id: <15a9fa72eed4f02bdbeaef206803d5e22260e2de.1610143658.git.balato= n@eik.bme.hu> Reviewed-by: Peter Maydell Signed-off-by: David Gibson --- hw/ppc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 7e267d94a1..d2329edbab 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -64,6 +64,7 @@ config SAM460EX select SMBUS_EEPROM select USB_EHCI_SYSBUS select USB_OHCI + select FDT_PPC =20 config PREP bool --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037980; cv=none; d=zohomail.com; s=zohoarc; b=HhBveAdc0gEJustdrVj7NYIOGamMyBRnnsfpZO3Rm0zzaJIMu2BkXTDQH3GiRqlKPrfDkLsbfhq32OW29mByrswARjfySiB/vwxBxiDm33QKH0lpk/AufiXJEqsPr3jKww4zLvGUsdZ2CThTkIQHNLp5Q4x9qY67v1awwYc44NM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037980; h=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=1JOcWRbmCO6NBK80Q703Y0ilg/BTzOJimCUFlf2zX0Y=; b=M1/CzLx/nvj4X0ysKCRdufzSej566H6mom4gWksP31wfNUNuRLQGgMVsv6p8CvHUa+AXWHZ/t6ItDiO3cbt68vvVCvOAZWdVErjpwKVIfGFtM4yyRyqnK+oXW3zrbgUud1EEd3Aoz2xE+H99YGz0QQ+y6JbKQZBZ+CAJzFmR5oY= 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 1611037980817962.507097591616; Mon, 18 Jan 2021 22:33:00 -0800 (PST) Received: from localhost ([::1]:53628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kZX-0002zD-Ow for importer@patchew.org; Tue, 19 Jan 2021 01:32:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQn-0001QZ-9H; Tue, 19 Jan 2021 01:23:57 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:47399 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000Sy-Rx; Tue, 19 Jan 2021 01:23:53 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrW6nWgz9sWj; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037403; bh=QsJzCm5/tGou+LocHcbDDZVTxVgpms8hkwzIpO8gcpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FGwhUQVgKMq5Lji0qqqEzcFSupIzhtKudJNtldgZZjNmt27nEDj2M6JMB789EuLie UaBbaOXUbFGZu/PkxSZtxcP4C99BkPuW58zetYUtEJKXb1nOeaZ3caKUvaJ8djqjsz cfshGWHM+iTR9g5B6s+bgSW9mmfRXSUWyEmo0WwY= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 07/13] Revert "ppc4xx: Move common dependency on serial to common option" Date: Tue, 19 Jan 2021 17:23:12 +1100 Message-Id: <20210119062318.13857-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: David Gibson , qemu-ppc@nongnu.org, 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) Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan This reverts commit e6d5106786 which was added mistakenly. While this change works it was suggested during review that keeping dependencies explicit for each board may be better than listing them in a common option so keep the previous version and revert this change. Signed-off-by: BALATON Zoltan Message-Id: <8c65807fc7dc1c4c4f6320f2fd6409a3091c88ff.1610143658.git.balato= n@eik.bme.hu> Reviewed-by: Peter Maydell Signed-off-by: David Gibson --- hw/ppc/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index d2329edbab..d11dc30509 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -36,6 +36,7 @@ config PPC405 select M48T59 select PFLASH_CFI02 select PPC4XX + select SERIAL =20 config PPC440 bool @@ -44,6 +45,7 @@ config PPC440 imply E1000_PCI select PCI_EXPRESS select PPC4XX + select SERIAL select FDT_PPC =20 config PPC4XX @@ -51,7 +53,6 @@ config PPC4XX select BITBANG_I2C select PCI select PPC_UIC - select SERIAL =20 config SAM460EX bool @@ -60,6 +61,7 @@ config SAM460EX select IDE_SII3112 select M41T80 select PPC440 + select SERIAL select SM501 select SMBUS_EEPROM select USB_EHCI_SYSBUS @@ -121,6 +123,7 @@ config VIRTEX bool select PPC4XX select PFLASH_CFI01 + select SERIAL select XILINX select XILINX_ETHLITE select FDT_PPC --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037970; cv=none; d=zohomail.com; s=zohoarc; b=as6zcEDJihtkfnVJ9AcbWLsZM85IVXw1aoIROUKtWjVL46+nMdtNTOeLONliwdsv6nyzGBMuTLNZDfbskLbPn1wFY70lrBdJJl7tqMERTyIOnZOPF6EsUC1EKBr55R6cBh5Dcdx0InfY/vkek0id2hSvwHEQle2y6+c4WY1x940= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037970; h=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=JmjxRx+80kCyS4TZUDp5RAEK94X677wzQqeQIJDXBrI=; b=SWCgsNF/jDFESS+5qQz4PAw70zNYn4G1BmKLaaHLeNcSLrMlVZrJh2Aw5niZK67+3uTOd0HhNAs9UR08QIMeUmbxlGCglo6meJzVaz7eRWe9AYC5+GmhPU5gVhw4ENQ0dgLN1nVM2qnfZLD0KjjpPV0YYzkZlGoaw0wTGO5Ggu8= 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 1611037970625834.4185758697122; Mon, 18 Jan 2021 22:32:50 -0800 (PST) Received: from localhost ([::1]:52590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kZN-0002Yl-DR for importer@patchew.org; Tue, 19 Jan 2021 01:32:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQg-0001KU-7U; Tue, 19 Jan 2021 01:23:50 -0500 Received: from ozlabs.org ([203.11.71.1]:53819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000Sw-Cr; Tue, 19 Jan 2021 01:23:49 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrX0LFGz9sWm; Tue, 19 Jan 2021 17:23:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037404; bh=LJ2eQ5x5zz38Rr6VcKg9tAdMi3vH1X07i1g+fXmUXNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ph2qi5ly1zy+6rXaimIiOo+WzPOAsdbmzUhz+VKmnzKoPKbnjgbml7tm4kWLtskl3 4geMugn1ufwd3OazpMoK8h31+8637G6PwOiljyN35j9I8OeDiuCpTgOz1CCboM14tI X5YK4MeQArwy5SXQ9wn3hB9jyv9EF9AMjx4+Vai4= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 08/13] sam460ex: Use type cast macro instead of simple cast Date: Tue, 19 Jan 2021 17:23:13 +1100 Message-Id: <20210119062318.13857-9-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: David Gibson , qemu-ppc@nongnu.org, 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) Content-Type: text/plain; charset="utf-8" From: BALATON Zoltan Use the PCI_BUS type cast macro to convert result of qdev_get_child_bus(). Also remove the check for NULL afterwards which should not be needed because sysbus_create_simple() uses error_abort and we create the PCI host object here that's expected to have a PCI bus so this shouldn't fail. Even if it would fail that would be due to a programmer error so an error message is not necessary. Signed-off-by: BALATON Zoltan Message-Id: Reviewed-by: Peter Maydell Signed-off-by: David Gibson --- hw/ppc/sam460ex.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 45721ad6c7..e459b43065 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -419,11 +419,8 @@ static void sam460ex_init(MachineState *machine) /* All PCI irqs are connected to the same UIC pin (cf. UBoot source) */ dev =3D sysbus_create_simple("ppc440-pcix-host", 0xc0ec00000, qdev_get_gpio_in(uic[1], 0)); - pci_bus =3D (PCIBus *)qdev_get_child_bus(dev, "pci.0"); - if (!pci_bus) { - error_report("couldn't create PCI controller!"); - exit(1); - } + pci_bus =3D PCI_BUS(qdev_get_child_bus(dev, "pci.0")); + memory_region_init_alias(isa, NULL, "isa_mmio", get_system_io(), 0, 0x10000); memory_region_add_subregion(get_system_memory(), 0xc08000000, isa); --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037829; cv=none; d=zohomail.com; s=zohoarc; b=P3bIeRSDms5/SL7WtwpgLfMhCTOhaFvaaV+Jon5hs2S6cw36KjknmuJ4X8F3vzAv2qAYLm/IJNJ2rQceZISshQgbZfCGnq0ikiU+z36o0VH8am+MGZJu7Pjw3P9t9IjZup40UhV68WzZujxvgVd44ssLBYDyGxZtix3EUJ5FrYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037829; h=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=h3C2FyTnQzd/3J2A+Fkc1DrmZFrpX+lIbYnOaiwpZ3c=; b=kymI4oIXErwVJIkB90kU8hFp3F3RLQBR/PUQyss4pbknuXe+rEdYXeF1T5JwyI5V/nC+h9qIxc0xIqadjl84GMTmDGhRYmOnRc6SaZPpvN1H9V80UazyCnTWkIRMdFjeMtYhWq4pzf1yRNyTzo2miM+GtQiYWqbecCpe5Lql12w= 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 16110378294782.477493263602696; Mon, 18 Jan 2021 22:30:29 -0800 (PST) Received: from localhost ([::1]:45274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kX1-0007nd-8v for importer@patchew.org; Tue, 19 Jan 2021 01:30:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQi-0001PY-2N; Tue, 19 Jan 2021 01:23:52 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:40225 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000Sz-Mh; Tue, 19 Jan 2021 01:23:51 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrX11j0z9sWt; Tue, 19 Jan 2021 17:23:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037404; bh=bUdcRt/C02JGH6ZSqYyd7wasHsvkSZHIq6uK/d97gi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KXWySwUeruMHG1uH/vSv1FMeGg8SjSQ02ZL6OXJEQ1ZM7Awq2GPBnhSHZ73YJOWtl +6AWGl+mm3qAWn6keYqLRV9YaSAy1NRTnRzTtJab7mXbHeQB7xTHJFvj5o+TvaPM70 k8l2WCQKdrXvwY0uTy0U3YFKrZFbz7b/fd4bsTIU= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 09/13] spapr: Improve handling of memory unplug with old guests Date: Tue, 19 Jan 2021 17:23:14 +1100 Message-Id: <20210119062318.13857-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Since commit 1e8b5b1aa16b ("spapr: Allow memory unplug to always succeed") trying to unplug memory from a guest that doesn't support it (eg. rhel6) no longer generates an error like it used to. Instead, it leaves the memory around : only a subsequent reboot or manual use of drmgr within the guest can complete the hot-unplug sequence. A flag was added to SpaprMachineClass so that this new behavior only applies to the default machine type. We can do better. CAS processes all pending hot-unplug requests. This means that we don't really care about what the guest supports if the hot-unplug request happens before CAS. All guests that we care for, even old ones, set enough bits in OV5 that lead to a non-empty bitmap in spapr->ov5_cas. Use that as a heuristic to decide if CAS has already occured or not. Always accept unplug requests that happen before CAS since CAS will process them. Restore the previous behavior of rejecting them after CAS when we know that the guest doesn't support memory hot-unplug. This behavior is suitable for all machine types : this allows to drop the pre_6_0_memory_unplug flag. Fixes: 1e8b5b1aa16b ("spapr: Allow memory unplug to always succeed") Signed-off-by: Greg Kurz Message-Id: <161012708715.801107.11418801796987916516.stgit@bahia.lan> Reviewed-by: Daniel Henrique Barboza Signed-off-by: David Gibson --- hw/ppc/spapr.c | 24 +++++++++++++----------- hw/ppc/spapr_events.c | 3 +-- hw/ppc/spapr_ovec.c | 7 +++++++ include/hw/ppc/spapr.h | 2 +- include/hw/ppc/spapr_ovec.h | 1 + 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2c403b574e..6c47466fc2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4048,6 +4048,18 @@ static void spapr_machine_device_unplug(HotplugHandl= er *hotplug_dev, } } =20 +bool spapr_memory_hot_unplug_supported(SpaprMachineState *spapr) +{ + return spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT) || + /* + * CAS will process all pending unplug requests. + * + * HACK: a guest could theoretically have cleared all bits in OV5, + * but none of the guests we care for do. + */ + spapr_ovec_empty(spapr->ov5_cas); +} + static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_de= v, DeviceState *dev, Error **= errp) { @@ -4056,16 +4068,9 @@ static void spapr_machine_device_unplug_request(Hotp= lugHandler *hotplug_dev, SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - if (!smc->pre_6_0_memory_unplug || - spapr_ovec_test(sms->ov5_cas, OV5_HP_EVT)) { + if (spapr_memory_hot_unplug_supported(sms)) { spapr_memory_unplug_request(hotplug_dev, dev, errp); } else { - /* NOTE: this means there is a window after guest reset, prior= to - * CAS negotiation, where unplug requests will fail due to the - * capability not being detected yet. This is a bit different = than - * the case with PCI unplug, where the events will be queued a= nd - * eventually handled by the guest after boot - */ error_setg(errp, "Memory hot unplug not supported for this gue= st"); } } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { @@ -4543,11 +4548,8 @@ DEFINE_SPAPR_MACHINE(6_0, "6.0", true); */ static void spapr_machine_5_2_class_options(MachineClass *mc) { - SpaprMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); - spapr_machine_6_0_class_options(mc); compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); - smc->pre_6_0_memory_unplug =3D true; } =20 DEFINE_SPAPR_MACHINE(5_2, "5.2", false); diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 6aedd988b3..d51daedfa6 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -658,8 +658,7 @@ static void spapr_hotplug_req_event(uint8_t hp_id, uint= 8_t hp_action, /* we should not be using count_indexed value unless the guest * supports dedicated hotplug event source */ - g_assert(!SPAPR_MACHINE_GET_CLASS(spapr)->pre_6_0_memory_unplug || - spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT)); + g_assert(spapr_memory_hot_unplug_supported(spapr)); hp->drc_id.count_indexed.count =3D cpu_to_be32(drc_id->count_indexed.count); hp->drc_id.count_indexed.index =3D diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index dd003f1763..b2567caa5c 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -125,6 +125,13 @@ bool spapr_ovec_test(SpaprOptionVector *ov, long bitnr) return test_bit(bitnr, ov->bitmap) ? true : false; } =20 +bool spapr_ovec_empty(SpaprOptionVector *ov) +{ + g_assert(ov); + + return bitmap_empty(ov->bitmap, OV_MAXBITS); +} + static void guest_byte_to_bitmap(uint8_t entry, unsigned long *bitmap, long bitmap_offset) { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 1cc19575f5..3ad2ff7132 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -142,7 +142,6 @@ struct SpaprMachineClass { hwaddr rma_limit; /* clamp the RMA to this size */ bool pre_5_1_assoc_refpoints; bool pre_5_2_numa_associativity; - bool pre_6_0_memory_unplug; =20 bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index, uint64_t *buid, hwaddr *pio,=20 @@ -950,4 +949,5 @@ bool spapr_check_pagesize(SpaprMachineState *spapr, hwa= ddr pagesize, =20 void spapr_set_all_lpcrs(target_ulong value, target_ulong mask); hwaddr spapr_get_rtas_addr(void); +bool spapr_memory_hot_unplug_supported(SpaprMachineState *spapr); #endif /* HW_SPAPR_H */ diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h index d4dee9e06a..48b716a060 100644 --- a/include/hw/ppc/spapr_ovec.h +++ b/include/hw/ppc/spapr_ovec.h @@ -71,6 +71,7 @@ void spapr_ovec_cleanup(SpaprOptionVector *ov); void spapr_ovec_set(SpaprOptionVector *ov, long bitnr); void spapr_ovec_clear(SpaprOptionVector *ov, long bitnr); bool spapr_ovec_test(SpaprOptionVector *ov, long bitnr); +bool spapr_ovec_empty(SpaprOptionVector *ov); SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int ve= ctor); int spapr_dt_ovec(void *fdt, int fdt_offset, SpaprOptionVector *ov, const char *name); --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611038139; cv=none; d=zohomail.com; s=zohoarc; b=Kgnk2redT1LSHZ2wO6X/f5zLtUzA+9kyKR0ohraxo3x20pnDKYKo9W+LEufvjdWCubZVnCEDQTONYUc+s/Z2gFkoRouNWB3rQcR5hZ/Y8lCAZB5yPIqk+l6irmyInpjl6fA4IFvf5Mw7+lHIdTwWR0+mcBCOxAVnYeEnOw8scIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611038139; h=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=WXwyDc+s7/8BMxDvrGcDzfagyLrsgID70HDUBLUEeQQ=; b=GyFmPvVfeloFz/LgvuXyGW8bPZ7F6WxDHQ9TJYOPLmobCAAOodNd5heB5xgmVGF9nIDCnZfgOr26qPTkWQc8Ua4pcfvwJ/ORJxzZhyulqeU3o+tesDBb1rcUaa+RHu0155696CeO7FZp40/01NU4JymnmiCwf3LEEjRGt5WkmsY= 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 1611038139502253.1417768152404; Mon, 18 Jan 2021 22:35:39 -0800 (PST) Received: from localhost ([::1]:33496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kc6-0006NU-BE for importer@patchew.org; Tue, 19 Jan 2021 01:35:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQh-0001OX-Ov; Tue, 19 Jan 2021 01:23:51 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:52725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000T3-OT; Tue, 19 Jan 2021 01:23:51 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrX1qK6z9sX1; Tue, 19 Jan 2021 17:23:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037404; bh=B3tcSqQNdEkTiEz6Kox3p+lHQZepOSJevvA9DYIUqY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bkW2QNxfOJVAcnhJPNiL9RFGKnHRRlgKC5ynsa459id5gJ/uFtrEgpV/KuX3M5nCz fth1UxF4WHnobeLwY713k3/QVHY+GidgFyYn9rH47OIrKhF26Het+TiGoAabEY8TfK MSdcFeULMqzL2kuVKzNmObe82oMBzH7AKnfenoJc= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 10/13] spapr.h: fix trailing whitespace in phb_placement Date: Tue, 19 Jan 2021 17:23:15 +1100 Message-Id: <20210119062318.13857-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza This whitespace was messing with lots of diffs if you happen to use an editor that eliminates trailing whitespaces on file save. Signed-off-by: Daniel Henrique Barboza Message-Id: <20210114180628.1675603-2-danielhb413@gmail.com> Signed-off-by: David Gibson --- include/hw/ppc/spapr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 3ad2ff7132..7f785409e4 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,7 +144,7 @@ struct SpaprMachineClass { bool pre_5_2_numa_associativity; =20 bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index, - uint64_t *buid, hwaddr *pio,=20 + uint64_t *buid, hwaddr *pio, hwaddr *mmio32, hwaddr *mmio64, unsigned n_dma, uint32_t *liobns, hwaddr *nv2gpa, hwaddr *nv2atsd, Error **errp); --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611038375; cv=none; d=zohomail.com; s=zohoarc; b=GveJW7FAgRqm9+XOeihyD/qAf3BWqAOAneuVAfonTeKC5ZwGUOaHXkE8hZsCSDnWZWlX544Zl4RW7bKlIjH77kJNYCze1dPbipVY1LgVzoFnR0PsVklVDS5Q8IJes+mYNsfEODWfr21kZSPkvDq7arBXUozFQBEJCBQQe3AV00g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611038375; h=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=ZEhud541QW94ZOOWaNlFjUtBEz5KnkJ66pkekE7NT/0=; b=T7ZXsPZ0sX0moaWHCgk9iCjwOjpp6JepUXiuf29O9uv/6oRFljkjE7NoCefjBbGqpGUfWDVskNNf3cw4TuwW0PtjADF00KlOQVnHeUA+OtcjxQFTxz7uUtE83f68LjUoMf65kVI56ew0/Gmj7zCwKkHTT+IECb4O8t6eI6ZiYz8= 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 1611038375417729.506158123339; Mon, 18 Jan 2021 22:39:35 -0800 (PST) Received: from localhost ([::1]:41816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kfu-0001a6-CE for importer@patchew.org; Tue, 19 Jan 2021 01:39:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQi-0001QJ-TR; Tue, 19 Jan 2021 01:23:56 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:35155 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000T4-Sy; Tue, 19 Jan 2021 01:23:52 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrX5SX7z9sX4; Tue, 19 Jan 2021 17:23:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037404; bh=7eoo1JGQEz0AGnMffHoG0i70grShp7cTjR5JUeO8D28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwbZLa3dxHUIVBHvSKkpLCqvvdFKJGowyg7U17Uhr2ldlttT8pwrkN5cR+r3HdNl2 BvOlyycjbRDZLLwav0Z6tQpDxxvkQvevTKlTHFWqSo8PW2FnPfVhCjlXcYxCyJFuBa q3grBt3570VQrxeGQdFqL2HDTelzbSuMxclf+AdM= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 11/13] spapr_hcall.c: make do_client_architecture_support static Date: Tue, 19 Jan 2021 17:23:16 +1100 Message-Id: <20210119062318.13857-12-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza The function is called only inside spapr_hcall.c. Signed-off-by: Daniel Henrique Barboza Message-Id: <20210114180628.1675603-3-danielhb413@gmail.com> Signed-off-by: David Gibson --- hw/ppc/spapr_hcall.c | 1 + include/hw/ppc/spapr.h | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index e5dfc1ba7a..7b5cd3553c 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1632,6 +1632,7 @@ static uint32_t cas_check_pvr(PowerPCCPU *cpu, uint32= _t max_compat, return best_compat; } =20 +static target_ulong do_client_architecture_support(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong vec, diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 7f785409e4..c27c7ce515 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -582,11 +582,6 @@ void spapr_register_hypercall(target_ulong opcode, spa= pr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); =20 -target_ulong do_client_architecture_support(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong addr, - target_ulong fdt_bufsize); - /* Virtual Processor Area structure constants */ #define VPA_MIN_SIZE 640 #define VPA_SIZE_OFFSET 0x4 --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611037609; cv=none; d=zohomail.com; s=zohoarc; b=SU1QTVFOfu2uIgmGf8hLePWeozy8v1ssMNsoT2Fn17smnF5rJOLPrvkSweCpKs3FrNjoIbUeC9SVSmP/CzsT8pWTjXtjNsvVZpZ7KofzLnywakb3uJ5kss2HilOUNdNtuUTuqJu/QuwyJXSt21npeE6Fye11Dx0A4QQY8NWyOww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611037609; h=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=qRignV6/pQnZErldyVyhSILTcW365ZSC4kS/hH7zrVg=; b=WoxBDUvV7/rRJPIj8wGlv7MsX6lN1bo/GwMaGwUkYKBBxf2q/ZuyKRDsEDHIuhchDVllmXIGPU/GjvY5SUYt4dY6f+BUTHZLhhh3LgLw5SJXzshGioil4/krAuGXdTCiWTrfOjA1rtaAQujl2Yd0VsPkCsASFH3dgPAhLiqGwRc= 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 1611037609351630.1457774893373; Mon, 18 Jan 2021 22:26:49 -0800 (PST) Received: from localhost ([::1]:34960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kTY-0003Zg-Be for importer@patchew.org; Tue, 19 Jan 2021 01:26:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQg-0001KR-63; Tue, 19 Jan 2021 01:23:50 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:35915 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQe-0000T8-IS; Tue, 19 Jan 2021 01:23:49 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrX6CLKz9sX5; Tue, 19 Jan 2021 17:23:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037404; bh=wG3k4vvD+OJELcn2svuHMUF0VgofMWSORdUpb3pvDjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mGUuFQWVeVzff4M1eum4MNPhf3rrDrDq9N9QV85Z2zIC1CW3ExA0ezuRZcU7JWIrJ EA6334PBEZyQEOcklPsggdWplQ7WWKVPPctIot4LxWVM1A4MsC1G/EzzE6zAQAMPSx 4JCaL7StEp1oKk+W125mj4xEwJNObChL1/96/PDM= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 12/13] spapr_rtas.c: fix identation of rtas_ibm_suspend_me() args Date: Tue, 19 Jan 2021 17:23:17 +1100 Message-Id: <20210119062318.13857-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza Signed-off-by: Daniel Henrique Barboza Message-Id: <20210114180628.1675603-5-danielhb413@gmail.com> Signed-off-by: David Gibson --- hw/ppc/spapr_rtas.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 513c7a8435..8a79f9c628 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -219,9 +219,9 @@ static void rtas_stop_self(PowerPCCPU *cpu, SpaprMachin= eState *spapr, } =20 static void rtas_ibm_suspend_me(PowerPCCPU *cpu, SpaprMachineState *spapr, - uint32_t token, uint32_t nargs, - target_ulong args, - uint32_t nret, target_ulong rets) + uint32_t token, uint32_t nargs, + target_ulong args, + uint32_t nret, target_ulong rets) { CPUState *cs; =20 --=20 2.29.2 From nobody Mon May 6 20:43:25 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=1611038414; cv=none; d=zohomail.com; s=zohoarc; b=gTz3P0Al+mzPfCZKkogEsHOWO3E6yys1zfEr6K8+G6I+xRUQ4392QBaykP9QB3YqFSKSyq7MWV7dMluchymqJNdT/FlaZMh+TPgJh280y9GbNxKT+PXzGQQAvuBrrbL/NxFoq8764n8KPCnYGqjY+B5BxW8pZa57ZeDA/foR75A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611038414; h=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=vzssCEKUhY+PWac701/BbvrY4Aewec/3oGiWBFVSh50=; b=aQKuB+ndUdCvIn2nY//MKFnbMocza7k8uKtLrSzAm+sWz7pVe7NWrvAHb0S9fBftcYxA8yQZSjrWBfIvbADInKgQxhVFHsiYdcrBKNrxFjvmJyAWUhJmdOcBC0sjsCLDQiPu3jB2tPo08g6YvK8LL4mBPxCiYpGvC0631BpMY94= 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 1611038414586966.282332932029; Mon, 18 Jan 2021 22:40:14 -0800 (PST) Received: from localhost ([::1]:42632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1kgX-0001wE-Ib for importer@patchew.org; Tue, 19 Jan 2021 01:40:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQo-0001R4-BA; Tue, 19 Jan 2021 01:23:59 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:33937 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1kQi-0000X4-SM; Tue, 19 Jan 2021 01:23:58 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DKdrY0Bt0z9sXH; Tue, 19 Jan 2021 17:23:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1611037405; bh=79shwS2+CEPG3Z5H/OohnnLYmOtj+JqZfXPV/12nFDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nXY6sgIw+zDxBNldGA1jNWl5HHtFMhCheYDrESlRNjK/ESlWxCnWDX2Xnt+CwtNtX ejYPLMe5DUn8Q+a+qTaLGKv5f1EUyuHETWd9TgszqumnUdlIi4BJUfxgMNsG1FALBR ZZnnIlvRHLCepVtPfvEG/vyRx+xyt5XImRXrJBw4= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 13/13] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu() Date: Tue, 19 Jan 2021 17:23:18 +1100 Message-Id: <20210119062318.13857-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119062318.13857-1-david@gibson.dropbear.id.au> References: <20210119062318.13857-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: Daniel Henrique Barboza , qemu-ppc@nongnu.org, qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza Use g_autoptr() with Object and g_autofree with the string to avoid the need of a cleanup path. Signed-off-by: Daniel Henrique Barboza Message-Id: <20210114180628.1675603-6-danielhb413@gmail.com> Signed-off-by: David Gibson --- hw/ppc/spapr_cpu_core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 2f7dc3c23d..4f316a6f9d 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -277,8 +277,8 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, = int i, Error **errp) { SpaprCpuCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(sc); CPUCore *cc =3D CPU_CORE(sc); - Object *obj; - char *id; + g_autoptr(Object) obj =3D NULL; + g_autofree char *id =3D NULL; CPUState *cs; PowerPCCPU *cpu; =20 @@ -293,23 +293,17 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc= , int i, Error **errp) cs->start_powered_off =3D true; cs->cpu_index =3D cc->core_id + i; if (!spapr_set_vcpu_id(cpu, cs->cpu_index, errp)) { - goto err; + return NULL; } =20 cpu->node_id =3D sc->node_id; =20 id =3D g_strdup_printf("thread[%d]", i); object_property_add_child(OBJECT(sc), id, obj); - g_free(id); =20 cpu->machine_data =3D g_new0(SpaprCpuState, 1); =20 - object_unref(obj); return cpu; - -err: - object_unref(obj); - return NULL; } =20 static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) --=20 2.29.2