From patchwork Tue Jun 10 12:56:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 895203 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ecd:b0:3a4:ee3f:8f15 with SMTP id ea13csp2253080wrb; Tue, 10 Jun 2025 06:05:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPpSbHyJk6nNXTbJenB+j5fIjeeTj8Uklo8C5dJ1aeoJ3KkX5EqFCtELuDOG0jPdWXXtUACQ==@linaro.org X-Google-Smtp-Source: AGHT+IEOV8HErB07QgpHvjWIQ5wAVvME4uZ+OwJrSbQl1MSsKgvac20lmmK53kdvScqDRcj3QpdK X-Received: by 2002:ad4:5dcb:0:b0:6fa:bedb:f61d with SMTP id 6a1803df08f44-6fb24c526c0mr37481716d6.14.1749560758244; Tue, 10 Jun 2025 06:05:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1749560758; cv=none; d=google.com; s=arc-20240605; b=F26LS8pWvDvQattHYp4tQPEiRAe++7eCUuMbDVkcWGnmpbAt/gcrFT+0nl7B1PG2Kt MjQd4CUodvcmLSLaFEDX4DNFCfm8y+MoI91AOvVlrHUp7HX9EsPlaNJiW5TwBqTdkqQy Dla2C8ryZj4BEAZ9t0KofkHICN80sdxtzwGnKR6vRnGXpFThiUggsntil/bW98hRbXIC fXqi7u6aX3B1Y1coPRlrsB4fhb5+xuH6AXc9MufVPZ8WB/ZGTmzPVmyYe5CPRUzhg9HY r25G5F3CV8c84qTrMCps1zFERpSukv52CkfxFMSdWuxrUM2hL/G0k5X+GiAA96Ot62uc IbUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; fh=Tr7NIUtXAhmtWFkJJjP6G2+mN+Bis7DT7Z3/vsFybJ4=; b=XeErvMLIK4nHkZFL9I/v2vHc6lyNMGfja9OG3eeJkCBZZvLcMpTsVZcO1JQ+0qGUwD /DSOf1qZkv83G6jqZ7ugo5uPaBfg3SIyTJsTdV1bA8MeEOrUqIb0xPcBlkwJZAq31DFj TBAGrvVvf3b1MF9RXwyYNnwhCoOmv1U9DXRTchVdhPHDRV20MeDFoFwMouhMoI5PLsXx pi2ZGqMSe8dS6TkIxWlrukRon/rz+4j8DHglnC3ynEn69b1LiXmKe0P2ejJ3TvQ9KA+K MUALrutfrIahwEP1+O83XZUn68H4qmVentfhFwOg6IQ7rUC4aRsM0eVnF+CbMmmfO78p hyZQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QX4bsIph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fb09ab05cfsi100886156d6.74.2025.06.10.06.05.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jun 2025 06:05:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QX4bsIph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uOyXb-0006oi-2A; Tue, 10 Jun 2025 08:57:23 -0400 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 1uOyXZ-0006o2-28 for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:21 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uOyXX-0002ci-2v for qemu-devel@nongnu.org; Tue, 10 Jun 2025 08:57:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so45288345e9.0 for ; Tue, 10 Jun 2025 05:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749560237; x=1750165037; darn=nongnu.org; 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=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; b=QX4bsIphaAKsqsp7k9txKCymPghZciGLyUCojTj0FavSgaQNfIu2mUvh7SjWLfFEnO 72ZkSV4caUKktKOPWGhMA6XtSJnSoB0uXeq9xyEiwJLfE5qRXy8JXybUcwQLR0br9KJE mj5tfB+6IhQfhncd2EZCPph8QQZ9t0bAn5gkD3+9Rv2UzXBZZTyY14KqrvTlDGrVJ1ku ebmKw7/vC53ZC2zSaXBVfSvMteA5hs2aDhoVYgk3qm6XdqT+kXuWrTHOcSq0F3VSC8Yv GdZcDkk1yIfSYAGF6fndP1mPJagQlEAFkJJK6qlnksZ8HPsw04MCjTCzESSqk6WWXqbU Dmrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749560237; x=1750165037; 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=E9wZcuxBWyI1dFyweR0rRL6SBi5bA4sN/aQECa3VdUc=; b=LXTbcZsbZNwBWOQk3t1ZaeSa5PuwCCKCC8qOXs6wKj4B/MncfD8Reui8qc4NnzYdqZ LHq9YVbfGvK5WZxGviQ+Z5iHKDOCYD1Mf9LPS5Us7pftvqCGVrHOuEYDRBvJpDUEqBIE vNfhlGVK5QI9alyokvVrKyH1nUb0Bf9LaZxJQ0xh3YPOl9rIWAHQ+0M5LeTZhs6j32Zw CRwweSJxxWyuLj+JiG0VD/XBybwwdprqa7OyQ9l/mRwlO58knwQ5j5VtxiNA0WjEtT6P xyCPIqJY3s+bGTUlZxqSxPRtT5k86h38HDWbuWss2CxQPmWMM8QZ5lIO2SWBuAnzeRSO hmrg== X-Gm-Message-State: AOJu0YyRqjZuL0LbIg87+7W9oo5zq9ikfOOprIG4AKDUyTQ3NgRskswI D6paAuwEiNkoaZ7sLRoqjRFyBKsRsRJGh4/U7cqvi5p9dBCC2/oSXdgEyMi07yGH5BPmipRq7gq jbl0PIfM= X-Gm-Gg: ASbGncuoG9B0lHMbFRhWNBp3kY+GSwMtydSkaLY+0laTHpBtYtHaJ0fZ26+fMjSJOEQ 0T15TIKJdLL1i2KZKAPj3VzCnJYBuNzOhFuPHADQP7Hh0i7qaRCLDTuFdESfGaB9as03vUTxguO UttSOpbHo5FdUMyB0Vlu2sbX+4jo8IVs6pzIRtAKtYlnXPb2yuH6Z1cT9Y6nQaAd+TrsvseCYHB vaU0KyKmqB7Fh0R8oNt93QOfbsBhFWJJN75GQ0x+W6+Ev+ICR0PJp8R06+vKqNPbCiTGVKNAVBV CWHt+wK951cFM2b4YvDGoy3HT7qQ+DcvbXR/+qEKoEIHPEVgQ2KR2TkemMkOcZB1YUA4QisgbB7 jYul5U3msPA2ipzxiEHNX8pss+Y1hkqTK/5iVg+n7Cw== X-Received: by 2002:a05:600c:c119:b0:453:78f:faa8 with SMTP id 5b1f17b1804b1-453078ffbbamr70192195e9.6.1749560236668; Tue, 10 Jun 2025 05:57:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4526e0563cesm144357165e9.1.2025.06.10.05.57.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Jun 2025 05:57:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 09/24] hw/ppc/e500: Use SysBusDevice API to access TYPE_CCSR's internal resources Date: Tue, 10 Jun 2025 14:56:18 +0200 Message-ID: <20250610125633.24411-10-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610125633.24411-1-philmd@linaro.org> References: <20250610125633.24411-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow Rather than accessing the attributes of TYPE_CCSR directly, use the SysBusDevice API which exists exactly for that purpose. Furthermore, registering the memory region with the SysBusDevice API makes it show up in QMP's `info qom-tree` command. Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan [balaton: rebased] Signed-off-by: BALATON Zoltan Acked-by: Bernhard Beschow Message-ID: <619a58d1f83d2aad5b4feec930d46c64abff0977.1748012109.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/ppce500.c | 8 ++++---- hw/ppc/e500.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index e97a515d5fe..52269b05bb1 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" -#include "hw/ppc/e500-ccsr.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" @@ -418,11 +417,12 @@ static const VMStateDescription vmstate_ppce500_pci = { static void e500_pcihost_bridge_realize(PCIDevice *d, Error **errp) { PPCE500PCIBridgeState *b = PPC_E500_PCI_BRIDGE(d); - PPCE500CCSRState *ccsr = CCSR( + SysBusDevice *ccsr = SYS_BUS_DEVICE( object_resolve_path_component(qdev_get_machine(), "e500-ccsr")); + MemoryRegion *ccsr_space = sysbus_mmio_get_region(ccsr, 0); - memory_region_init_alias(&b->bar0, OBJECT(ccsr), "e500-pci-bar0", &ccsr->ccsr_space, - 0, int128_get64(ccsr->ccsr_space.size)); + memory_region_init_alias(&b->bar0, OBJECT(ccsr), "e500-pci-bar0", + ccsr_space, 0, int128_get64(ccsr_space->size)); pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &b->bar0); } diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index dedd96b0574..6899802bedd 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -931,7 +931,6 @@ void ppce500_init(MachineState *machine) CPUPPCState *firstenv = NULL; MemoryRegion *ccsr_addr_space; SysBusDevice *s; - PPCE500CCSRState *ccsr; I2CBus *i2c; irqs = g_new0(IrqLines, smp_cpus); @@ -993,10 +992,10 @@ void ppce500_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, machine->ram); dev = qdev_new("e500-ccsr"); + s = SYS_BUS_DEVICE(dev); object_property_add_child(OBJECT(machine), "e500-ccsr", OBJECT(dev)); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - ccsr = CCSR(dev); - ccsr_addr_space = &ccsr->ccsr_space; + sysbus_realize_and_unref(s, &error_fatal); + ccsr_addr_space = sysbus_mmio_get_region(s, 0); memory_region_add_subregion(address_space_mem, pmc->ccsrbar_base, ccsr_addr_space); @@ -1284,6 +1283,7 @@ static void e500_ccsr_initfn(Object *obj) PPCE500CCSRState *ccsr = CCSR(obj); memory_region_init(&ccsr->ccsr_space, obj, "e500-ccsr", MPC8544_CCSRBAR_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(ccsr), &ccsr->ccsr_space); } static const TypeInfo e500_ccsr_info = {