From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454961; cv=none; d=zohomail.com; s=zohoarc; b=gDBtILW9iMQ1MjtyvfNSk+zpLG5cEXNznjXxBAhOkOROOWbnYPTWy+RYWLQWMqcb38FcJz20NcJtEKzGhcBPzu/pVU/bfVPtf8FokpTwU2RjTqoQ6VVk2gzz/DtdGVqYoCCFYtxwYqL/Z/qelyBDJyrnWW1Bq9G9O1Yx1RDsQYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454961; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SOhKBz9bQ6VQPdGkLKDSp+AoU5nJP8IFyHDySBpgUlw=; b=LYtGHr4tDkffdFCaJmOsiD0InIf+DYTyptifwEHgfyrVOaMqQTD4AJU2ltyAMCQ8IP+OgH9tcos9UqMB+RmHCNvp/9L2zbB52Dh2El1l1j9NRYr0Z0E/AoA8ntagfA3fNYipbGyUmy1NpnO19kdbOE+8a9m6VuXv298VQ5dNfCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1609454961309199.88593361821165; Thu, 31 Dec 2020 14:49:21 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id 91so21024587wrj.7 for ; Thu, 31 Dec 2020 14:49:20 -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 l20sm77266228wrh.82.2020.12.31.14.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:18 -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=SOhKBz9bQ6VQPdGkLKDSp+AoU5nJP8IFyHDySBpgUlw=; b=VTJkgzymKsJFiPovzuEyYLOZRbtxsP0BcwV+kaCkZcP8o/6ATiRnOiF5TeaXiHEo7Q sgt5i/qF61zbyTY3XhmFKJd3N7hNcWgdeDUhUpgZti5XdLB/rw57tffgn00zcvY2tWKh wu+grp0vgKdXvBF2GOKLzMp9Gpn8/9F3ztoSYVimO26govlg9OVHP4SF+iXw09Bg+edH 3MU+MBvkKIoxoNuitBGlul6Z/6bgxd1M5rw+QPlN3md0lx3n930ROY7rB/N8N7ynWRMs AKiaYU+hGfOQNEZLY7+13wsp+4J4m3jE6LUsZ1JbV5LyuvWo5J+vKzglg79FjKK4O4Sd okeQ== 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=SOhKBz9bQ6VQPdGkLKDSp+AoU5nJP8IFyHDySBpgUlw=; b=fYkRxAzYWVJPAPZJQ5BnIwt88p59xdxlydw1m8p/mSZd01E9Bf+VncxSE4JyO+QzuY 7u0FJSiQCRlXduKblxmXTU0rvP/CZr5AkDjhn+P+tNSWYsOAeniHCTIH20I3efn5mshe cJaVA2L4znRhPPeqGguTKjNk4z55xd/d9VK8i7lb2Tb93rvaoCWus50AkWqYlTgOpjcK p7ZGGjQHWYlbzj5fe+YfbL+igdq/5eaWqyqgP5cjVmt7FZ7Y4JKLJri95i/JoZnwKBDo eU+q3FbBXrHkHtMaXV4lyk9ifiBDOofXdhsHr//sBAtqf5W2JGcnAHtxOA7PTxj3MTeD 822A== X-Gm-Message-State: AOAM5319aY9RBhe1nKTl+TDLndVYzrPc9Cg8p6SyrocvSWZNk6zeNfYo pbglFObzb9sBH23x0xouCto= X-Google-Smtp-Source: ABdhPJy7gNWuIxWfnM+zbZPWMebEMV1VJxglH4vLVmd+6/JbMZSao2Y6FSi5dLn7psDcF6gOErLA+g== X-Received: by 2002:adf:a34d:: with SMTP id d13mr66754667wrb.194.1609454959508; Thu, 31 Dec 2020 14:49:19 -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 01/18] hw/pci-host/bonito: Remove unused definitions Date: Thu, 31 Dec 2020 23:48:54 +0100 Message-Id: <20201231224911.1467352-2-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen --- hw/pci-host/bonito.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index a99eced0657..0634f3289c4 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -189,12 +189,6 @@ FIELD(BONGENCFG, PCIQUEUE, 12, 1) #define BONITO_PCICONF_REG_MASK 0xFC #define BONITO_PCICONF_REG_OFFSET 0 =20 - -/* idsel BIT =3D pci slot number +12 */ -#define PCI_SLOT_BASE 12 -#define PCI_IDSEL_VIA686B_BIT (17) -#define PCI_IDSEL_VIA686B (1 << PCI_IDSEL_VIA686B_BIT) - #define PCI_ADDR(busno , devno , funno , regno) \ ((((busno) << 16) & 0xff0000) + (((devno) << 11) & 0xf800) + \ (((funno) << 8) & 0x700) + (regno)) --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454966; cv=none; d=zohomail.com; s=zohoarc; b=oBBk04EbrXOhWbCFRE9NR+oTYhiBiOmUOsbNrLPbvXFEVSu3ePpbMACWUlLxubHQPSSQT8h/UKWBeYmbrAnzuSBnCnYRFHksNdqkwRFnk2PrmcHxhokS9/H7zJuoBurgUpi4RfCqOZi+xKtHqZKnC/d+DIFgpPMblAZpv1CRmlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DaTE72cdZaTjtjdnfodb65w5ACl9PUYleicR63q1RfQ=; b=k+E+0JS9iFL2o3JGrWO9XkLqFj4R9sWPi8TI1ISoDUqjv0OHJq2XZv4L/AnBwYfxwOOafIDHoOY0lJTiM6iN96oF15cEBGdfLQR8hxZb57H9EKv2+Lo6zAKlH62Cfd9m8i7t05+0rf/AyRYfvYMit1IqsWaIrFl9bzgdxP14e+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1609454966128146.62628806600082; Thu, 31 Dec 2020 14:49:26 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id c124so8138129wma.5 for ; Thu, 31 Dec 2020 14:49:25 -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 o8sm70616044wrm.17.2020.12.31.14.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:23 -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=DaTE72cdZaTjtjdnfodb65w5ACl9PUYleicR63q1RfQ=; b=I0QCXiBBrAukbla5jow0+Mq0n69wiMOjPlbeba/3f70bY1U14iy+pcleLExbawmEPv 3i94uYcb+UUm3gmV8/RB2OkKsvIb/9/3DJdGupGJQGFTSSzHrnRaFeWWrDrKHCpXTYJV 7TkE36qMsJS4x8fTc+OBGr3mDMFyHpo+xFNMfvDhqokVoYAExBEtu38qE5FVWFORZKv0 uGyijMYs4NdCx9enZyE+5rezmd6aUXr8UxhzfdLxfFS4CsuRsbQhyPdjf/lay83fSnVw yiEbQQllr9/2m0j1gsAssY0QdcRAei7tzDQnBX8IduXnNO89tAHJam46Y652vnNjMBC1 1AEw== 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=DaTE72cdZaTjtjdnfodb65w5ACl9PUYleicR63q1RfQ=; b=q+ttl9uv8JhzghdTTpYuWP6HcvMyCMTlR2x2B8WHGuGiOQLzi3+PndfDhNOFIywrY4 bDj/ax2L4DyiBK/dOs08S9TnYboelzm1/STQ/wy3VgLUd8cNzUCaBYHros8kmllVW3Q9 d3AKl4ez+zd/mBMb37+LZq84zHjGcMOGEY0/m5a9wHBxi1w/d1X4h6xCbPSDh3A4LFcz 0vMT1v/TbCBgv8T9BFEvJ9js4VCbVxc9a4xX37qVOX+J6OD7iXtE38B2XeHxjQ6mohej 9oa1Xi7m0ohDbH4pztYFcPBJEKP+D9qoo3Adb7LY7w9RFd7hFi1KHJ/hJC1wn4sF0QcB lC5g== X-Gm-Message-State: AOAM531Hhvnfa44m5V2JZ7dnKBaYwizxtn0glF8gvXA0KarsuvXm2ykW X5fjgDoT6bqm+wXRxN0nCS0= X-Google-Smtp-Source: ABdhPJxP4l4HTBzKIBuvYdBFKzxkPIGRvq18P6sNPc/uBbZesEITGrVjdbntgHGWKW7vwach7BAgYQ== X-Received: by 2002:a1c:98c7:: with SMTP id a190mr13453260wme.184.1609454964330; Thu, 31 Dec 2020 14:49:24 -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 02/18] hw/pci-host/bonito: Display hexadecimal value with '0x' prefix Date: Thu, 31 Dec 2020 23:48:55 +0100 Message-Id: <20201231224911.1467352-3-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen --- hw/pci-host/bonito.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 0634f3289c4..efeba29011f 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -463,8 +463,8 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hw= addr addr) regno =3D (cfgaddr & BONITO_PCICONF_REG_MASK) >> BONITO_PCICONF_REG_OF= FSET; =20 if (idsel =3D=3D 0) { - error_report("error in bonito pci config address " TARGET_FMT_plx - ",pcimap_cfg=3D%x", addr, s->regs[BONITO_PCIMAP_CFG]); + error_report("error in bonito pci config address 0x" TARGET_FMT_plx + ",pcimap_cfg=3D0x%x", addr, s->regs[BONITO_PCIMAP_CFG= ]); exit(1); } pciaddr =3D PCI_ADDR(pci_bus_num(phb->bus), devno, funno, regno); --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454970; cv=none; d=zohomail.com; s=zohoarc; b=JCpvnJRdr2yZZ/RAqhm5LYhj5VAULr40SNUpWVTnhm86HDN3P9frBUMZCBy/jPMdjVzXnVEZyQB+fQVe38DnRFRlWORO0Mf9/43s7HXd/C/N/U0G/eenL8+Vknv92BasW0LRWQMLGp1qJMuepQxPQPelRYS4Km0KDqKTgI1tfv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454970; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y8tdHrr32AcTrGaePHWGuuNZrRgCCpLKfmCaddeiLIU=; b=RtPc2cPkWY+ZL9j6grIZ6Xa4fa1qWtl2O00xqLW6Gx3Ct1/BXx//Xvdspu8msgpJGh9hA9pMWBPC2sLpbBjDQga7bgr3nl/pXgLGjzTOE7wJiX/BrDc2d5eGOrF4NEnn1AINk0UnPJvoclS62NYxFxESlcNpqyGTEnMPqfzDpiA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1609454970814624.9900066397579; Thu, 31 Dec 2020 14:49:30 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id r3so21064256wrt.2 for ; Thu, 31 Dec 2020 14:49:30 -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 o13sm49363262wrh.88.2020.12.31.14.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:28 -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=y8tdHrr32AcTrGaePHWGuuNZrRgCCpLKfmCaddeiLIU=; b=tIoU2fNFWfJO1TdguFoffRALA2Mb9w9Ky+qqy+g7/FpgFpR5M8vSjzYKPmH9FKTwWr ProVR81wDZWA9Yh0mtYGNs8iCvLsxYKRDkJzFPc7FxgVFRAe/CSLEOKy+76sW7/+kRqK BWgYCw2zLQluoNFOJ6S1eWOxKzYQGwlrhTr5KC+9nsg/anKu0bYgVAqS8xykIMM7uuc7 u8ON5KEeQ5nASfND2R6mXA/g0h2fBrW5g98i5L/MTiDmg9wo94KtEyde0upUW2Ofisj3 obQ7YUfN1ZHoe/AMChh54/yd1wSOYYkc+hSLOeUuGY1wGaTx6h9WLt9hG6T/giZq2sU1 3p0Q== 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=y8tdHrr32AcTrGaePHWGuuNZrRgCCpLKfmCaddeiLIU=; b=hCI9J+ZQaibAGzo0uFJN4z/vrMMxdWj1tzbdi7Q+E2a50FsIUCesJuF7r9xvV+akKe IAb5tdOaNDh4NRy6YrF9tzv8LPIOzZwN/KF4M19Z3sALs1bdYeXLzHJ5p3dxS+ec22G+ Tb5TnFAtuKBwS3PlB1xz7UCzCZRUN7faePigHXmBRMNYEXs+4amdxngTyw2CUyXGC4vL jeYNiYB2Z+vYyM0CCfybnQaxy+hc9PnF7WXkrBAQFXhM+95svwi5QGR951DFbunS/R7y gTgtUj4oz+K7i6lTXsdL2RNhIDIyO7mMJ8A7xN8ioFnN2LVCfFUNcQaAWepXviRFE+qN iWBw== X-Gm-Message-State: AOAM533SMeBrtVkcfnTw0SlxeAmKX+roQJIGpGa2/19Av3HwTJJRfAZ7 H2r8Plse73H83dtZnRVQ0Oo= X-Google-Smtp-Source: ABdhPJxl9Q0YxAwCTFKUW23rLMeEBfzrJOCLpgLuNLWHTkRvOxFwYb0NnDOpnmJ0tn/p8ACf5xxC4A== X-Received: by 2002:a5d:43d2:: with SMTP id v18mr66459196wrr.326.1609454969088; Thu, 31 Dec 2020 14:49:29 -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 03/18] hw/pci-host/bonito: Use PCI_DEVFN() macro Date: Thu, 31 Dec 2020 23:48:56 +0100 Message-Id: <20201231224911.1467352-4-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) Use the PCI_DEVFN() macro to replace the '0x28' magic value, this way it is clearer we access PCI function #0 of slot #5. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen --- hw/pci-host/bonito.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index efeba29011f..4c903d4f682 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -626,7 +626,7 @@ static void bonito_pcihost_realize(DeviceState *dev, Er= ror **errp) phb->bus =3D pci_register_root_bus(dev, "pci", pci_bonito_set_irq, pci_bonito_map_ir= q, dev, &bs->pci_mem, get_system_io(), - 0x28, 32, TYPE_PCI_BUS); + PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS); =20 for (size_t i =3D 0; i < 3; i++) { char *name =3D g_strdup_printf("pci.lomem%zu", i); --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454975; cv=none; d=zohomail.com; s=zohoarc; b=BaaByqvjguRSO64G2KIeNvmmeQFTO/VnannCodRUpII9MEVNsupsmbZYqKJoK0Q03XQsKyRvcva6te2NwDtJ/F9MKyHi204zrGYY+Es6fCmqPRyLtSlsc2wshfKqzBQxF9dr0zpL7P88eWz4/28P+gSTuK/QTx7tUXuYKVs5XWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HCV6hM+D7eP0IiKfRG2kbILOOq4+o/HRgbbPJbxLHKY=; b=RNdTqJJ+CMvFox/4+yzTHtWDRSGcQgrkCc4KQZUNk6yqtSsb/OffdnHCdo4SjrBGxwBHoo8SZsuXxDVvbzqjwZ52OfdhrEwrPJibGKHIbdcX9noG+PHaSdY59ewTJQtLxkPwLU6AHnnRA7NnZx9y8HDfJfj6Nl2hUwSY735kkv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1609454975777312.8123619361701; Thu, 31 Dec 2020 14:49:35 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id c133so8142741wme.4 for ; Thu, 31 Dec 2020 14:49:35 -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 n16sm33339556wrj.26.2020.12.31.14.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:33 -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=HCV6hM+D7eP0IiKfRG2kbILOOq4+o/HRgbbPJbxLHKY=; b=qrQIJXU5zI+od83uHpIwGReSAKMqujZWIDkpoYJvIKqm7ofx79Yd69un4MwrmyNnZO bqL4dmhX+eNeKenj/f+wFAg8ywHck9ANSrCmegZ7ghV4fy+/Te91EG96Se/lzEvpXlgt jIv/rFkoam/nI6UhNfUt7bSfQ9bj1Ifb8whDoH2ScXqNaufYaipFBxZ4KwlqIul7hn2r F7XAA8kw+rEKDMMUwygXKkAku1PR3KXLjGlaJdL3Sj2F3ucvkNWAtwik9fBcTbgKSxfl VBhbgA+UeOV9PtbJjI6QzOWhbx1u8uoIRsxZf38sgTLn/qQo5S2458SpbCT/lEvxQvkN 4m/Q== 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=HCV6hM+D7eP0IiKfRG2kbILOOq4+o/HRgbbPJbxLHKY=; b=Br4pLl9iWoI1/mjPvhQb3IYJD/MWoRKnYqhRFyuL/k4ABjx+EOVjih3Rl82gnOx7I5 HuVj5TIqtIDZ4AHQaVpvsnbGg8lwimk0ceTIgtrn0SaKZR/B9f7jG0C74i2a1PR4paoT ssGOu0FPQyvQV5gEUUezmLEYq4WdVlgJ4s5NPGkznlXjcu+IvwmM310o1nE0MYunxtYA YnYxMPyB3jXYzmbEpA8QhURAmlPJIReseI3JL0AlxiFmHgCtgr9k9xIOP6zRIDAy759e npPL4b2/PV0RPWcDM0q+rSvdiBibcB/3RFdFCFxrCpy6aui5YOF7wKe53/4igrhxWGGN yCvw== X-Gm-Message-State: AOAM532KZDDT9Bxf/0FP/gThHSbJOScEHENYqzg5jefQMIup7a0AMVPe adXRu0yuJqAkI5bO5L4Z++k= X-Google-Smtp-Source: ABdhPJwb+22KqIXjUg51dPk2CF7bVRFAnblDdwgi/CnnwgSMXGL+KYIQbVY5P9mSo2CUMoelDzLFtQ== X-Received: by 2002:a1c:9e86:: with SMTP id h128mr13817940wme.171.1609454974071; Thu, 31 Dec 2020 14:49:34 -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 04/18] hw/pci-host/bonito: Use pci_config_set_interrupt_pin() Date: Thu, 31 Dec 2020 23:48:57 +0100 Message-Id: <20201231224911.1467352-5-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) Replace pci_set_byte(PCI_INTERRUPT_PIN) by pci_config_set_interrupt_pin(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen --- hw/pci-host/bonito.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 4c903d4f682..fe94e6740b5 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -723,7 +723,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp) pci_set_word(dev->config + PCI_SUBSYSTEM_ID, 0x0000); =20 pci_set_byte(dev->config + PCI_INTERRUPT_LINE, 0x00); - pci_set_byte(dev->config + PCI_INTERRUPT_PIN, 0x01); + pci_config_set_interrupt_pin(dev->config, 0x01); /* interrupt pin A */ + pci_set_byte(dev->config + PCI_MIN_GNT, 0x3c); pci_set_byte(dev->config + PCI_MAX_LAT, 0x00); =20 --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454980; cv=none; d=zohomail.com; s=zohoarc; b=Lx0nftSIiAf1fqpE8E2RPRYZioEYEgXrUi7mb5L3603zASPLO4LHac28f0U7clNPRHDW0M4+aKz9xW85404f8HtSAGjA/DG0QSbpBHELPPMYgKCLf0tdMROOLUfm/Oh0ENqDwx52DfxM3/4ueRR5/sqEfmHWSKTSP8ZfqVDZ4kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=lTW0+GPF/Qiwr5KP80sR5Z1KwPOjjjlEuDQyb9JL25Z1/4d2g3zvMyHkN56SVIJrOyp3MReTWCN93s3rdhdDO4TwZHuPp+uNdPym+uEB4qB8drnOOduAoeBK5ImknplV64jLYSbD2Nblv1s7yxJnKSkNdh8+aIwqS+NZkBRDRUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1609454980765783.4559977463424; Thu, 31 Dec 2020 14:49:40 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id d26so20997401wrb.12 for ; Thu, 31 Dec 2020 14:49:40 -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 f14sm14235284wme.14.2020.12.31.14.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:38 -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=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=KTkMcdaLQ+M+6Ujn+w8NnLe6S5cMiDheHSv5aKm6zbRR4jXPap3Aks7r2G383Y/PXa 4LGFww/mf7y96WMTwJXDMoe/iz2LfAIlu/ty5PSiF5EgY49r8MWFVRPhRlf2YlvOeKxw SAZhQcU9Dtzyeiv/xzhO1ACYq/iugoh5QP32MIZpDyVf2vPRWNHiaB7XxU9x+1E9Ok39 2kEKchFOMTC6YxuzpBg3TIkbV3VQoGO6J3JchDFerNW4e5Y/BBDrsDhSD4VzYcPGzG28 Yhh8XkBcjt/9f4KtMKUaOA8ZEaBXVQfTu/YYM8lS4iW2fLseOecllO1xo3hbnlonHCQg 4dLg== 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=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=jn3Ve3n0kut8qc1uaqcRKD98TUTfWzCvAdgNKQ5XKhsJNgKoHYVuDnnuWv74rdYwXT 8sMfQzsmwA0nxPl0LZ36H0SrXUTlJ6MvRNJ7BxN4c1FVS4aqll5k9AAs/AoYjx/o3EJK WqWtC919SAVVRP+J9JGoHqzRBgAbrvSSgFAj7lB9QSNLm9zlDfl5Hffc6FmmfIyogV83 II76RFlimd9Bo0GRuOmNudpW4CptvyfMENljs1D5fmg4rp3tu77mKXMF4nZKBs2f4ms0 22o8vWC3B2NR4KDXr67yuM7LaVkCVB7L0bpRd2YFiWSvafaFM640jpxcEXF4NU+Zx4mm 07Vw== X-Gm-Message-State: AOAM530tHv8bayxV4Pc40xyy6sp88Ik4kQbOQziy8JYNme6QOAhQ6tfm eO40aGc4DlA5FXy1NGe1ka0= X-Google-Smtp-Source: ABdhPJz2XQ//XEm+IRLh1Rvisu6ftnBMqMOTpVRXTV/2Ql2zgghbFzJkvhvddkkYz5IjAIKtbtrYFQ== X-Received: by 2002:a5d:540f:: with SMTP id g15mr66744461wrv.397.1609454978926; Thu, 31 Dec 2020 14:49:38 -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 05/18] hw/pci-host/bonito: Simplify soft reset using FIELD_EX32() Date: Thu, 31 Dec 2020 23:48:58 +0100 Message-Id: <20201231224911.1467352-6-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index fe94e6740b5..104c58331d0 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -244,7 +244,6 @@ static void bonito_writel(void *opaque, hwaddr addr, { PCIBonitoState *s =3D opaque; uint32_t saddr; - int reset =3D 0; =20 saddr =3D addr >> 2; =20 @@ -277,13 +276,12 @@ static void bonito_writel(void *opaque, hwaddr addr, s->regs[saddr] =3D val; break; case BONITO_BONGENCFG: - if (!(s->regs[saddr] & 0x04) && (val & 0x04)) { - reset =3D 1; /* bit 2 jump from 0 to 1 cause reset */ - } - s->regs[saddr] =3D val; - if (reset) { + if (!FIELD_EX32(s->regs[saddr], BONGENCFG, CPUSELFRESET) + && FIELD_EX32(val, BONGENCFG, CPUSELFRESET)) { + /* bit 2 jump from 0 to 1 cause reset */ qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); } + s->regs[saddr] =3D val; break; case BONITO_INTENSET: s->regs[BONITO_INTENSET] =3D val; --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609454985; cv=none; d=zohomail.com; s=zohoarc; b=d0sxYznf+tnr4YAnFrOcZjMAsiV0Erc3cPB4SBjq9r5Z/PkDn8KtCz0vKONwBHyEMJMI43cU9iowQ56PI+5CEc6Q1ZhAcoW3rFOCHpohZlC3AZk28WvgM8CT16wFvNQE7WUAHc0cfwBShOhoA8oY/rXF1MeOpCBIA4ua9bb4kEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454985; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R2ny6HpRTTZsoN85CWHTkLlGTVWjBfb4+zResZwGkow=; b=VukpLf0Ldiw75wgVDYUMF3Vr9e0KqqXHxGiNQxn/UwyHkthKRXt3hr3wbzkWgBzC0+hO8YwwLfctUtLAaOdvfrFgoOs9bQMEbCG13+3cAig0Qzi40LdD4O2GeTIpZZI5+PbLB1VlN01CdJ4FepUWk74Ye1LaGsAS6NdHP7ixu/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 16094549855871019.4664565894853; Thu, 31 Dec 2020 14:49:45 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id g25so4391885wmh.1 for ; Thu, 31 Dec 2020 14:49:45 -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 m11sm13850842wmi.16.2020.12.31.14.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:43 -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=R2ny6HpRTTZsoN85CWHTkLlGTVWjBfb4+zResZwGkow=; b=NnjWKvwdz9HVKZBGLasiQOK/IfGhrqwfdjK/Tes09YRSX7klKa9SZ9F1C+KxN45SZD eklitOLa0xnRHqflhXoNjMkB2Zq1/fmhQ1azodt3t0q/Km48DZbZxINX+EeOx9v7yOIF nt0nyeb0hwkjMtDp+ThUtx1eOfLs7XNkAU1ePQoT5BvfR7CaEWCjcVl2Jmeb8NlMUNDp JPQp2rARm9WuxQ1loQSOf8Ko7Wd+j1UWF7u7dKg3auPALyRpmy5HkAuKlmnih/gRTlGw Tcq5O4bvc+RTysowX494aEJVv6JXmefLhxcJP5gPpS3XOiOGIgdmzl4t26mRDneh/mEn XfkQ== 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=R2ny6HpRTTZsoN85CWHTkLlGTVWjBfb4+zResZwGkow=; b=TUwOq+udbqvKCJta+8AR1CsMRh5W1+6Zg2u2WvImoGHogooIhM5OzEZylQGcTluLOu iFdlH6nW5ZdCNw7l142oRvFHpnjfWw9DXSjZIp/HOQ8SjWiF1RMh/xw/1gm/k/pcJeXL lfQ/B/zpUnNWxQSxx3WsLYCds0lcXeHPK+JOs7LjfLnhjnFmFUAz88Bw49Alrb+VsvQi dP5mVRdYcz8+VbbvPQpTEjWaafUH/NZYRA/k9PcFUzCSBiknynJkEakUuJPOKG98lTp6 AA8ZhJ/SAq2XrF4BSx9OtbLa451Ci6xW2Amj4/ZIep1W2KvfU6BjZwnerNVF8JXyjsvO bCuQ== X-Gm-Message-State: AOAM533kZ6w7nLPnuGuEs5z0vuIxZSDRjwOpkwizL7CKNylQJb9AATfC SWrEt8IsavHUAFJti+3p0Jo= X-Google-Smtp-Source: ABdhPJxv0B4TkMYvH4x+gzvwkOK2ksL5+Nb+1/B9VD6yiRyUkJ0ICD5DHlC7I7BaKdmFI+qGE7etAA== X-Received: by 2002:a1c:2b46:: with SMTP id r67mr13370772wmr.162.1609454983822; Thu, 31 Dec 2020 14:49:43 -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: [RFC PATCH 06/18] hw/pci-host/bonito: Do not allow big-endian targets Date: Thu, 31 Dec 2020 23:48:59 +0100 Message-Id: <20201231224911.1467352-7-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) This model is not complete for big-endian targets, do not allow its use. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Yes I must improve that, I know =3D) However enough for now to post the following patches. --- hw/pci-host/bonito.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 104c58331d0..93820f69e49 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -53,6 +53,7 @@ #include "hw/misc/unimp.h" #include "hw/registerfields.h" #include "qom/object.h" +#include "hw/core/cpu.h" =20 /* #define DEBUG_BONITO */ =20 @@ -354,7 +355,7 @@ static uint64_t bonito_pciconf_readl(void *opaque, hwad= dr addr, static const MemoryRegionOps bonito_pciconf_ops =3D { .read =3D bonito_pciconf_readl, .write =3D bonito_pciconf_writel, - .endianness =3D DEVICE_NATIVE_ENDIAN, + .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, .max_access_size =3D 4, @@ -648,6 +649,8 @@ static void bonito_realize(PCIDevice *dev, Error **errp) BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(s->pcihost); MemoryRegion *pcimem_alias =3D g_new(MemoryRegion, 1); =20 + assert(!target_words_bigendian()); /* FIXME not supported */ + /* * Bonito North Bridge, built on FPGA, * VENDOR_ID/DEVICE_ID are "undefined" --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454990; cv=none; d=zohomail.com; s=zohoarc; b=gZY5U1BfCoh45Aq7I7MjI9oGQoPcP37WgROPKqJs9htCYN2Ww84X0aCPPxvEk7kHBcoFu87D2I8lzJVLAasRSm4N7ujalT0hyWUDnHQQae8TU1OicLXIz2MKUEmunZZY/7efNQUjS7uVFyF4AwoPmFmEupANpr7l6NDCi1OnmxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454990; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VwJCZ0fkM6seEv+et0rkbAeXeCRTJ+76lzeZJDFriQk=; b=Pn4zQC2P7f7qeuwYtV/Wb06f/MPTJeqtR01qGUKf5ZXciwoI8SwO8j5To/ZHSDw6n9f0EVgid93g/7Y4whhLSpL9SlrWJnHFrUR0Kzy55KNiV/IiN8BTKRBCMh0cdfs9SFwUJzIOsPo1O3iIlQkp+EkJoQnJOAPfpikl20gXACg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1609454990534549.068808402221; Thu, 31 Dec 2020 14:49:50 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id r4so8133951wmh.5 for ; Thu, 31 Dec 2020 14:49:49 -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 i11sm12371357wmq.10.2020.12.31.14.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:48 -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=VwJCZ0fkM6seEv+et0rkbAeXeCRTJ+76lzeZJDFriQk=; b=VKMgTyN+SALsi9ty1hnEYlbPHAXViT49yYmC++uJX0Wsd9lxGlr+1ia+n9S5elSFlD YG8n8TcwsBstHQr42G+6S2OoBTyw7RpxDbp4/vyYMGb+6/6eOreVeB6epqF6QqcmK6EJ P8B1MmGQ9KNCSKttkC8SqTxUGVBQ6IydMV0CAf48PidCCggRQYkRUDx/2xjLMsrSxs6G 0Vnm6GR6iK4yHQeRglcVWKThB2psGO40Y9OdG0LaYMioii0osmKTja/h/YwGSMRMC6Cx C5IUwuSxl5rkUnsdRLuKeDkyWjFHCnsSAgneqWiwtzUV++0eDvVSRvedZ20IbFXti+LE ZonQ== 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=VwJCZ0fkM6seEv+et0rkbAeXeCRTJ+76lzeZJDFriQk=; b=lXz2wTMrLVr/bRutcC7be3sPRO0hvTht9atRnBEMDvzuzL0nBILpJB+2toYqmNMD4o Zr9cU1ESV7rXRPAa9EEUwbQv4oUEXn3hpcZvMhvra3XaUNF7Iwd3wL4llloRlalp70Y1 gMqIau+xnRAwnAerGqhGGoEsVzni0b2WemTz5yPdmMLRHbhRCaLpxW+NhzW41Lz2l2d+ LENCiElzeseaRi8Z2ax/0XRkhDWVx1nGCow/zeXh9Z6blKIa7mlGVcFDOJan1Kpl20cA KKMwf3YuRUftjD/sPHTEMdY0SF26Mk/rWLvT3DzRHzieTRdFwy7dgkbrX5q+Kq2kHRzt HWdQ== X-Gm-Message-State: AOAM530BJ1XZZhxCKGRs5PspIzsm245K3wQ3BBPMoaY34g1d244zkDse /dNgbhQdxeCS9cqBTdZXPWg= X-Google-Smtp-Source: ABdhPJy/+AF34tldc1MxGNaofp7jdudFloTOt25dTJINQzxf1Lo8Db5gJzU6byrtOC6uZxGdu3xzsA== X-Received: by 2002:a1c:3cd5:: with SMTP id j204mr13188258wma.53.1609454988707; Thu, 31 Dec 2020 14:49:48 -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 07/18] hw/pci-host/bonito: Make BONPONCFG register read-only Date: Thu, 31 Dec 2020 23:49:00 +0100 Message-Id: <20201231224911.1467352-8-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) Per the datasheet (Chapter 5.2. "Power-on settable configuration register - bonponcfg"), the bonponcfg can only be modified using "pull-up on the corresponding IOD0-15 signal". Do not allow update of this register by the CPU. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 93820f69e49..29c0294d289 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -251,7 +251,6 @@ static void bonito_writel(void *opaque, hwaddr addr, DPRINTF("bonito_writel "TARGET_FMT_plx" val %lx saddr %x\n", addr, val, saddr); switch (saddr) { - case BONITO_BONPONCFG: case BONITO_IODEVCFG: case BONITO_SDCFG: case BONITO_PCIMAP: @@ -292,6 +291,7 @@ static void bonito_writel(void *opaque, hwaddr addr, s->regs[BONITO_INTENCLR] =3D val; s->regs[BONITO_INTEN] &=3D ~val; break; + case BONITO_BONPONCFG: case BONITO_INTEN: case BONITO_INTISR: DPRINTF("write to readonly bonito register %x\n", saddr); --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454997; cv=none; d=zohomail.com; s=zohoarc; b=OOcekUCitHrUGuztNWbTU0trM+rR2wj55YlX0bgeS3TNc3SepC/DJdGGpCNzo6wE4lF3NabX9wDdLptMNkE6kXPMWqVsvCg1/DL9wvV5UdR6feXPryjM7JMPEv631gPkgmlgjLRUcHxSzovMg1b3dAivO0PstR26cOEmyILn/qA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454997; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WFrblze5li4MVZdmD/PXlDbbm0BIjxaFdcbJ0KL/q84=; b=MSSiu2Pb35xLYS1/+T5VUX6TD9L4AEqtd0pupWOetjm4PuAXc0XV5NTephdCtGXkuhjDr3fTrEXf4cVDn2dqagLK17PZ2ZY5e8E/hNbrz0nFgU5gvJBjRANlfk+cnSekC7jvH7ropYvn+16UDLMJ3zKU5VvsPZnXFEcqWsloSNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1609454997354488.4392758885682; Thu, 31 Dec 2020 14:49:57 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id w5so21012379wrm.11 for ; Thu, 31 Dec 2020 14:49:54 -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 y68sm15055472wmc.0.2020.12.31.14.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:52 -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=WFrblze5li4MVZdmD/PXlDbbm0BIjxaFdcbJ0KL/q84=; b=oCY+HZdeKzxfhjf18meqoCqH9zznlem7sYBdRiB6VTF1ann6gl2OyrxX5s7X2a2Rya AxZ4eeM6XHAOEP2SBAkqi/9N5Gj438kYyODZMOR8Y6jJCKzWwGqvyk34eyfbX57FQWI2 3MaR9wBDRFaodr4kB8vRp6I/Dc1fTIWlQNoe8b6OuMczQYIQT96LLbcIbgCXYe0AfQlK FfAcRSwRdXCgaBmcz9puZj8+BOzZfYF+UZencqjTndOMlyPfl6ERYlV3ms6mlAnFhc9B CsM9u2VH6v+smIph5AUzW/mjvVv80i9S53iOglgV+oDa+tiCy5JY2v02TvJOEVCEr1/s TTQw== 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=WFrblze5li4MVZdmD/PXlDbbm0BIjxaFdcbJ0KL/q84=; b=CiqJDEv9ec0M1rLTBiGvdPaT0Z0cEn3FYkbldUNIh3/O4bhtyMZQAFuTgJv8MUdkrl OGuY1FTTL/BaSaGr+usYlRbNmfbu4lICOL8D8Or2zMVv2xuyA1QA5plHNAOYjr4AVIWz 3lwu9nudAfIQ9KHs0ExxCMhj3qEb6X6oBQHwYjDuJ59BL3/K31iZ2fax9aOONG3FEBvS h5b9kgxm4zKVI6vJmZihV4CZKL6FXrwOyg9hAr7JXxrVSy2i9fh720mL8jTFp6/ODtxI y8HyskQWUqfv/Wg857zhHQw0WD1x9R+11UB5gg5MsM03/3MbJ7eeDE3ZeEtkNtmqRCd8 q56Q== X-Gm-Message-State: AOAM530iscAjX0nrZroFiwvve8q16x8u81Sy/XcpMBsKezOwgn9xf0NX GR8JN4/6C99Kd31tDYH8ekM= X-Google-Smtp-Source: ABdhPJwrwe/LCzS7HK1cnQW6hO5y0DzMChCzRI6loZYj9hHRtsU0CfUiPYwbjGhFN9sXDBcgOmvwyw== X-Received: by 2002:adf:9d42:: with SMTP id o2mr57237279wre.135.1609454993514; Thu, 31 Dec 2020 14:49:53 -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: [RFC PATCH 08/18] hw/pci-host/bonito: Remap PCI "lo" regions when PCIMAP reg is modified Date: Thu, 31 Dec 2020 23:49:01 +0100 Message-Id: <20201231224911.1467352-9-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) Per the datasheet (Chapter 5.7.1. "PCI address regions"), the PCIMAP register: Map the 64Mbyte regions marked "PCI_Lo" in the CPU's memory map, each of which can be assigned to any 64 Mbyte-aligned region of PCI memory. The address appearing on the PCI bus consists of the low 26 bits of the CPU physical address, with the high 6 bits coming from the appropriate base6 field. Each of the three regions is an independent window onto PCI memory, and can be positioned on any 64Mbyte boundary in PCI space. Remap the 3 regions on reset and when PCIMAP is updated. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC: memory_region_is_mapped() is probably not the best call to check if this is the first call. hw/pci-host/bonito.c | 49 ++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 29c0294d289..a091ef15d27 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -138,6 +138,10 @@ FIELD(BONGENCFG, PCIQUEUE, 12, 1) =20 /* 4. PCI address map control */ #define BONITO_PCIMAP (0x10 >> 2) /* 0x110 */ +FIELD(PCIMAP, LO0, 0, 6) +FIELD(PCIMAP, LO1, 6, 6) +FIELD(PCIMAP, LO2, 12, 6) +FIELD(PCIMAP, 2G, 18, 1) #define BONITO_PCIMEMBASECFG (0x14 >> 2) /* 0x114 */ #define BONITO_PCIMAP_CFG (0x18 >> 2) /* 0x118 */ =20 @@ -232,6 +236,7 @@ struct BonitoState { qemu_irq *pic; PCIBonitoState *pci_dev; MemoryRegion pci_mem; + MemoryRegion pcimem_lo_alias[3]; }; =20 #define TYPE_BONITO_PCI_HOST_BRIDGE "Bonito-pcihost" @@ -240,6 +245,31 @@ OBJECT_DECLARE_SIMPLE_TYPE(BonitoState, BONITO_PCI_HOS= T_BRIDGE) #define TYPE_PCI_BONITO "Bonito" OBJECT_DECLARE_SIMPLE_TYPE(PCIBonitoState, PCI_BONITO) =20 +static void bonito_remap(PCIBonitoState *s) +{ + static const char *const region_name[3] =3D { + "pci.lomem0", "pci.lomem1", "pci.lomem2" + }; + BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(s->pcihost); + + for (size_t i =3D 0; i < 3; i++) { + uint32_t offset =3D extract32(s->regs[BONITO_PCIMAP], 6 * i, 6) <<= 26; + + if (memory_region_is_mapped(&bs->pcimem_lo_alias[i])) { + memory_region_del_subregion(get_system_memory(), + &bs->pcimem_lo_alias[i]); + object_unparent(OBJECT(&bs->pcimem_lo_alias[i])); + } + + memory_region_init_alias(&bs->pcimem_lo_alias[i], OBJECT(s), + region_name[i], &bs->pci_mem, + offset, 64 * MiB); + memory_region_add_subregion(get_system_memory(), + BONITO_PCILO_BASE + i * 64 * MiB, + &bs->pcimem_lo_alias[i]); + } +} + static void bonito_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { @@ -253,7 +283,6 @@ static void bonito_writel(void *opaque, hwaddr addr, switch (saddr) { case BONITO_IODEVCFG: case BONITO_SDCFG: - case BONITO_PCIMAP: case BONITO_PCIMEMBASECFG: case BONITO_PCIMAP_CFG: case BONITO_GPIODATA: @@ -275,6 +304,10 @@ static void bonito_writel(void *opaque, hwaddr addr, case BONITO_MEMSIZE: s->regs[saddr] =3D val; break; + case BONITO_PCIMAP: + s->regs[saddr] =3D val; + bonito_remap(s); + break; case BONITO_BONGENCFG: if (!FIELD_EX32(s->regs[saddr], BONGENCFG, CPUSELFRESET) && FIELD_EX32(val, BONGENCFG, CPUSELFRESET)) { @@ -603,6 +636,8 @@ static void bonito_reset(void *opaque) s->regs[BONITO_DQCFG] =3D 0x8; s->regs[BONITO_MEMSIZE] =3D 0x10000000; s->regs[BONITO_PCIMAP] =3D 0x6140; + + bonito_remap(s); } =20 static const VMStateDescription vmstate_bonito =3D { @@ -619,7 +654,6 @@ static void bonito_pcihost_realize(DeviceState *dev, Er= ror **errp) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(dev); - MemoryRegion *pcimem_lo_alias =3D g_new(MemoryRegion, 3); =20 memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_= SIZE); phb->bus =3D pci_register_root_bus(dev, "pci", @@ -627,17 +661,6 @@ static void bonito_pcihost_realize(DeviceState *dev, E= rror **errp) dev, &bs->pci_mem, get_system_io(), PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS); =20 - for (size_t i =3D 0; i < 3; i++) { - char *name =3D g_strdup_printf("pci.lomem%zu", i); - - memory_region_init_alias(&pcimem_lo_alias[i], NULL, name, - &bs->pci_mem, i * 64 * MiB, 64 * MiB); - memory_region_add_subregion(get_system_memory(), - BONITO_PCILO_BASE + i * 64 * MiB, - &pcimem_lo_alias[i]); - g_free(name); - } - create_unimplemented_device("pci.io", BONITO_PCIIO_BASE, 1 * MiB); } =20 --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455000; cv=none; d=zohomail.com; s=zohoarc; b=GOcHnAxywXS0fB6PZ+7BgE5WyoIIxuifM6L9IGlA4A+rDXRLZsVOLVFmfr/ToLU4HrncJ7iXTd6lBX6sHbnbT0JfzhoMKEvTsvcB0yTXmpS0JBqR9DeNGXvG1g0OIiBWWJOScBq6Rfgc5hKisywquUySHqxBXjJ36a6MEtlEFWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455000; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zpXgP9moZBrSC473lu7QGvZbzGR5/trPsHw8SfcFSaA=; b=UhBvRJs5JxYkWOOUEfzp3M2VKnILiCmD2GFK/e2RlwK6UEU9J53XKlBtQobDJYALj3EMoWdsim+mQLUUhi3TNOiEu6PSj63qm+oJhBZ6xHzKXxi+PN2XIA+hLHdAbWI3AcO6kPO7ODtUhB3+QR+8uRI//nNlAjrTmNN4nNWDCqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1609455000183434.8499729471672; Thu, 31 Dec 2020 14:50:00 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id w5so21012464wrm.11 for ; Thu, 31 Dec 2020 14:49:59 -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 s1sm73228987wrv.97.2020.12.31.14.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:57 -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=zpXgP9moZBrSC473lu7QGvZbzGR5/trPsHw8SfcFSaA=; b=c2NUqgSeZEiaA5RZAU2EyMjQN3wcDgK6nBfaToXNSTYmyzmKnEjkUHMpyRGsCuAoCO Aq3QtK/exYVGj7R33s+5mX4SqvICgEwfhVgoh3M1cRYz/0Y6ode+XchEkGMnaUXn2O7x szqyHrRaPkmUbMd/e0jE1WsECGTBEyfEbyfOjMGrzRAtIZ83h0tLOXDv9cuVC38LG+k8 nUQvkEqStchVnsvba5cthZfUVZU2WVreDszqD12wdQ/SRuHRc9B4h7yNYKsCb/VH9Brx jQufP5voa6CRoroWtfU1cPylkzkpDb5YeKx6EbEt3CYZF7LnXU4aNvyMUX4wZx3Gte6i Jvng== 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=zpXgP9moZBrSC473lu7QGvZbzGR5/trPsHw8SfcFSaA=; b=Sq8+hz8cqg7DlUT45x4KoKptLMFHECRJiUDlYlAk2D6DKK3Q10jt+z9m/X17CIzn0d YLWdv/1+yzwxb42TfdSyB2fwFxxlIqSQgBRSBbTV3En+unJrkC4aTXYeVzFupsc2BNAV /J89AWMdChLcwN0eBbmuTlb4y1dwo9pcWl4kQtIn8RUcsH5Bfh/LRFWZUKjghZiq7TwY NTup2q2BEGN8hKyPpKcHX5PrrF+T1cvb6oO1sIxdFLZcuCw+2/HzRCSWBnLkNOM66WwO EuwCYbm2/yEuH5TXEZkSX0qhvnmmXF6JPQIEdxMyLgLSAzczhkgBquAQk5qmR0I+UQlA 2Tow== X-Gm-Message-State: AOAM531f6jVs5iwHvYk7B0pb79MtS2RjDNY5l4j5JL/LH2e/ys3xeZ3q Jz2xcxzkNpm4SHFZeCunlI4= X-Google-Smtp-Source: ABdhPJxVy8JZj8s35RJPmonjGj9EwE0mzrxii/EQKK2hMbyhMcP4V0BvmK30W2pHAqmfdue7pQvcvg== X-Received: by 2002:a05:6000:10c4:: with SMTP id b4mr67406710wrx.170.1609454998452; Thu, 31 Dec 2020 14:49:58 -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 09/18] hw/pci-host/bonito: Rename north bridge helpers Date: Thu, 31 Dec 2020 23:49:02 +0100 Message-Id: <20201231224911.1467352-10-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) Rename north bridge related helpers as 'bonito_northbridge_*'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index a091ef15d27..d91ed82c99e 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -270,7 +270,7 @@ static void bonito_remap(PCIBonitoState *s) } } =20 -static void bonito_writel(void *opaque, hwaddr addr, +static void bonito_northbridge_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { PCIBonitoState *s =3D opaque; @@ -335,7 +335,7 @@ static void bonito_writel(void *opaque, hwaddr addr, } } =20 -static uint64_t bonito_readl(void *opaque, hwaddr addr, +static uint64_t bonito_northbridge_read(void *opaque, hwaddr addr, unsigned size) { PCIBonitoState *s =3D opaque; @@ -352,9 +352,9 @@ static uint64_t bonito_readl(void *opaque, hwaddr addr, } } =20 -static const MemoryRegionOps bonito_ops =3D { - .read =3D bonito_readl, - .write =3D bonito_writel, +static const MemoryRegionOps bonito_northbridge_ops =3D { + .read =3D bonito_northbridge_read, + .write =3D bonito_northbridge_write, .endianness =3D DEVICE_NATIVE_ENDIAN, .valid =3D { .min_access_size =3D 4, @@ -681,7 +681,7 @@ static void bonito_realize(PCIDevice *dev, Error **errp) pci_config_set_prog_interface(dev->config, 0x00); =20 /* set the north bridge register mapping */ - memory_region_init_io(&s->iomem, OBJECT(s), &bonito_ops, s, + memory_region_init_io(&s->iomem, OBJECT(s), &bonito_northbridge_ops, s, "north-bridge-register", BONITO_INTERNAL_REG_SIZ= E); sysbus_init_mmio(sysbus, &s->iomem); sysbus_mmio_map(sysbus, 0, BONITO_INTERNAL_REG_BASE); --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609455005; cv=none; d=zohomail.com; s=zohoarc; b=bA4EuRcAcCI7vWReKvL5n4DGp6w+Z6FS8t4tMZGLPmCKp9ML+Q97tMLDdvEPZFMaNrFsnmL+1OXlFd5KqKY0BB5PUtbKJ6O7uENaffwkcq2Mdx0ZASpslMH64NdN4ZkgCPFD1tqY0S5SsHi0TcCrz7OUMdYoILVeBaozeia95Go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455005; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B6/juozgCAEtqAlqqeCmHKGqNvNofCEfutV+ADMnaIU=; b=YDIFxVI1EUYrMWNy2Q4+zyI6h0v9D5cD3Y5kknj3MN3dS6Ina7aPXTs6yb723TOf0Pjjwzfu/j5OH3xg1TvbMrBTaP0YNEmVhYkYs4ERDf5BmuzDZHtbZ33OfgWm7ne19msH6fhWFxmeTTfePwWi+tS/zF663CHp1ULl/HKELPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 16094550050677.672861379795336; Thu, 31 Dec 2020 14:50:05 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id a6so8154053wmc.2 for ; Thu, 31 Dec 2020 14:50:04 -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 m17sm78156359wrn.0.2020.12.31.14.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:02 -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=B6/juozgCAEtqAlqqeCmHKGqNvNofCEfutV+ADMnaIU=; b=b/v6BaEyBbvTf1K8UoFZMv/bKU0SCRamDxou769Qu9Dih+fuS4SrqBmnJg+kEbbpPj WsjVFJmzKlZl+Fw4YsKiT9pnBYlXNHLee11LqLvCh5wBPAShEw57/6nWgBpCxf6GatFX in5in1BN0RAx7OJKHnahB6t5oXQ6S4OdGAMFDY4wmDXKciOzG2ieR+0YNjJDuLlyVLod WnclR76YyZXPk8kPpY4hRTKq5kZ3OH2KUnGpH+W6EiBWkDZ4aYsedvfqeWVSX+vIYj4k Zw7Hp/B2NOb6xEeWEnxD6wgp1a/k2XArKxI+A5EnqogmAHTndkfRq4p95Epxrt8uixNK l5Cw== 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=B6/juozgCAEtqAlqqeCmHKGqNvNofCEfutV+ADMnaIU=; b=qlmr4jdrtYn1NlsVYm8AqDWIN5Ru7loTpB1hhVHdLdnmdtt74YzBVDq/TWzpSVC2X7 o2wK1mOLPzZMRA8sfzLRMlHlSbQem8Kv19T2m6h2DUrJXpgzy8wPmtE7uMawOxwRXY61 99W5tEGxj5K94oIyXgqqIWfAy2JrAeFSInoUGAbG8R6SU6/3ICrNfjza8IlR0mNR45TR E7pqbbm6rREyThpo1+0NeSJa9KWaBoKQB2EZQUte0c72ZnP8vjI40EKaFWHQ/iOtR1EO VDg8EFpCJAuqLxeNNdJwR0PtWb2qk6jjIgR1F//v9Yb/B7aP8ewuSbCeFYYkBOG8RkwE NVFw== X-Gm-Message-State: AOAM532frsVx7VRQO7tgkMVc5wVr9FylDP1PK9BK9l64jlo+5Cc+gzcq otssF4Mr8bna5bgVQW3/paY= X-Google-Smtp-Source: ABdhPJxDGgpdFWNz+fyfE5DGnBLV6bvlpnhyp1R7v1YCn+ek5MfCFNd7I9Y/AaD4p436azzS3iUMoQ== X-Received: by 2002:a1c:1bc6:: with SMTP id b189mr13096299wmb.71.1609455003272; Thu, 31 Dec 2020 14:50:03 -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 10/18] hw/pci-host/bonito: Rename PCI host helpers Date: Thu, 31 Dec 2020 23:49:03 +0100 Message-Id: <20201231224911.1467352-11-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) Rename PCI host side related helpers as 'bonito_host_*'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index d91ed82c99e..45f31512b25 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -574,7 +574,7 @@ static const MemoryRegionOps bonito_spciconf_ops =3D { =20 #define BONITO_IRQ_BASE 32 =20 -static void pci_bonito_set_irq(void *opaque, int irq_num, int level) +static void bonito_host_set_irq(void *opaque, int irq_num, int level) { BonitoState *s =3D opaque; qemu_irq *pic =3D s->pic; @@ -593,7 +593,7 @@ static void pci_bonito_set_irq(void *opaque, int irq_nu= m, int level) } =20 /* map the original irq (0~3) to bonito irq (16~47, but 16~31 are unused) = */ -static int pci_bonito_map_irq(PCIDevice *pci_dev, int irq_num) +static int bonito_host_map_irq(PCIDevice *pci_dev, int irq_num) { int slot; =20 @@ -650,14 +650,14 @@ static const VMStateDescription vmstate_bonito =3D { } }; =20 -static void bonito_pcihost_realize(DeviceState *dev, Error **errp) +static void bonito_host_realize(DeviceState *dev, Error **errp) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(dev); =20 memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_= SIZE); phb->bus =3D pci_register_root_bus(dev, "pci", - pci_bonito_set_irq, pci_bonito_map_ir= q, + bonito_host_set_irq, bonito_host_map_= irq, dev, &bs->pci_mem, get_system_io(), PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS); =20 @@ -808,23 +808,23 @@ static const TypeInfo bonito_info =3D { }, }; =20 -static void bonito_pcihost_class_init(ObjectClass *klass, void *data) +static void bonito_host_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->realize =3D bonito_pcihost_realize; + dc->realize =3D bonito_host_realize; } =20 -static const TypeInfo bonito_pcihost_info =3D { +static const TypeInfo bonito_host_info =3D { .name =3D TYPE_BONITO_PCI_HOST_BRIDGE, .parent =3D TYPE_PCI_HOST_BRIDGE, .instance_size =3D sizeof(BonitoState), - .class_init =3D bonito_pcihost_class_init, + .class_init =3D bonito_host_class_init, }; =20 static void bonito_register_types(void) { - type_register_static(&bonito_pcihost_info); + type_register_static(&bonito_host_info); type_register_static(&bonito_info); } =20 --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455009; cv=none; d=zohomail.com; s=zohoarc; b=JqyTdPIH6SSDwuPsK+N/QZLbAB2KF0WMfSLMicd304IUlEpUX3fn2x2DE6wz/6VqR+Rb3IMyrLtq1Y90QI6thnyPNt1hcF+Gt0uSbEBlPYv9tl+bdzof0dZKLdkVPnxKkBycgj+ZPBXzIa9sov4OP+4faJUIB9OUxprL6+4QtFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455009; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dBfFIOqaMVBFIfJTXjxhEPCFtIoZjvkYJY/nRro5Kjo=; b=hdS3R1Xx6WbjcoXNGH91HWy+ddLDtmL2bjXaPlg0N1y3U801JjONiemavc5VRSwdre5bxxwdlV/S+RrPzCqlbK8S+3UH+fELg9MLHnqSzoVezM2gKBwXU9u4lotdEd2M5zMrdNSzpwx3Sqyb2EP29RQLbnE1OcMRJSU6JuxL88A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1609455009984726.3420215583551; Thu, 31 Dec 2020 14:50:09 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id a12so21015953wrv.8 for ; Thu, 31 Dec 2020 14:50:09 -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 r20sm13534438wmh.15.2020.12.31.14.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:07 -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=dBfFIOqaMVBFIfJTXjxhEPCFtIoZjvkYJY/nRro5Kjo=; b=geNRdEdWFGMSpaD58v+33FhERhEKgw+Zb4HcxZrdECyOU2IKq4HopNEY83dTO7gGq6 bZsZvsew1hr6jKEcXpe2IP7iV7+VA8zLZBnITSp6mc38jgRo/7QLKr8pFoP+4oSvPugb SS6xBSmhuQ76JdfqfzZdBL6ZdMZzCSzKD/wXJGF4MTv1oLtNUgusTWUZ8R4ndGvPYB/t Oq++hWZm32xolMHqWor3p2EAEGp+JMn6p12kvvvkd2I5xODxf8//fizR3Ub+2ZFhbPz/ 8yBvzp3UxvBRrZMch4yEikLMoSjEbakZNCR+wWyxZS5IkqZKvUUjaX+8FqiH2RWfM6fK Fmdw== 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=dBfFIOqaMVBFIfJTXjxhEPCFtIoZjvkYJY/nRro5Kjo=; b=cyievlvyPaKl3xJJK5QL7zi0P1RJ4vOuwIX+HG8w+MH9g+YqXQjBJESmhzB37egwsT S7RiIMkWqPo4bPjVjVOe/lKUS7uSQU24sxB815Ow2aQlILrNRk4GKc212/0GCcq7WnnP htntx7vVoddyq1FD1VlBlKKR4RdqNeiuyjiX5mBFDrQqxJxM0j0rtV04QMY4udcOPcPE NA6wV8wxlXXPQwgHzgAtA7h0BQf+jva7utlU0ChJzKW1Te7+Hq+8q83R1WOIDhxLWLQj oxmi7PbzZGnYtcuSB/7FXo9DyWx0BcYH1pjfFz3vH9GSM36fKDE6tnK7PJst2G9hhmTX Gxhw== X-Gm-Message-State: AOAM532qYG8aDCwvz6H0KIpXKd60a55pnxJXc2URTu0wPWE+6W3tpVy5 47BNg+ccs6SzDs5O8Fg8Ia5dbzNpoKE= X-Google-Smtp-Source: ABdhPJw6EC67x8TZILuQa2tYJbOQBQnKXxE7SByf/ekTp2jl51aoKur3NcC5+TZoB9oFsE+L+kPTJA== X-Received: by 2002:a5d:40d2:: with SMTP id b18mr64625056wrq.369.1609455008170; Thu, 31 Dec 2020 14:50:08 -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 11/18] hw/pci-host/bonito: Rename PCI function helpers Date: Thu, 31 Dec 2020 23:49:04 +0100 Message-Id: <20201231224911.1467352-12-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) Rename PCI function related helpers as 'bonito_pci_*'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 45f31512b25..06f5e683c81 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -664,7 +664,7 @@ static void bonito_host_realize(DeviceState *dev, Error= **errp) create_unimplemented_device("pci.io", BONITO_PCIIO_BASE, 1 * MiB); } =20 -static void bonito_realize(PCIDevice *dev, Error **errp) +static void bonito_pci_realize(PCIDevice *dev, Error **errp) { PCIBonitoState *s =3D PCI_BONITO(dev); SysBusDevice *sysbus =3D SYS_BUS_DEVICE(s->pcihost); @@ -778,12 +778,12 @@ PCIBus *bonito_init(qemu_irq *pic) return phb->bus; } =20 -static void bonito_class_init(ObjectClass *klass, void *data) +static void bonito_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->realize =3D bonito_realize; + k->realize =3D bonito_pci_realize; k->vendor_id =3D 0xdf53; k->device_id =3D 0x00d5; k->revision =3D 0x01; @@ -797,11 +797,11 @@ static void bonito_class_init(ObjectClass *klass, voi= d *data) dc->user_creatable =3D false; } =20 -static const TypeInfo bonito_info =3D { +static const TypeInfo bonito_pci_info =3D { .name =3D TYPE_PCI_BONITO, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIBonitoState), - .class_init =3D bonito_class_init, + .class_init =3D bonito_pci_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { }, @@ -825,7 +825,7 @@ static const TypeInfo bonito_host_info =3D { static void bonito_register_types(void) { type_register_static(&bonito_host_info); - type_register_static(&bonito_info); + type_register_static(&bonito_pci_info); } =20 type_init(bonito_register_types) --=20 2.26.2 From nobody Tue Nov 18 09:20:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455014; cv=none; d=zohomail.com; s=zohoarc; b=CLwuLTJxIibrxyGh8mXkZwyZVu2cu1Tj4f0hUZ7rikbwUa8MJtUpvuyT8ent5DIARDxZCzwiKIyeVsKalikwijlPzECdork4FSU2J0bJ9ttnx8FLRwHcEfkb0mOc3p+tpFicIEzhfeu1c8jKqAsToiHn9zFTM9w3qfGUFB7z1Bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=frcRibRAQPnxHYg1S20zY4t6JJJt53NxCQQDBMLiUO/q5bwBdF7mI3+VUUpbF8ZfWwIbwywx5unIj/44vtgzQ8nbDnPkclXJyIbXUvmW8a40mVEmJ3kGkQgMR/E2vOMa3CK2jxh7VPiN8F4G7fqKjZ0rpxLBPvQYIgk+XicUHhw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1609455014734302.34165731718383; Thu, 31 Dec 2020 14:50:14 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id t30so21073707wrb.0 for ; Thu, 31 Dec 2020 14:50:14 -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 z6sm13543546wmi.15.2020.12.31.14.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:12 -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=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=npSCuc/1hjruJrlW02Oq+QrLldqb2szca1XJo4t2M8b1XLorxRwU3qBRFjV4VIXKn4 VAziqQwbDQvAnwJyVyHgh2I0VWk2mCkyLfFg05UK0++lgbBQ9I424IJm6NOOaas4813m A/w7EsmgI4hd8FLfyTS8LnCcyE/+808n/Io3X3gU9fAA4U8UxNN1IqX5TQCmoQVahloe tLuZSSBhWP6YSpZVgZ0TIHthcDHEgCRL99sysGytQMBEF8G6GDLVdSlTLUp4uJM4nfrA PnflhLtkxFUt2w7pv/3vTB9rZcDvLFSPBdXtvChdApFD2UkoRo8B7nVqW6X/cRTcsB5i Af8Q== 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=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=OnsrMYecjYO3ZHqfq1FBMVxozBf4D3Q9d70zRpCU+bPwW8ZlkvGW1AmlRHt6V8CDb8 cL02dnI6Eq2efWToousi/8k+uMluK7Jq59IybCNNRA71DIV7TPdH1HipmeyYKqCkO3pQ 8ZGSyW4s7mtoSSNdUrUbVuCx0ZvjJOWw3iUgurdCd/CAY8W8oJ3t4H7iBsaByzh0bgZA huhU8+wLCkYf+cVXnDPPD3NH7lQwS/nV8vc4IF+axhCSMnrOz7UotrI9hp12Y33Z+hmg HvjebdOsxBlcGY/VAZNzac3glpduiDuuHVWftge+L2zBWNa9cUxEwH/h/87bz4mibu1L AAKw== X-Gm-Message-State: AOAM530mUAmWKj8D3ROQqWgpaD/jaBTe4suvND2ES4JkUAsYRAwMGQ4a KmW5TmK4v2s8NbaU7CkwM8U= X-Google-Smtp-Source: ABdhPJyV8YR4FTlTCmVi3ndNvh4kOICiBdMBQ/eOrpLHv91aVd36Y1udH3KPtyOr8H9Coct2Kl+rnA== X-Received: by 2002:a5d:4987:: with SMTP id r7mr67758313wrq.352.1609455012945; Thu, 31 Dec 2020 14:50:12 -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 12/18] hw/pci-host/bonito: Rename PCIBonitoState -> BonitoPciState Date: Thu, 31 Dec 2020 23:49:05 +0100 Message-Id: <20201231224911.1467352-13-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) As we use BonitoState for the whole device, rename the PCI function device as BonitoPciState. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 06f5e683c81..1c88ccc6af8 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -200,7 +200,7 @@ FIELD(PCIMAP, 2G, 18, 1) =20 typedef struct BonitoState BonitoState; =20 -struct PCIBonitoState { +struct BonitoPciState { PCIDevice dev; =20 BonitoState *pcihost; @@ -229,12 +229,12 @@ struct PCIBonitoState { MemoryRegion bonito_localio; =20 }; -typedef struct PCIBonitoState PCIBonitoState; +typedef struct BonitoPciState BonitoPciState; =20 struct BonitoState { PCIHostState parent_obj; qemu_irq *pic; - PCIBonitoState *pci_dev; + BonitoPciState *pci_dev; MemoryRegion pci_mem; MemoryRegion pcimem_lo_alias[3]; }; @@ -243,9 +243,9 @@ struct BonitoState { OBJECT_DECLARE_SIMPLE_TYPE(BonitoState, BONITO_PCI_HOST_BRIDGE) =20 #define TYPE_PCI_BONITO "Bonito" -OBJECT_DECLARE_SIMPLE_TYPE(PCIBonitoState, PCI_BONITO) +OBJECT_DECLARE_SIMPLE_TYPE(BonitoPciState, PCI_BONITO) =20 -static void bonito_remap(PCIBonitoState *s) +static void bonito_remap(BonitoPciState *s) { static const char *const region_name[3] =3D { "pci.lomem0", "pci.lomem1", "pci.lomem2" @@ -273,7 +273,7 @@ static void bonito_remap(PCIBonitoState *s) static void bonito_northbridge_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t saddr; =20 saddr =3D addr >> 2; @@ -338,7 +338,7 @@ static void bonito_northbridge_write(void *opaque, hwad= dr addr, static uint64_t bonito_northbridge_read(void *opaque, hwaddr addr, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t saddr; =20 saddr =3D addr >> 2; @@ -365,7 +365,7 @@ static const MemoryRegionOps bonito_northbridge_ops =3D= { static void bonito_pciconf_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); =20 DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %lx\n", addr, val); @@ -376,7 +376,7 @@ static uint64_t bonito_pciconf_readl(void *opaque, hwad= dr addr, unsigned size) { =20 - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); =20 DPRINTF("bonito_pciconf_readl "TARGET_FMT_plx"\n", addr); @@ -399,7 +399,7 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr = addr, unsigned size) { uint32_t val; - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->bonldma)) { return 0; @@ -413,7 +413,7 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr = addr, static void bonito_ldma_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->bonldma)) { return; @@ -436,7 +436,7 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr a= ddr, unsigned size) { uint32_t val; - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->boncop)) { return 0; @@ -450,7 +450,7 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr a= ddr, static void bonito_cop_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->boncop)) { return; @@ -471,7 +471,7 @@ static const MemoryRegionOps bonito_cop_ops =3D { =20 static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t cfgaddr; uint32_t idsel; @@ -509,7 +509,7 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hw= addr addr) static void bonito_spciconf_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; @@ -536,7 +536,7 @@ static void bonito_spciconf_write(void *opaque, hwaddr = addr, uint64_t val, =20 static uint64_t bonito_spciconf_read(void *opaque, hwaddr addr, unsigned s= ize) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; @@ -578,7 +578,7 @@ static void bonito_host_set_irq(void *opaque, int irq_n= um, int level) { BonitoState *s =3D opaque; qemu_irq *pic =3D s->pic; - PCIBonitoState *bonito_state =3D s->pci_dev; + BonitoPciState *bonito_state =3D s->pci_dev; int internal_irq =3D irq_num - BONITO_IRQ_BASE; =20 if (bonito_state->regs[BONITO_INTEDGE] & (1 << internal_irq)) { @@ -615,7 +615,7 @@ static int bonito_host_map_irq(PCIDevice *pci_dev, int = irq_num) =20 static void bonito_reset(void *opaque) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t val =3D 0; =20 /* set the default value of north bridge registers */ @@ -645,7 +645,7 @@ static const VMStateDescription vmstate_bonito =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, PCIBonitoState), + VMSTATE_PCI_DEVICE(dev, BonitoPciState), VMSTATE_END_OF_LIST() } }; @@ -666,7 +666,7 @@ static void bonito_host_realize(DeviceState *dev, Error= **errp) =20 static void bonito_pci_realize(PCIDevice *dev, Error **errp) { - PCIBonitoState *s =3D PCI_BONITO(dev); + BonitoPciState *s =3D PCI_BONITO(dev); SysBusDevice *sysbus =3D SYS_BUS_DEVICE(s->pcihost); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(s->pcihost); @@ -760,7 +760,7 @@ PCIBus *bonito_init(qemu_irq *pic) DeviceState *dev; BonitoState *pcihost; PCIHostState *phb; - PCIBonitoState *s; + BonitoPciState *s; PCIDevice *d; =20 dev =3D qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE); @@ -800,7 +800,7 @@ static void bonito_pci_class_init(ObjectClass *klass, v= oid *data) static const TypeInfo bonito_pci_info =3D { .name =3D TYPE_PCI_BONITO, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(PCIBonitoState), + .instance_size =3D sizeof(BonitoPciState), .class_init =3D bonito_pci_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.26.2 From nobody Tue Nov 18 09:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455019; cv=none; d=zohomail.com; s=zohoarc; b=KcR9Y0FcCZINjpDd5vcS1QJqZz56kdebdJRYQ91uuIFL6G03F/e+/5Vjg5FJT9NHa29Y1PVvLAeGxwiJd3OkAumFu/ld3/+O1bdQabzyV/mwErUD0tvR9Zvl/JWpLxZFfUhv1K5gLZEPzzGSA0dpMSRjfPAM2hnuebAG6HpBLig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/CZdAhxdZnoENonIoHzd7f1sQJAHt0dXIOFmHph9mF8=; b=H3ywOYIUhQfVMIYzPl0Q5nDfVIYo1mPOxzF1wtaXbYSB2bUBttvB4jGUGXYpMWRiQOoS1jwr2mr6453uzVjSi/pHEgI+NWdDMzobgp8AR8TdjpzF3VMAKbT7TaDVRhnf5Z9lRudIJ0O9G++LD/foadnAQ4H6gLVIODrg/gYP0Sw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1609455019479489.9962451457469; Thu, 31 Dec 2020 14:50:19 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id t16so21050446wra.3 for ; Thu, 31 Dec 2020 14:50:18 -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 s63sm15819299wms.18.2020.12.31.14.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:17 -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=/CZdAhxdZnoENonIoHzd7f1sQJAHt0dXIOFmHph9mF8=; b=Irr1/szBywhnnMeBE4QFxAMIlivuta+Dqz75Sk8ph105KIh8q4BXte9VKFceYt1JOH 4ynSGqAk8w2sAYhdm3b3nvKn8HLXnfpp3peMK9enPRca0wagoAzeRJKLSRB4oVmniU3Z PrudWdwdPqQa+FiJaeybq/RQy1qAsvzL5Q5BrBthKv4R1FJQ1DLkPCWbeq0+VuaIxe3w qsAv/xZRuLHSfQmX8r4ANRgg9PF0/792YbTuC4FCWXeIfB+r4e1GnumowuCs5T1Cii0H TTgHOtGAz0cBBMRurgf9nXPAvLFMheBBBTfYgQZ/6D9mLBzVXLggEqXV47N/PCBvigSS 9uUg== 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=/CZdAhxdZnoENonIoHzd7f1sQJAHt0dXIOFmHph9mF8=; b=srEdyAYgebmiIxHO6Rj12viWOY04k/+C3v4vy7v5iaEh2dg+w+OyYLdhDlOpQtujB+ 6KoM9r5K5O6CZNlkLX3YWm9dOllDMONTeudkOZKB6Zs23URMfmCYQzfVY5mAQ0aMHN8m QU9yg16JhY+pnWsm6TBRsVcJCmxwuFuV/PSazEWFJCVHTybEkXPlANL2RunY2hY+Tqpr D1E2ZyL65AticgSQcth3bCQ/U2ELnBPreQECwgpmG7j72ppliGfmf6cFUFHSrShpsr29 abx6leVKUkx4OlBochEAAumUsFQK96cVxx5hMPwxXXWAVE96fPoYlADesoTX21nNOc5F SjUg== X-Gm-Message-State: AOAM532WCHa+zBPd02S0+QE8r4XbV+J5KhsBXmLLNq1Xjqvxa3nXPplg TpBRvKanOcr+k5TjxKD8wuY= X-Google-Smtp-Source: ABdhPJwXubpBVxE6BSa1eUEB+/eXVQKGRFoxMt7sLhy0fpcpPsTsWYilcOllcQfUiMDijE/0IBZg1Q== X-Received: by 2002:a5d:5227:: with SMTP id i7mr67978145wra.68.1609455017745; Thu, 31 Dec 2020 14:50:17 -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 13/18] hw/pci-host/bonito: Create PCI regions in bonito_host_realize() Date: Thu, 31 Dec 2020 23:49:06 +0100 Message-Id: <20201231224911.1467352-14-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 PCI regions belong to the 'host' device, not the PCI function. Move the PCI regions creation there. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 1c88ccc6af8..4dcaa2fa8bb 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -654,6 +654,7 @@ static void bonito_host_realize(DeviceState *dev, Error= **errp) { PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(dev); + MemoryRegion *pcimem_alias =3D g_new(MemoryRegion, 1); =20 memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_= SIZE); phb->bus =3D pci_register_root_bus(dev, "pci", @@ -662,6 +663,14 @@ static void bonito_host_realize(DeviceState *dev, Erro= r **errp) PCI_DEVFN(5, 0), 32, TYPE_PCI_BUS); =20 create_unimplemented_device("pci.io", BONITO_PCIIO_BASE, 1 * MiB); + + memory_region_init_alias(pcimem_alias, NULL, "pci.mem.alias", + &bs->pci_mem, 0, BONITO_PCIHI_SIZE); + memory_region_add_subregion(get_system_memory(), + BONITO_PCIHI_BASE, pcimem_alias); + create_unimplemented_device("PCI_2", + (hwaddr)BONITO_PCIHI_BASE + BONITO_PCIHI_S= IZE, + 2 * GiB); } =20 static void bonito_pci_realize(PCIDevice *dev, Error **errp) @@ -669,8 +678,6 @@ static void bonito_pci_realize(PCIDevice *dev, Error **= errp) BonitoPciState *s =3D PCI_BONITO(dev); SysBusDevice *sysbus =3D SYS_BUS_DEVICE(s->pcihost); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); - BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(s->pcihost); - MemoryRegion *pcimem_alias =3D g_new(MemoryRegion, 1); =20 assert(!target_words_bigendian()); /* FIXME not supported */ =20 @@ -732,14 +739,6 @@ static void bonito_pci_realize(PCIDevice *dev, Error *= *errp) create_unimplemented_device("IOCS[3]", BONITO_DEV_BASE + 3 * 256 * KiB, 256 * KiB); =20 - memory_region_init_alias(pcimem_alias, NULL, "pci.mem.alias", - &bs->pci_mem, 0, BONITO_PCIHI_SIZE); - memory_region_add_subregion(get_system_memory(), - BONITO_PCIHI_BASE, pcimem_alias); - create_unimplemented_device("PCI_2", - (hwaddr)BONITO_PCIHI_BASE + BONITO_PCIHI_S= IZE, - 2 * GiB); - /* set the default value of north bridge pci config */ pci_set_word(dev->config + PCI_COMMAND, 0x0000); pci_set_word(dev->config + PCI_STATUS, 0x0000); --=20 2.26.2 From nobody Tue Nov 18 09:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455024; cv=none; d=zohomail.com; s=zohoarc; b=lz2nWSCA2mdv1KQENO+ACTYspQl4jEGBQJ2JCRKzGrsIjnPvGnXd2CLKSuS9lryBn/EQ7UKM/Ucp+o7KBNoB08K48QnoalpmnA3zFX3HwPT4Bs8oZUETNB8h1Od5bDh3Ndu1MnZiQSGlW/B5l/n8INxp+XJ4t2TuS6+8KCJbOKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455024; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qScEGFj7AcZq0QlXolKGt5D9IhypmF9z1VDvyAbEW+g=; b=TuZSTP8+CmdNmwdj+1bQMr67LCh6lL3tvFRJ7I2dWUJahFlBf2HKT4qUyC37PgORpgSOKQcKYxzGLYrryZJcLlew0w6kcGgUSBOww/Bgb7uz0DISYH2vBdkWhxjb8tkSr2ztECKZ/wMtubVdRS6TqTsPtED5fL33TyOnc+IeB44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1609455024192366.90628890180164; Thu, 31 Dec 2020 14:50:24 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id q18so21083388wrn.1 for ; Thu, 31 Dec 2020 14:50:23 -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 j9sm71603552wrm.14.2020.12.31.14.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:21 -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=qScEGFj7AcZq0QlXolKGt5D9IhypmF9z1VDvyAbEW+g=; b=V3SX3xbHRjtZmp+wuexeWM6t8GEg7BN1cgLLee4UfkJAUzxWZsdQ89owwPe/Sw3Yve aBFouVKcgma4qv2zOl8KrRa3Yo3X+eLRXTyfgXRTjflFhQIVx0EPPTH46XyhC8AiZBb+ lMKTzaG32MFgqBG3gSEHn6YVv5Ome7drdUTl158iu9Yf60SuXoS4awD2h8dxtB07nplG BOPIt/JTKW+aY4ZiqS6kwD3NCUj9xuR47PVAFTc/n3GqTpDgu50cASJbh+mqKZOt23ly NGbhGaMUku4nHjHGh5iiqksPUnuk4tUjGNdrUsfHt3NNZDp4PxMTLTInjUnr1Q6bg2QF Ajrw== 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=qScEGFj7AcZq0QlXolKGt5D9IhypmF9z1VDvyAbEW+g=; b=hWEHeILFTmmunMQXCuX6qHjEawBwUU4bDHsJ1ebmZh8dtt0fZMezn/DrbupAsT1KDf Ei59eOWdqnbKoxLIBFYqt9rgxluz5foQj4Z2L6J+N+MeUItau39bu3/w82NEflFgShM0 aVWqNG1R0B556Uuah6X7F80L2v0lqkY6qlN1d0Lfu8Z3M5HdtWo1cdRlRvqKwIdsNYkd z1boznCJYCcyid3xluOpj96kXWgxGvJGOj9FI0U90/ze6PAE1ZqdVLcvH6X4rLDL3Ed7 R5b3NiafJPEv8DKi413O6hgMlIArf8A2pFe763wrGMzSM9bEWLvcs/DoK6AxcJxYHXsW hKLw== X-Gm-Message-State: AOAM531WutMJxNP+fO+nY7SMZX1APMw7LZTg9r341Cs9b0SPn4Dxcwq0 BsKyPHUkQ/ZDkv6Wo7M3v6M= X-Google-Smtp-Source: ABdhPJxDM5KTXzzp4L6BHkGKP3OCWU1ZMHQlBm4/8rDR04Yq5Fn9BNOXpW0EHzYnfdX82zk74r4PXA== X-Received: by 2002:a5d:5401:: with SMTP id g1mr65489938wrv.93.1609455022445; Thu, 31 Dec 2020 14:50:22 -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: [RFC PATCH 14/18] hw/pci-host/bonito: Simplify using pci_host_conf_le_ops MemoryRegionOps Date: Thu, 31 Dec 2020 23:49:07 +0100 Message-Id: <20201231224911.1467352-15-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 4dcaa2fa8bb..c09d54cca82 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -362,39 +362,6 @@ static const MemoryRegionOps bonito_northbridge_ops = =3D { }, }; =20 -static void bonito_pciconf_writel(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - BonitoPciState *s =3D opaque; - PCIDevice *d =3D PCI_DEVICE(s); - - DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %lx\n", addr, val); - d->config_write(d, addr, val, 4); -} - -static uint64_t bonito_pciconf_readl(void *opaque, hwaddr addr, - unsigned size) -{ - - BonitoPciState *s =3D opaque; - PCIDevice *d =3D PCI_DEVICE(s); - - DPRINTF("bonito_pciconf_readl "TARGET_FMT_plx"\n", addr); - return d->config_read(d, addr, 4); -} - -/* north bridge PCI configure space. 0x1fe0 0000 - 0x1fe0 00ff */ - -static const MemoryRegionOps bonito_pciconf_ops =3D { - .read =3D bonito_pciconf_readl, - .write =3D bonito_pciconf_writel, - .endianness =3D DEVICE_LITTLE_ENDIAN, - .valid =3D { - .min_access_size =3D 4, - .max_access_size =3D 4, - }, -}; - static uint64_t bonito_ldma_readl(void *opaque, hwaddr addr, unsigned size) { @@ -694,7 +661,7 @@ static void bonito_pci_realize(PCIDevice *dev, Error **= errp) 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), &bonito_pciconf_ops, = s, + 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); --=20 2.26.2 From nobody Tue Nov 18 09:20:16 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 From nobody Tue Nov 18 09:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455033; cv=none; d=zohomail.com; s=zohoarc; b=Fq+RVR14b6Yebl/dcZKrBPGCg+06bySDgfKNC7dpRzzfB9Jgf3qLw9WP0Eqs23lDsNY7+Xoa88GqdXvCG1LES9/3TNJcFiVVBzryZnnoVr19OdMOXZApCmIchYUR46lwtS0b0C7g6pejEH7GiLJ3JMuOnsB1TdE3updicDDQJNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455033; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bRQj82c2dJ/rqcosZjZiHFbNtmid7e/8/vWsz4qrKdU=; b=Zl0xEqbYsHrlwDxpRXptMveul5ITn4BFmHzolxR9R3Rw5aoLKAbbZVEI+iU+B6Y628rOHFusnvglSwsH7upHNPRg5yait7tiXwakbB4BuwbTRXGMxngP3mg0bMa6mWDMUQ8D4kNuVsyrijbThprSgWkS9lUHz2Q+srUtFKMhmz4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1609455033808654.6180310050269; Thu, 31 Dec 2020 14:50:33 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id w5so21013118wrm.11 for ; Thu, 31 Dec 2020 14:50:33 -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 u205sm15462023wme.42.2020.12.31.14.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:31 -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=bRQj82c2dJ/rqcosZjZiHFbNtmid7e/8/vWsz4qrKdU=; b=dZFm8j+1d+3sYs3D7TjZklBb2QYT/Ree7TerLC35X/83Rm0x+1Pq0ygi2TqsPnEOwX yGzezJv10J+WwzdYIcGoNV1BwZl/u+PTP6xX6qM7ZSaCPD+6Cr18gCV1i9jYS6Rsuxwe 4paQV/3PS7iibRQm+6N28ZWmFULWIaXaymrjfMC1MbYqwE3A6dGBsutMBQym9gzadE3h sVNBqwmvaFayanshiQTR07rOanTTxB1OQxrRIRP09TJUWn5NvE7pioqnu2oxIOfUhbJw 8oB0pygtLGBWZGGTn/OueneAoUJbD7248g1i4Bm85yDY5t9jm3BNGEVDZncAWbmOgWmm /BbQ== 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=bRQj82c2dJ/rqcosZjZiHFbNtmid7e/8/vWsz4qrKdU=; b=cuYBVtY9nvdfiU+GwGx3sRbezpEZS7HP0rrDqnswAFvEiJZPnYhNEozZf808f5kr8f pt81pTJ/HPk5LEOs7XDTqlc6IN4OfATv8qoej00y0ZUouzzhpmbMLg8kEnOFKlxot9qo rIlImBKLeQMxaUfiYLL92Fg+8vIeadACOrnKGFU901llOe6Ddi8ePBwru5O+hptWfO2c J1rjvvTDAU9h8UTcS4TsEV94i5h72vFoBvx2EHd1jnWcIQezQa9wF1+8lpovPdBJn+Ru vM17q0fFIoDtyNIIQZVaU8WYzcA0xYplTiyqShKjdGhDGspaxhxp8WHwmV1jQhIqAKZP 3xag== X-Gm-Message-State: AOAM533BhdDj1cK/EtPrYGmsv0U5a8ihYSBjcJUz09SJK2tM510L5LyH SL7Q69mYdITfYEp30RmHQoE= X-Google-Smtp-Source: ABdhPJzPg9G1rBCCh+xp8a/lzp24DhPTbZ92h2DGvfrSWfMUJFNlN/IdGN12qgYHZ5jW4NGWCxhNOw== X-Received: by 2002:a5d:4b44:: with SMTP id w4mr65873135wrs.155.1609455032099; Thu, 31 Dec 2020 14:50:32 -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 16/18] hw/pci-host/bonito: Create TYPE_PCI_BONITO in bonito_host_realize() Date: Thu, 31 Dec 2020 23:49:09 +0100 Message-Id: <20201231224911.1467352-17-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) As it doesn't make sens to create the TYPE_BONITO_PCI_HOST_BRIDGE PCI function device without its host side, create it in the host realize(). This will allow to inline bonito_init() in few commits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 099bb737c77..5a8a85ae443 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -622,6 +622,7 @@ static void bonito_host_realize(DeviceState *dev, Error= **errp) PCIHostState *phb =3D PCI_HOST_BRIDGE(dev); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(dev); MemoryRegion *pcimem_alias =3D g_new(MemoryRegion, 1); + PCIDevice *pci_dev; =20 memory_region_init(&bs->pci_mem, OBJECT(dev), "pci.mem", BONITO_PCIHI_= SIZE); phb->bus =3D pci_register_root_bus(dev, "pci", @@ -645,6 +646,11 @@ static void bonito_host_realize(DeviceState *dev, Erro= r **errp) "north-bridge-pci-config", BONITO_PCICONFIG_SIZE= ); memory_region_add_subregion(get_system_memory(), BONITO_PCICONFIG_BASE, &phb->conf_mem); + + pci_dev =3D pci_new(PCI_DEVFN(0, 0), TYPE_PCI_BONITO); + PCI_BONITO(pci_dev)->pcihost =3D bs; + bs->pci_dev =3D PCI_BONITO(pci_dev); + pci_realize_and_unref(pci_dev, phb->bus, &error_fatal); } =20 static void bonito_pci_realize(PCIDevice *dev, Error **errp) @@ -727,8 +733,6 @@ PCIBus *bonito_init(qemu_irq *pic) DeviceState *dev; BonitoState *pcihost; PCIHostState *phb; - BonitoPciState *s; - PCIDevice *d; =20 dev =3D qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE); phb =3D PCI_HOST_BRIDGE(dev); @@ -736,12 +740,6 @@ PCIBus *bonito_init(qemu_irq *pic) pcihost->pic =3D pic; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 - d =3D pci_new(PCI_DEVFN(0, 0), TYPE_PCI_BONITO); - s =3D PCI_BONITO(d); - s->pcihost =3D pcihost; - pcihost->pci_dev =3D s; - pci_realize_and_unref(d, phb->bus, &error_fatal); - return phb->bus; } =20 --=20 2.26.2 From nobody Tue Nov 18 09:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455039; cv=none; d=zohomail.com; s=zohoarc; b=YHUkf5raiBXttjqnZ4YRgBRL32mG7JEc15uPXsnfMqRZ/UmzPXB/c3vcy3ufoBl7pmtrrKYrBeAz7oWa8NZrcEwpI/7VLVyTarcnEU4F+HqI0N7ENxHmCiEUUxH8cDlQVX1SZ3WXYkl+/qjyBW/+L/snjS/jfvURmMsH+Y43n8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455039; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UF9C9rlsBDCs9WWqG2eWdP7HydEgcGaCKsEyc6/esyM=; b=e/EpWS0qvVCMAIZgm9/zXhlJi5a7JGae5lFk95wkp8ZqlDPvAfWlblmdO3U18Pacrn4ELFrynKqGiwnZpBTNwF6lyfBU48GKljZt0e48XMbVrZnFSUC/LUr4H6tjBClni56YkxeS5/Y1t9jmaa8Q+xDd++geSyYeSE60VSK7Bpg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1609455039830157.3778158021297; Thu, 31 Dec 2020 14:50:39 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id i9so21046309wrc.4 for ; Thu, 31 Dec 2020 14:50:39 -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 v4sm71421865wrw.42.2020.12.31.14.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:36 -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=UF9C9rlsBDCs9WWqG2eWdP7HydEgcGaCKsEyc6/esyM=; b=droiYmEKIwW90N4e0qmB2pejDtiNvETQkmpurJ7uSetyKPyLsOQTklmjdSkiHU8frO nImJvu1bYzBY6iTEv0KO03zpf04lWCW0Bou+d38IsScsYfnreH8V2BSV3mwtFBkQQB0v Mi6pjU+MnsZeocrjdX/ouk3S2Oz0FomXRIiVT2acU+xLgv4yFcphJZxytnTVcD3nw2FO ZqyuXtRkJFe1YRJksBq7Lbjilt8xAcL+lg/um8yIw/1nHG7OjKNxNDD2JGBRy/DB8DTc j0BjbOMle/bBjIdkz7DvXnbAwyFYWpVpwdVVB5i8iT+w7FqItiPuidRyVDlcO8CMlzLB vV2Q== 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=UF9C9rlsBDCs9WWqG2eWdP7HydEgcGaCKsEyc6/esyM=; b=uBlcSNR3x1a9WciGM09lTrvt4bFuduS9NxrudjlXEkardOc+Q+iXtt5JorFokXFkvi 9BmmOlv+7AjDYFtez3QgMOCSJ7cgrWoToaS5WUVsdzYaYfrFKWR5cpUCP0PIyvMMepdX UPDlNyGrnBEQVA5ZtsqiZ3iZS32k2MwdYjdCC+dq8y0SGcpc1fXVUbxFgIBsnIPFkh5E z6bO/WE0aRCQrJypFA2rHS6zgdFBS7yYmBNPV5MlWv1JJkd9fuzI0wu9aBzzUdnIDQJT QiVhyOKgyAirpAtfaYFUnwqqZWMxUfsaA6x7y+Vr/4wZViopO1OxlTBio4zZCERY7ENF WdrA== X-Gm-Message-State: AOAM533sQwBG6nVHhSwe7eHb/1v0CHhzQXpuJYykJZVHDjyrjQt5p2jq kF50H79ZL56qsOx8mBCSmD4= X-Google-Smtp-Source: ABdhPJy01jgWHtQHWS6xsNSy6BAxU0CySc87Nr0u66dRpC5Nk+FddIpBrq9eYqoQcw+BSsxP28Ez/g== X-Received: by 2002:adf:f58f:: with SMTP id f15mr66717570wro.388.1609455036959; Thu, 31 Dec 2020 14:50:36 -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 17/18] hw/pci-host/bonito: Declare TYPE_BONITO_PCI_HOST_BRIDGE in include/ Date: Thu, 31 Dec 2020 23:49:10 +0100 Message-Id: <20201231224911.1467352-18-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) Declare TYPE_BONITO_PCI_HOST_BRIDGE in the new "hw/pci-host/bonito.h" header, so we can inline the bonito_init() call in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/bonito.h | 34 ++++++++++++++++++++++++++++++++++ hw/pci-host/bonito.c | 16 +--------------- MAINTAINERS | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 include/hw/pci-host/bonito.h diff --git a/include/hw/pci-host/bonito.h b/include/hw/pci-host/bonito.h new file mode 100644 index 00000000000..d0264f34783 --- /dev/null +++ b/include/hw/pci-host/bonito.h @@ -0,0 +1,34 @@ +/* + * Algorithmics Bonito64 'north bridge' controller + * + * Copyright (c) 2008 yajin (yajin@vm-kernel.org) + * Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com) + * Copyright (c) 2020 Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef HW_PCI_HOST_BONITO_H +#define HW_PCI_HOST_BONITO_H + +#include "exec/memory.h" +#include "hw/pci/pci_host.h" +#include "qom/object.h" + +typedef struct BonitoPciState BonitoPciState; + +#define TYPE_BONITO_PCI_HOST_BRIDGE "Bonito-pcihost" +OBJECT_DECLARE_SIMPLE_TYPE(BonitoState, BONITO_PCI_HOST_BRIDGE) + +typedef struct BonitoState BonitoState; + +struct BonitoState { + /*< private >*/ + PCIHostState parent_obj; + /*< public >*/ + qemu_irq *pic; + BonitoPciState *pci_dev; + MemoryRegion pci_mem; + MemoryRegion pcimem_lo_alias[3]; +}; + +#endif diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 5a8a85ae443..b959b353854 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -45,6 +45,7 @@ #include "hw/pci/pci.h" #include "hw/irq.h" #include "hw/mips/mips.h" +#include "hw/pci-host/bonito.h" #include "hw/pci/pci_host.h" #include "migration/vmstate.h" #include "sysemu/reset.h" @@ -198,8 +199,6 @@ FIELD(PCIMAP, 2G, 18, 1) ((((busno) << 16) & 0xff0000) + (((devno) << 11) & 0xf800) + \ (((funno) << 8) & 0x700) + (regno)) =20 -typedef struct BonitoState BonitoState; - struct BonitoPciState { PCIDevice dev; =20 @@ -227,20 +226,7 @@ struct BonitoPciState { MemoryRegion iomem_cop; MemoryRegion bonito_pciio; MemoryRegion bonito_localio; - }; -typedef struct BonitoPciState BonitoPciState; - -struct BonitoState { - PCIHostState parent_obj; - qemu_irq *pic; - BonitoPciState *pci_dev; - MemoryRegion pci_mem; - MemoryRegion pcimem_lo_alias[3]; -}; - -#define TYPE_BONITO_PCI_HOST_BRIDGE "Bonito-pcihost" -OBJECT_DECLARE_SIMPLE_TYPE(BonitoState, BONITO_PCI_HOST_BRIDGE) =20 #define TYPE_PCI_BONITO "Bonito" OBJECT_DECLARE_SIMPLE_TYPE(BonitoPciState, PCI_BONITO) diff --git a/MAINTAINERS b/MAINTAINERS index 1e7c8f04885..2e22830efba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1153,6 +1153,7 @@ F: hw/mips/fuloong2e.c F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h +F: include/hw/pci-host/bonito.h =20 Loongson-3 virtual platforms M: Huacai Chen --=20 2.26.2 From nobody Tue Nov 18 09:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609455043; cv=none; d=zohomail.com; s=zohoarc; b=LjuqLnE55DwIxEPSjTq3Qdflnfn6aPoXN9u5DpPd0LyVvN0B/uviakfoUoF5X2iCK1p3Tc0J+tGeGBBLk0VUp4QvyFcV3pODYuvv1JRGaqUvYSwGHJdM0hg25yCaHkqrql6dcUJSURzLpy2A9Hmrgdb0vfRTkRcdKAlsXyvVr5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455043; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=423UJbcbIa77Pf7DWP8ntIYBlM/uiTnfSWl6dX1wzkM=; b=CI7A6rAeV+ROdoOtUwUetzRZXoxIxHO8GL/H1k58nrbJx27nutJhFHPbf2nfPurwOmJB0Od6+ECI8cVCoREejjiSXrYAqAp8sBK5g5ivaiRbUwmXBn/xhHDEsEMOLIXGw33v1YSikLE95GjElqL85qE/aZH0g5rFxr1YpwFDgFw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1609455043741601.4536576437504; Thu, 31 Dec 2020 14:50:43 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id i9so21046433wrc.4 for ; Thu, 31 Dec 2020 14:50:43 -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 r2sm72319749wrn.83.2020.12.31.14.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:41 -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=423UJbcbIa77Pf7DWP8ntIYBlM/uiTnfSWl6dX1wzkM=; b=HW7xG8rDq7aUhQi7ETz8ENCqsU1WwI/QSBHCBNc/SjvA4QX+bK0F/x5O+5Mp1gL+lH 3BMhjbDNcoZF+FntBru1ljFl1aglY+7p2Mq/NRueKvuCkbTuy0jHgeQOLHOzSw/6U8JW sS1xE2ajx05WduvWP/GHxB1BogmBdQfCtyEARdO9l8fAtrUqn7Pjgc9+UiMFq/vxWcTj 9wW4Dr4JoAUALxP1SUserUpYlRbujasv86y/TvVfZYpTxP7aQsmaNL4NfRE1nVfH0GqK bRtM7WQLXLhcjQSi6EgK73IjEpEr4Basevbt887Sozm/28D3zvejOQeIFp9HME3Kpo9E VitA== 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=423UJbcbIa77Pf7DWP8ntIYBlM/uiTnfSWl6dX1wzkM=; b=DtxaOr1HJebpB7i6PjasODoj3VoZCVzY+uj9puGSo90um3LpnKwIVLh5tDLwIUM4/U o+QktzAg0r0vjbeW104Z6QTFZcFDlpmGtO2FY5nlIGWipU9Y8bgVkTYJdwRYMQe1B+tb 68xpheF/IhmrPJiKqgYTMUjwYDQr4xHWHpOn+eVYvVz/esitPjz2WIoeIfOCa8ReNtC/ 9R+/tqWWV6m9zSJ/Xw38XA+bbsiXCEyPqX6fL9livbk6aQ5p5FhmTEORjbrI5hHgyy26 KSibhGyh7zE77Bb8f4PfkpM9lwU8F3WqsyoWs4jsBrSLtgGdeqrpOOxPDJ/q1YGqfyTM wtRQ== X-Gm-Message-State: AOAM530ve8rS1ZksEv6X4lzVXn8/SDHafk8iXf2FxF+zV0+Zx/OlR9pt +IFfVpMO2k2REVG2+PMa5Cs= X-Google-Smtp-Source: ABdhPJy+j67cr4SJreaz//u0IYQ5JJaJyIpWlW0YHR4WoxboDfiDlcg3bHROCNdQWmLaZyn3w0A9OA== X-Received: by 2002:a05:6000:cc:: with SMTP id q12mr67707459wrx.335.1609455041958; Thu, 31 Dec 2020 14:50:41 -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: [RFC PATCH 18/18] hw/mips/fuloong2e: Inline bonito_init() Date: Thu, 31 Dec 2020 23:49:11 +0100 Message-Id: <20201231224911.1467352-19-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) Remove bonito_init() by inlining it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- TBC next year. --- include/hw/mips/mips.h | 3 --- hw/mips/fuloong2e.c | 7 ++++++- hw/pci-host/bonito.c | 15 --------------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h index 6c9c8805f3f..609a33881f6 100644 --- a/include/hw/mips/mips.h +++ b/include/hw/mips/mips.h @@ -12,9 +12,6 @@ /* gt64xxx.c */ PCIBus *gt64120_register(qemu_irq *pic); =20 -/* bonito.c */ -PCIBus *bonito_init(qemu_irq *pic); - /* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma; void rc4030_dma_read(void *dma, uint8_t *buf, int len); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 45c596f4fe5..19b3788e816 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -25,6 +25,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/clock.h" +#include "hw/pci-host/bonito.h" #include "hw/intc/i8259.h" #include "hw/dma/i8257.h" #include "hw/isa/superio.h" @@ -303,6 +304,7 @@ static void mips_fuloong2e_init(MachineState *machine) MIPSCPU *cpu; CPUMIPSState *env; DeviceState *dev; + BonitoState *bonito; =20 cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); clock_set_hz(cpuclk, 533080000); /* ~533 MHz */ @@ -360,7 +362,10 @@ static void mips_fuloong2e_init(MachineState *machine) cpu_mips_clock_init(cpu); =20 /* North bridge, Bonito --> IP2 */ - pci_bus =3D bonito_init((qemu_irq *)&(env->irq[2])); + bonito =3D BONITO_PCI_HOST_BRIDGE(qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE= )); + bonito->pic =3D (qemu_irq *)&(env->irq[2]); /* TODO link/property */ + sysbus_realize_and_unref(SYS_BUS_DEVICE(bonito), &error_fatal); + pci_bus =3D PCI_HOST_BRIDGE(bonito)->bus; =20 /* South bridge -> IP5 */ vt82c686b_southbridge_init(pci_bus, FULOONG2E_VIA_SLOT, env->irq[5], diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index b959b353854..28d385ff363 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -714,21 +714,6 @@ static void bonito_pci_realize(PCIDevice *dev, Error *= *errp) qemu_register_reset(bonito_reset, s); } =20 -PCIBus *bonito_init(qemu_irq *pic) -{ - DeviceState *dev; - BonitoState *pcihost; - PCIHostState *phb; - - dev =3D qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE); - phb =3D PCI_HOST_BRIDGE(dev); - pcihost =3D BONITO_PCI_HOST_BRIDGE(dev); - pcihost->pic =3D pic; - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - - return phb->bus; -} - static void bonito_pci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); --=20 2.26.2