From nobody Wed Nov 5 08:16:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153317810159072.61277635970657; Wed, 1 Aug 2018 19:48:21 -0700 (PDT) Received: from localhost ([::1]:43666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl3f2-0004sC-Gc for importer@patchew.org; Wed, 01 Aug 2018 22:48:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl3a6-0001Kg-AA for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fl3a5-0007Nh-Av for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:14 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:37077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fl3a5-0007Mc-4z for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:13 -0400 Received: by mail-wm0-x241.google.com with SMTP id n11-v6so724413wmc.2 for ; Wed, 01 Aug 2018 19:43:12 -0700 (PDT) Received: from bloodymary.ipads-lab.se.sjtu.edu.cn ([46.243.138.172]) by smtp.gmail.com with ESMTPSA id t2-v6sm389721wrv.63.2018.08.01.19.43.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 19:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fFT88fSCc8Id0yV1jnVKufTRMy3Nz920XlVRJoN8GY4=; b=ZmnzfTqxu62jko1I1lW9FIS7qZltPA6OwZ0Ig/F2eis0ri4tvfJDnaGmGKT51kzo9l L6yqAs5N4LgARKe1zi0bsy9vfLnpfi+4xoameiQpajLWCsVar3ZsbodibeAuQTSAOszK Ly9jQS31WXodhwvbnrN7LR1nhaI/i/Zd4nVxIDSi4n+03kosU5XhaG1UHrVsnYMVuOAK +KbhKliwfN6Yax322BSPEmjL8jcOi0gZCLd4h0CcQry3jyox1QVtPcu++8mLEZWa98Ez FAh+laDz3Z5CzxG3h4hgxZS1VTF5oR4Duv8QVVk/gUj6ZBcarYJf2aMTMY+ccN61Ls/Y sWRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fFT88fSCc8Id0yV1jnVKufTRMy3Nz920XlVRJoN8GY4=; b=MqjYhKofDRQAdBuPNZ44iBU0xs0rAcIqXUZ/4/Pc5vheflpY6ghm2V4tc2J6mf/7ov S0Mt2yS4QuC4cvP1EZ8DEp89xZXr3gX/ipUVV/Y1GQT9H8EwFZYXUOhXfQ0zrV3cEov/ kXXR1ozEMN6/7bGE9y9EoSAVip9IGMgwx7hEuQsWOLgEGNwcU/7lr02E7JjJnFf0QR/s GfhjA1pJXFvXNncx/D/G+jOSPbFlNAgdRmo69+xXyPJe5+PZKkQBvwY6pld883I1PY7E oBdfKZ0obFjNf18CDJz2OB8RMHAmX+Rgk+0PAmXN9qOvGXt5s9b6ijPO0nVRHFtqzX0U EgLA== X-Gm-Message-State: AOUpUlGlL+TdmmRKIncOW5Y3f2LIVeGnwQSGZ8L42BC0DB8jSCj2BkPT ogAFTxqdKPp9Y4awcsrUtg95ospJ7RI= X-Google-Smtp-Source: AAOMgpel1wSisxQf1RAYiE3NhCqQxHRhE5CoilG0HNeS+pqPGlYKhs1ZBCF+t3fUIYOc9vxrph/4FQ== X-Received: by 2002:a1c:7301:: with SMTP id d1-v6mr522497wmb.34.1533177792002; Wed, 01 Aug 2018 19:43:12 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2018 10:42:22 +0800 Message-Id: <1533177743-20894-6-git-send-email-whois.zihan.yang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533177743-20894-1-git-send-email-whois.zihan.yang@gmail.com> References: <1533177743-20894-1-git-send-email-whois.zihan.yang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [RFC v3 5/6] pci_expander_bridge: Add ioport for pxb host bus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zihan Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This enables seabios to read config file in pxb host bus other than sysbus Signed-off-by: Zihan Yang --- hw/pci-bridge/pci_expander_bridge.c | 15 +++++++++++++++ include/hw/pci-bridge/pci_expander_bridge.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index cdfdb90..38212db 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -226,6 +226,20 @@ static void pxb_pcie_host_initfn(Object *obj) qdev_prop_allow_set_link_before_realize, 0, NULL); } =20 +static void pxb_pcie_host_realize(DeviceState *dev, Error **errp) +{ + PCIHostState *pci =3D PCI_HOST_BRIDGE(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + + // FIX ME! Use specific port number for pxb-pcie host bridge, not scal= able! + /* port layout is | pxb1_cmd | pxb1_data | pxb2_cmd | pxb2_data | ... = | */ + sysbus_add_io(sbd, PXB_PCIE_HOST_BRIDGE_CONFIG_ADDR_BASE, &pci->conf_m= em); + sysbus_init_ioports(sbd, PXB_PCIE_HOST_BRIDGE_CONFIG_ADDR_BASE + g_lis= t_length(pxb_dev_list) * 8, 4); + + sysbus_add_io(sbd, PXB_PCIE_HOST_BRIDGE_CONFIG_DATA_BASE, &pci->data_m= em); + sysbus_init_ioports(sbd, PXB_PCIE_HOST_BRIDGE_CONFIG_DATA_BASE + g_lis= t_length(pxb_dev_list) * 8, 4); +} + static Property pxb_pcie_host_props[] =3D { DEFINE_PROP_UINT64(PCIE_HOST_MCFG_BASE, PXBPCIEHost, parent_obj.base_a= ddr, PCIE_BASE_ADDR_UNMAPPED), @@ -254,6 +268,7 @@ static void pxb_pcie_host_class_init(ObjectClass *class= , void *data) =20 dc->fw_name =3D "pcie"; dc->props =3D pxb_pcie_host_props; + dc->realize =3D pxb_pcie_host_realize; /* Reason: Internal part of the pxb/pxb-pcie device, not usable by its= elf */ dc->user_creatable =3D false; sbc->explicit_ofw_unit_address =3D pxb_host_ofw_unit_address; diff --git a/include/hw/pci-bridge/pci_expander_bridge.h b/include/hw/pci-b= ridge/pci_expander_bridge.h index 1119210..e6d3b67 100644 --- a/include/hw/pci-bridge/pci_expander_bridge.h +++ b/include/hw/pci-bridge/pci_expander_bridge.h @@ -7,6 +7,9 @@ #define PROP_PXB_PCIE_DOMAIN_NR "domain_nr" #define PROP_PXB_BUS_NR "bus_nr" =20 +#define PXB_PCIE_HOST_BRIDGE_CONFIG_ADDR_BASE 0x1000 +#define PXB_PCIE_HOST_BRIDGE_CONFIG_DATA_BASE 0x1004 + uint64_t pxb_pcie_mcfg_hole(void); =20 #endif --=20 2.7.4