From nobody Sun May 19 12:26:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1673991446; cv=none; d=zohomail.com; s=zohoarc; b=k5IAM7XcBon0TJ8PAWvCN1sqtGalBisFAGYYgZuC+j3drk9RPkjowoO3mWyOsOcPodvydBkvjy6LL3PZBVCgerCjxCP/op2setYW6WwsXxhgzdf/YROBs0imWZGGDYDKeMZ4s+ke5scY0ervXwCWXknahH+/iTZT4YGY2vCarpw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673991446; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ydeX9QFFdks9xGDUB7zYGvimiTN6pGP8Ia7mPwpsiT8=; b=oJHfT9uk3qZ+Ub25WS6gorVvWDT1LjJ9Uua8n8GcZYTZvurpsoXxAp9v7mDJoRpvIOGZN85YSteKbb9dJxpyrR2tNTRX7nB/EKNKS+GUjhwovpwuV8HdkBekclPNTcs1n/d7xZOKFhOv22a2G0kEnyi00ZGTzDenEeI8TJjqCac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673991446637469.11160384329924; Tue, 17 Jan 2023 13:37:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHsO4-0002tl-Db; Tue, 17 Jan 2023 15:16:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHsO3-0002tY-3D for qemu-devel@nongnu.org; Tue, 17 Jan 2023 15:16:51 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHsO1-0006Rg-Ly for qemu-devel@nongnu.org; Tue, 17 Jan 2023 15:16:50 -0500 Received: by mail-ed1-x536.google.com with SMTP id s21so2509298edi.12 for ; Tue, 17 Jan 2023 12:16:49 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id w21-20020a05640234d500b0049c2b02bad4sm5746257edc.88.2023.01.17.12.16.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Jan 2023 12:16:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ydeX9QFFdks9xGDUB7zYGvimiTN6pGP8Ia7mPwpsiT8=; b=M4a/OMcrw38n2lxsGg5Comb/Gw3G1TsBIhXkP7lju0H8oKPgaDw/zQl6fN3jqarBQO 4DiFz9wFKFmAcPshH9+AYp+xpSwFgZQyC8tDGRnYvuoTwY4TavgWA3JA4I1hFUyN3YP0 jFGymLMsrTpSlQuwWTR3smKdM+u7EDZzutHCtfSdLtpmCq9om8lnzaJDtrHJkRfoKqMk HDEzsvB7Qt6RZfpJt36HKB6DxZsLtYrgVwHt5dEd+7i2TiIaMfNLVB3lU4otUlYNrKDc irq+fcQYLxDIkUVmozwtsGzFdpad/u41gZMS+RcYiFUONXhhose8AU5qwnVjNFccblBm 59AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ydeX9QFFdks9xGDUB7zYGvimiTN6pGP8Ia7mPwpsiT8=; b=xYzZlfNemyUQdz+CagFeIeFIRc6ZG//ojhSyVjE0pyYSz8TwYnPEKeW6Ve5Zr+/f0t vCYxEf3ai1F3zhAz/ixGuKYFR+VVfj5pggwHfBm7GxHsB/AFWuiLVbVsI+5NKs32klBw TgvYis5LWYJdPAno1d9Nlw5G8DLCyeFFxxEa69gWk5tM/iq4tILoHu+ngpmHP6KftLtI LJDmDxuxEaNcDhvaYZfXjnCx0kmvL6KpfDDoRNHlQCS5KyHWCe+Qnv1nAngZOvxV1E28 TSWQ7dj9IYr3IXm2ZbdtIVZdmVb6Q4ccE93oVOjcXN7cJg1T4pBzBLfKASc8CYD6BAkm IYvA== X-Gm-Message-State: AFqh2krUx8mNHWetQUxi/1UFmXD5D9h1fPOUpK+xANt/VI3RHajSSgDx to9gn7TgY7End6FOCwrmSVh7MUT8fmP2U9Vs X-Google-Smtp-Source: AMrXdXvArPq5hfpDLRQQ4/hB0PA0eLQ5zC1TOHFTsQyTx62PfN/DpeqBhWsNEz3kMdEuQZmfzdw4LQ== X-Received: by 2002:aa7:cfd3:0:b0:48e:bb08:c96 with SMTP id r19-20020aa7cfd3000000b0048ebb080c96mr4005986edy.28.1673986608204; Tue, 17 Jan 2023 12:16:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/ppc/pegasos2: Extract via_i2c_bus() helper Date: Tue, 17 Jan 2023 21:16:39 +0100 Message-Id: <20230117201640.88365-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117201640.88365-1-philmd@linaro.org> References: <20230117201640.88365-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673991448577100003 Simplify a bit pegasos2_init() by extracting via_i2c_bus(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/pegasos2.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index f46d4bf51d..ac69aee099 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -96,6 +96,14 @@ static void pegasos2_cpu_reset(void *opaque) } } =20 +static I2CBus *via_i2c_bus(PCIDevice *via) +{ + PCIDevice *dev; + + dev =3D PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm")); + return I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); +} + static void pegasos2_init(MachineState *machine) { Pegasos2MachineState *pm =3D PEGASOS2_MACHINE(machine); @@ -103,7 +111,6 @@ static void pegasos2_init(MachineState *machine) MemoryRegion *rom =3D g_new(MemoryRegion, 1); PCIBus *pci_bus; PCIDevice *dev, *via; - I2CBus *i2c_bus; const char *fwname =3D machine->firmware ?: PROM_FILENAME; char *filename; int sz; @@ -171,10 +178,8 @@ static void pegasos2_init(MachineState *machine) dev =3D PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); pci_ide_create_devs(dev); =20 - dev =3D PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm")); - i2c_bus =3D I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); spd_data =3D spd_data_generate(DDR, machine->ram_size); - smbus_eeprom_init_one(i2c_bus, 0x57, spd_data); + smbus_eeprom_init_one(via_i2c_bus(via), 0x57, spd_data); =20 /* other PC hardware */ pci_vga_init(pci_bus); --=20 2.38.1 From nobody Sun May 19 12:26:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1673987984; cv=none; d=zohomail.com; s=zohoarc; b=DC6I5L7B9yclblU8xRnTfAifs7tdAP7/lMaogHX2kqhfaZp20O4kgdAyfP4nJP7K5o9yi77Gk1cqCqTpX1eSffyWMupT+gv7WG29/ksDFJSqEcyLI+XxZBMdP5mOE1TRfs0jqu+mBZnDRhEGUub8Kol2eM1LoRNtUTB5IEZU8Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673987984; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UMCy71y0Z4Vz5M1MpnhAy1/JUyaemBevfRPJi/p9hAI=; b=jsP1EoU5CMg1aPJfSAu8vEbZgAYmX9btFYP5wd9siAAgnggc7euwAnVrtOepM7wA/TNALPvd1VW20V8YMaPvIYq/s9oV6Kd3xcrU4dyOl4HVsk4s7lQ3rclkhJXf0rqtB/pomB7TTNdFpnApO6UTbjH5zjEi2x1/Hp5AL1EbpeM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673987984335147.53147911211147; Tue, 17 Jan 2023 12:39:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHsOA-0002xK-PX; Tue, 17 Jan 2023 15:17:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHsO9-0002uX-A0 for qemu-devel@nongnu.org; Tue, 17 Jan 2023 15:16:57 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHsO6-0006S4-VK for qemu-devel@nongnu.org; Tue, 17 Jan 2023 15:16:57 -0500 Received: by mail-ej1-x62e.google.com with SMTP id qx13so19709698ejb.13 for ; Tue, 17 Jan 2023 12:16:54 -0800 (PST) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id v22-20020aa7d816000000b0049dd7eec977sm4509567edq.41.2023.01.17.12.16.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Jan 2023 12:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UMCy71y0Z4Vz5M1MpnhAy1/JUyaemBevfRPJi/p9hAI=; b=vpRVWRXF+uJG6PDprzK/7ZwGU7jjXX1E7DfWS/5HS6xA5e4oHtp4dLxx826Wn5iW0u F9hHIyYLdzFkxNOLEFX4GQkusfRfLNxjNAMCOPX+tJ1uYX/yuFASGiKKl4xpsUaOjWt7 LS/g2OYapHioBlHrr7/rsOOBOncD9Ur9m6yVDYBhvTOsZtsB+2sq5gOrv8Ti9IKcd0v0 PzheRzfj01AuSKw/ZJ49C2OEI6RyxpfwOFJMYw/IcphhAZQ1yNaAK2deR7ChoYUJGB+6 sk2wgzrtWvmkjs8G4Sm/wteVdc/GNU5Jcc3Pj3ZQ5paDvWMahIu891/sfwhKy8BLJYUQ AaKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UMCy71y0Z4Vz5M1MpnhAy1/JUyaemBevfRPJi/p9hAI=; b=4hpmLLo5DZaiePsoQGR0GwssurkUb7Stg6eSSV2C0+yQam54dAffxI3D5Ewar77rLH Pq8v2DWFP80xlqXywcc7moI/XRmQjxIAMEF1cBTL7Kf7jnVmmp/ccLwY3XEGu2O1UTCJ A0Q2jBaaCwpDU04X4MoxBSUxDR7ynZnciUAPint8AefCVhYWquOJJdfgT01pszJsu9eM +Qge9rHFmxqTaSr7lginndBgICyN/xo9XdUjnbhNvxUO7Fg+IFIwQl5zyBTiSKh4ape+ PYQlEZTUl4YYsJTeCl8cP7+10QiT2CUenRS8ky37mdsxcDu//NHzU1l9z10SWV+XFh/m 7oEw== X-Gm-Message-State: AFqh2kpYWaw+9dKPgTxl6FE8CnyjWZFmQRszFZvrY/Lb2SHyxBNxrGw2 Zb8wffLkbwlSgjhaC0IyQsTjTDN7djfG7k8v X-Google-Smtp-Source: AMrXdXvaHYIC603jzhMYfanYoZP2f4BJSqkkwfOKPMMvkDIgni/e0Zvhyt+4BIGpA4Rn4f4uayxFFQ== X-Received: by 2002:a17:907:c70f:b0:871:d04e:1df with SMTP id ty15-20020a170907c70f00b00871d04e01dfmr4444523ejc.29.1673986613117; Tue, 17 Jan 2023 12:16:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/ppc/pegasos2: Extract via_vt8231_create() helper Date: Tue, 17 Jan 2023 21:16:40 +0100 Message-Id: <20230117201640.88365-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230117201640.88365-1-philmd@linaro.org> References: <20230117201640.88365-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673987986339100003 Simplify a bit pegasos2_init() by extracting the VIA southbridge creation code into a new via_vt8231_create() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/pegasos2.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index ac69aee099..445cb5ef31 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -96,6 +96,25 @@ static void pegasos2_cpu_reset(void *opaque) } } =20 +static PCIDevice *via_vt8231_create(MachineState *machine, PCIBus *pci_bus) +{ + Pegasos2MachineState *pm =3D PEGASOS2_MACHINE(machine); + PCIDevice *dev, *via; + + via =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), + true, TYPE_VT8231_ISA); + object_property_add_alias(OBJECT(machine), "rtc-time", + object_resolve_path_component(OBJECT(via), "= rtc"), + "date"); + qdev_connect_gpio_out(DEVICE(via), 0, + qdev_get_gpio_in_named(pm->mv, "gpp", 31)); + + dev =3D PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); + pci_ide_create_devs(dev); + + return via; +} + static I2CBus *via_i2c_bus(PCIDevice *via) { PCIDevice *dev; @@ -110,7 +129,7 @@ static void pegasos2_init(MachineState *machine) CPUPPCState *env; MemoryRegion *rom =3D g_new(MemoryRegion, 1); PCIBus *pci_bus; - PCIDevice *dev, *via; + PCIDevice *via; const char *fwname =3D machine->firmware ?: PROM_FILENAME; char *filename; int sz; @@ -166,17 +185,7 @@ static void pegasos2_init(MachineState *machine) pci_bus =3D mv64361_get_pci_bus(pm->mv, 1); =20 /* VIA VT8231 South Bridge (multifunction PCI device) */ - via =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), tru= e, - TYPE_VT8231_ISA); - object_property_add_alias(OBJECT(machine), "rtc-time", - object_resolve_path_component(OBJECT(via), - "rtc"), - "date"); - qdev_connect_gpio_out(DEVICE(via), 0, - qdev_get_gpio_in_named(pm->mv, "gpp", 31)); - - dev =3D PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); - pci_ide_create_devs(dev); + via =3D via_vt8231_create(machine, pci_bus); =20 spd_data =3D spd_data_generate(DDR, machine->ram_size); smbus_eeprom_init_one(via_i2c_bus(via), 0x57, spd_data); --=20 2.38.1