From nobody Tue Nov 18 10:38:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455029; cv=none; d=zohomail.com; s=zohoarc; b=I1IZ+wUg+P5XQgkTNlWE98V0h/XlldVdo8NPhyRkf6Vj7wohIcNw4M64srlZVBdeajTYBKS1qnZjhrzA4WP9Y6puGJW1sL3eGMTzjeZk9aXjt8f0FC+rpZqWvgLl9tr/yCBkPdjpVA+qzUG5iCl73/W1celM37gJLMv7jIrDb+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455029; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U9pXfDIHDtTAEsuOS9yHHlzE8xYt6k1B0TpokEBN3ro=; b=SJOP0WQ1FyTEtV0ApYkKwvHmvxj/u4+Q100/64lrLp5ZZtGt9wBgp4Xz3ev3vwqZPZm1OXh35rIXnlrKwxfjjsfdPq6/QfvFFGtyLVE86OudCcspIH98cMlakzFSD/UsmANtqbaSWnqqIdTb7NRKV/HBvFBPawisKtyfbt+ne74= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1609455029066724.077680431607; Thu, 31 Dec 2020 14:50:29 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id r4so8134670wmh.5 for ; Thu, 31 Dec 2020 14:50:28 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (239.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.239]) by smtp.gmail.com with ESMTPSA id h184sm15061993wmh.23.2020.12.31.14.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U9pXfDIHDtTAEsuOS9yHHlzE8xYt6k1B0TpokEBN3ro=; b=gkrW+y9agX4liAywPUAzeSNFGJcZlPj2rDfi8VKQWmlVzloqmheKNtGfE4W/HIHeah 9he4YGB04jLffQ4As+a6EY9YST9r+5jffFpVad2PeXB3IUxNUiyS+//FuMGFD1eebwzB FSPpndK1ZAKyaNjhSct5/a5LR/6J/5dApEWWqxhTNhtssJcjHNMnOhtrS0B0sHgB6mcB xxIriToN0wymOb3io9tCWzlYU9aD7JCE5TKlHjOzqMoa8DzlYISH7fSPWZZA/Wh3+ibP oX+TiARavWLwmxtOwi+Dzy5ivJ/Pl/b5du9aF5BAxsH4dGmg+dhFZ+Jf6iiKdsbMquqi /5QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=U9pXfDIHDtTAEsuOS9yHHlzE8xYt6k1B0TpokEBN3ro=; b=lgvP5MW6XstmNL21uztmdO/NVSE4j3Rtia/VKBRSoso36IwEcse04tNXLa5Zt5mSu6 18KT1qDQ9DE3KzWyuUnI4qrmDFD2bfeeOWo1bfhEkEsPsQpWc0sdT/CMoAANrVxiDEfj gNuPPGse33qzrenW/kQA5P/1UzdhmNyGRPaeIWxVQFRZFkdEmCtt59jwDVTYddKiPe7B VElCJAyS/gcTfLXZgUgqUgOFHjDPYfvyqgK5aXcsLU6GKm8NW8hJJ7JO3PEAqR/8olLG f8GpsgdqwK2it0WVLzkPF9RNsER7bay+kZxKVKlRlbi/wvrKqtjGQBaYdO4H7AsZP3sI 2aow== X-Gm-Message-State: AOAM531Fay12v9ZuHRQ2tDI1dvxOHnf83X/urGy0UPKsQkQOsLC/Nhwg NP3ev7SgdLp4MBUL3a8QcfDLTVq8nhM= X-Google-Smtp-Source: ABdhPJyyS4tEvaiEG5HortvVFWPPfuf3qI0zfPqawxJFpAy1iRV3TmW+97tNz0zr1ME4Np2weZl3xQ== X-Received: by 2002:a1c:4107:: with SMTP id o7mr13522953wma.69.1609455027343; Thu, 31 Dec 2020 14:50:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Rikalo , Aurelien Jarno , Huacai Chen Subject: [PATCH 15/18] hw/pci-host/bonito: Map north bridge region in bonito_host_realize() Date: Thu, 31 Dec 2020 23:49:08 +0100 Message-Id: <20201231224911.1467352-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201231224911.1467352-1-f4bug@amsat.org> References: <20201231224911.1467352-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The 'north bridge' is not part of the PCI function, so create and map it in bonito_host_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index c09d54cca82..099bb737c77 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -638,6 +638,13 @@ static void bonito_host_realize(DeviceState *dev, Erro= r **errp) create_unimplemented_device("PCI_2", (hwaddr)BONITO_PCIHI_BASE + BONITO_PCIHI_S= IZE, 2 * GiB); + + /* set the north bridge pci configure mapping */ + /* north bridge PCI configure space. 0x1fe0 0000 - 0x1fe0 00ff */ + memory_region_init_io(&phb->conf_mem, OBJECT(phb), &pci_host_conf_le_o= ps, bs, + "north-bridge-pci-config", BONITO_PCICONFIG_SIZE= ); + memory_region_add_subregion(get_system_memory(), BONITO_PCICONFIG_BASE, + &phb->conf_mem); } =20 static void bonito_pci_realize(PCIDevice *dev, Error **errp) @@ -660,30 +667,24 @@ static void bonito_pci_realize(PCIDevice *dev, Error = **errp) sysbus_init_mmio(sysbus, &s->iomem); sysbus_mmio_map(sysbus, 0, BONITO_INTERNAL_REG_BASE); =20 - /* set the north bridge pci configure mapping */ - memory_region_init_io(&phb->conf_mem, OBJECT(s), &pci_host_conf_le_ops= , s, - "north-bridge-pci-config", BONITO_PCICONFIG_SIZE= ); - sysbus_init_mmio(sysbus, &phb->conf_mem); - sysbus_mmio_map(sysbus, 1, BONITO_PCICONFIG_BASE); - /* set the south bridge pci configure mapping */ memory_region_init_io(&phb->data_mem, OBJECT(s), &bonito_spciconf_ops,= s, "south-bridge-pci-config", BONITO_SPCICONFIG_SIZ= E); sysbus_init_mmio(sysbus, &phb->data_mem); - sysbus_mmio_map(sysbus, 2, BONITO_SPCICONFIG_BASE); + sysbus_mmio_map(sysbus, 1, BONITO_SPCICONFIG_BASE); =20 create_unimplemented_device("bonito", BONITO_REG_BASE, BONITO_REG_SIZE= ); =20 memory_region_init_io(&s->iomem_ldma, OBJECT(s), &bonito_ldma_ops, s, "ldma", 0x100); sysbus_init_mmio(sysbus, &s->iomem_ldma); - sysbus_mmio_map(sysbus, 3, 0x1fe00200); + sysbus_mmio_map(sysbus, 2, 0x1fe00200); =20 /* PCI copier */ memory_region_init_io(&s->iomem_cop, OBJECT(s), &bonito_cop_ops, s, "cop", 0x100); sysbus_init_mmio(sysbus, &s->iomem_cop); - sysbus_mmio_map(sysbus, 4, 0x1fe00300); + sysbus_mmio_map(sysbus, 3, 0x1fe00300); =20 create_unimplemented_device("ROMCS", BONITO_FLASH_BASE, 60 * MiB); =20 @@ -691,14 +692,14 @@ static void bonito_pci_realize(PCIDevice *dev, Error = **errp) memory_region_init_alias(&s->bonito_pciio, OBJECT(s), "isa_mmio", get_system_io(), 0, BONITO_PCIIO_SIZE); sysbus_init_mmio(sysbus, &s->bonito_pciio); - sysbus_mmio_map(sysbus, 5, BONITO_PCIIO_BASE); + sysbus_mmio_map(sysbus, 4, BONITO_PCIIO_BASE); =20 /* add pci local io mapping */ =20 memory_region_init_alias(&s->bonito_localio, OBJECT(s), "IOCS[0]", get_system_io(), 0, 256 * KiB); sysbus_init_mmio(sysbus, &s->bonito_localio); - sysbus_mmio_map(sysbus, 6, BONITO_DEV_BASE); + sysbus_mmio_map(sysbus, 5, BONITO_DEV_BASE); create_unimplemented_device("IOCS[1]", BONITO_DEV_BASE + 1 * 256 * KiB, 256 * KiB); create_unimplemented_device("IOCS[2]", BONITO_DEV_BASE + 2 * 256 * KiB, --=20 2.26.2